[dia] Update Chinese simplified translation



commit 850cfeed117548705f4c6ac9d3cea495cfc24c31
Author: 玉堂白鹤 <yjwork xfce gmail com>
Date:   Sat Aug 3 21:08:00 2013 +0800

    Update Chinese simplified translation

 po/zh_CN.po |10837 +++++++++++++++++++++++++++++------------------------------
 1 files changed, 5255 insertions(+), 5582 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6c1cb34..bb47155 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,41 +6,44 @@
 # Funda Wang <fundawang linux net cn>, 2004
 # 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
 msgid ""
 msgstr ""
 "Project-Id-Version: dia 0.96.1\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=dia&component=general\n"
-"POT-Creation-Date: 2010-07-16 11:26+0000\n"
-"PO-Revision-Date: 2010-07-27 16:14+0800\n"
-"Last-Translator: 丁鑫 <xgnid foxmail com>\n"
+"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"
 "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"
 
 #. This is not an errror
-#: ../app/app_procs.c:209
+#: ../app/app_procs.c:208
 #, c-format
 msgid "Warning: invalid layer range %lu - %lu\n"
 msgstr "警告:无效的图层范围 %lu - %lu\n"
 
-#: ../app/app_procs.c:221
+#: ../app/app_procs.c:220
 #, c-format
 msgid "Warning: Layer %lu (%s) selected more than once.\n"
 msgstr "警告:图层 %lu (%s) 被多次选择。\n"
 
-#: ../app/app_procs.c:247
+#: ../app/app_procs.c:246
 #, c-format
 msgid "Warning: Layer %d (%s) selected more than once.\n"
 msgstr "警告:图层 %d (%s) 被多次选择。\n"
 
-#: ../app/app_procs.c:256
+#: ../app/app_procs.c:255
 #, c-format
-msgid "Warning: There is no layer named %s\n"
-msgstr "警告:没有名为 %s 的图层\n"
+msgid "Warning: There is no layer named %s.\n"
+msgstr "警告:没有名为 %s 的图层。\n"
 
 #: ../app/app_procs.c:338
 #, c-format
@@ -49,206 +52,217 @@ msgstr "%s 错误:不知道如何导出到 %s\n"
 
 #: ../app/app_procs.c:347
 #, c-format
-msgid "%s error: input and output file name is identical: %s"
+msgid "%s error: input and output filenames are identical: %s"
 msgstr "%s 错误:输入文件和要输出的文件同名:%s"
 
-#: ../app/app_procs.c:355
+#. 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
+msgid "Import"
+msgstr "导入"
+
+#: ../app/app_procs.c:356
 #, c-format
 msgid "%s error: need valid input file %s\n"
 msgstr "%s 错误:需要合法的输入文件 %s\n"
 
 #. if (!quiet)
-#: ../app/app_procs.c:383
+#: ../app/app_procs.c:384
 #, c-format
 msgid "%s --> %s\n"
 msgstr "%s --> %s\n"
 
-#: ../app/app_procs.c:554
+#: ../app/app_procs.c:556
 #, c-format
 msgid "Can't find output format/filter %s\n"
 msgstr "找不到输出格式/过滤器 %s\n"
 
-#: ../app/app_procs.c:624
+#: ../app/app_procs.c:626
 #, c-format
-msgid "Input-directory '%s' must exist!\n"
+msgid "Input directory '%s' must exist!\n"
 msgstr "输入目录“%s”必须存在!\n"
 
-#: ../app/app_procs.c:641
+#: ../app/app_procs.c:643
 #, c-format
-msgid "Output-directory '%s' must exist!\n"
+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:691
+#: ../app/app_procs.c:693
 #, c-format
 msgid "Select the filter/format out of: %s"
 msgstr "自此选出过滤器/格式:%s"
 
 #. &export_file_name
-#: ../app/app_procs.c:709
+#: ../app/app_procs.c:711
 msgid "Export loaded file and exit"
 msgstr "导出载入的文件然后退出"
 
-#: ../app/app_procs.c:709
+#: ../app/app_procs.c:711
 msgid "OUTPUT"
 msgstr "输出"
 
 #. &export_file_format
 #. &export_format_string
-#: ../app/app_procs.c:711
+#: ../app/app_procs.c:713
 msgid "TYPE"
 msgstr "类型"
 
-#: ../app/app_procs.c:713
+#: ../app/app_procs.c:715
 msgid "Export graphics size"
 msgstr "导出图像大小"
 
-#: ../app/app_procs.c:713
+#: ../app/app_procs.c:715
 msgid "WxH"
 msgstr "宽x高"
 
-#: ../app/app_procs.c:715
+#: ../app/app_procs.c:717
 msgid ""
 "Show only specified layers (e.g. when exporting). Can be either the layer "
 "name or a range of layer numbers (X-Y)"
 msgstr "只显示指定的图层(例如:导出时)。可以用图层名称或是图层号的范围(X-Y)"
 
-#: ../app/app_procs.c:716
+#: ../app/app_procs.c:718
 msgid "LAYER,LAYER,..."
 msgstr "图层、图层……"
 
-#: ../app/app_procs.c:718
+#: ../app/app_procs.c:720
 msgid "Don't show the splash screen"
 msgstr "不显示启动画面"
 
-#: ../app/app_procs.c:720
-msgid "Don't create empty diagram"
+#: ../app/app_procs.c:722
+msgid "Don't create an empty diagram"
 msgstr "不创建空图表"
 
-#: ../app/app_procs.c:722
+#: ../app/app_procs.c:724
 msgid "Start integrated user interface (diagrams in tabs)"
 msgstr "启动集成的用户界面(图表显示为标签)"
 
-#: ../app/app_procs.c:724
+#: ../app/app_procs.c:726
 msgid "Send error messages to stderr instead of showing dialogs."
 msgstr "将错误信息发送至标准错误,而不显示对话框。"
 
-#: ../app/app_procs.c:726
+#: ../app/app_procs.c:728
 msgid "Directory containing input files"
 msgstr "输入文件所在目录"
 
-#: ../app/app_procs.c:726 ../app/app_procs.c:728
+#: ../app/app_procs.c:728 ../app/app_procs.c:730
 msgid "DIRECTORY"
 msgstr "目录"
 
-#: ../app/app_procs.c:728
+#: ../app/app_procs.c:730
 msgid "Directory containing output files"
 msgstr "输出文件所在目录"
 
-#: ../app/app_procs.c:730
+#: ../app/app_procs.c:732
 msgid "Display credits list and exit"
 msgstr "显示致谢清单后退出"
 
-#: ../app/app_procs.c:732
+#: ../app/app_procs.c:734
 msgid "Generate verbose output"
 msgstr "产生详细的输出"
 
-#: ../app/app_procs.c:734
+#: ../app/app_procs.c:736
 msgid "Display version and exit"
 msgstr "显示版本后退出"
 
-#: ../app/app_procs.c:757
+#: ../app/app_procs.c:763
 msgid "[FILE...]"
 msgstr "[文件...]"
 
-#: ../app/app_procs.c:769
+#: ../app/app_procs.c:777
 #, c-format
 msgid "Invalid option?"
 msgstr "无效的选项?"
 
-#: ../app/app_procs.c:792
+#: ../app/app_procs.c:800
 #, c-format
 msgid "Filename conversion failed: %s\n"
 msgstr "文件名转换失败:%s\n"
 
-#: ../app/app_procs.c:805
+#: ../app/app_procs.c:813
 #, c-format
 msgid "Missing input: %s\n"
 msgstr "缺少输入:%s\n"
 
-#: ../app/app_procs.c:830
+#: ../app/app_procs.c:838
 msgid "Can't connect to session manager!\n"
 msgstr "无法连接会话管理器!\n"
 
 #. TRANSLATOR: 2nd and 3rd %s are time and date respectively.
-#: ../app/app_procs.c:870
+#: ../app/app_procs.c:880
 #, c-format
 msgid "Dia version %s, compiled %s %s\n"
 msgstr "Dia 版本 %s,编译于 %s %s\n"
 
-#: ../app/app_procs.c:872
+#: ../app/app_procs.c:882
 #, c-format
 msgid "Dia version %s\n"
 msgstr "Dia 版本 %s\n"
 
-#: ../app/app_procs.c:910
+#: ../app/app_procs.c:920
+msgid "Object Defaults"
+msgstr "对象默认值"
+
+#: ../app/app_procs.c:927
 msgid ""
 "Couldn't find standard objects when looking for object-libs; exiting...\n"
 msgstr "查找对象库时无法找到标准对象,正在退出...\n"
 
-#: ../app/app_procs.c:912
+#: ../app/app_procs.c:929
 #, c-format
 msgid ""
 "Couldn't find standard objects when looking for object-libs in '%s'; "
 "exiting...\n"
 msgstr "查找“%s”中的对象库时,无法找到标准对象;正在退出...\n"
 
-#: ../app/app_procs.c:979
+#: ../app/app_procs.c:993
 msgid "Diagram1.dia"
 msgstr "图表1.dia"
 
-#: ../app/app_procs.c:1014
+#: ../app/app_procs.c:1028
 msgid ""
 "This shouldn't happen.  Please file a bug report at bugzilla.gnome.org\n"
-"describing how you can cause this message to appear.\n"
+"describing how you caused this message to appear.\n"
 msgstr ""
 "错误的程序状态。请在 bugzilla.gnome.org 提交错误报告,\n"
 "描述您如何致使 Dia 出现这个错误信息的。\n"
 
-#: ../app/app_procs.c:1029
+#: ../app/app_procs.c:1043
 msgid "Exiting Dia"
 msgstr "退出 Dia"
 
 #. no standard buttons
-#: ../app/app_procs.c:1093
+#: ../app/app_procs.c:1107
 msgid "Quitting without saving modified diagrams"
 msgstr "在不保存图表改动的情况下退出"
 
-#: ../app/app_procs.c:1095
+#: ../app/app_procs.c:1109
 msgid ""
 "Modified diagrams exist. Are you sure you want to quit Dia without saving "
 "them?"
 msgstr "图表已修改。确定不保存文件并退出Dia?"
 
-#: ../app/app_procs.c:1099
+#: ../app/app_procs.c:1113
 msgid "Quit Dia"
 msgstr "退出 Dia"
 
-#: ../app/app_procs.c:1168 ../app/app_procs.c:1175
-msgid "Could not create per-user Dia config directory"
+#: ../app/app_procs.c:1186 ../app/app_procs.c:1193
+msgid "Could not create per-user Dia configuration directory"
 msgstr "无法创建用户的 Dia 配置目录"
 
-#: ../app/app_procs.c:1178
+#: ../app/app_procs.c:1196
 msgid ""
-"Could not create per-user Dia config directory. Please make sure that the "
-"environment variable HOME points to an existing directory."
+"Could not create per-user Dia configuration directory. Please make sure that "
+"the environment variable HOME points to an existing directory."
 msgstr "无法创建用户的 Dia 配置目录。请确定环境变量 HOME 指向存在的目录。"
 
-#: ../app/app_procs.c:1201
-msgid "Objects and filters internal to dia"
+#: ../app/app_procs.c:1219
+msgid "Objects and filters internal to Dia"
 msgstr "Dia 内部的对象和过滤器"
 
-#: ../app/app_procs.c:1257
+#: ../app/app_procs.c:1272
 #, c-format
 msgid ""
 "The original author of Dia was:\n"
@@ -257,7 +271,7 @@ msgstr ""
 "Dia 原作者:\n"
 "\n"
 
-#: ../app/app_procs.c:1262
+#: ../app/app_procs.c:1277
 #, c-format
 msgid ""
 "\n"
@@ -268,7 +282,7 @@ msgstr ""
 "Dia 当前的维护者:\n"
 "\n"
 
-#: ../app/app_procs.c:1267
+#: ../app/app_procs.c:1282
 #, c-format
 msgid ""
 "\n"
@@ -279,7 +293,7 @@ msgstr ""
 "其它作者:\n"
 "\n"
 
-#: ../app/app_procs.c:1272
+#: ../app/app_procs.c:1287
 #, c-format
 msgid ""
 "\n"
@@ -290,44 +304,54 @@ msgstr ""
 "Dia 文档编写:\n"
 "\n"
 
-#: ../app/autosave.c:90
-msgid "Recovering autosaved diagrams"
-msgstr "正在恢复自动保存的图表"
-
-#: ../app/autosave.c:98
-msgid ""
-"Autosaved files exist.\n"
-"Please select those you wish to recover."
-msgstr ""
-"发现自动保存的文件。\n"
-"请选择希望恢复的文件。"
-
-#: ../app/color_area.c:316 ../app/color_area.c:359
+#: ../app/color_area.c:333 ../app/color_area.c:343
 msgid "Select foreground color"
 msgstr "选择前景色"
 
-#: ../app/color_area.c:317 ../app/color_area.c:360
+#: ../app/color_area.c:334 ../app/color_area.c:344
 msgid "Select background color"
 msgstr "选择背景色"
 
-#: ../app/commands.c:124
-msgid "No print plug-in found!"
+#: ../app/commands.c:131
+msgid "No print plugin found!"
 msgstr "没有找到打印插件!"
 
-#: ../app/commands.c:143
+#: ../app/commands.c:150
 #, c-format
 msgid "Diagram%d.dia"
 msgstr "图表%d.dia"
 
-#: ../app/commands.c:336
+#: ../app/commands.c:249
+msgid "No image from Clipboard to paste."
+msgstr "没有可从剪贴板粘贴的图像。"
+
+#: ../app/commands.c:298
+msgid "No selected object can take an image."
+msgstr "没有选择可以容纳图像的对象。"
+
+#: ../app/commands.c:325
+msgid "Clipboard Paste"
+msgstr "剪切板粘贴"
+
+#. might become more right some day ;)
+#: ../app/commands.c:333
+#, c-format
+msgid "No clipboard handler for '%s'"
+msgstr "没有对应“%s”的剪贴板处理器"
+
+#: ../app/commands.c:424
+msgid "Clipboard Copy"
+msgstr "剪切板复制"
+
+#: ../app/commands.c:623
 msgid "No existing object to paste.\n"
 msgstr "没有要粘贴的对象。\n"
 
-#: ../app/commands.c:641 ../app/commands.c:679
+#: ../app/commands.c:933 ../app/commands.c:971
 msgid "Could not find help directory"
 msgstr "无法找到帮助目录"
 
-#: ../app/commands.c:648
+#: ../app/commands.c:940
 #, c-format
 msgid ""
 "Could not open help directory:\n"
@@ -336,7 +360,7 @@ msgstr ""
 "无法打开帮助目录:\n"
 "%s"
 
-#: ../app/commands.c:725
+#: ../app/commands.c:1008
 msgid "translator_credits-PLEASE_ADD_YOURSELF_HERE"
 msgstr ""
 "Wang Jian <lark linux net cn>, 2001\n"
@@ -344,9 +368,11 @@ msgstr ""
 "Wen Shaohua <nadwsh sbell com cn>, 2002\n"
 "Funda Wang <fundawang linux net cn>, 2004\n"
 "James Meng <linuxmeng gmail com>, 2009\n"
-"Ming Yang <yamisoe gmail com, 2009>"
+"Ming Yang <yamisoe gmail com>, 2009\n"
+"丁鑫 <xgnid foxmail com>, 2010\n"
+"玉堂白鹤 <yjwork xfce gmail com>, 2013"
 
-#: ../app/commands.c:727
+#: ../app/commands.c:1010
 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"
@@ -374,27 +400,36 @@ msgstr ""
 "如果还没有,写信给:Free Software Foundation, Inc., 59 Temple Place - Suite "
 "330, Boston, MA 02111-1307, USA。\n"
 
-#: ../app/commands.c:750
+#: ../app/commands.c:1037
 msgid "A program for drawing structured diagrams."
 msgstr "结构性图表绘制程序。"
 
-#: ../app/confirm.c:69
+#: ../app/confirm.c:71
 #, c-format
-msgid "You are about to print a diagram with %d pages."
-msgstr "您正准备打印一份 %d 页的图表。"
+#| 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:71
+#: ../app/confirm.c:75
 #, c-format
-msgid "You are about to export a diagram with %d pages."
-msgstr "您正准备导出一份 %d 页的图表。"
+#| 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:73
+#: ../app/confirm.c:79
 #, 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 "您即将导出的图表可能需要 %s 内存(%d 页)。"
+msgstr[0] "您即将导出的图表可能需要 %s 内存(%d 页)。"
 
-#: ../app/confirm.c:81
+#: ../app/confirm.c:88
 msgid ""
 "You can adjust the size of the diagram by changing the 'Scaling' in the "
 "'Page Setup' dialog.\n"
@@ -404,7 +439,7 @@ msgstr ""
 "您可以通过在“页面设置”对话框中改变“缩放比例”来调整图表的尺寸。\n"
 "也可以用“全选”和“最适合”将对象移到想要的范围内。"
 
-#: ../app/confirm.c:85
+#: ../app/confirm.c:92
 msgid "Confirm Diagram Size"
 msgstr "确认图表尺寸"
 
@@ -413,322 +448,222 @@ msgstr "确认图表尺寸"
 msgid "'%s' creation failed"
 msgstr "创建“%s”失败"
 
-#: ../app/defaults.c:43 ../app/defaults.c:151
+#: ../app/defaults.c:44 ../app/defaults.c:147
 msgid "Object defaults"
 msgstr "对象默认值"
 
-#: ../app/defaults.c:61
+#: ../app/defaults.c:62
 msgid "This object has no defaults."
 msgstr "此对象没有默认值。"
 
-#: ../app/defaults.c:115
+#: ../app/defaults.c:111
 msgid "Defaults: "
 msgstr "默认:"
 
-#: ../app/dia-props.c:85
-msgid "Diagram Properties"
-msgstr "图表属性"
-
-#: ../app/dia-props.c:119
-msgid "Dynamic grid"
-msgstr "动态网格"
-
-#: ../app/dia-props.c:127
-msgid "x"
-msgstr "x"
-
-#: ../app/dia-props.c:131
-msgid "y"
-msgstr "y"
-
-#: ../app/dia-props.c:136
-msgid "Spacing"
-msgstr "间距"
-
-#: ../app/dia-props.c:156
-msgid "Visible spacing"
-msgstr "可见间距"
-
-#. Hexes!
-#: ../app/dia-props.c:177 ../app/preferences.c:242
-msgid "Hex grid"
-msgstr "六角网格"
-
-#: ../app/dia-props.c:185
-msgid "Hex grid size"
-msgstr "六角网格大小"
-
-#: ../app/dia-props.c:198
-msgid "Grid"
-msgstr "网格"
-
-#: ../app/dia-props.c:209 ../lib/diagramdata.c:117
-msgid "Background"
-msgstr "背景"
-
-#: ../app/dia-props.c:220 ../app/preferences.c:122
-msgid "Grid Lines"
-msgstr "网格线"
-
-#: ../app/dia-props.c:231
-msgid "Page Breaks"
-msgstr "换页"
-
-#: ../app/dia-props.c:242
-msgid "Colors"
-msgstr "颜色"
-
-#. Can we be sure that the filename is the 'proper title'?
-#: ../app/dia-props.c:263
-#, c-format
-msgid "Diagram Properties: %s"
-msgstr "图表属性:%s"
-
-#: ../app/diacanvas.c:122
-msgid "X position"
-msgstr "X 位置"
-
-#: ../app/diacanvas.c:123
-msgid "X position of child widget"
-msgstr "子部件的 X 位置"
-
-#: ../app/diacanvas.c:132
-msgid "Y position"
-msgstr "Y 位置"
-
-#: ../app/diacanvas.c:133
-msgid "Y position of child widget"
-msgstr "子部件的 Y 位置"
-
-#: ../app/diagram.c:234
+#: ../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:237 ../lib/message.c:90 ../lib/message.c:293
+#: ../app/diagram.c:240 ../lib/message.c:91 ../lib/message.c:299
 msgid "Error"
 msgstr "错误"
 
-#: ../app/diagram.c:1219
+#. ToDo: move context further up in the callstack and to sth useful with it's content
+#: ../app/diagram.c:272
+msgid "Load Into"
+msgstr "加载到"
+
+#: ../app/diagram.c:1217
 msgid "Trying to group with no selected objects."
 msgstr "没有选中任何对象以供组合。"
 
-#: ../app/diagram.c:1229
-msgid ""
-"You cannot group objects that belong to different groups or have different "
-"parents"
-msgstr "不能组合属于不同组或者拥有不同父对象的对象"
-
-#: ../app/diagram_tree_menu.c:47
-msgid "/_Sort objects"
-msgstr "/对象排序(_S)"
-
-#: ../app/diagram_tree_menu.c:48
-msgid "/Sort objects/by _name"
-msgstr "/对象排序(S)/按名称(_N)"
-
-#: ../app/diagram_tree_menu.c:50
-msgid "/Sort objects/by _type"
-msgstr "/对象排序(S)/按类型(_T)"
-
-#: ../app/diagram_tree_menu.c:52
-msgid "/Sort objects/as _inserted"
-msgstr "/对象排序(S)/按插入先后(_I)"
-
-#: ../app/diagram_tree_menu.c:55
-msgid "/Sort objects/All by name"
-msgstr "/对象排序(S)/全部按名称"
-
-#: ../app/diagram_tree_menu.c:57
-msgid "/Sort objects/All by type"
-msgstr "/对象排序(S)/全部按类型"
-
-#: ../app/diagram_tree_menu.c:59
-msgid "/Sort objects/All as inserted"
-msgstr "/对象排序(S)/全部按插入先后"
-
-#: ../app/diagram_tree_menu.c:61
-msgid "/Sort objects/_Default"
-msgstr "/对象排序(S)/默认(_D)"
-
-#: ../app/diagram_tree_menu.c:62
-msgid "/Sort objects/Default/by _name"
-msgstr "/对象排序(S)/默认(D)/按名称(_N)"
-
-#: ../app/diagram_tree_menu.c:64
-msgid "/Sort objects/Default/by _type"
-msgstr "/对象排序(S)/默认(D)/按类型(_T)"
-
-#: ../app/diagram_tree_menu.c:66
-msgid "/Sort objects/Default/as _inserted"
-msgstr "/对象排序(S)/默认(D)/按插入先后(_I)"
-
-#: ../app/diagram_tree_menu.c:68
-msgid "/Sort _diagrams"
-msgstr "/图表排序(_D)"
-
-#: ../app/diagram_tree_menu.c:69
-msgid "/Sort _diagrams/by _name"
-msgstr "/图表排序(_D)/根据名称(_N)"
-
-#: ../app/diagram_tree_menu.c:71
-msgid "/Sort _diagrams/as _inserted"
-msgstr "/图表排序(_D)/按插入先后(_I)"
-
-#: ../app/diagram_tree_menu.c:73
-msgid "/Sort diagrams/_Default"
-msgstr "/图表排序(D)/默认(_D)"
-
-#: ../app/diagram_tree_menu.c:74
-msgid "/Sort diagrams/Default/by _name"
-msgstr "/图表排序(D)/默认(D)/根据名称(_N)"
-
-#: ../app/diagram_tree_menu.c:76
-msgid "/Sort diagrams/Default/as _inserted"
-msgstr "/图表排序(D)/默认(D)/按插入先后(_I)"
-
-#: ../app/diagram_tree_menu.c:84 ../app/diagram_tree_menu.c:95
-msgid "/_Locate"
-msgstr "/定位(_L)"
-
-#: ../app/diagram_tree_menu.c:85
-msgid "/_Properties"
-msgstr "/属性(_P)"
-
-#: ../app/diagram_tree_menu.c:86
-msgid "/_Hide this type"
-msgstr "/隐藏此类型(_H)"
-
-#: ../app/diagram_tree_view.c:161
+#: ../app/diagram_tree_view.c:164
 msgid "Diagram"
 msgstr "图表"
 
-#: ../app/diagram_tree_view.c:165
-#: ../plug-ins/drs/dia-render-script-import.c:231
+#: ../app/diagram_tree_view.c:171
+#: ../plug-ins/drs/dia-render-script-import.c:232
 msgid "Layer"
 msgstr "图层"
 
-#: ../app/diagram_tree_view.c:169
-msgid "Layer(s)"
-msgstr "图层"
+#: ../app/diagram_tree_view.c:177
+#, c-format
+msgid "%d Layer"
+msgid_plural "%d Layers"
+msgstr[0] "%d 个图层"
 
-#: ../app/diagram_tree_view.c:172 ../app/diagram_tree_view.c:465
-#: ../objects/Database/table.c:141 ../objects/Istar/actor.c:146
-#: ../objects/Istar/actor.c:147 ../objects/Istar/other.c:150
-#: ../objects/Istar/other.c:151 ../objects/KAOS/other.c:153
-#: ../objects/KAOS/other.c:154 ../objects/UML/association.c:240
+#: ../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
 msgid "Type"
 msgstr "类型"
 
-#. Translators: Menu item Verb/Support/Position
-#. Translators: Menu item Verb/Support/Position/Position
-#: ../app/diagram_tree_view.c:173 ../objects/FS/function.c:805
-#: ../objects/FS/function.c:807 ../objects/Istar/actor.c:70
-msgid "Position"
-msgstr "位置"
+#: ../app/diagram_tree_view.c:184
+msgid "object|Position"
+msgstr "对象|位置"
 
 #
-#: ../app/diagram_tree_view.c:176
+#: ../app/diagram_tree_view.c:187
 msgid "Children"
 msgstr "子对象"
 
-#
-#: ../app/diagram_tree_view.c:180
-msgid "Object(s)"
-msgstr "对象"
+#: ../app/diagram_tree_view.c:191
+#, c-format
+msgid "%d Object"
+msgid_plural "%d Objects"
+msgstr[0] "%d 个对象"
 
 #
-#: ../app/diagram_tree_view.c:396
+#: ../app/diagram_tree_view.c:448
 msgid "Select"
 msgstr "选择"
 
 #. Translators: Menu item Verb/Support/Position/Locate
 #. Translators: Menu item Verb/Signal/Sense/Locate
-#: ../app/diagram_tree_view.c:397 ../objects/FS/function.c:813
-#: ../objects/FS/function.c:1055
+#: ../app/diagram_tree_view.c:449 ../objects/FS/function.c:807
+#: ../objects/FS/function.c:1049
 msgid "Locate"
 msgstr "定位"
 
-#: ../app/diagram_tree_view.c:398
+#: ../app/diagram_tree_view.c:450
 msgid "Properties"
 msgstr "属性(_P)"
 
-#. *** board of value **************
-#: ../app/diagram_tree_view.c:448 ../app/exit_dialog.c:123
-#: ../app/plugin-manager.c:262 ../objects/Database/table.c:139
-#: ../objects/Database/table.c:182 ../objects/SISSI/sissi_dialog.c:734
-#: ../objects/UML/association.c:234 ../objects/UML/class.c:145
-#: ../objects/UML/large_package.c:139 ../objects/UML/umlattribute.c:37
-#: ../objects/UML/umlformalparameter.c:35 ../objects/UML/umloperation.c:62
-#: ../objects/UML/umlparameter.c:43
+#: ../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
 msgid "Name"
 msgstr "名字"
 
-#: ../app/diagram_tree_view.c:511 ../app/diagram_tree_window.c:80
-#: ../app/preferences.c:123
+#: ../app/diagram_tree_view.c:565
 msgid "Diagram Tree"
 msgstr "图表树"
 
 #. paper size
-#: ../app/diapagelayout.c:153
+#: ../app/diapagelayout.c:155
 msgid "Paper Size"
 msgstr "纸张大小"
 
 #. orientation
-#: ../app/diapagelayout.c:186
+#: ../app/diapagelayout.c:184
 msgid "Orientation"
 msgstr "方向"
 
 #. margins
-#: ../app/diapagelayout.c:224
+#: ../app/diapagelayout.c:213
 msgid "Margins"
 msgstr "边距"
 
-#: ../app/diapagelayout.c:236
+#: ../app/diapagelayout.c:225
 msgid "Top:"
 msgstr "顶部:"
 
-#: ../app/diapagelayout.c:249
+#: ../app/diapagelayout.c:238
 msgid "Bottom:"
 msgstr "底部:"
 
-#: ../app/diapagelayout.c:262
+#: ../app/diapagelayout.c:251
 msgid "Left:"
 msgstr "左边:"
 
-#: ../app/diapagelayout.c:275
+#: ../app/diapagelayout.c:264
 msgid "Right:"
 msgstr "右边:"
 
 #. Scaling
-#: ../app/diapagelayout.c:289
+#: ../app/diapagelayout.c:278
 msgid "Scaling"
 msgstr "缩放比例"
 
-#: ../app/diapagelayout.c:300
+#: ../app/diapagelayout.c:289
 msgid "Scale:"
 msgstr "比例:"
 
-#: ../app/diapagelayout.c:312
+#: ../app/diapagelayout.c:301
 msgid "Fit to:"
 msgstr "适合于:"
 
-#: ../app/diapagelayout.c:324
+#: ../app/diapagelayout.c:313
 msgid "by"
 msgstr "由"
 
-#: ../app/diapagelayout.c:741
+#: ../app/diapagelayout.c:732
 #, c-format
 msgid "%0.3gcm x %0.3gcm"
 msgstr "%0.3g厘米 x %0.3g厘米"
 
-#: ../app/diapagelayout.c:845 ../app/pagesetup.c:76
+#: ../app/diapagelayout.c:836 ../app/pagesetup.c:77
 msgid "Page Setup"
 msgstr "页面设置"
 
-#: ../app/disp_callbacks.c:91 ../app/properties-dialog.c:158
+#: ../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-props.c:137
+msgid "Spacing"
+msgstr "间距"
+
+#: ../app/dia-props.c:157
+msgid "Visible spacing"
+msgstr "可见间距"
+
+#. Hexes!
+#: ../app/dia-props.c:178 ../app/preferences.c:243
+msgid "Hex grid"
+msgstr "六角网格"
+
+#: ../app/dia-props.c:186
+msgid "Hex grid size"
+msgstr "六角网格大小"
+
+#: ../app/dia-props.c:199
+msgid "Grid"
+msgstr "网格"
+
+#: ../app/dia-props.c:210 ../lib/diagramdata.c:123
+msgid "Background"
+msgstr "背景"
+
+#: ../app/dia-props.c:221 ../app/preferences.c:122
+msgid "Grid Lines"
+msgstr "网格线"
+
+#: ../app/dia-props.c:232
+msgid "Page Breaks"
+msgstr "换页"
+
+#: ../app/dia-props.c:243
+msgid "Colors"
+msgstr "颜色"
+
+#. Can we be sure that the filename is the 'proper title'?
+#: ../app/dia-props.c:264
+#, c-format
+msgid "Diagram Properties: %s"
+msgstr "图表属性:%s"
+
+#: ../app/disp_callbacks.c:93 ../app/properties-dialog.c:156
 msgid ""
 "This object doesn't support Undo/Redo.\n"
 "Undo information erased."
@@ -736,16 +671,26 @@ msgstr ""
 "此对象不支持撤消/重做。\n"
 "已删除撤消信息。"
 
-#: ../app/disp_callbacks.c:126
-msgid "Properties..."
-msgstr "属性..."
+#: ../app/disp_callbacks.c:128
+msgid "Properties…"
+msgstr "属性…"
+
+#: ../app/disp_callbacks.c:167
+msgid "Follow link…"
+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
+msgid "Convert to Path"
+msgstr "转换为路径"
 
 #
-#: ../app/disp_callbacks.c:244
+#: ../app/disp_callbacks.c:345
 msgid "Selection"
 msgstr "选择"
 
-#: ../app/disp_callbacks.c:1062
+#: ../app/disp_callbacks.c:1113
 msgid ""
 "The object you dropped cannot fit into its parent. \n"
 "Either expand the parent object, or drop the object elsewhere."
@@ -756,32 +701,32 @@ msgstr ""
 #. http://www.gnu.org/software/gettext/manual/html_chapter/gettext_10.html#SEC150
 #. * Althoug the single objects wont get triggered here some languages have variations on the other numbers
 #.
-#: ../app/display.c:110
+#: ../app/display.c:109
 #, c-format
 msgid "Selection of %d object"
 msgid_plural "Selection of %d objects"
 msgstr[0] "选取了 %d 个对象"
 
-#: ../app/display.c:120
+#: ../app/display.c:119
 #, c-format
 msgid "Selected '%s'"
 msgstr "已选取“%s”"
 
 #. we really should not come here but instead disable the menu command earlier
-#: ../app/display.c:1084
-msgid "No anti-aliased renderer found"
+#: ../app/display.c:1177
+msgid "No antialiased renderer found"
 msgstr "无法找到反锯齿渲染器"
 
-#: ../app/display.c:1222
+#: ../app/display.c:1332
 msgid "<unnamed>"
 msgstr "<未命名>"
 
 #. no standard buttons
-#: ../app/display.c:1228
+#: ../app/display.c:1338
 msgid "Closing diagram without saving"
 msgstr "在不保存图表的情况下关闭"
 
-#: ../app/display.c:1230
+#: ../app/display.c:1340
 #, c-format
 msgid ""
 "The diagram '%s'\n"
@@ -790,11 +735,11 @@ msgstr ""
 "图表“%s”\n"
 "尚未保存过。现在保存更改吗?"
 
-#: ../app/display.c:1232
+#: ../app/display.c:1342
 msgid "Close Diagram"
 msgstr "关闭图表"
 
-#: ../app/display.c:1237
+#: ../app/display.c:1347
 msgid "_Discard Changes"
 msgstr "放弃更改(_D)"
 
@@ -814,53 +759,54 @@ msgstr "保存选中的对象"
 msgid "The following are not saved:"
 msgstr "下列文件还未保存:"
 
-#: ../app/exit_dialog.c:113
+#: ../app/exit_dialog.c:115
 msgid "Save"
 msgstr "保存"
 
-#: ../app/exit_dialog.c:129
+#: ../app/exit_dialog.c:131
 msgid "Path"
 msgstr "路径"
 
 #
-#: ../app/exit_dialog.c:142
+#: ../app/exit_dialog.c:144
 msgid "Select All"
 msgstr "全选"
 
-#: ../app/exit_dialog.c:150
+#: ../app/exit_dialog.c:152
 msgid "Select None"
 msgstr "不选"
 
-#: ../app/exit_dialog.c:236
+#: ../app/exit_dialog.c:244
 msgid "Nothing selected for saving.  Would you like to try again?"
 msgstr "没有选中的对象可供保存。您想再试一次吗?"
 
 #: ../app/filedlg.c:144 ../app/filedlg.c:152 ../app/filedlg.c:168
-#: ../app/filedlg.c:747 ../lib/widgets.c:1473
+#: ../app/filedlg.c:819 ../lib/widgets.c:402
 msgid "Supported Formats"
 msgstr "支持的格式"
 
-#: ../app/filedlg.c:192 ../app/filedlg.c:605
+#: ../app/filedlg.c:197 ../app/filedlg.c:199 ../app/filedlg.c:662
+#: ../app/filedlg.c:664
 msgid "By extension"
 msgstr "按扩展名"
 
-#: ../app/filedlg.c:281
+#: ../app/filedlg.c:293
 msgid "Open Diagram"
 msgstr "打开图表"
 
-#: ../app/filedlg.c:313
+#: ../app/filedlg.c:326
 msgid "Open Options"
 msgstr "打开选项"
 
-#: ../app/filedlg.c:321 ../app/filedlg.c:729
+#: ../app/filedlg.c:334 ../app/filedlg.c:801
 msgid "Determine file type:"
 msgstr "确定文件类型:"
 
-#: ../app/filedlg.c:341 ../app/filedlg.c:742 ../lib/widgets.c:1478
+#: ../app/filedlg.c:354 ../app/filedlg.c:814 ../lib/widgets.c:410
 msgid "All Files"
 msgstr "全部文件"
 
-#: ../app/filedlg.c:374 ../plug-ins/postscript/paginate_psprint.c:408
+#: ../app/filedlg.c:393 ../plug-ins/postscript/paginate_psprint.c:416
 msgid ""
 "Some characters in the filename are neither UTF-8\n"
 "nor your local encoding.\n"
@@ -870,13 +816,13 @@ msgstr ""
 "也不是您的本地编码。\n"
 "这可能会导致一些功能不能正确工作。"
 
-#: ../app/filedlg.c:384 ../app/filedlg.c:652
-#: ../plug-ins/postscript/paginate_psprint.c:422
+#: ../app/filedlg.c:403 ../app/filedlg.c:716
+#: ../plug-ins/postscript/paginate_psprint.c:430
 msgid "File already exists"
 msgstr "文件已存在"
 
-#: ../app/filedlg.c:386 ../app/filedlg.c:654
-#: ../plug-ins/postscript/paginate_psprint.c:418
+#: ../app/filedlg.c:405 ../app/filedlg.c:718
+#: ../plug-ins/postscript/paginate_psprint.c:426
 #, c-format
 msgid ""
 "The file '%s' already exists.\n"
@@ -885,17 +831,17 @@ msgstr ""
 "文件“%s”已存在。\n"
 "您要覆盖它吗?"
 
-#: ../app/filedlg.c:440
+#: ../app/filedlg.c:489
 msgid "Save Diagram"
 msgstr "保存图表"
 
 #. Need better way to make it a reasonable size.  Isn't there some
 #. standard look for them (or is that just Gnome?)
-#: ../app/filedlg.c:451
+#: ../app/filedlg.c:503
 msgid "Compress diagram files"
 msgstr "压缩图表文件"
 
-#: ../app/filedlg.c:460
+#: ../app/filedlg.c:512
 msgid ""
 "Compression reduces file size to less than 1/10th size and speeds up loading "
 "and saving.  Some text programs cannot manipulate compressed files."
@@ -903,7 +849,7 @@ msgstr ""
 "压缩文件到小于原先的 1/10,可以加快载入和保存的速度。但某些文本程序无法处理压"
 "缩过的文件。"
 
-#: ../app/filedlg.c:678
+#: ../app/filedlg.c:747
 #, c-format
 msgid ""
 "Could not determine which export filter\n"
@@ -912,268 +858,137 @@ msgstr ""
 "无法确定使用哪个导出过滤器来保存\n"
 "“%s”"
 
-#: ../app/filedlg.c:705
+#: ../app/filedlg.c:774
 msgid "Export Diagram"
 msgstr "导出图表"
 
-#: ../app/filedlg.c:721
+#: ../app/filedlg.c:793
 msgid "Export Options"
 msgstr "导出选项"
 
-#: ../app/find-and-replace.c:454
+#: ../app/find-and-replace.c:480
 msgid "_Search for:"
 msgstr "搜索(_S):"
 
-#: ../app/find-and-replace.c:467
+#: ../app/find-and-replace.c:493
 msgid "Replace _with:"
 msgstr "替换为(_W):"
 
-#: ../app/find-and-replace.c:477
+#: ../app/find-and-replace.c:503
 msgid "_Match case"
 msgstr "匹配大小写(_M)"
 
-#: ../app/find-and-replace.c:481
+#: ../app/find-and-replace.c:507
 msgid "Match _entire word only"
 msgstr "只匹配整个单词(_E)"
 
-#: ../app/find-and-replace.c:485
+#: ../app/find-and-replace.c:511
 msgid "Match _all properties (not just object name)"
 msgstr "匹配全部属性(不仅仅是对象名称)(_A)"
 
-#: ../app/find-and-replace.c:508
+#: ../app/find-and-replace.c:537
 msgid "Find"
 msgstr "查找"
 
-#: ../app/find-and-replace.c:538 ../app/menus.c:268
+#: ../app/find-and-replace.c:567 ../app/menus.c:263
 msgid "Replace"
 msgstr "替换"
 
-#: ../app/find-and-replace.c:541
+#: ../app/find-and-replace.c:570
 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:546
+#: ../app/find-and-replace.c:575
 msgid "_Replace"
 msgstr "替换(_R)"
 
-#: ../app/interface.c:153
-msgid ""
-"Modify object(s)\n"
-"Use <Space> to toggle between this and other tools"
-msgstr ""
-"修改对象\n"
-"使用<空格键>切换工具"
-
-#: ../app/interface.c:159
-msgid ""
-"Text edit(s)\n"
-"Use <Esc> to leave this tool"
-msgstr ""
-"编辑文本\n"
-"使用<Esc>退出该工具"
-
-#. Translators: Menu item Verb/Control Magnitude/Change/Magnify
-#: ../app/interface.c:165 ../app/menus.c:230 ../objects/FS/function.c:991
-msgid "Magnify"
-msgstr "放大"
-
-#: ../app/interface.c:171
-msgid "Scroll around the diagram"
-msgstr "滚动图表"
-
-#. how it used to be before 0.96+SVN
-#. new name matching "same name, same type"  rule
-#: ../app/interface.c:177 ../app/menus.c:233 ../lib/properties.c:92
-#: ../lib/properties.h:557 ../objects/AADL/aadlbox.c:153
-#: ../objects/Jackson/requirement.c:144 ../objects/UML/activity.c:129
-#: ../objects/UML/actor.c:126 ../objects/UML/classicon.c:149
-#: ../objects/UML/component.c:130 ../objects/UML/component_feature.c:161
-#: ../objects/UML/node.c:130 ../objects/UML/node.c:132
-#: ../objects/UML/note.c:124 ../objects/UML/object.c:151
-#: ../objects/UML/small_package.c:135 ../objects/UML/state.c:154
-#: ../objects/UML/usecase.c:142 ../objects/custom/custom_object.c:237
-#: ../objects/network/basestation.c:135 ../objects/network/radiocell.c:127
-msgid "Text"
-msgstr "文本"
-
-#: ../app/interface.c:183 ../app/menus.c:234
-msgid "Box"
-msgstr "方框"
-
-#: ../app/interface.c:189 ../app/menus.c:235
-msgid "Ellipse"
-msgstr "椭圆"
-
-#: ../app/interface.c:195 ../app/menus.c:236
-msgid "Polygon"
-msgstr "多边形"
-
-#: ../app/interface.c:201 ../app/menus.c:237
-msgid "Beziergon"
-msgstr "贝塞尔封闭曲线"
-
-#: ../app/interface.c:207 ../app/menus.c:239 ../objects/standard/line.c:232
-msgid "Line"
-msgstr "直线"
-
-#: ../app/interface.c:213 ../app/menus.c:240
-msgid "Arc"
-msgstr "圆弧"
-
-#: ../app/interface.c:219 ../app/menus.c:241
-msgid "Zigzagline"
-msgstr "横竖折线"
-
-#: ../app/interface.c:225 ../app/menus.c:242
-msgid "Polyline"
-msgstr "折线"
-
-#: ../app/interface.c:231 ../app/menus.c:243
-msgid "Bezierline"
-msgstr "贝塞尔曲线"
-
-#: ../app/interface.c:237 ../app/menus.c:246
-msgid "Image"
-msgstr "图像"
-
-#: ../app/interface.c:244 ../app/menus.c:244
-msgid "Outline"
-msgstr "轮廓字"
-
-#: ../app/interface.c:623 ../app/interface.c:856
+#: ../app/interface.c:517
 msgid "Pops up the Navigation window."
 msgstr "弹出导航窗口。"
 
-#: ../app/interface.c:818
+#: ../app/interface.c:732
 msgid "Diagram menu."
 msgstr "图表菜单。"
 
-#: ../app/interface.c:921
+#: ../app/interface.c:772
 msgid "Zoom"
 msgstr "缩放"
 
-#: ../app/interface.c:936
+#: ../app/interface.c:787
 msgid "Toggles snap-to-grid for this window."
 msgstr "切换本窗口的“对齐到网格”功能。"
 
-#: ../app/interface.c:947
+#: ../app/interface.c:798
 msgid "Toggles object snapping for this window."
 msgstr "切换本窗口的“对象捕捉”功能。"
 
-#: ../app/interface.c:1336
-#, c-format
-msgid "No sheet named %s"
-msgstr "没有名为 %s 的工作表"
-
-#: ../app/interface.c:1374
-msgid "Other sheets"
-msgstr "其它工作表"
-
-#: ../app/interface.c:1434 ../sheets/Flowchart.sheet.in.h:10
-msgid "Flowchart"
-msgstr "流程图"
-
-#: ../app/interface.c:1494
-msgid ""
-"Foreground & background colors for new objects.  The small black and white "
-"squares reset colors.  The small arrows swap colors.  Double click to change "
-"colors."
-msgstr ""
-"新对象的前景和背景色。黑白小方块可重置颜色。小箭头可调换颜色。双击可改变颜"
-"色。"
-
-#: ../app/interface.c:1508
-msgid ""
-"Line widths.  Click on a line to set the default line width for new "
-"objects.  Double-click to set the line width more precisely."
-msgstr ""
-"直线宽度。单击直线可以设定新对象的缺省线条宽度。双击则可以更精确的设定线宽。"
-
-#: ../app/interface.c:1551
-msgid ""
-"Arrow style at the beginning of new lines.  Click to pick an arrow, or set "
-"arrow parameters with Details..."
-msgstr "新直线起始箭头样式。单击可以挑选箭头,或是用“细节...”设定箭头参数"
-
-#: ../app/interface.c:1556
-msgid ""
-"Line style for new lines.  Click to pick a line style, or set line style "
-"parameters with Details..."
-msgstr "新直线的线条样式。点击可以挑选直线样式,或是用“细节...”设定线条参数"
-
-#: ../app/interface.c:1572
-msgid ""
-"Arrow style at the end of new lines.  Click to pick an arrow, or set arrow "
-"parameters with Details..."
-msgstr "新直线终止箭头样式。点击可以挑选箭头,或是用“细节...”设定箭头参数"
-
-#: ../app/interface.c:1632 ../app/interface.c:1756 ../dia.desktop.in.in.h:3
+#: ../app/interface.c:926 ../app/interface.c:1034 ../dia.desktop.in.in.h:2
 msgid "Diagram Editor"
 msgstr "图表编辑器"
 
-#: ../app/layer_dialog.c:163
+#: ../app/layer_dialog.c:165
 msgid "New Layer"
 msgstr "新建图层"
 
-#: ../app/layer_dialog.c:164
+#: ../app/layer_dialog.c:166
 msgid "Raise Layer"
 msgstr "提高图层"
 
-#: ../app/layer_dialog.c:165
+#: ../app/layer_dialog.c:167
 msgid "Lower Layer"
 msgstr "降低图层"
 
-#: ../app/layer_dialog.c:166
+#: ../app/layer_dialog.c:168
 msgid "Delete Layer"
 msgstr "删除图层"
 
-#: ../app/layer_dialog.c:309
+#: ../app/layer_dialog.c:305
 msgid "Layers:"
 msgstr "图层:"
 
-#: ../app/layer_dialog.c:389
+#: ../app/layer_dialog.c:384
 msgid "Layers"
 msgstr "图层"
 
-#: ../app/layer_dialog.c:403
+#: ../app/layer_dialog.c:398
 msgid "Diagram:"
 msgstr "图表:"
 
-#: ../app/layer_dialog.c:517 ../app/layer_dialog.c:1231
+#: ../app/layer_dialog.c:512 ../app/layer_dialog.c:1224
 #, c-format
 msgid "New layer %d"
 msgstr "新建图层 %d"
 
-#: ../app/layer_dialog.c:733
+#: ../app/layer_dialog.c:727
 msgid "none"
 msgstr "无"
 
-#: ../app/layer_dialog.c:1202
+#: ../app/layer_dialog.c:1194
 msgid "Edit Layer"
 msgstr "编辑图层"
 
-#: ../app/layer_dialog.c:1202
+#: ../app/layer_dialog.c:1194
 msgid "Add Layer"
 msgstr "添加图层"
 
-#: ../app/layer_dialog.c:1221
+#: ../app/layer_dialog.c:1213
 msgid "Layer name:"
 msgstr "图层名:"
 
-#: ../app/linewidth_area.c:246 ../lib/properties.h:506 ../lib/properties.h:509
-#: ../objects/chronogram/chronoline.c:183
-#: ../objects/chronogram/chronoref.c:162
+#: ../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/linewidth_area.c:258
+#: ../app/linewidth_area.c:259
 msgid "Line width:"
 msgstr "线宽:"
 
-#: ../app/load_save.c:301
+#: ../app/load_save.c:266
 msgid ""
 "Error loading diagram.\n"
 "Linked object not found in document."
@@ -1181,41 +996,47 @@ msgstr ""
 "载入图表时发生错误。\n"
 "在文档中没有发现所链接的对象。"
 
-#: ../app/load_save.c:305
+#: ../app/load_save.c:270
 #, c-format
 msgid ""
 "Error loading diagram.\n"
-"connection handle %d does not exist on '%s'."
+"Connection handle %d does not exist on '%s'."
 msgstr ""
 "载入图表时发生错误。\n"
 "连接柄 %d 不存在于“%s”。"
 
-#: ../app/load_save.c:323
+#: ../app/load_save.c:288
 #, c-format
 msgid ""
 "Error loading diagram.\n"
-"connection point %d does not exist on '%s'."
+"Connection point %d does not exist on '%s'."
 msgstr ""
 "载入图表时发生错误。\n"
 "连接点 %d 不存在于“%s”。"
 
-#: ../app/load_save.c:363
+#: ../app/load_save.c:328
 #, c-format
 msgid "Can't find parent %s of %s object\n"
 msgstr "找不到 %2$s 对象的父对象 %1$s\n"
 
-#: ../app/load_save.c:413
-msgid "You must specify a file, not a directory.\n"
-msgstr "您必须指定一个文件,而不是目录。\n"
+#: ../app/load_save.c:378
+msgid "You must specify a file, not a directory."
+msgstr "您必须指定一个文件,而不是目录。"
 
-#: ../app/load_save.c:420 ../plug-ins/dxf/dxf-import.c:1312
-#: ../plug-ins/wpg/wpg.c:1177 ../plug-ins/xfig/xfig-import.c:1270
-#: ../plug-ins/xslt/xslt.c:93
+#: ../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
 #, c-format
 msgid "Couldn't open: '%s' for reading.\n"
 msgstr "无法打开“%s”进行读取。\n"
 
-#: ../app/load_save.c:438 ../app/load_save.c:444
+#. this was talking about unknown file type but it could as well be broken XML
+#: ../app/load_save.c:403
+#, c-format
+msgid "Error loading diagram %s."
+msgstr "载入图表 %s 时发生错误。"
+
+#: ../app/load_save.c:408
 #, c-format
 msgid ""
 "Error loading diagram %s.\n"
@@ -1224,7 +1045,7 @@ msgstr ""
 "载入图表 %s 时发生错误。\n"
 "未知的文件类型。"
 
-#: ../app/load_save.c:452
+#: ../app/load_save.c:416
 #, c-format
 msgid ""
 "Error loading diagram %s.\n"
@@ -1233,7 +1054,7 @@ msgstr ""
 "载入图表 %s 时发生错误。\n"
 "不是 Dia 文件。"
 
-#: ../app/load_save.c:669
+#: ../app/load_save.c:674
 #, c-format
 msgid ""
 "Error loading diagram:\n"
@@ -1244,43 +1065,44 @@ msgstr ""
 "%s。\n"
 "合法的 Dia 文件至少定义了一个层。"
 
-#: ../app/load_save.c:990
+#: ../app/load_save.c:1017
 #, c-format
 msgid "Not allowed to write to output file %s\n"
 msgstr "不允许写入输出文件 %s\n"
 
-#: ../app/load_save.c:1022
+#: ../app/load_save.c:1049
 #, c-format
 msgid "Not allowed to write temporary files in %s\n"
 msgstr "不允许在 %s 中写入临时文件\n"
 
-#: ../app/load_save.c:1044 ../plug-ins/cairo/diacairo.c:125
-#: ../plug-ins/cgm/cgm.c:1154 ../plug-ins/drs/dia-render-script.c:124
-#: ../plug-ins/dxf/dxf-export.c:547 ../plug-ins/hpgl/hpgl.c:710
-#: ../plug-ins/libart/export_png.c:159
-#: ../plug-ins/metapost/render_metapost.c:1176
-#: ../plug-ins/pgf/render_pgf.c:1202 ../plug-ins/postscript/render_eps.c:105
-#: ../plug-ins/pstricks/render_pstricks.c:916
-#: ../plug-ins/shape/shape-export.c:137 ../plug-ins/svg/render_svg.c:196
-#: ../plug-ins/vdx/vdx-export.c:1849 ../plug-ins/wpg/wpg.c:1072
-#: ../plug-ins/xfig/xfig-export.c:1151 ../plug-ins/xslt/xslt.c:101
+#: ../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
 #, c-format
-msgid "Can't open output file %s: %s\n"
-msgstr "无法打开输入文件 %s:%s\n"
+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:1055
+#: ../app/load_save.c:1083
 #, c-format
 msgid "Internal error %d writing file %s\n"
 msgstr "写入文件 %2$s 时发生内部错误 %1$d\n"
 
-#: ../app/load_save.c:1066
+#: ../app/load_save.c:1094
 #, c-format
 msgid "Can't rename %s to final output file %s: %s\n"
 msgstr "无法将 %s 重命名为终稿输出文件 %s:%s\n"
 
-#: ../app/load_save.c:1157 ../app/load_save.c:1162
+#: ../app/load_save.c:1110
+msgid "Diagram Save"
+msgstr "保存图表"
+
+#: ../app/load_save.c:1240 ../app/load_save.c:1245
 msgid "Dia Diagram File"
 msgstr "Dia 图表文件"
 
@@ -1298,6 +1120,10 @@ msgid "Create a new diagram"
 msgstr "创建新图表"
 
 #: ../app/menus.c:82
+msgid "_Open…"
+msgstr "打开(_O)…"
+
+#: ../app/menus.c:82
 msgid "Open a diagram file"
 msgstr "打开图表文件"
 
@@ -1306,479 +1132,571 @@ msgstr "打开图表文件"
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: ../app/menus.c:92
-msgid "Sheets and Objects..."
-msgstr "工作表和对象..."
-
 #: ../app/menus.c:94
-msgid "Plugins..."
-msgstr "插件..."
+msgid "Sheets and Objects…"
+msgstr "工作表和对象…"
 
-#: ../app/menus.c:101
-msgid "_Diagram tree..."
-msgstr "图表树(_D)..."
+#: ../app/menus.c:96
+msgid "Plugins…"
+msgstr "插件…"
 
-#: ../app/menus.c:102
-msgid "_Diagram tree"
+#: ../app/menus.c:97
+msgid "_Diagram Tree"
 msgstr "图表树(_D)"
 
-#: ../app/menus.c:108
+#: ../app/menus.c:102
 msgid "Show Toolbar"
 msgstr "显示工具栏"
 
-#: ../app/menus.c:109
+#: ../app/menus.c:103
 msgid "Show Statusbar"
 msgstr "显示状态栏"
 
-#: ../app/menus.c:110
+#: ../app/menus.c:104
 msgid "Show Layers"
 msgstr "显示图层"
 
-#: ../app/menus.c:116
+#: ../app/menus.c:110
 msgid "Save the diagram"
 msgstr "保存图表"
 
-#: ../app/menus.c:117
+#: ../app/menus.c:111
+msgid "Save _As…"
+msgstr "另存为(_A)…"
+
+#: ../app/menus.c:111
 msgid "Save the diagram with a new name"
 msgstr "将图表另存为"
 
-#
-#: ../app/menus.c:118
-msgid "_Export ..."
+#: ../app/menus.c:112
+msgid "_Export…"
 msgstr "导出(_E)..."
 
-#: ../app/menus.c:118
+#: ../app/menus.c:112
 msgid "Export the diagram"
 msgstr "导出图表"
 
-#: ../app/menus.c:119
+#: ../app/menus.c:113
 msgid "_Diagram Properties"
 msgstr "图表属性(_D)"
 
-#: ../app/menus.c:120
-msgid "Page Set_up..."
-msgstr "页面设置(_U)..."
+#: ../app/menus.c:114
+msgid "Page Set_up…"
+msgstr "页面设置(_U)…"
+
+#: ../app/menus.c:115
+msgid "_Print…"
+msgstr "打印机(_P)…"
 
-#: ../app/menus.c:121
+#: ../app/menus.c:115
 msgid "Print the diagram"
 msgstr "打印图表"
 
-#: ../app/menus.c:124
+#: ../app/menus.c:118
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: ../app/menus.c:128
+#: ../app/menus.c:119
+msgid "Undo"
+msgstr "撤销"
+
+#: ../app/menus.c:120
+msgid "Redo"
+msgstr "重做"
+
+#: ../app/menus.c:122
 msgid "Copy selection"
 msgstr "复制图表"
 
-#: ../app/menus.c:129
+#: ../app/menus.c:123
 msgid "Cut selection"
 msgstr "剪切选择"
 
 #
-#: ../app/menus.c:130
+#: ../app/menus.c:124
 msgid "Paste selection"
 msgstr "粘贴选择"
 
 #
-#: ../app/menus.c:131
+#: ../app/menus.c:125
 msgid "_Duplicate"
 msgstr "副本(_D)"
 
+#: ../app/menus.c:128
+msgid "_Find…"
+msgstr "查找(_F)…"
+
+#: ../app/menus.c:129
+msgid "_Replace…"
+msgstr "替换(_R)…"
+
 #
 #. the following used to bind to <control><shift>C which collides with Unicode input.
-#. * <control>>alt> doesn't work either
-#: ../app/menus.c:139
+#. * <control><alt> doesn't work either
+#: ../app/menus.c:133
 msgid "Copy Text"
 msgstr "复制文本"
 
 #
-#: ../app/menus.c:140
+#: ../app/menus.c:134
 msgid "Cut Text"
 msgstr "剪切文本"
 
 #
-#: ../app/menus.c:141
+#: ../app/menus.c:135
 msgid "Paste _Text"
 msgstr "粘贴文本(_T)"
 
-#: ../app/menus.c:143
+#
+#: ../app/menus.c:137
+msgid "Paste _Image"
+msgstr "粘贴图像(_I)"
+
+#: ../app/menus.c:139
 msgid "_Layers"
 msgstr "图层(_L)"
 
-#: ../app/menus.c:144
-msgid "Add Layer..."
-msgstr "添加图层..."
+#: ../app/menus.c:140
+msgid "Add Layer…"
+msgstr "添加图层…"
 
-#: ../app/menus.c:145
-msgid "Rename Layer..."
-msgstr "重命名图层..."
+#: ../app/menus.c:141
+msgid "Rename Layer…"
+msgstr "重命名图层…"
 
-#: ../app/menus.c:146
-msgid "Move selection to layer above"
+#: ../app/menus.c:142
+msgid "Move Selection to Layer above"
 msgstr "将所选移到上一图层"
 
-#: ../app/menus.c:147
-msgid "Move selection to layer below"
+#: ../app/menus.c:143
+msgid "Move Selection to Layer below"
 msgstr "将所选移到下一图层"
 
-#: ../app/menus.c:148
-msgid "_Layers..."
-msgstr "图层(_L)..."
+#: ../app/menus.c:144
+msgid "_Layers…"
+msgstr "图层(_L)…"
 
 #
-#: ../app/menus.c:150
+#: ../app/menus.c:145
 msgid "_View"
 msgstr "查看(_V)"
 
-#: ../app/menus.c:151
+#: ../app/menus.c:146
 msgid "Zoom in"
 msgstr "放大"
 
-#: ../app/menus.c:152
+#: ../app/menus.c:147
 msgid "Zoom out"
 msgstr "缩小"
 
-#: ../app/menus.c:153
+#: ../app/menus.c:148
 msgid "_Zoom"
 msgstr "缩放(_Z)"
 
-#: ../app/menus.c:154
+#: ../app/menus.c:149
 msgid "1600%"
 msgstr "1600%"
 
-#: ../app/menus.c:155 ../app/menus.c:574
+#: ../app/menus.c:150 ../app/menus.c:578 ../app/menus.c:590
 msgid "800%"
 msgstr "800%"
 
-#: ../app/menus.c:156 ../app/menus.c:575
+#: ../app/menus.c:151 ../app/menus.c:579 ../app/menus.c:591
 msgid "400%"
 msgstr "400%"
 
-#: ../app/menus.c:157
+#: ../app/menus.c:152
 msgid "283"
 msgstr "283"
 
-#: ../app/menus.c:158
+#: ../app/menus.c:153
 msgid "200"
 msgstr "200"
 
-#: ../app/menus.c:159
+#: ../app/menus.c:154
 msgid "141"
 msgstr "141"
 
-#: ../app/menus.c:161
+#: ../app/menus.c:156
 msgid "85"
 msgstr "85"
 
-#: ../app/menus.c:162
+#: ../app/menus.c:157
 msgid "70.7"
 msgstr "70.7"
 
-#: ../app/menus.c:163
+#: ../app/menus.c:158
 msgid "50"
 msgstr "50"
 
-#: ../app/menus.c:164
+#: ../app/menus.c:159
 msgid "35.4"
 msgstr "35.4"
 
-#: ../app/menus.c:165
+#: ../app/menus.c:160
 msgid "25"
 msgstr "25"
 
 #. Show All, Best Fit.  Same as the Gimp, Ctrl+E
-#: ../app/menus.c:167
+#: ../app/menus.c:162
 msgid "Zoom fit"
 msgstr "最佳尺寸"
 
 #
 #. "display_toggle_entries" items go here
-#: ../app/menus.c:171
+#: ../app/menus.c:166
 msgid "New _View"
 msgstr "新建视图(_V)"
 
-#: ../app/menus.c:172
+#: ../app/menus.c:167
 msgid "C_lone View"
 msgstr "克隆视图(_L)"
 
 #
-#: ../app/menus.c:175
+#: ../app/menus.c:170
 msgid "_Objects"
 msgstr "对象(_O)"
 
 #
-#: ../app/menus.c:176
+#: ../app/menus.c:171
 msgid "Send to _Back"
 msgstr "推到最后(_B)"
 
 #
-#: ../app/menus.c:177
+#: ../app/menus.c:172
 msgid "Bring to _Front"
 msgstr "提到最前(_F)"
 
 #
-#: ../app/menus.c:178
+#: ../app/menus.c:173
 msgid "Send Backwards"
 msgstr "下移一层"
 
 #
-#: ../app/menus.c:179
+#: ../app/menus.c:174
 msgid "Bring Forwards"
 msgstr "上移一层"
 
-#: ../app/menus.c:181
+#: ../app/menus.c:176
 msgid "_Group"
 msgstr "组合(_G)"
 
 #
 #. deliberately not using Ctrl+U for Ungroup
-#: ../app/menus.c:183
+#: ../app/menus.c:178
 msgid "_Ungroup"
 msgstr "取消组合(_U)"
 
-#: ../app/menus.c:185
+#: ../app/menus.c:180
 msgid "_Parent"
 msgstr "父对象(_P)"
 
 #
-#: ../app/menus.c:186
+#: ../app/menus.c:181
 msgid "_Unparent"
 msgstr "取消父对象(_U)"
 
 #
-#: ../app/menus.c:187
+#: ../app/menus.c:182
 msgid "_Unparent Children"
 msgstr "取消子对象的父对象(_U)"
 
 #. Translators: Menu item Verb/Support/Position/Align
-#: ../app/menus.c:189 ../objects/FS/function.c:811
+#: ../app/menus.c:184 ../objects/FS/function.c:805
 msgid "Align"
 msgstr "对齐"
 
-#: ../app/menus.c:194 ../objects/standard/textobj.c:137
+#: ../app/menus.c:189 ../objects/standard/textobj.c:110
 msgid "Top"
 msgstr "顶部"
 
-#: ../app/menus.c:195
+#: ../app/menus.c:190
 msgid "Middle"
 msgstr "中间"
 
-#: ../app/menus.c:196 ../objects/standard/textobj.c:136
+#: ../app/menus.c:191 ../objects/standard/textobj.c:109
 msgid "Bottom"
 msgstr "底部"
 
 #
-#: ../app/menus.c:198
+#: ../app/menus.c:193
 msgid "Spread Out Horizontally"
 msgstr "水平平均分布"
 
 #
-#: ../app/menus.c:199
+#: ../app/menus.c:194
 msgid "Spread Out Vertically"
 msgstr "垂直平均分布"
 
-#: ../app/menus.c:200
+#: ../app/menus.c:195
 msgid "Adjacent"
 msgstr "相邻的"
 
-#: ../app/menus.c:201
+#: ../app/menus.c:196
 msgid "Stacked"
 msgstr "堆叠"
 
+#: ../app/menus.c:197 ../app/menus.c:207
+msgid "Connected"
+msgstr "连接"
+
 #
-#: ../app/menus.c:205
+#: ../app/menus.c:201
 msgid "_Select"
 msgstr "选择(_S)"
 
-#: ../app/menus.c:206
+#: ../app/menus.c:202
 msgid "All"
 msgstr "全选"
 
-#: ../app/menus.c:207 ../lib/arrows.c:1876 ../objects/Jackson/domain.c:96
-#: ../objects/UML/association.c:221 ../objects/UML/association.c:227
+#: ../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:208
+#: ../app/menus.c:204
 msgid "Invert"
 msgstr "反选"
 
-#: ../app/menus.c:210
+#: ../app/menus.c:206
 msgid "Transitive"
 msgstr "传递"
 
-#: ../app/menus.c:211
-msgid "Connected"
-msgstr "连接"
-
 #
-#: ../app/menus.c:212
+#: ../app/menus.c:208
 msgid "Same Type"
 msgstr "相同类型"
 
 #
 #. display_select_radio_entries go here
-#: ../app/menus.c:216
+#: ../app/menus.c:212
 msgid "Select By"
 msgstr "选择"
 
+#. For placment of the toplevel Layout menu and it's accelerator
+#: ../app/menus.c:215
+msgid "L_ayout"
+msgstr "布局(_A)"
+
 #
-#: ../app/menus.c:218
+#: ../app/menus.c:217
 msgid "_Input Methods"
 msgstr "输入法(_I)"
 
-#: ../app/menus.c:220
+#: ../app/menus.c:219
 msgid "D_ialogs"
 msgstr "对话框(_I)"
 
-#: ../app/menus.c:222
+#: ../app/menus.c:221
 msgid "D_ebug"
 msgstr "调试(_E)"
 
 #
-#: ../app/menus.c:228
+#: ../app/menus.c:227
 msgid "_Tools"
 msgstr "工具(_T)"
 
-#: ../app/menus.c:229
+#: ../app/menus.c:228
 msgid "Modify"
 msgstr "修改"
 
-#: ../app/menus.c:231
-msgid "Edit text"
+#. 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:230
+msgid "Edit Text"
 msgstr "编辑文本"
 
-#: ../app/menus.c:232
+#: ../app/menus.c:231
 msgid "Scroll"
 msgstr "移动"
 
-#: ../app/menus.c:255
-msgid "Fullscr_een"
-msgstr "全屏(_E)"
+#. how it used to be before 0.96+SVN
+#. new name matching "same name, same type"  rule
+#: ../app/menus.c:232 ../app/toolbox.c:98 ../lib/properties.c:101
+#: ../lib/properties.h: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:233 ../app/toolbox.c:104
+msgid "Box"
+msgstr "方框"
+
+#: ../app/menus.c:234 ../app/toolbox.c:110
+msgid "Ellipse"
+msgstr "椭圆"
+
+#: ../app/menus.c:235 ../app/toolbox.c:116
+msgid "Polygon"
+msgstr "多边形"
+
+#: ../app/menus.c:236 ../app/toolbox.c:122
+msgid "Beziergon"
+msgstr "贝塞尔封闭曲线"
+
+#: ../app/menus.c:238 ../app/toolbox.c:128 ../objects/standard/line.c:325
+msgid "Line"
+msgstr "直线"
+
+#: ../app/menus.c:239 ../app/toolbox.c:134
+msgid "Arc"
+msgstr "圆弧"
+
+#: ../app/menus.c:240 ../app/toolbox.c:140
+msgid "Zigzagline"
+msgstr "横竖折线"
+
+#: ../app/menus.c:241 ../app/toolbox.c:146
+msgid "Polyline"
+msgstr "折线"
+
+#: ../app/menus.c:242 ../app/toolbox.c:152
+msgid "Bezierline"
+msgstr "贝塞尔曲线"
+
+#: ../app/menus.c:243 ../app/toolbox.c:165
+msgid "Outline"
+msgstr "轮廓字"
+
+#: ../app/menus.c:245 ../app/toolbox.c:158
+msgid "Image"
+msgstr "图像"
 
 #
-#: ../app/menus.c:257
-msgid "_AntiAliased"
+#: ../app/menus.c:252
+msgid "_Antialiased"
 msgstr "反锯齿(_A)"
 
 #
-#: ../app/menus.c:258
+#: ../app/menus.c:253
 msgid "Show _Grid"
 msgstr "显示网格(_G)"
 
 #
-#: ../app/menus.c:259
-msgid "_Snap To Grid"
+#: ../app/menus.c:254
+msgid "_Snap to Grid"
 msgstr "对齐到网格(_S)"
 
 #
-#: ../app/menus.c:260
-msgid "Snap To _Objects"
+#: ../app/menus.c:255
+msgid "Snap to _Objects"
 msgstr "对象捕捉(_O)"
 
 #
-#: ../app/menus.c:261
+#: ../app/menus.c:256
 msgid "Show _Rulers"
 msgstr "显示标尺(_R)"
 
 #
-#: ../app/menus.c:262
+#: ../app/menus.c:257
 msgid "Show _Connection Points"
 msgstr "显示连接点(_C)"
 
-#: ../app/menus.c:269
+#: ../app/menus.c:264
 msgid "Union"
 msgstr "联合"
 
 #
-#: ../app/menus.c:270
+#: ../app/menus.c:265
 msgid "Intersection"
 msgstr "交叉"
 
 #. Translators: Menu item Verb/Channel/Export/Remove
 #. Translators: Menu item Verb/Branch/Separate/Remove
 #. Translators: Menu item Verb/Branch/Separate/Remove/Remove
-#: ../app/menus.c:271 ../objects/FS/function.c:711
-#: ../objects/FS/function.c:863 ../objects/FS/function.c:865
+#: ../app/menus.c:266 ../objects/FS/function.c:705
+#: ../objects/FS/function.c:857 ../objects/FS/function.c:859
 msgid "Remove"
 msgstr "删除"
 
 #. Cannot also be called Invert, duplicate names caused keybinding problems
-#: ../app/menus.c:273
+#: ../app/menus.c:268
 msgid "Inverse"
 msgstr "反转"
 
-#: ../app/menus.c:337
+#: ../app/menus.c:331
 msgid "NULL tooldata in tool_menu_select"
 msgstr "tool_menu_select 中的 tooldata 值为 NULL"
 
-#: ../app/menus.c:576
+#: ../app/menus.c:580 ../app/menus.c:592
 msgid "300%"
 msgstr "300%"
 
-#: ../app/menus.c:577
+#: ../app/menus.c:581 ../app/menus.c:593
 msgid "200%"
 msgstr "200%"
 
-#: ../app/menus.c:578
+#: ../app/menus.c:582 ../app/menus.c:594
 msgid "150%"
 msgstr "150%"
 
-#: ../app/menus.c:579
+#: ../app/menus.c:583 ../app/menus.c:595
 msgid "100%"
 msgstr "100%"
 
-#: ../app/menus.c:580
+#: ../app/menus.c:584 ../app/menus.c:596
 msgid "75%"
 msgstr "75%"
 
-#: ../app/menus.c:581
+#: ../app/menus.c:585 ../app/menus.c:597
 msgid "50%"
 msgstr "50%"
 
-#: ../app/menus.c:582
+#: ../app/menus.c:586 ../app/menus.c:598
 msgid "25%"
 msgstr "25%"
 
-#: ../app/menus.c:583
+#: ../app/menus.c:587 ../app/menus.c:599
 msgid "10%"
 msgstr "10%"
 
-#: ../app/menus.c:608
+#: ../app/menus.c:625
 msgid "Toggles snap-to-grid."
 msgstr "切换对齐到网格。"
 
-#: ../app/menus.c:619
+#: ../app/menus.c:636
 msgid "Toggles object snapping."
 msgstr "切换对象捕捉。"
 
-#: ../app/modify_tool.c:392
-msgid "Couldn't get GTK settings"
-msgstr "无法获取 GTK 设置"
+#: ../app/menus.c:1254
+msgid "The function is not available anymore."
+msgstr "该函数已不复存在。"
+
+#: ../app/modify_tool.c:384
+msgid "Couldn't get GTK+ settings"
+msgstr "无法获取 GTK+ 设置"
 
-#: ../app/plugin-manager.c:200
-msgid "Plug-ins"
+#: ../app/plugin-manager.c:208
+msgid "Plugins"
 msgstr "插件"
 
-#: ../app/plugin-manager.c:255
+#: ../app/plugin-manager.c:263
 msgid "Loaded"
 msgstr "已载入"
 
-#: ../app/plugin-manager.c:268 ../objects/SISSI/sissi_dialog.c:730
-#: ../objects/SISSI/sissi_dialog.c:882
+#: ../app/plugin-manager.c:276
 msgid "Description"
 msgstr "说明"
 
-#: ../app/plugin-manager.c:277
+#: ../app/plugin-manager.c:285
 msgid "Load at Startup"
 msgstr "在启动时装载"
 
-#: ../app/plugin-manager.c:284
-msgid "File Name"
+#: ../app/plugin-manager.c:292
+msgid "Filename"
 msgstr "文件名"
 
-#: ../app/preferences.c:99 ../app/preferences.c:144
+#: ../app/preferences.c:100 ../app/preferences.c:143
 msgid "any"
 msgstr "任意"
 
@@ -1798,15 +1716,15 @@ msgstr "查看默认值"
 msgid "Favorites"
 msgstr "收藏夹"
 
-#: ../app/preferences.c:165
+#: ../app/preferences.c:164
 msgid "Reset tools after create"
 msgstr "创建后重置工具"
 
-#: ../app/preferences.c:168
+#: ../app/preferences.c:167
 msgid "Number of undo levels:"
 msgstr "可撤消次数:"
 
-#: ../app/preferences.c:171
+#: ../app/preferences.c:170
 msgid ""
 "Reverse dragging selects\n"
 "intersecting objects"
@@ -1814,193 +1732,190 @@ msgstr ""
 "反向拖曳选择\n"
 "相交的对象"
 
-#: ../app/preferences.c:174
+#: ../app/preferences.c:173
 msgid "Recent documents list size:"
 msgstr "最近文档列表大小:"
 
-#: ../app/preferences.c:177
+#: ../app/preferences.c:176
 msgid "Use menu bar"
 msgstr "使用菜单栏"
 
-#: ../app/preferences.c:180
+#: ../app/preferences.c:179
 msgid "Keep tool box on top of diagram windows"
 msgstr "保持工具箱在图表窗口项部"
 
-#: ../app/preferences.c:183
+#: ../app/preferences.c:182
 msgid "Length unit:"
 msgstr "长度单位:"
 
-#: ../app/preferences.c:186
-msgid "Font-size unit:"
+#: ../app/preferences.c:185
+msgid "Font size unit:"
 msgstr "字体大小单位:"
 
-#: ../app/preferences.c:189
+#: ../app/preferences.c:188
 msgid "New diagram:"
 msgstr "新建图表:"
 
-#: ../app/preferences.c:190
+#: ../app/preferences.c:189
 msgid "Portrait"
 msgstr "纵向"
 
-#: ../app/preferences.c:192
+#: ../app/preferences.c:191
 msgid "Paper type:"
 msgstr "纸张类型:"
 
-#: ../app/preferences.c:194 ../objects/Database/table_dialog.c:1075
+#: ../app/preferences.c:193
 msgid "Background Color:"
 msgstr "背景色:"
 
-#: ../app/preferences.c:196
+#: ../app/preferences.c:195
 msgid "Compress saved files"
 msgstr "压缩保存的文件"
 
-#: ../app/preferences.c:199
+#: ../app/preferences.c:198
 msgid "Connection Points:"
 msgstr "连接点:"
 
 #. { NULL, PREF_NONE, 0, NULL, 3, N_("Grid:") },
-#: ../app/preferences.c:200 ../app/preferences.c:211 ../app/preferences.c:235
+#: ../app/preferences.c:199 ../app/preferences.c:210 ../app/preferences.c:234
 msgid "Visible"
 msgstr "可见"
 
 #
-#: ../app/preferences.c:201
+#: ../app/preferences.c:200
 msgid "Snap to object"
 msgstr "对象捕捉"
 
-#: ../app/preferences.c:204
+#: ../app/preferences.c:203
 msgid "New window:"
 msgstr "新建窗口:"
 
-#: ../app/preferences.c:205
+#: ../app/preferences.c:204
 msgid "Width:"
 msgstr "宽度:"
 
-#: ../app/preferences.c:206
+#: ../app/preferences.c:205
 msgid "Height:"
 msgstr "高度:"
 
-#: ../app/preferences.c:207
+#: ../app/preferences.c:206
 msgid "Magnify:"
 msgstr "放大:"
 
-#: ../app/preferences.c:210
+#: ../app/preferences.c:209
 msgid "Page breaks:"
 msgstr "换页:"
 
-#: ../app/preferences.c:212 ../app/preferences.c:240
+#: ../app/preferences.c:211 ../app/preferences.c:241
 msgid "Color:"
 msgstr "颜色:"
 
-#: ../app/preferences.c:213
+#: ../app/preferences.c:212
 msgid "Solid lines"
 msgstr "实线"
 
 #
-#: ../app/preferences.c:216
+#: ../app/preferences.c:215
 msgid "Antialias:"
 msgstr "反锯齿:"
 
-#: ../app/preferences.c:217
+#: ../app/preferences.c:216
 msgid "view antialised"
 msgstr "查看反锯齿化的对象"
 
 #. Favored Filter
 #. Translators: Menu item Verb/Channel/Export
 #. Translators: Menu item Verb/Channel/Export/Export
-#: ../app/preferences.c:221 ../objects/FS/function.c:701
-#: ../objects/FS/function.c:703 ../plug-ins/libart/export_png.c:328
+#: ../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
+#: ../app/preferences.c:222
 msgid "Portable Network Graphics"
 msgstr "便携式网络图像"
 
-#: ../app/preferences.c:225 ../plug-ins/svg/render_svg.c:487
-#: ../plug-ins/svg/svg-import.c:884
+#: ../app/preferences.c:224 ../plug-ins/svg/render_svg.c:604
+#: ../plug-ins/svg/svg-import.c:1506
 msgid "Scalable Vector Graphics"
 msgstr "可缩放矢量图(SVG)"
 
-#: ../app/preferences.c:227
+#: ../app/preferences.c:226
 msgid "PostScript"
 msgstr "PostScript"
 
-#: ../app/preferences.c:229
-msgid "Windows MetaFile"
+#: ../app/preferences.c:228 ../plug-ins/wmf/wmf.cpp:1477
+msgid "Windows Metafile"
 msgstr "Windows 图元文件"
 
-#: ../app/preferences.c:231
-msgid "Enhanced MetaFile"
+#: ../app/preferences.c:230 ../plug-ins/wmf/wmf.cpp:1486
+msgid "Enhanced Metafile"
 msgstr "增强型图元文件"
 
-#: ../app/preferences.c:236
+#: ../app/preferences.c:235
 msgid "Snap to"
 msgstr "对齐到"
 
-#: ../app/preferences.c:237
+#: ../app/preferences.c:236
 msgid "Dynamic grid resizing"
 msgstr "动态网格大小调整"
 
-#: ../app/preferences.c:238
+#: ../app/preferences.c:237
 msgid "X Size:"
 msgstr "X 大小:"
 
-#: ../app/preferences.c:239
+#: ../app/preferences.c:238
 msgid "Y Size:"
 msgstr "Y 大小:"
 
-#: ../app/preferences.c:241
+#: ../app/preferences.c:239
+msgid "Visual Spacing X:"
+msgstr "可见间距 X:"
+
+#: ../app/preferences.c:240
+msgid "Visual Spacing Y:"
+msgstr "可见间距 Y:"
+
+#: ../app/preferences.c:242
 msgid "Lines per major line"
 msgstr "主格线之间的行数"
 
-#: ../app/preferences.c:243
+#: ../app/preferences.c:244
 msgid "Hex Size:"
 msgstr "六角格线大小:"
 
-#. There's really no reason to not pretty format it, and allowing non-pretty
-#. can lead to problems with long lines, CVS etc.
-#. { "pretty_formated_xml", PREF_BOOLEAN,PREF_OFFSET(pretty_formated_xml),
-#. &default_true,0,"pretty formated xml",NULL, TRUE},
-#.
-#: ../app/preferences.c:255
-msgid "Diagram tree window:"
-msgstr "图表树窗口"
-
-#: ../app/preferences.c:257
-msgid "Save hidden object types"
-msgstr "保存隐藏的对象类型"
-
-#: ../app/preferences.c:485 ../lib/prop_inttypes.c:158
+#: ../app/preferences.c:481 ../lib/prop_inttypes.c:159
+#: ../lib/prop_pixbuf.c:268
 msgid "Yes"
 msgstr "是"
 
-#: ../app/preferences.c:485 ../app/preferences.c:496
-#: ../lib/prop_inttypes.c:160 ../lib/prop_inttypes.c:186
+#: ../app/preferences.c:481 ../app/preferences.c:492
+#: ../lib/prop_inttypes.c:161 ../lib/prop_inttypes.c:187
+#: ../lib/prop_pixbuf.c:270 ../lib/prop_pixbuf.c:276
 msgid "No"
 msgstr "否"
 
-#: ../app/preferences.c:591
+#: ../app/preferences.c:595
 msgid "Preferences"
 msgstr "首选项"
 
-#: ../app/properties-dialog.c:57
+#: ../app/properties-dialog.c:60
 msgid "Object properties"
 msgstr "对象属性"
 
-#: ../app/properties-dialog.c:82
+#: ../app/properties-dialog.c:85
 msgid "This object has no properties."
 msgstr "此对象无属性。"
 
-#: ../app/properties-dialog.c:250
+#: ../app/properties-dialog.c:248
 msgid "Properties: "
 msgstr "属性:"
 
-#: ../app/properties-dialog.c:254
+#: ../app/properties-dialog.c:252
 msgid "Object properties:"
 msgstr "对象属性:"
 
-#: ../app/sheets.c:155
+#: ../app/sheets.c:158
 #, c-format
 msgid ""
 "%s\n"
@@ -2009,7 +1924,7 @@ msgstr ""
 "%s\n"
 "系统工作表"
 
-#: ../app/sheets.c:157
+#: ../app/sheets.c:160
 #, c-format
 msgid ""
 "%s\n"
@@ -2018,26 +1933,26 @@ msgstr ""
 "%s\n"
 "用户工作表"
 
-#: ../app/sheets.c:275
+#: ../app/sheets.c:278
 msgid ""
 "Can't get symbol 'custom_type' from any module.\n"
 "Editing shapes is disabled."
 msgstr "无法从任何模块中找到符号“custom_type”。禁止编辑形状。"
 
-#: ../app/sheets.c:410
+#: ../app/sheets.c:413
 #, c-format
 msgid "Widget not found: %s"
 msgstr "无法找到子部件:%s"
 
-#: ../app/sheets.c:485
+#: ../app/sheets.c:443
 msgid "SVG Shape"
 msgstr "SVG 形状"
 
-#: ../app/sheets.c:487
+#: ../app/sheets.c:445
 msgid "Programmed DiaObject"
 msgstr "Programmed DiaObject"
 
-#: ../app/sheets_dialog.c:255
+#: ../app/sheets_dialog.c:253
 msgid "Select SVG Shape File"
 msgstr "选择 SVG 形状文件"
 
@@ -2073,7 +1988,7 @@ msgstr "<- 移动"
 msgid "<- Move All"
 msgstr "<- 全部移动"
 
-#: ../app/sheets_dialog_callbacks.c:289 ../app/sheets_dialog_callbacks.c:1083
+#: ../app/sheets_dialog_callbacks.c:289 ../app/sheets_dialog_callbacks.c:1071
 msgid "Line Break"
 msgstr "换行"
 
@@ -2104,80 +2019,147 @@ msgstr ""
 "%s\n"
 "未分配的类型"
 
-#: ../app/sheets_dialog_callbacks.c:780
+#: ../app/sheets_dialog_callbacks.c:770
 msgid "Please select a .shape file"
 msgstr "请选择一个 .shape 文件"
 
-#: ../app/sheets_dialog_callbacks.c:787
+#: ../app/sheets_dialog_callbacks.c:777
 #, c-format
 msgid "Filename must end with '%s': '%s'"
 msgstr "文件名必须以“%s”结尾:“%s”"
 
-#: ../app/sheets_dialog_callbacks.c:795
+#: ../app/sheets_dialog_callbacks.c:785
 #, c-format
 msgid "Error examining %s: %s"
 msgstr "错误检查 %s:%s"
 
-#: ../app/sheets_dialog_callbacks.c:826
+#: ../app/sheets_dialog_callbacks.c:816
 msgid "Please export the diagram as a shape."
 msgstr "请将图表导出为形状。"
 
-#: ../app/sheets_dialog_callbacks.c:829
+#: ../app/sheets_dialog_callbacks.c:819
 #, c-format
 msgid "Could not interpret shape file: '%s'"
 msgstr "无法解析形状文件:%s"
 
-#: ../app/sheets_dialog_callbacks.c:899
+#: ../app/sheets_dialog_callbacks.c:887
 msgid "Sheet must have a Name"
 msgstr "工作表必须有名称"
 
-#: ../app/sheets_dialog_callbacks.c:1593 ../app/sheets_dialog_callbacks.c:1600
+#: ../app/sheets_dialog_callbacks.c:1579 ../app/sheets_dialog_callbacks.c:1586
 #, c-format
 msgid "Couldn't open '%s': %s"
 msgstr "无法打开“%s”:%s"
 
-#: ../app/sheets_dialog_callbacks.c:1654
+#: ../app/sheets_dialog_callbacks.c:1640
 #, c-format
 msgid "Couldn't open: '%s' for writing"
 msgstr "无法以写方式打开:“%s”"
 
-#: ../app/sheets_dialog_callbacks.c:1664
+#: ../app/sheets_dialog_callbacks.c:1650
 msgid "a user"
 msgstr "用户"
 
-#: ../app/sheets_dialog_callbacks.c:1677
+#: ../app/sheets_dialog_callbacks.c:1663
 #, c-format
 msgid "File: %s"
 msgstr "文件:%s"
 
-#: ../app/sheets_dialog_callbacks.c:1680
+#: ../app/sheets_dialog_callbacks.c:1666
 #, c-format
 msgid "Date: %s"
 msgstr "日期:%s"
 
-#: ../app/sheets_dialog_callbacks.c:1684
+#: ../app/sheets_dialog_callbacks.c:1670
 #, c-format
 msgid "For: %s"
 msgstr "给:%s"
 
-#: ../app/sheets_dialog_callbacks.c:1701
+#: ../app/sheets_dialog_callbacks.c:1687
 msgid "add shapes here"
 msgstr "在此处添加形状"
 
-#: ../app/splash.c:57
-msgid "Loading ..."
-msgstr "正在载入..."
+#: ../app/splash.c:50
+msgid "Loading …"
+msgstr "正在载入 …"
 
-#: ../app/splash.c:75
+#: ../app/splash.c:68
 #, c-format
 msgid "Dia v %s"
 msgstr "Dia v %s"
 
+#: ../app/toolbox.c:74
+msgid ""
+"Modify object(s)\n"
+"Use <Space> to toggle between this and other tools"
+msgstr ""
+"修改对象\n"
+"使用<空格键>切换工具"
+
+#: ../app/toolbox.c:80
+msgid ""
+"Text edit(s)\n"
+"Use <Esc> to leave this tool"
+msgstr ""
+"编辑文本\n"
+"使用<Esc>退出该工具"
+
+#: ../app/toolbox.c:92
+msgid "Scroll around the diagram"
+msgstr "滚动图表"
+
+#: ../app/toolbox.c:352
+#, c-format
+msgid "No sheet named %s"
+msgstr "没有名为 %s 的工作表"
+
+#: ../app/toolbox.c:390
+msgid "Other sheets"
+msgstr "其它工作表"
+
+#: ../app/toolbox.c:450 ../sheets/Flowchart.sheet.in.h:1
+msgid "Flowchart"
+msgstr "流程图"
+
+#: ../app/toolbox.c:494
+msgid ""
+"Foreground & background colors for new objects.  The small black and white "
+"squares reset colors.  The small arrows swap colors.  Double-click to change "
+"colors."
+msgstr ""
+"新对象的前景和背景色。黑白小方块可重置颜色。小箭头可调换颜色。双击可改变颜"
+"色。"
+
+#: ../app/toolbox.c:508
+msgid ""
+"Line widths.  Click on a line to set the default line width for new "
+"objects.  Double-click to set the line width more precisely."
+msgstr ""
+"直线宽度。单击直线可以设定新对象的缺省线条宽度。双击则可以更精确的设定线宽。"
+
+#: ../app/toolbox.c:551
+msgid ""
+"Arrow style at the beginning of new lines.  Click to pick an arrow, or set "
+"arrow parameters with Details…"
+msgstr "新直线起始箭头样式。单击可以挑选箭头,或是用“细节…”设定箭头参数"
+
+#: ../app/toolbox.c:556
+msgid ""
+"Line style for new lines.  Click to pick a line style, or set line style "
+"parameters with Details…"
+msgstr "新直线的线条样式。点击可以挑选直线样式,或是用“细节…”设定线条参数"
+
+#: ../app/toolbox.c:572
+msgid ""
+"Arrow style at the end of new lines.  Click to pick an arrow, or set arrow "
+"parameters with Details…"
+msgstr "新直线终止箭头样式。点击可以挑选箭头,或是用“细节…”设定箭头参数"
+
 #: ../dia.desktop.in.in.h:1
 msgid "Dia"
 msgstr "Dia"
 
-#: ../dia.desktop.in.in.h:2
+#: ../dia.desktop.in.in.h:3
 msgid "Dia Diagram Editor"
 msgstr "Dia 图表编辑器"
 
@@ -2185,169 +2167,374 @@ msgstr "Dia 图表编辑器"
 msgid "Edit your Diagrams"
 msgstr "编辑您的图表"
 
-#: ../lib/arrows.c:1877
+#. Installer message if no GTK+ was found
+#: ../installer/win32/gennsh.c:39
+msgid ""
+"GTK+ is not installed. Please use the full installer. It is available from "
+"http://dia-installer.de.";
+msgstr ""
+"没有安装 GTK+。请使用完整的安装程序。可以从 http://dia-installer.de 处获得。"
+
+#. Installer message: Don't install over pre 0.95 versions
+#: ../installer/win32/gennsh.c:42
+msgid ""
+"Please remove old Dia installations completely or install Dia to a different "
+"location."
+msgstr "请完全卸载旧的 Dia 版本,或者把 Dia 安装到别的地方。"
+
+#. Installer message:  License Page
+#: ../installer/win32/gennsh.c:45
+msgid "Next >"
+msgstr "下一步 >"
+
+#. Installer message, keep the $(^Name) and $_CLICK, these will be replaced
+#: ../installer/win32/gennsh.c:48
+msgid ""
+"$(^Name) is released under the GPL license. The license is provided here for "
+"information purposes only. $_CLICK"
+msgstr ""
+"$(^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
+msgid ""
+"Your old Dia directory is about to be deleted. Would you like to continue?$\r"
+"$\rNote: Any non-standard plugins that you may have installed will be "
+"deleted.$\rDia user settings will not be affected."
+msgstr ""
+"旧的 Dia 目录即将被删除。您想继续吗?$\\r$\\r注意:任何您已安装的非标准插件都"
+"会被删除。$\\rDia 用户设置不会受到影响。"
+
+#. Installer message: confirmatin question. Keep $\r
+#: ../installer/win32/gennsh.c:78
+msgid ""
+"The installation directory you specified already exists. Any contents$\rwill "
+"be deleted. Would you like to continue?"
+msgstr "指定的安装目录已存在。其下所有内容$\r都会被删除。您想继续吗?"
+
+#. Installer message: Uninstall Section Prompts. Keep $\r
+#: ../installer/win32/gennsh.c:81
+msgid ""
+"The uninstaller could not find registry entries for Dia.$\rIt is likely that "
+"another user installed this application."
+msgstr "卸载程序无法找到 Dia 的注册表项。$\r可能是其他用户安装了 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 以及所有子目录。继续?"
+
+#: ../lib/arrows.c:1891
 msgid "Lines"
 msgstr "直线"
 
-#: ../lib/arrows.c:1878
+#: ../lib/arrows.c:1892
 msgid "Hollow Triangle"
 msgstr "空心三角形"
 
-#: ../lib/arrows.c:1879
+#: ../lib/arrows.c:1893
 msgid "Filled Triangle"
 msgstr "实心三角形"
 
-#: ../lib/arrows.c:1880
+#: ../lib/arrows.c:1894
 msgid "Unfilled Triangle"
 msgstr "空心三角形"
 
-#: ../lib/arrows.c:1881
+#: ../lib/arrows.c:1895
 msgid "Hollow Diamond"
 msgstr "空心菱形"
 
-#: ../lib/arrows.c:1882
+#: ../lib/arrows.c:1896
 msgid "Filled Diamond"
 msgstr "实心菱形"
 
-#: ../lib/arrows.c:1883
+#: ../lib/arrows.c:1897
 msgid "Half Diamond"
 msgstr "半菱形"
 
-#: ../lib/arrows.c:1884
+#: ../lib/arrows.c:1898
 msgid "Half Head"
 msgstr "半个箭头"
 
-#: ../lib/arrows.c:1885
+#: ../lib/arrows.c:1899
 msgid "Slashed Cross"
 msgstr "交叉线"
 
-#: ../lib/arrows.c:1886
+#: ../lib/arrows.c:1900
 msgid "Filled Ellipse"
 msgstr "实心椭圆"
 
-#: ../lib/arrows.c:1887
+#: ../lib/arrows.c:1901
 msgid "Hollow Ellipse"
 msgstr "空心椭圆"
 
-#: ../lib/arrows.c:1888
+#: ../lib/arrows.c:1902
 msgid "Filled Dot"
 msgstr "实心点"
 
-#: ../lib/arrows.c:1889
+#: ../lib/arrows.c:1903
 msgid "Dimension Origin"
 msgstr "坐标原点"
 
-#: ../lib/arrows.c:1890
+#: ../lib/arrows.c:1904
 msgid "Blanked Dot"
 msgstr "空心点"
 
-#: ../lib/arrows.c:1891
+#: ../lib/arrows.c:1905
 msgid "Double Hollow Triangle"
 msgstr "双空心三角形"
 
-#: ../lib/arrows.c:1892
+#: ../lib/arrows.c:1906
 msgid "Double Filled Triangle"
 msgstr "双实心三角形"
 
-#: ../lib/arrows.c:1893
+#: ../lib/arrows.c:1907
 msgid "Filled Dot and Triangle"
 msgstr "实心圆点和三角形"
 
-#: ../lib/arrows.c:1894
+#: ../lib/arrows.c:1908
 msgid "Filled Box"
 msgstr "实心方框"
 
-#: ../lib/arrows.c:1895
+#: ../lib/arrows.c:1909
 msgid "Blanked Box"
 msgstr "空心方框"
 
-#: ../lib/arrows.c:1896
+#: ../lib/arrows.c:1910
 msgid "Slashed"
 msgstr "斜线"
 
-#: ../lib/arrows.c:1897
+#: ../lib/arrows.c:1911
 msgid "Integral Symbol"
 msgstr "积分符号"
 
-#: ../lib/arrows.c:1898
+#: ../lib/arrows.c:1912
 msgid "Crow Foot"
 msgstr "鸟爪形"
 
-#: ../lib/arrows.c:1899
+#: ../lib/arrows.c:1913
 msgid "Cross"
 msgstr "十字"
 
-#: ../lib/arrows.c:1900
+#: ../lib/arrows.c:1914
 msgid "1-or-many"
 msgstr "一个或多个"
 
-#: ../lib/arrows.c:1901
+#: ../lib/arrows.c:1915
 msgid "0-or-many"
 msgstr "零个或多个"
 
-#: ../lib/arrows.c:1902
+#: ../lib/arrows.c:1916
 msgid "1-or-0"
 msgstr "一个或零个"
 
-#: ../lib/arrows.c:1903
+#: ../lib/arrows.c:1917
 msgid "1 exactly"
 msgstr "只有一个"
 
-#: ../lib/arrows.c:1904
+#: ../lib/arrows.c:1918
 msgid "Filled Concave"
 msgstr "实心凹箭头"
 
-#: ../lib/arrows.c:1905
+#: ../lib/arrows.c:1919
 msgid "Blanked Concave"
 msgstr "空心凹箭头"
 
-#: ../lib/arrows.c:1906 ../lib/properties.c:72 ../lib/properties.c:78
-#: ../lib/properties.h:485 ../lib/properties.h:491
+#: ../lib/arrows.c:1920 ../lib/properties.c:81 ../lib/properties.c:87
+#: ../lib/properties.h:601 ../lib/properties.h:607
 msgid "Round"
 msgstr "圆的"
 
-#: ../lib/arrows.c:1907
+#: ../lib/arrows.c:1921
 msgid "Open Round"
 msgstr "开放的圆形"
 
-#: ../lib/arrows.c:1908
+#: ../lib/arrows.c:1922
 msgid "Backslash"
 msgstr "反斜杠"
 
-#: ../lib/arrows.c:1909
+#: ../lib/arrows.c:1923
 msgid "Infinite Line"
 msgstr "无限长线"
 
-#: ../lib/arrows.c:2037
+#: ../lib/arrows.c:2051
 msgid "Arrow head of unknown type"
 msgstr "未知类型箭头"
 
-#: ../lib/arrows.c:2045
+#: ../lib/arrows.c:2059
 #, c-format
-msgid "Arrow head of type %s has too small dimensions, removing.\n"
-msgstr "%s 类型的箭头尺寸太小,正在移除。\n"
+msgid "Arrow head of type %s has too small dimensions; removing.\n"
+msgstr "%s 类型的箭头尺寸太小;正在移除。\n"
 
-#: ../lib/arrows.c:2178
+#: ../lib/arrows.c:2192
 msgid "unknown arrow"
 msgstr "未知箭头"
 
-#: ../lib/bezier_conn.c:638
-msgid "Internal error: Setting corner type of endpoint of bezier"
-msgstr "内部错误:设置贝塞尔曲线端点的拐角类型"
-
 #: ../lib/create.c:50 ../lib/create.c:100 ../lib/create.c:127
-#: ../lib/create.c:161 ../lib/create.c:197 ../lib/create.c:224
-#: ../lib/create.c:260 ../lib/create.c:295 ../lib/create.c:338
-#: ../plug-ins/svg/svg-import.c:267 ../plug-ins/vdx/vdx-import.c:145
+#: ../lib/create.c:160 ../lib/create.c:196 ../lib/create.c:228
+#: ../lib/create.c:252 ../lib/create.c:284 ../lib/create.c:305
+#: ../lib/create.c:335 ../lib/create.c:378 ../plug-ins/svg/svg-import.c:438
+#: ../plug-ins/vdx/vdx-import.c:144
 msgid "Can't find standard object"
 msgstr "找不到标准对象"
 
-#: ../lib/dia_dirs.c:259
+#: ../lib/diaarrowchooser.c:367
+msgid "Arrow Properties"
+msgstr "箭头属性"
+
+#: ../lib/diaarrowselector.c:123
+msgid "More arrows"
+msgstr "更多箭头"
+
+#: ../lib/diaarrowselector.c:140
+msgid "Size: "
+msgstr "大小:"
+
+#: ../lib/diacolorselector.c:204
+msgid "Select color"
+msgstr "选择颜色"
+
+#: ../lib/diacolorselector.c:292
+msgid "More colors…"
+msgstr "更多颜色…"
+
+#: ../lib/dia_dirs.c:315
 #, c-format
-msgid "Too many ..'s in filename %s\n"
+msgid "Too many \"..\"s in filename %s\n"
 msgstr "文件名 %s 中有太多 “..”\n"
 
-#: ../lib/dia_xml.c:192
+#: ../lib/diadynamicmenu.c:396
+msgid "Reset menu"
+msgstr "重置菜单"
+
+#: ../lib/diafontselector.c:158
+msgid "Other fonts"
+msgstr "其它字体"
+
+#: ../lib/diafontselector.c:233
+#, c-format
+msgid "Couldn't find font family for %s\n"
+msgstr "找不到 %s 的字体族\n"
+
+#. pathologic case - pixbuf not even supporting PNG?
+#: ../lib/dia_image.c:328
+#, c-format
+msgid ""
+"Unsupported file format for saving:\n"
+"%s\n"
+"%s"
+msgstr ""
+"不支持保存的文件格式:\n"
+"%s\n"
+"%s"
+
+#: ../lib/dia_image.c:331
+#, c-format
+msgid ""
+"Could not save file:\n"
+"%s\n"
+"%s"
+msgstr ""
+"无法保存文件:\n"
+"%s\n"
+"%s"
+
+#: ../lib/dialinechooser.c:309
+msgid "Line Style Properties"
+msgstr "线型属性"
+
+#: ../lib/dialinechooser.c:344
+msgid "Details…"
+msgstr "细节…"
+
+#: ../lib/dialinestyleselector.c: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
+msgid "Dash length: "
+msgstr "划长度: "
+
+#: ../lib/dialogs.c:51 ../plug-ins/postscript/paginate_psprint.c:314
+msgid "OK"
+msgstr "确定"
+
+#: ../lib/dialogs.c:52 ../plug-ins/postscript/paginate_psprint.c:326
+msgid "Cancel"
+msgstr "取消"
+
+#: ../lib/dia_xml.c:212
 #, c-format
 msgid ""
 "The file %s has no encoding specification;\n"
@@ -2356,101 +2543,121 @@ msgstr ""
 "文件 %s 没有指定编码;\n"
 "假定编码为 %s"
 
-#: ../lib/dia_xml.c:597
+#: ../lib/dia_xml.c:506
+#, c-format
+msgid "Unknown type of DataNode '%s'"
+msgstr "未知的数据节点类型“%s”"
+
+#: ../lib/dia_xml.c:525
+msgid "Taking int value of non-int node."
+msgstr "试图获取非整型节点的整型值。"
+
+#: ../lib/dia_xml.c:701
 msgid "Taking point value of non-point node."
-msgstr "获取非点节点的点值。"
+msgstr "试图获取非点节点的点值。"
 
-#: ../lib/dia_xml.c:608
+#: ../lib/dia_xml.c:712
 #, c-format
 msgid "Incorrect x Point value \"%s\" %f; discarding it."
 msgstr "不正确的 x 点值“%s” %f;放弃。"
 
-#: ../lib/dia_xml.c:615
+#: ../lib/dia_xml.c:719
 msgid "Error parsing point."
 msgstr "分析点时出错。"
 
 #. don't bother with useless warnings (see above)
-#: ../lib/dia_xml.c:623
+#: ../lib/dia_xml.c:727
 #, c-format
 msgid "Incorrect y Point value \"%s\" %f; discarding it."
 msgstr "不正确的 y 点值“%s” %f;放弃。"
 
-#: ../lib/dia_xml.c:640
+#: ../lib/dia_xml.c:747
 msgid "Taking bezpoint value of non-point node."
 msgstr "获取非点节点的贝塞尔点值。"
 
-#: ../lib/dia_xml.c:658
+#: ../lib/dia_xml.c:765
 msgid "Error parsing bezpoint p1."
 msgstr "分析贝塞尔点 p1 时出错。"
 
-#: ../lib/dia_xml.c:672
+#: ../lib/dia_xml.c:779
 msgid "Error parsing bezpoint p2."
 msgstr "分析贝塞尔点 p2 时出错。"
 
-#: ../lib/dia_xml.c:686
+#: ../lib/dia_xml.c:793
 msgid "Error parsing bezpoint p3."
 msgstr "分析贝塞尔点 p3 时出错。"
 
-#: ../lib/diaarrowchooser.c:376
-msgid "Arrow Properties"
-msgstr "箭头属性"
+#: ../lib/dia_xml.c:820
+msgid "Taking rectangle value of non-rectangle node."
+msgstr "获取非矩形节点的矩形值。"
 
-#: ../lib/dialinechooser.c:303
-msgid "Line Style Properties"
-msgstr "线型属性"
+#: ../lib/dia_xml.c:832 ../lib/dia_xml.c:843 ../lib/dia_xml.c:854
+msgid "Error parsing rectangle."
+msgstr "分析矩形时出错。"
 
-#: ../lib/dialinechooser.c:338
-msgid "Details..."
-msgstr "细节..."
+#: ../lib/dia_xml.c:882
+msgid "Taking string value of non-string node."
+msgstr "获取非字符串节点的字符串值。"
 
-#: ../lib/dialogs.c:51
-msgid "Ok"
-msgstr "确定"
+#: ../lib/dia_xml.c:908
+msgid "Error in string tag."
+msgstr "字符串标记错误。"
 
-#: ../lib/dialogs.c:52 ../plug-ins/postscript/paginate_psprint.c:322
-msgid "Cancel"
-msgstr "取消"
+#: ../lib/dia_xml.c:926
+msgid "Error in file, string not starting with #"
+msgstr "文件有错误,字符串未以 # 开头"
+
+#: ../lib/dia_xml.c:988
+msgid "Taking font value of non-font node."
+msgstr "试图获取非字体节点的字体值。"
 
 #: ../lib/filter.c:177
 #, c-format
 msgid "Multiple export filters with unique name %s"
 msgstr "多个导出过滤器有相同的名称 %s"
 
-#: ../lib/font.c:85
+#: ../lib/filter.c:195
+#, c-format
+msgid "Multiple import filters with unique name %s"
+msgstr "多个导入过滤器有相同的名称 %s"
+
+#: ../lib/font.c:89
 #, c-format
 msgid "Can't load font %s.\n"
 msgstr "无法载入字体 %s。\n"
 
-#: ../lib/message.c:92 ../lib/message.c:278
+#: ../lib/group.c:628
+msgid "Transformation"
+msgstr "变换"
+
+#: ../lib/message.c:93 ../lib/message.c:284
 msgid "Warning"
 msgstr "警告"
 
-#: ../lib/message.c:119
+#: ../lib/message.c:120
 msgid "There is one similar message."
 msgstr "有一条类似的消息。"
 
-#: ../lib/message.c:124
+#: ../lib/message.c:125
 msgid "Show repeated messages"
 msgstr "显示重复的消息"
 
-#: ../lib/message.c:145
+#: ../lib/message.c:146
 msgid "Don't show this message again"
 msgstr "不再显示此消息"
 
-#: ../lib/message.c:203
+#: ../lib/message.c:206
 #, c-format
-msgid "There are %d similar messages."
-msgstr "有 %d 条类似的消息。"
+#| 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:262
+#: ../lib/message.c:268
 msgid "Notice"
 msgstr "注意"
 
-#: ../lib/newgroup.c:124
-msgid "Open group"
-msgstr "打开组"
-
-#: ../lib/object_defaults.c:128
+#: ../lib/object_defaults.c:134
 #, c-format
 msgid ""
 "Error loading defaults '%s'.\n"
@@ -2459,36 +2666,53 @@ msgstr ""
 "装载“%s”文件默认对象时出错。\n"
 "不是 Dia 文件。"
 
-#: ../lib/plug-ins.c:111
+#. base property stuff...
+#: ../lib/orth_conn.h:97
+msgid "Autoroute"
+msgstr "自动布线"
+
+#: ../lib/orth_conn.h:108
+msgid "Autorouting"
+msgstr "自动布线"
+
+#: ../lib/persistence.c:321
+msgid "Persistence"
+msgstr "规避"
+
+#: ../lib/plug-ins.c:113
 msgid "???"
 msgstr "???"
 
-#: ../lib/plug-ins.c:186
+#: ../lib/plug-ins.c:188
 #, c-format
 msgid "Missing dependencies for '%s'?"
 msgstr "“%s”的依赖关系不能满足?"
 
-#: ../lib/plug-ins.c:197
+#: ../lib/plug-ins.c:199
 msgid "Missing symbol 'dia_plugin_init'"
 msgstr "缺少符号“dia_plugin_init”"
 
-#: ../lib/plug-ins.c:205 ../lib/plug-ins.c:213
+#: ../lib/plug-ins.c:207 ../lib/plug-ins.c:215
 msgid "dia_plugin_init() call failed"
 msgstr "调用 dia_plugin_init() 时发生错误"
 
-#: ../lib/plug-ins.c:232
+#: ../lib/plug-ins.c:234
 #, c-format
 msgid "%s Plugin could not be unloaded"
 msgstr "无法卸载 %s 插件"
 
-#: ../lib/plug-ins.c:303
-#, c-format
-msgid ""
-"Could not open `%s'\n"
-"`%s'"
-msgstr ""
-"无法打开“%s”\n"
-"“%s”"
+#: ../lib/plug-ins.c:442
+msgid "Plugin Configuration"
+msgstr "插件配置"
+
+#: ../lib/propdialogs.c:324 ../objects/UML/association.c:234
+#: ../objects/UML/object.c:144
+msgid "General"
+msgstr "常规"
+
+#: ../lib/propdialogs.c:325
+msgid "Meta"
+msgstr "元数据"
 
 #: ../lib/prop_dict.c:43
 msgid "Author"
@@ -2506,115 +2730,170 @@ msgstr "创建日期"
 msgid "Modification date"
 msgstr "修改日期"
 
-#: ../lib/prop_dict.c:47 ../objects/SISSI/sissi_dialog.c:880
+#: ../lib/prop_dict.c:47
 msgid "URL"
 msgstr "URL"
 
-#: ../lib/prop_inttypes.c:558
-msgid "Property cast from int to enum out of range"
-msgstr "将属性从 int 转换为 enum 时超出了范围"
+#: ../lib/prop_dict.c:235 ../sheets/ciscomisc.sheet.in.h:43
+msgid "Key"
+msgstr "钥匙"
 
-#: ../lib/prop_text.c:469
-#, c-format
-msgid "Group with %d objects"
-msgstr "有 %d 个对象的组"
+#: ../lib/prop_dict.c:242 ../objects/UML/umlattribute.c:41
+#: ../objects/UML/umlparameter.c:47
+msgid "Value"
+msgstr "值"
 
-#: ../lib/properties.c:65 ../lib/properties.h:478 ../lib/widgets.c:715
+#: ../lib/properties.c:67 ../lib/properties.h:588 ../lib/widgets.c:269
 msgid "Left"
 msgstr "左"
 
-#: ../lib/properties.c:66 ../lib/properties.h:479 ../lib/widgets.c:721
-#: ../objects/standard/textobj.c:138
+#: ../lib/properties.c:68 ../lib/properties.h:589 ../lib/widgets.c:270
+#: ../objects/standard/textobj.c:111
 msgid "Center"
 msgstr "中"
 
-#: ../lib/properties.c:67 ../lib/properties.h:480 ../lib/widgets.c:727
+#: ../lib/properties.c:69 ../lib/properties.h:590 ../lib/widgets.c:271
 msgid "Right"
 msgstr "右"
 
-#: ../lib/properties.c:71 ../lib/properties.h:484
+#: ../lib/properties.c:74 ../lib/properties.h:594
+msgid "Never"
+msgstr "从不"
+
+#: ../lib/properties.c:75 ../lib/properties.h:595
+msgid "When Needed"
+msgstr "按需"
+
+#: ../lib/properties.c:76 ../lib/properties.h:596
+msgid "Always"
+msgstr "总是"
+
+#: ../lib/properties.c:80 ../lib/properties.h:600
 msgid "Miter"
 msgstr "斜角"
 
-#: ../lib/properties.c:73 ../lib/properties.h:486
+#: ../lib/properties.c:82 ../lib/properties.h:602
 msgid "Bevel"
 msgstr "斜面"
 
-#: ../lib/properties.c:77 ../lib/properties.h:490
+#: ../lib/properties.c:86 ../lib/properties.h:606
 msgid "Butt"
 msgstr "对接"
 
-#: ../lib/properties.c:79 ../lib/properties.h:492
+#: ../lib/properties.c:88 ../lib/properties.h:608
 msgid "Projecting"
 msgstr "投影"
 
-#: ../lib/properties.c:86 ../lib/properties.h:512 ../lib/properties.h:515
-#: ../objects/chronogram/chronoline.c:181
-#: ../objects/chronogram/chronoref.c:160
+#: ../lib/properties.c:95 ../lib/properties.h:629 ../lib/properties.h:632
+#: ../objects/chronogram/chronoline.c:178
+#: ../objects/chronogram/chronoref.c:157
 msgid "Line color"
 msgstr "线条颜色"
 
-#: ../lib/properties.c:87 ../lib/properties.h:518 ../lib/properties.h:521
+#: ../lib/properties.c:96 ../lib/properties.h:635 ../lib/properties.h:638
 msgid "Line style"
 msgstr "线型"
 
-#: ../lib/properties.c:88 ../lib/properties.h:537 ../lib/properties.h:540
+#: ../lib/properties.c:97 ../lib/properties.h:654 ../lib/properties.h:657
 msgid "Fill color"
 msgstr "填充颜色"
 
-#: ../lib/properties.c:89 ../lib/properties.h:543 ../lib/properties.h:546
+#. just to simplify transfering properties between objects
+#: ../lib/properties.c:98 ../lib/properties.h:660 ../lib/properties.h:663
+#: ../lib/standard-path.c:139
 msgid "Draw background"
 msgstr "绘制背景"
 
-#: ../lib/properties.c:90 ../lib/properties.h:550
+#: ../lib/properties.c:99 ../lib/properties.h:667
 msgid "Start arrow"
 msgstr "起始箭头"
 
-#: ../lib/properties.c:91 ../lib/properties.h:553
+#: ../lib/properties.c:100 ../lib/properties.h:670
 msgid "End arrow"
 msgstr "终止箭头"
 
-#: ../lib/properties.c:93 ../lib/properties.h:563
+#: ../lib/properties.c:102 ../lib/properties.h:680
 msgid "Text alignment"
 msgstr "文本对齐"
 
-#. all this just to make the defaults selectable ...
-#: ../lib/properties.c:94 ../lib/properties.h:568
-#: ../objects/Database/table_dialog.c:1033 ../objects/Database/reference.c:117
-#: ../objects/GRAFCET/condition.c:134 ../objects/GRAFCET/step.c:167
-#: ../objects/GRAFCET/transition.c:144 ../objects/UML/class.c:177
-#: ../objects/UML/class_dialog.c:564 ../objects/chronogram/chronoline.c:185
-#: ../objects/chronogram/chronoref.c:166
+#: ../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
 msgid "Font"
 msgstr "字体"
 
-#: ../lib/properties.c:95 ../lib/properties.h:576
-#: ../objects/GRAFCET/condition.c:136 ../objects/GRAFCET/step.c:169
-#: ../objects/GRAFCET/transition.c:146 ../objects/chronogram/chronoline.c:187
-#: ../objects/chronogram/chronoref.c:168
+#: ../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
 msgid "Font size"
 msgstr "字体大小"
 
-#: ../lib/properties.c:96 ../lib/properties.h:582
-#: ../objects/GRAFCET/step.c:171 ../objects/chronogram/chronoline.c:189
-#: ../objects/chronogram/chronoref.c:170
+#: ../lib/properties.c:105 ../lib/properties.h:699
+#: ../objects/chronogram/chronoline.c:186
+#: ../objects/chronogram/chronoref.c:167 ../objects/GRAFCET/step.c:169
 msgid "Text color"
 msgstr "文本颜色"
 
-#: ../lib/properties.h:524 ../lib/properties.h:527
+#: ../lib/properties.h:641 ../lib/properties.h:644
 msgid "Line join"
 msgstr "线连接"
 
-#: ../lib/properties.h:530 ../lib/properties.h:533
+#: ../lib/properties.h:647 ../lib/properties.h:650
 msgid "Line caps"
 msgstr "线端"
 
-#: ../lib/proplist.c:163
+#: ../lib/properties.h:708
+msgid "Text fitting"
+msgstr "文本拟合"
+
+#: ../lib/prop_inttypes.c:567
+msgid "Property cast from int to enum out of range"
+msgstr "将属性从 int 转换为 enum 时超出了范围"
+
+#: ../lib/proplist.c:161
 #, c-format
-msgid "No attribute '%s' (%p) or no data(%p) in this attribute"
+msgid "No attribute '%s' (%p) or no data (%p) in this attribute"
 msgstr "不存在属性“%s”(%p)或者不存在属性值(%p)"
 
-#: ../lib/sheet.c:70 ../lib/sheet.c:85
+#: ../lib/prop_pixbuf.c:99 ../lib/prop_pixbuf.c:146
+#, c-format
+msgid ""
+"Failed to load image form diagram:\n"
+"%s"
+msgstr ""
+"从图表加载图像失败:\n"
+"%s"
+
+#: ../lib/prop_pixbuf.c:198
+#, c-format
+msgid ""
+"Saving inline pixbuf failed:\n"
+"%s"
+msgstr ""
+"保存内嵌 pixbuf 失败:\n"
+"%s"
+
+#: ../lib/prop_pixbuf.c:294
+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
+msgid "Parameters"
+msgstr "参数"
+
+#: ../lib/prop_text.c:483
+#, 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
 #, c-format
 msgid ""
 "DiaObject '%s' needed in sheet '%s' was not found.\n"
@@ -2623,7 +2902,7 @@ msgstr ""
 "没有在工作表“%2$s”中找到所需的 DiaObject“%1$s”。\n"
 "不能使用该 DiaObject。"
 
-#: ../lib/sheet.c:315
+#: ../lib/sheet.c:316
 #, c-format
 msgid ""
 "The system sheet '%s' appears to be more recent than your custom\n"
@@ -2638,558 +2917,472 @@ msgstr ""
 "把新对象(如果有的话)从“%s”移到您定制的工作表中,\n"
 "或者用“工作表和对象”对话框移除“%s”。"
 
-#: ../lib/sheet.c:372
+#: ../lib/sheet.c:375
 #, c-format
 msgid "%s: you should use object tags rather than shape tags now"
 msgstr "%s:现在您应当用对象标签,而不是形状标签"
 
-#: ../lib/widgets.c:435
-msgid "Other fonts"
-msgstr "其它字体"
-
-#: ../lib/widgets.c:507
-#, c-format
-msgid "Couldn't find font family for %s\n"
-msgstr "找不到 %s 的字体族\n"
-
-#. Translators: Menu item Noun/Material/Solid
-#: ../lib/widgets.c:883 ../objects/FS/function.c:1079
-msgid "Solid"
-msgstr "实心"
+#: ../lib/standard-path.c:123
+msgid "Stroke"
+msgstr "描边"
 
-#: ../lib/widgets.c:889
-msgid "Dashed"
-msgstr "划线"
-
-#: ../lib/widgets.c:895
-msgid "Dash-Dot"
-msgstr "点划线"
-
-#: ../lib/widgets.c:901
-msgid "Dash-Dot-Dot"
-msgstr "双点划线"
+#. Translators: Menu item Verb/Provision/Supply/Fill
+#: ../lib/standard-path.c:124 ../objects/FS/function.c:933
+msgid "Fill"
+msgstr "填充"
 
-#: ../lib/widgets.c:907
-msgid "Dotted"
-msgstr "虚线"
+#: ../lib/standard-path.c:125
+msgid "Fill & Stroke"
+msgstr "填充和描边"
 
-#. fs->sizebox = GTK_HBOX(box);
-#: ../lib/widgets.c:925
-msgid "Dash length: "
-msgstr "划长度: "
+#: ../lib/standard-path.c:130
+msgid "Bezier points"
+msgstr "贝塞尔点"
 
-#: ../lib/widgets.c:1053
-msgid "Select color"
-msgstr "选择颜色"
+#: ../lib/standard-path.c:131
+msgid "Drawing"
+msgstr "绘制"
 
-#: ../lib/widgets.c:1119
-msgid "More colors..."
-msgstr "更多颜色..."
+#: ../lib/standard-path.c:140
+msgid "Draw Control Lines"
+msgstr "绘制控制线"
 
-#: ../lib/widgets.c:1267
-msgid "More arrows"
-msgstr "更多箭头"
+#: ../lib/standard-path.c:466
+msgid "Convert to Bezier"
+msgstr "转换为 Bezier"
 
-#: ../lib/widgets.c:1284
-msgid "Size: "
-msgstr "大小:"
+#: ../lib/standard-path.c:467
+msgid "Show Control Lines"
+msgstr "显示控制线"
 
-#: ../lib/widgets.c:1460
+#: ../lib/widgets.c:390
 msgid "Select image file"
 msgstr "选择图像文件"
 
-#: ../lib/widgets.c:1508
+#: ../lib/widgets.c:441
 msgid "Browse"
 msgstr "浏览"
 
-#: ../lib/widgets.c:2061
-msgid "Reset menu"
-msgstr "重置菜单"
-
-#. Installer message if no GTK+ was found
-#: ../installer/win32/gennsh.c:38
-msgid ""
-"GTK+ is not installed. Please use the full installer. It is available from "
-"http://dia-installer.de.";
-msgstr ""
-"没有安装 GTK+。请使用完整的安装程序。可以从 http://dia-installer.de 处获得。"
-
-#. Installer message: Don't install over pre 0.95 versions
-#: ../installer/win32/gennsh.c:41
-msgid ""
-"Please remove old Dia installations completely or install Dia to a different "
-"location."
-msgstr "请完全卸载旧的 Dia 版本,或者把 Dia 安装到别的地方。"
-
-#. Installer message:  License Page
-#: ../installer/win32/gennsh.c:44
-msgid "Next >"
-msgstr "下一步 >"
-
-#. Installer message, keep the $(^Name) and $_CLICK, these will be replaced
-#: ../installer/win32/gennsh.c:47
-msgid ""
-"$(^Name) is released under the GPL license. The license is provided here for "
-"information purposes only. $_CLICK"
-msgstr ""
-"$(^Name) 根据 GPL 许可证发布。 在此处给出该许可证文本仅仅是为了提供信息。 "
-"$_CLICK"
-
-#. Installer message: Components page
-#: ../installer/win32/gennsh.c:50
-msgid "Dia Diagram Editor (required)"
-msgstr "Dia 图表编辑器 (必需)"
-
-#. Installer message: Components page
-#: ../installer/win32/gennsh.c:53
-msgid "Translations"
-msgstr "翻译"
-
-#. Installer message: Component description
-#: ../installer/win32/gennsh.c:56
-msgid "Optional translations of the Dia user interface"
-msgstr "Dia 用户界面里可选的翻译"
-
-#. Installer message: Component description
-#: ../installer/win32/gennsh.c:59
-msgid "Core Dia files and dlls"
-msgstr "核心 Dia 文件和动态连接库文件"
-
-#. Installer message: Component name
-#: ../installer/win32/gennsh.c:62
-msgid "Python plug-in"
-msgstr "Python 插件"
-
-#. Installer message: Component description
-#: ../installer/win32/gennsh.c:65
-msgid ""
-"Support for the Python Scripting Language 2.3. Do not select this if Python "
-"is not installed."
-msgstr "对 Python 脚本语言 2.3 的支持。如果 Python 没有安装,请不要选择 "
-
-#. Installer message: hyperlink text on finish page
-#: ../installer/win32/gennsh.c:68
-msgid "Visit the Dia for Windows Web Page"
-msgstr "访问 Dia Windows 版页面"
-
-#. Installer message: Dia uninstaller entry in Control Panel
-#: ../installer/win32/gennsh.c:71
-msgid "Dia (remove only)"
-msgstr "Dia (仅移除)"
-
-#. Installer message: confirmation question. Keep $\r
-#: ../installer/win32/gennsh.c:74
-msgid ""
-"Your old Dia directory is about to be deleted. Would you like to continue?$\r"
-"$\rNote: Any non-standard plugins that you may have installed will be "
-"deleted.$\rDia user settings will not be affected."
-msgstr ""
-"旧的 Dia 目录即将被删除。您想继续吗?$\\r$\\r注意:任何您已安装的非标准插件都"
-"会被删除。$\\rDia 用户设置不会受到影响。"
-
-#. Installer message: confirmatin question. Keep $\r
-#: ../installer/win32/gennsh.c:77
-msgid ""
-"The installation directory you specified already exists. Any contents$\rwill "
-"be deleted. Would you like to continue?"
-msgstr "指定的安装目录已存在。其下所有内容$\r都会被删除。您想继续吗?"
-
-#. Installer message: Uninstall Section Prompts. Keep $\r
-#: ../installer/win32/gennsh.c:80
-msgid ""
-"The uninstaller could not find registry entries for Dia.$\rIt is likely that "
-"another user installed this application."
-msgstr "卸载程序无法找到 Dia 的注册表项。$\r可能是其他用户安装了 Dia。"
-
-#. Installer message: Uninstall error message
-#: ../installer/win32/gennsh.c:83
-msgid "You do not have permission to uninstall this application."
-msgstr "您没有权限卸载此程序。"
-
-#. Installer message: Uninstallation warning. Keep $INSTDIR
-#: ../installer/win32/gennsh.c:86
-msgid "This will completely delete $INSTDIR and all subdirectories. Continue?"
-msgstr "该操作会删除 $INSTDIR 以及所有子目录。继续?"
-
-#. Installer message: Uninstallation warning. Keep $\PROFILE\.dia
-#: ../installer/win32/gennsh.c:89
-msgid ""
-"This will completely delete $PROFILE\\.dia and all subdirectories. Continue?"
-msgstr "该操作将完全删除 $PROFILE\\.dia 以及所有子目录。继续?"
-
-#: ../objects/AADL/aadl.c:52
-msgid "Architecture Analysis & Design Language diagram objects"
-msgstr "结构分析和设计语言图表对象"
-
 #: ../objects/AADL/aadlbox.c:147
 msgid "Declaration"
 msgstr "声明"
 
-#: ../objects/AADL/aadlbox.c:358
+#: ../objects/AADL/aadlbox.c:356
 msgid "Add Access Provider"
 msgstr "添加访问提供者"
 
-#: ../objects/AADL/aadlbox.c:360
+#: ../objects/AADL/aadlbox.c:358
 msgid "Add Access Requirer"
 msgstr "添加访问请求者"
 
-#: ../objects/AADL/aadlbox.c:362
+#: ../objects/AADL/aadlbox.c:360
 msgid "Add In Data Port"
 msgstr "添加输入数据端口"
 
-#: ../objects/AADL/aadlbox.c:364
+#: ../objects/AADL/aadlbox.c:362
 msgid "Add In Event Port"
 msgstr "添加输入事件端口"
 
-#: ../objects/AADL/aadlbox.c:366
+#: ../objects/AADL/aadlbox.c:364
 msgid "Add In Event Data Port"
 msgstr "添加输入事件数据端口"
 
-#: ../objects/AADL/aadlbox.c:368
+#: ../objects/AADL/aadlbox.c:366
 msgid "Add Out Data Port"
 msgstr "添加输出数据端口"
 
-#: ../objects/AADL/aadlbox.c:370
+#: ../objects/AADL/aadlbox.c:368
 msgid "Add Out Event Port"
 msgstr "添加输出事件端口"
 
-#: ../objects/AADL/aadlbox.c:372
+#: ../objects/AADL/aadlbox.c:370
 msgid "Add Out Event Data Port"
 msgstr "添加输出事件数据端口"
 
-#: ../objects/AADL/aadlbox.c:374
+#: ../objects/AADL/aadlbox.c:372
 msgid "Add In Out Data Port"
 msgstr "添加输入输出数据端口"
 
-#: ../objects/AADL/aadlbox.c:376
+#: ../objects/AADL/aadlbox.c:374
 msgid "Add In Out Event Port"
 msgstr "添加输入输出事件端口"
 
-#: ../objects/AADL/aadlbox.c:378
+#: ../objects/AADL/aadlbox.c:376
 msgid "Add In Out Event Data Port"
 msgstr "添加输入输出事件数据端口"
 
-#: ../objects/AADL/aadlbox.c:380
+#: ../objects/AADL/aadlbox.c:378
 msgid "Add Port Group"
 msgstr "添加端口组"
 
-#: ../objects/AADL/aadlbox.c:382
+#: ../objects/AADL/aadlbox.c:380
 msgid "Add Connection Point"
 msgstr "添加连接点"
 
-#: ../objects/AADL/aadlbox.c:386
+#: ../objects/AADL/aadlbox.c:384
 msgid "Delete Port"
 msgstr "删除端口"
 
-#: ../objects/AADL/aadlbox.c:387
+#: ../objects/AADL/aadlbox.c:385
 msgid "Edit Port Declaration"
 msgstr "编辑端口声明"
 
-#: ../objects/AADL/aadlbox.c:391
+#: ../objects/AADL/aadlbox.c:389
 msgid "Delete Connection Point"
 msgstr "删除连接点"
 
-#: ../objects/Database/compound.c:198
-msgid "Number of arms"
-msgstr "手柄数"
-
-#: ../objects/Database/compound.c:221
-msgid "Flip arms verticaly"
-msgstr "垂直翻转手柄"
-
-#: ../objects/Database/compound.c:223
-msgid "Flip arms horizontaly"
-msgstr "水平翻转手柄"
-
-#: ../objects/Database/compound.c:225
-msgid "Center mount point verticaly"
-msgstr "使装载点垂直居中"
-
-#: ../objects/Database/compound.c:227
-msgid "Center mount point horizontaly"
-msgstr "使装载点水平居中"
-
-#: ../objects/Database/compound.c:229
-msgid "Center mount point"
-msgstr "使装载点居中"
-
-#: ../objects/Database/compound.c:234
-msgid "Compound"
-msgstr "复合"
-
-#: ../objects/Database/database.c:39
-msgid "Entity/Relationship table diagram objects"
-msgstr "实体/关系表图表对象"
-
-#: ../objects/Database/table.c:143 ../objects/Database/table.c:184
-#: ../objects/Database/table.c:201 ../objects/UML/class.c:149
-#: ../objects/UML/class.c:192 ../objects/UML/class_dialog.c:595
-#: ../objects/UML/umlattribute.c:43 ../objects/UML/umloperation.c:66
-#: ../objects/UML/umlparameter.c:49 ../sheets/SDL.sheet.in.h:3
-msgid "Comment"
-msgstr "注释"
+#: ../objects/AADL/aadl.c:52
+msgid "Architecture Analysis & Design Language diagram objects"
+msgstr "结构分析和设计语言图表对象"
 
-#: ../objects/Database/table.c:145
-msgid "Primary key"
-msgstr "主键"
+#: ../objects/chronogram/chronogram.c:40
+msgid "Chronogram diagram objects"
+msgstr "Chronogram 图表对象"
 
-#: ../objects/Database/table.c:147
-msgid "Nullable"
-msgstr "可以为空"
+#: ../objects/chronogram/chronoline.c:147 ../sheets/AADL.sheet.in.h:5
+msgid "Data"
+msgstr "数据"
 
-#: ../objects/Database/table.c:149
-msgid "Unique"
-msgstr "唯一索引"
+#: ../objects/chronogram/chronoline.c:149
+msgid "Data name"
+msgstr "数据名称"
 
-#: ../objects/Database/table.c:186
-msgid "Visible comments"
-msgstr "可见的注释"
+#: ../objects/chronogram/chronoline.c:151
+msgid "Events"
+msgstr "事件"
 
-#: ../objects/Database/table.c:188 ../objects/UML/class.c:172
-msgid "Comment tagging"
-msgstr "注释标记"
+#: ../objects/chronogram/chronoline.c:154
+msgid "Event specification"
+msgstr "事件规格"
 
-#: ../objects/Database/table.c:190 ../objects/Database/table_dialog.c:973
-msgid "Underline primary keys"
-msgstr "为主键加上下划线"
+#: ../objects/chronogram/chronoline.c:155
+msgid ""
+"@ time    set the pointer to an absolute time.\n"
+"( duration  set the signal up, then wait 'duration'.\n"
+") duration  set the signal down, then wait 'duration'.\n"
+"u duration  set the signal to \"unknown\" state, then wait 'duration'.\n"
+"Example: @ 1.0 (2.0)1.0(2.0)\n"
+msgstr ""
+"@ 时间    将指针指向一个绝对时间。\n"
+"( 时间段  设置 up 信号,然后等待“时间段”。\n"
+") 时间段  设置 down 信号,然后等待“时间段”。\n"
+"u 时间段  将信号设置为“未知”状态,然后等待“时间段”。\n"
+"例如:@ 1.0 (2.0)1.0(2.0)\n"
 
-#: ../objects/Database/table.c:192 ../objects/Database/table_dialog.c:978
-msgid "Use bold font for primary keys"
-msgstr "为主键使用粗体"
+#: ../objects/chronogram/chronoline.c:163
+#: ../objects/chronogram/chronoref.c:145
+msgid "Start time"
+msgstr "开始时间"
 
-#. property rows
-#: ../objects/Database/table.c:197 ../objects/SADT/arrow.c:137
-#: ../objects/UML/class.c:182 ../objects/UML/class_dialog.c:570
-msgid "Normal"
-msgstr "正常"
+#: ../objects/chronogram/chronoline.c:165
+#: ../objects/chronogram/chronoref.c:147
+msgid "End time"
+msgstr "结束时间"
 
-#: ../objects/Database/table.c:199
-msgid "Tablename"
-msgstr "表名"
+#: ../objects/chronogram/chronoline.c:167
+msgid "Rise time"
+msgstr "上升时间"
 
-#: ../objects/Database/table.c:204 ../objects/Database/table.c:206
-#: ../objects/Database/table.c:208 ../objects/Database/reference.c:120
-#: ../objects/UML/association.c:245 ../objects/UML/association.c:256
-#: ../objects/UML/association.c:258 ../objects/UML/association.c:260
-#: ../objects/UML/association.c:262 ../objects/UML/association.c:264
-#: ../objects/UML/class.c:196 ../objects/UML/class.c:198
-#: ../objects/UML/class.c:200 ../objects/UML/class.c:202
-#: ../objects/UML/class.c:204 ../objects/UML/class.c:206
-msgid " "
-msgstr " "
+#: ../objects/chronogram/chronoline.c:169
+msgid "Fall time"
+msgstr "下降时间"
 
-#: ../objects/Database/table.c:212 ../objects/UML/class.c:212
-#: ../objects/UML/object.c:157
-msgid "Attributes"
-msgstr "属性"
+#: ../objects/chronogram/chronoline.c:170
+msgid "Multi-bit data"
+msgstr "多位数据"
 
-#: ../objects/Database/table.c:249 ../objects/UML/class.c:324
-msgid "Show comments"
-msgstr "显示注释"
+#: ../objects/chronogram/chronoline.c:172
+#: ../objects/chronogram/chronoref.c:155
+msgid "Aspect"
+msgstr "外观"
 
-#. init data
-#: ../objects/Database/table.c:254 ../objects/Database/table.c:357
-#: ../sheets/Database.sheet.in.h:5
-msgid "Table"
-msgstr "表"
+#: ../objects/chronogram/chronoline.c:174
+msgid "Data color"
+msgstr "数据颜色"
 
-#. Attributes page:
-#: ../objects/Database/table_dialog.c:608 ../objects/UML/class_dialog.c:1081
-msgid "_Attributes"
-msgstr "属性(_A)"
+#: ../objects/chronogram/chronoline.c:176
+msgid "Data line width"
+msgstr "数据线宽度"
 
-#. the "new" button
-#: ../objects/Database/table_dialog.c:636 ../objects/SISSI/sissi_dialog.c:739
-#: ../objects/SISSI/sissi_dialog.c:871
-msgid "_New"
-msgstr "新建(_N)"
+#: ../objects/chronogram/chronoref.c:143
+msgid "Time data"
+msgstr "时间数据"
 
-#. the "delete" button
-#: ../objects/Database/table_dialog.c:644
-msgid "_Delete"
-msgstr "删除(_D)"
+#: ../objects/chronogram/chronoref.c:149
+msgid "Major time step"
+msgstr "主时间步"
 
-#. the "Move up" button
-#: ../objects/Database/table_dialog.c:652
-msgid "Move up"
-msgstr "上移"
+#: ../objects/chronogram/chronoref.c:151
+msgid "Minor time step"
+msgstr "副时间步"
 
-#. the "Move down" button
-#: ../objects/Database/table_dialog.c:660
-msgid "Move down"
-msgstr "下移"
+#: ../objects/chronogram/chronoref.c:161
+msgid "Minor step line width"
+msgstr "主步线的宽度"
 
-#: ../objects/Database/table_dialog.c:670 ../objects/UML/class_dialog.c:1138
-msgid "Attribute data"
-msgstr "属性数据"
+#: ../objects/custom/custom.c:140
+msgid "Custom"
+msgstr "定制"
 
-#: ../objects/Database/table_dialog.c:680
-#: ../objects/Database/table_dialog.c:1043 ../objects/ER/attribute.c:155
-#: ../objects/ER/entity.c:137 ../objects/ER/relationship.c:142
-#: ../objects/UML/class_dialog.c:1148 ../objects/UML/class_dialog.c:2014
-#: ../objects/UML/class_dialog.c:2250 ../objects/UML/class_dialog.c:2853
-#: ../objects/UML/dependency.c:137 ../objects/UML/generalization.c:133
-#: ../objects/UML/realizes.c:134
-msgid "Name:"
-msgstr "名称:"
+#: ../objects/custom/custom.c:140
+msgid "Custom XML shapes loader"
+msgstr "定制 XML 形状载入器"
 
-#: ../objects/Database/table_dialog.c:692 ../objects/FS/flow-ortho.c:169
-#: ../objects/FS/flow.c:146 ../objects/Istar/link.c:162
-#: ../objects/Jackson/phenomenon.c:146 ../objects/KAOS/metaandorrel.c:166
-#: ../objects/KAOS/metabinrel.c:173 ../objects/UML/class_dialog.c:1159
-#: ../objects/UML/class_dialog.c:2025 ../objects/UML/class_dialog.c:2261
-#: ../objects/UML/class_dialog.c:2864
-msgid "Type:"
-msgstr "类型:"
+#: ../objects/custom/custom_object.c:199 ../objects/custom/custom_object.c:232
+msgid "Flip horizontal"
+msgstr "水平翻转"
 
-#: ../objects/Database/table_dialog.c:704
-#: ../objects/Database/table_dialog.c:943
-#: ../objects/Database/table_dialog.c:1048 ../objects/UML/class_dialog.c:452
-#: ../objects/UML/class_dialog.c:1181 ../objects/UML/class_dialog.c:2111
-#: ../objects/UML/class_dialog.c:2283
-msgid "Comment:"
-msgstr "注释:"
+#: ../objects/custom/custom_object.c:201 ../objects/custom/custom_object.c:234
+msgid "Flip vertical"
+msgstr "垂直翻转"
 
-#: ../objects/Database/table_dialog.c:723
-msgid "_Primary key"
-msgstr "主键(_P)"
+#: ../objects/custom/custom_object.c:204 ../objects/custom/custom_object.c:237
+msgid "Scale of the subshapes"
+msgstr "子形状的缩放比例"
 
-#: ../objects/Database/table_dialog.c:730
-msgid "N_ullable"
-msgstr "可以为空(_U)"
+#: ../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
+msgid "Text padding"
+msgstr "文本填充"
 
-#: ../objects/Database/table_dialog.c:737
-msgid "Uni_que"
-msgstr "唯一索引(_Q)"
+#: ../objects/custom/custom_object.c:1777
+msgid "Flip Horizontal"
+msgstr "水平翻转"
 
-#: ../objects/Database/table_dialog.c:925
-msgid "_Table"
-msgstr "表(_T)"
+#: ../objects/custom/custom_object.c:1778
+msgid "Flip Vertical"
+msgstr "垂直翻转"
 
-#: ../objects/Database/table_dialog.c:933
-msgid "Table name:"
-msgstr "表名:"
+#: ../objects/custom/custom_object.c:1815
+#, c-format
+msgid "Cannot open icon file %s for object type '%s'."
+msgstr "无法为“%2$s”类型的对象打开图标文件%1$s。"
 
-#. XXX create a handler and disable the 'show documentation tag' checkbox
-#. if 'comment visible' is not active.
-#: ../objects/Database/table_dialog.c:963
-msgid "Comment visible"
-msgstr "注释可见"
+#: ../objects/custom_lines/custom_lines.c:160
+msgid "CustomLines"
+msgstr "定制线"
 
-#: ../objects/Database/table_dialog.c:968 ../objects/UML/class_dialog.c:522
-msgid "Show documentation tag"
-msgstr "显示文档标签"
+#: ../objects/custom_lines/custom_lines.c:160
+msgid "Custom XML lines loader"
+msgstr "定制 XML 线形载入器"
 
-#. * Fonts and Colors selection *
-#: ../objects/Database/table_dialog.c:1007 ../objects/UML/class_dialog.c:551
-msgid "_Style"
-msgstr "样式(_S)"
+#: ../objects/custom_lines/custom_linetypes.c:259
+msgid "INTERNAL: CustomLines: Illegal line type in LineInfo object."
+msgstr "INTERNAL:CustomLines:LineInfo 对象中的非法线类型。"
 
-#: ../objects/Database/table_dialog.c:1018
-msgid "Border width:"
-msgstr "边框宽度:"
+#: ../objects/custom/shape_info.c:170
+#, c-format
+msgid ""
+"The file '%s' has invalid path data.\n"
+"svg:path data must start with moveto."
+msgstr ""
+"文件“%s”含有无效的路径数据。\n"
+"svg:路径数据必须以 moveto 开始。"
 
-#. head line
-#: ../objects/Database/table_dialog.c:1031 ../objects/UML/class_dialog.c:561
-#: ../objects/UML/umlparameter.c:51
-msgid "Kind"
-msgstr "种类"
+#: ../objects/Database/compound.c:196
+msgid "Number of arms"
+msgstr "手柄数"
 
-#: ../objects/Database/table_dialog.c:1035 ../objects/UML/class_dialog.c:566
-msgid "Size"
-msgstr "尺寸"
+#: ../objects/Database/compound.c:219
+msgid "Flip arms vertically"
+msgstr "垂直翻转手柄"
 
-#: ../objects/Database/table_dialog.c:1038
-msgid "Normal:"
-msgstr "正常:"
+#: ../objects/Database/compound.c:221
+msgid "Flip arms horizontally"
+msgstr "水平翻转手柄"
 
-#: ../objects/Database/table_dialog.c:1059
-msgid "Text Color:"
-msgstr "文本颜色:"
+#: ../objects/Database/compound.c:223
+msgid "Center mount point vertically"
+msgstr "使装载点垂直居中"
 
-#: ../objects/Database/table_dialog.c:1067
-msgid "Foreground Color:"
-msgstr "前景色:"
+#: ../objects/Database/compound.c:225
+msgid "Center mount point horizontally"
+msgstr "使装载点水平居中"
 
-#. two chars at the beginning
-#: ../objects/Database/table_dialog.c:1380
-msgid "not null"
-msgstr "非空"
+#: ../objects/Database/compound.c:227
+msgid "Center mount point"
+msgstr "使装载点居中"
 
-#: ../objects/Database/table_dialog.c:1381
-msgid "null"
-msgstr "空"
+#: ../objects/Database/compound.c:232
+msgid "Compound"
+msgstr "复合"
 
-#: ../objects/Database/table_dialog.c:1382
-msgid "unique"
-msgstr "唯一索引"
+#: ../objects/Database/database.c:39
+msgid "Entity/Relationship table diagram objects"
+msgstr "实体/关系表图表对象"
 
-#: ../objects/Database/reference.c:108 ../objects/flowchart/box.c:152
-#: ../objects/standard/box.c:152 ../objects/standard/polyline.c:140
-#: ../objects/standard/zigzagline.c:136
+#: ../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
 msgid "Corner radius"
 msgstr "圆角半径"
 
-#: ../objects/Database/reference.c:111
+#: ../objects/Database/reference.c:112
 msgid "Start description"
 msgstr "起点描述:"
 
-#: ../objects/Database/reference.c:113
+#: ../objects/Database/reference.c:114
 msgid "End description"
 msgstr "终点描述:"
 
-#: ../objects/Database/reference.c:144 ../objects/ER/participation.c:406
-#: ../objects/FS/flow-ortho.c:632 ../objects/GRAFCET/vector.c:314
-#: ../objects/SADT/arrow.c:464 ../objects/UML/association.c:854
-#: ../objects/UML/component_feature.c:190 ../objects/UML/dependency.c:376
-#: ../objects/UML/generalization.c:372 ../objects/UML/realizes.c:363
-#: ../objects/UML/transition.c:172 ../objects/standard/zigzagline.c:385
+#: ../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
+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
 msgid "Add segment"
 msgstr "添加图段"
 
-#: ../objects/Database/reference.c:145 ../objects/ER/participation.c:407
-#: ../objects/FS/flow-ortho.c:633 ../objects/GRAFCET/vector.c:315
-#: ../objects/SADT/arrow.c:465 ../objects/UML/association.c:855
-#: ../objects/UML/component_feature.c:191 ../objects/UML/dependency.c:377
-#: ../objects/UML/generalization.c:373 ../objects/UML/realizes.c:364
-#: ../objects/UML/transition.c:173 ../objects/standard/zigzagline.c:386
+#: ../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
 msgid "Delete segment"
 msgstr "删除图段"
 
-#: ../objects/Database/reference.c:151 ../sheets/Database.sheet.in.h:4
+#: ../objects/Database/reference.c:152 ../sheets/Database.sheet.in.h:4
 msgid "Reference"
 msgstr "引用"
 
-#: ../objects/ER/attribute.c:157
+#: ../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
+msgid "Comment"
+msgstr "注释"
+
+#: ../objects/Database/table.c:142
+msgid "Primary"
+msgstr "主"
+
+#: ../objects/Database/table.c:142
+msgid "Primary key"
+msgstr "主键"
+
+#: ../objects/Database/table.c:144
+msgid "Nullable"
+msgstr "可以为空"
+
+#: ../objects/Database/table.c:146
+msgid "Unique"
+msgstr "唯一索引"
+
+#: ../objects/Database/table.c:148
+msgid "Default"
+msgstr "默认"
+
+#: ../objects/Database/table.c:148
+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
+msgid "Table"
+msgstr "表"
+
+#: ../objects/Database/table.c:186
+msgid "Visible comments"
+msgstr "可见的注释"
+
+#: ../objects/Database/table.c:188
+msgid "Underline primary keys"
+msgstr "为主键加上下划线"
+
+#: ../objects/Database/table.c:191 ../objects/UML/class.c:159
+msgid "Comment tagging"
+msgstr "注释标记"
+
+#: ../objects/Database/table.c:193
+msgid "Use bold font for primary keys"
+msgstr "为主键使用粗体"
+
+#: ../objects/Database/table.c:196 ../objects/UML/class.c:181
+#: ../objects/UML/object.c:150
+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
+msgid "Style"
+msgstr "样式"
+
+#: ../objects/Database/table.c:201 ../objects/UML/class.c:197
+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
+msgid "Normal"
+msgstr "正常"
+
+#: ../objects/Database/table.c:207
+msgid "Table name"
+msgstr "表名"
+
+#: ../objects/Database/table.c:262 ../objects/UML/class.c:342
+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
 msgid "Key:"
 msgstr "密钥:"
 
-#: ../objects/ER/attribute.c:159
+#: ../objects/ER/attribute.c:156
 msgid "Weak key:"
 msgstr "弱密钥:"
 
-#: ../objects/ER/attribute.c:161
+#: ../objects/ER/attribute.c:158
 msgid "Derived:"
 msgstr "来源:"
 
-#: ../objects/ER/attribute.c:163
+#: ../objects/ER/attribute.c:160
 msgid "Multivalue:"
 msgstr "多值:"
 
-#: ../objects/ER/attribute.c:436 ../sheets/ER.sheet.in.h:1
+#: ../objects/ER/attribute.c:433 ../sheets/ER.sheet.in.h:6
 msgid "Attribute"
 msgstr "属性"
 
-#: ../objects/ER/entity.c:139
+#: ../objects/ER/entity.c:136
 msgid "Weak:"
 msgstr "弱:"
 
-#: ../objects/ER/entity.c:141
+#: ../objects/ER/entity.c:138
 msgid "Associative:"
 msgstr "关联的:"
 
-#: ../objects/ER/entity.c:415 ../objects/UML/classicon.c:131
-#: ../sheets/ER.sheet.in.h:4
+#: ../objects/ER/entity.c:412 ../objects/UML/classicon.c:129
+#: ../sheets/ER.sheet.in.h:3
 msgid "Entity"
 msgstr "实体"
 
@@ -3197,41 +3390,49 @@ msgstr "实体"
 msgid "Entity/Relationship diagram objects"
 msgstr "实体/关系图表对象"
 
-#: ../objects/ER/participation.c:118
+#: ../objects/ER/participation.c:116
 msgid "Total:"
 msgstr "总共:"
 
-#: ../objects/ER/relationship.c:144
+#: ../objects/ER/relationship.c:141
 msgid "Left Cardinality:"
 msgstr "左基数:"
 
-#: ../objects/ER/relationship.c:146
+#: ../objects/ER/relationship.c:143
 msgid "Right Cardinality:"
 msgstr "右基数:"
 
-#: ../objects/ER/relationship.c:148
+#: ../objects/ER/relationship.c:145
 msgid "Rotate:"
 msgstr "旋转:"
 
-#: ../objects/ER/relationship.c:150
+#: ../objects/ER/relationship.c:147
 msgid "Identifying:"
 msgstr "标识:"
 
-#: ../objects/ER/relationship.c:459 ../sheets/ER.sheet.in.h:6
+#: ../objects/ER/relationship.c:456 ../sheets/ER.sheet.in.h:5
 msgid "Relationship"
 msgstr "关系"
 
+#: ../objects/flowchart/flowchart.c:37
+msgid "Flowchart objects"
+msgstr "流程图对象"
+
+#: ../objects/flowchart/parallelogram.c:152
+msgid "Shear angle"
+msgstr "圆角"
+
 #. Translators: Menu item Noun/Energy
-#: ../objects/FS/flow-ortho.c:160 ../objects/FS/flow-ortho.c:629
-#: ../objects/FS/flow.c:137 ../objects/FS/flow.c:631
-#: ../objects/FS/function.c:1101
+#: ../objects/FS/flow.c:135 ../objects/FS/flow.c:627
+#: ../objects/FS/flow-ortho.c:158 ../objects/FS/flow-ortho.c:624
+#: ../objects/FS/function.c:1095
 msgid "Energy"
 msgstr "能量"
 
 #. Translators: Menu item Noun/Material
-#: ../objects/FS/flow-ortho.c:161 ../objects/FS/flow-ortho.c:630
-#: ../objects/FS/flow.c:138 ../objects/FS/flow.c:632
-#: ../objects/FS/function.c:1077
+#: ../objects/FS/flow.c:136 ../objects/FS/flow.c:628
+#: ../objects/FS/flow-ortho.c:159 ../objects/FS/flow-ortho.c:625
+#: ../objects/FS/function.c:1071
 msgid "Material"
 msgstr "物质"
 
@@ -3239,1062 +3440,1073 @@ msgstr "物质"
 #. Translators: Menu item Verb/Signal/Signal
 #. Translators: Menu item Noun/Signal
 #. Translators: Menu item Noun/Signal/Signal
-#: ../objects/FS/flow-ortho.c:162 ../objects/FS/flow-ortho.c:631
-#: ../objects/FS/flow.c:139 ../objects/FS/flow.c:633
-#: ../objects/FS/function.c:1039 ../objects/FS/function.c:1041
-#: ../objects/FS/function.c:1177 ../objects/FS/function.c:1179
+#: ../objects/FS/flow.c:137 ../objects/FS/flow.c: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
 msgid "Signal"
 msgstr "信号"
 
+#: ../objects/FS/flow.c:144 ../objects/FS/flow-ortho.c:167
+#: ../objects/Istar/link.c:161 ../objects/Jackson/phenomenon.c:145
+#: ../objects/KAOS/metaandorrel.c:165 ../objects/KAOS/metabinrel.c:172
+#: ../objects/UML/class_attributes_dialog.c:528
+#: ../objects/UML/class_operations_dialog.c:788
+#: ../objects/UML/class_operations_dialog.c:988
+#: ../objects/UML/class_templates_dialog.c:447
+msgid "Type:"
+msgstr "类型:"
+
 #: ../objects/FS/fs.c:43
 msgid "Function structure diagram objects"
 msgstr "函数结构图表对象"
 
-#: ../objects/FS/function.c:144
+#: ../objects/FS/function.c:141
 msgid "Wish function"
 msgstr "预期函数"
 
-#: ../objects/FS/function.c:146
+#: ../objects/FS/function.c:143
 msgid "User function"
 msgstr "用户函数"
 
 #. Translators: Menu item Verb
-#: ../objects/FS/function.c:681
+#: ../objects/FS/function.c:675
 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:683 ../objects/FS/function.c:685
-#: ../objects/FS/function.c:725
+#: ../objects/FS/function.c:677 ../objects/FS/function.c:679
+#: ../objects/FS/function.c:719
 msgid "Channel"
 msgstr "通道"
 
-#. Translators: Menu item Verb/Channel/Import
-#. Translators: Menu item Verb/Channel/Import/Import
-#: ../objects/FS/function.c:687 ../objects/FS/function.c:689
-msgid "Import"
-msgstr "导入"
-
 #. Translators: Menu item Verb/Channel/Import/Input
-#: ../objects/FS/function.c:691 ../objects/KAOS/metabinrel.c:165
+#: ../objects/FS/function.c:685 ../objects/KAOS/metabinrel.c:164
 msgid "Input"
 msgstr "输入"
 
 #. Translators: Menu item Verb/Channel/Import/Receive
-#: ../objects/FS/function.c:693
+#: ../objects/FS/function.c:687
 msgid "Receive"
 msgstr "接收"
 
 #. Translators: Menu item Verb/Channel/Import/Allow
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Allow
-#: ../objects/FS/function.c:695 ../objects/FS/function.c:967
+#: ../objects/FS/function.c:689 ../objects/FS/function.c:961
 msgid "Allow"
 msgstr "允许"
 
 #. Translators: Menu item Verb/Channel/Import/Form Entrance
-#: ../objects/FS/function.c:697
+#: ../objects/FS/function.c:691
 msgid "Form Entrance"
 msgstr "表单入口"
 
 #. Translators: Menu item Verb/Channel/Import/Capture
 #. Translators: Menu item Verb/Provision/Store/Capture
-#: ../objects/FS/function.c:699 ../objects/FS/function.c:933
+#: ../objects/FS/function.c:693 ../objects/FS/function.c:927
 msgid "Capture"
 msgstr "捕捉"
 
 #. Translators: Menu item Verb/Channel/Export/Discharge
-#: ../objects/FS/function.c:705
+#: ../objects/FS/function.c:699
 msgid "Discharge"
 msgstr "释放"
 
 #. Translators: Menu item Verb/Channel/Export/Eject
-#: ../objects/FS/function.c:707
+#: ../objects/FS/function.c:701
 msgid "Eject"
 msgstr "弹出"
 
 #. Translators: Menu item Verb/Channel/Export/Dispose
-#: ../objects/FS/function.c:709
+#: ../objects/FS/function.c:703
 msgid "Dispose"
 msgstr "处理"
 
 #. Translators: Menu item Verb/Channel/Transfer
 #. Translators: Menu item Verb/Channel/Transfer/Transfer
 #. Translators: Menu item Verb/Channel/Transfer/Transmit/Transfer
-#: ../objects/FS/function.c:713 ../objects/FS/function.c:715
-#: ../objects/FS/function.c:733
+#: ../objects/FS/function.c:707 ../objects/FS/function.c:709
+#: ../objects/FS/function.c:727
 msgid "Transfer"
 msgstr "传输"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transport
 #. Translators: Menu item Verb/Channel/Transfer/Transport/Transport
-#: ../objects/FS/function.c:717 ../objects/FS/function.c:719
+#: ../objects/FS/function.c:711 ../objects/FS/function.c:713
 msgid "Transport"
 msgstr "输送"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transport/Lift
-#: ../objects/FS/function.c:721
+#: ../objects/FS/function.c:715
 msgid "Lift"
 msgstr "提升"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transport/Move
-#: ../objects/FS/function.c:723
+#: ../objects/FS/function.c:717
 msgid "Move"
 msgstr "移动"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transmit
 #. Translators: Menu item Verb/Channel/Transfer/Transmit/Transmit
-#: ../objects/FS/function.c:727 ../objects/FS/function.c:729
+#: ../objects/FS/function.c:721 ../objects/FS/function.c:723
 msgid "Transmit"
 msgstr "发射"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transmit/Conduct
-#: ../objects/FS/function.c:731
+#: ../objects/FS/function.c:725
 msgid "Conduct"
 msgstr "传导"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transmit/Convey
-#: ../objects/FS/function.c:735
+#: ../objects/FS/function.c:729
 msgid "Convey"
 msgstr "转让"
 
 #. Translators: Menu item Verb/Channel/Guide
 #. Translators: Menu item Verb/Channel/Guide/Guide
 #. Translators: Menu item Verb/Channel/Guide/Guide/Guide
-#: ../objects/FS/function.c:737 ../objects/FS/function.c:739
-#: ../objects/FS/function.c:741
+#: ../objects/FS/function.c:731 ../objects/FS/function.c:733
+#: ../objects/FS/function.c:735
 msgid "Guide"
 msgstr "导向"
 
 #. Translators: Menu item Verb/Channel/Guide/Guide/Direct
-#: ../objects/FS/function.c:743
+#: ../objects/FS/function.c:737
 msgid "Direct"
 msgstr "方向"
 
 #. Translators: Menu item Verb/Channel/Guide/Guide/Straighten
-#: ../objects/FS/function.c:745
+#: ../objects/FS/function.c:739
 msgid "Straighten"
 msgstr "弄直"
 
 #. Translators: Menu item Verb/Channel/Guide/Guide/Steer
-#: ../objects/FS/function.c:747
+#: ../objects/FS/function.c:741
 msgid "Steer"
 msgstr "把舵"
 
 #. Translators: Menu item Verb/Channel/Guide/Translate
-#: ../objects/FS/function.c:749
+#: ../objects/FS/function.c:743
 msgid "Translate"
 msgstr "转化"
 
 #. Translators: Menu item Verb/Channel/Guide/Rotate
 #. Translators: Menu item Verb/Channel/Guide/Rotate/Rotate
-#: ../objects/FS/function.c:751 ../objects/FS/function.c:753
+#: ../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:755
+#: ../objects/FS/function.c:749
 msgid "Turn"
 msgstr "平面旋转"
 
 #. Translators: Menu item Verb/Channel/Guide/Rotate/Spin
-#: ../objects/FS/function.c:757
+#: ../objects/FS/function.c:751
 msgid "Spin"
 msgstr "垂直旋转"
 
 #. Translators: Menu item Verb/Channel/Guide/Allow DOF
 #. Translators: Menu item Verb/Channel/Guide/Allow DOF/Allow DOF
-#: ../objects/FS/function.c:759 ../objects/FS/function.c:761
+#: ../objects/FS/function.c:753 ../objects/FS/function.c:755
 msgid "Allow DOF"
 msgstr "允许 DOF"
 
 #. Translators: Menu item Verb/Channel/Guide/Allow DOF/Constrain
-#: ../objects/FS/function.c:763
+#: ../objects/FS/function.c:757
 msgid "Constrain"
 msgstr "约束"
 
 #. Translators: Menu item Verb/Channel/Guide/Allow DOF/Unlock
-#: ../objects/FS/function.c:765
+#: ../objects/FS/function.c:759
 msgid "Unlock"
 msgstr "解锁"
 
 #. Translators: Menu item Verb/Support
 #. Translators: Menu item Verb/Support/Support
-#: ../objects/FS/function.c:767 ../objects/FS/function.c:769
+#: ../objects/FS/function.c:761 ../objects/FS/function.c:763
 msgid "Support"
 msgstr "支持"
 
 #. Translators: Menu item Verb/Support/Stop
 #. Translators: Menu item Verb/Support/Stop/Stop
-#: ../objects/FS/function.c:771 ../objects/FS/function.c:773
-#: ../sheets/SDL.sheet.in.h:19
+#: ../objects/FS/function.c:765 ../objects/FS/function.c:767
+#: ../sheets/SDL.sheet.in.h:16
 msgid "Stop"
 msgstr "停止"
 
 #. Translators: Menu item Verb/Support/Stop/Insulate
-#: ../objects/FS/function.c:775
+#: ../objects/FS/function.c:769
 msgid "Insulate"
 msgstr "隔离"
 
 #. Translators: Menu item Verb/Support/Stop/Protect
-#: ../objects/FS/function.c:777
+#: ../objects/FS/function.c:771
 msgid "Protect"
 msgstr "保护"
 
 #. Translators: Menu item Verb/Support/Stop/Prevent
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Prevent
-#: ../objects/FS/function.c:779 ../objects/FS/function.c:969
+#: ../objects/FS/function.c:773 ../objects/FS/function.c:963
 msgid "Prevent"
 msgstr "阻止"
 
 #. Translators: Menu item Verb/Support/Stop/Shield
-#: ../objects/FS/function.c:781
+#: ../objects/FS/function.c:775
 msgid "Shield"
 msgstr "屏蔽"
 
 #. Translators: Menu item Verb/Support/Stop/Inhibit
-#: ../objects/FS/function.c:783
+#: ../objects/FS/function.c:777
 msgid "Inhibit"
 msgstr "禁止"
 
 #. Translators: Menu item Verb/Support/Stabilize
 #. Translators: Menu item Verb/Support/Stabilize/Stabilize
-#: ../objects/FS/function.c:785 ../objects/FS/function.c:787
+#: ../objects/FS/function.c:779 ../objects/FS/function.c:781
 msgid "Stabilize"
 msgstr "稳定"
 
 #. Translators: Menu item Verb/Support/Stabilize/Steady
-#: ../objects/FS/function.c:789
+#: ../objects/FS/function.c:783
 msgid "Steady"
 msgstr "稳定"
 
 #. Translators: Menu item Verb/Support/Secure
 #. Translators: Menu item Verb/Support/Secure/Secure
-#: ../objects/FS/function.c:791 ../objects/FS/function.c:793
+#: ../objects/FS/function.c:785 ../objects/FS/function.c:787
 msgid "Secure"
 msgstr "牢固"
 
 #. Translators: Menu item Verb/Support/Secure/Attach
 #. Translators: Menu item Verb/Connect/Couple/Attach
-#: ../objects/FS/function.c:795 ../objects/FS/function.c:827
+#: ../objects/FS/function.c:789 ../objects/FS/function.c:821
 msgid "Attach"
 msgstr "附着"
 
 #. Translators: Menu item Verb/Support/Secure/Mount
-#: ../objects/FS/function.c:797
+#: ../objects/FS/function.c:791
 msgid "Mount"
 msgstr "安装"
 
 #. Translators: Menu item Verb/Support/Secure/Lock
-#: ../objects/FS/function.c:799 ../sheets/ciscomisc.sheet.in.h:19
+#: ../objects/FS/function.c:793 ../sheets/ciscomisc.sheet.in.h:42
 msgid "Lock"
 msgstr "锁定"
 
 #. Translators: Menu item Verb/Support/Secure/Fasten
-#: ../objects/FS/function.c:801
+#: ../objects/FS/function.c:795
 msgid "Fasten"
 msgstr "固定"
 
 #. Translators: Menu item Verb/Support/Secure/Hold
-#: ../objects/FS/function.c:803
+#: ../objects/FS/function.c:797
 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:809
+#: ../objects/FS/function.c:803
 msgid "Orient"
 msgstr "方向"
 
 #. Translators: Menu item Verb/Connect
 #. Translators: Menu item Verb/Connect/Connect
-#: ../objects/FS/function.c:815 ../objects/FS/function.c:817
+#: ../objects/FS/function.c:809 ../objects/FS/function.c:811
 msgid "Connect"
 msgstr "连接"
 
 #. Translators: Menu item Verb/Connect/Couple
 #. Translators: Menu item Verb/Connect/Couple/Couple
-#: ../objects/FS/function.c:819 ../objects/FS/function.c:821
+#: ../objects/FS/function.c:813 ../objects/FS/function.c:815
 msgid "Couple"
 msgstr "结合"
 
 #. Translators: Menu item Verb/Connect/Couple/Join
-#: ../objects/FS/function.c:823
+#: ../objects/FS/function.c:817
 msgid "Join"
 msgstr "联接"
 
 #. Translators: Menu item Verb/Connect/Couple/Assemble
-#: ../objects/FS/function.c:825
+#: ../objects/FS/function.c:819
 msgid "Assemble"
 msgstr "集合"
 
 #. Translators: Menu item Verb/Connect/Mix
 #. Translators: Menu item Verb/Connect/Mix/Mix
-#: ../objects/FS/function.c:829 ../objects/FS/function.c:831
+#: ../objects/FS/function.c:823 ../objects/FS/function.c:825
 msgid "Mix"
 msgstr "混合"
 
 #. Translators: Menu item Verb/Connect/Mix/Combine
-#: ../objects/FS/function.c:833
+#: ../objects/FS/function.c:827
 msgid "Combine"
 msgstr "联合"
 
 #. Translators: Menu item Verb/Connect/Mix/Blend
-#: ../objects/FS/function.c:835
+#: ../objects/FS/function.c:829
 msgid "Blend"
 msgstr "融合"
 
 #. Translators: Menu item Verb/Connect/Mix/Add
-#: ../objects/FS/function.c:837
+#: ../objects/FS/function.c:831
 msgid "Add"
 msgstr "添加"
 
 #. Translators: Menu item Verb/Connect/Mix/Pack
-#: ../objects/FS/function.c:839
+#: ../objects/FS/function.c:833
 msgid "Pack"
 msgstr "包装"
 
 #. Translators: Menu item Verb/Connect/Mix/Coalesce
-#: ../objects/FS/function.c:841
+#: ../objects/FS/function.c:835
 msgid "Coalesce"
 msgstr "聚结"
 
 #. Translators: Menu item Verb/Branch
 #. Translators: Menu item Verb/Branch/Branch
-#: ../objects/FS/function.c:843 ../objects/FS/function.c:845
-#: ../sheets/UML.sheet.in.h:5
+#: ../objects/FS/function.c:837 ../objects/FS/function.c:839
+#: ../sheets/UML.sheet.in.h:30
 msgid "Branch"
 msgstr "分支"
 
 #. Translators: Menu item Verb/Branch/Separate
 #. Translators: Menu item Verb/Branch/Separate/Separate
 #. Translators: Menu item Verb/Branch/Separate/Separate/Separate
-#: ../objects/FS/function.c:847 ../objects/FS/function.c:849
-#: ../objects/FS/function.c:851
+#: ../objects/FS/function.c:841 ../objects/FS/function.c:843
+#: ../objects/FS/function.c:845
 msgid "Separate"
 msgstr "分离"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Switch
-#: ../objects/FS/function.c:853
+#: ../objects/FS/function.c:847
 msgid "Switch"
 msgstr "转换"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Divide
-#: ../objects/FS/function.c:855
+#: ../objects/FS/function.c:849
 msgid "Divide"
 msgstr "划分"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Release
-#: ../objects/FS/function.c:857
+#: ../objects/FS/function.c:851
 msgid "Release"
 msgstr "释放"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Detach
-#: ../objects/FS/function.c:859
+#: ../objects/FS/function.c:853
 msgid "Detach"
 msgstr "拆开"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Disconnect
-#: ../objects/FS/function.c:861
+#: ../objects/FS/function.c:855
 msgid "Disconnect"
 msgstr "断开连接"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Cut
-#: ../objects/FS/function.c:867
+#: ../objects/FS/function.c:861
 msgid "Cut"
 msgstr "切开"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Polish
-#: ../objects/FS/function.c:869
+#: ../objects/FS/function.c:863
 msgid "Polish"
 msgstr "抛光"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Sand
-#: ../objects/FS/function.c:871
+#: ../objects/FS/function.c:865
 msgid "Sand"
 msgstr "沙磨"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Drill
-#: ../objects/FS/function.c:873
+#: ../objects/FS/function.c:867
 msgid "Drill"
 msgstr "钻孔"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Lathe
-#: ../objects/FS/function.c:875
+#: ../objects/FS/function.c:869
 msgid "Lathe"
 msgstr "车"
 
 #. Translators: Menu item Verb/Branch/Refine
 #. Translators: Menu item Verb/Branch/Refine/Refine
-#: ../objects/FS/function.c:877 ../objects/FS/function.c:879
+#: ../objects/FS/function.c:871 ../objects/FS/function.c:873
 msgid "Refine"
 msgstr "精制"
 
 #. Translators: Menu item Verb/Branch/Refine/Purify
-#: ../objects/FS/function.c:881
+#: ../objects/FS/function.c:875
 msgid "Purify"
 msgstr "提纯"
 
 #. Translators: Menu item Verb/Branch/Refine/Strain
-#: ../objects/FS/function.c:883
+#: ../objects/FS/function.c:877
 msgid "Strain"
 msgstr "拉紧"
 
 #. Translators: Menu item Verb/Branch/Refine/Filter
-#: ../objects/FS/function.c:885
+#: ../objects/FS/function.c:879
 msgid "Filter"
 msgstr "过滤"
 
 #. Translators: Menu item Verb/Branch/Refine/Percolate
-#: ../objects/FS/function.c:887
+#: ../objects/FS/function.c:881
 msgid "Percolate"
 msgstr "渗滤"
 
 #. Translators: Menu item Verb/Branch/Refine/Clear
-#: ../objects/FS/function.c:889
+#: ../objects/FS/function.c:883
 msgid "Clear"
 msgstr "清除"
 
 #. Translators: Menu item Verb/Branch/Distribute
 #. Translators: Menu item Verb/Branch/Distribute/Distribute
-#: ../objects/FS/function.c:891 ../objects/FS/function.c:893
+#: ../objects/FS/function.c:885 ../objects/FS/function.c:887
 msgid "Distribute"
 msgstr "分发"
 
 #. Translators: Menu item Verb/Branch/Distribute/Diverge
-#: ../objects/FS/function.c:895
+#: ../objects/FS/function.c:889
 msgid "Diverge"
 msgstr "发散"
 
 #. Translators: Menu item Verb/Branch/Distribute/Scatter
-#: ../objects/FS/function.c:897
+#: ../objects/FS/function.c:891
 msgid "Scatter"
 msgstr "散布"
 
 #. Translators: Menu item Verb/Branch/Distribute/Disperse
-#: ../objects/FS/function.c:899
+#: ../objects/FS/function.c:893
 msgid "Disperse"
 msgstr "疏散"
 
 #. Translators: Menu item Verb/Branch/Distribute/Diffuse
 #. Translators: Menu item Verb/Branch/Dissipate/Diffuse
-#: ../objects/FS/function.c:901 ../objects/FS/function.c:915
+#: ../objects/FS/function.c:895 ../objects/FS/function.c:909
 msgid "Diffuse"
 msgstr "扩散"
 
 #. Translators: Menu item Verb/Branch/Distribute/Empty
-#: ../objects/FS/function.c:903
+#: ../objects/FS/function.c:897
 msgid "Empty"
 msgstr "清空"
 
 #. Translators: Menu item Verb/Branch/Dissipate
 #. Translators: Menu item Verb/Branch/Dissipate/Dissipate
-#: ../objects/FS/function.c:905 ../objects/FS/function.c:907
+#: ../objects/FS/function.c:899 ../objects/FS/function.c:901
 msgid "Dissipate"
 msgstr "淡化"
 
 #. Translators: Menu item Verb/Branch/Dissipate/Absorb
-#: ../objects/FS/function.c:909
+#: ../objects/FS/function.c:903
 msgid "Absorb"
 msgstr "吸收"
 
 #. Translators: Menu item Verb/Branch/Dissipate/Dampen
-#: ../objects/FS/function.c:911
+#: ../objects/FS/function.c:905
 msgid "Dampen"
 msgstr "潮湿"
 
 #. Translators: Menu item Verb/Branch/Dissipate/Dispel
-#: ../objects/FS/function.c:913
+#: ../objects/FS/function.c:907
 msgid "Dispel"
 msgstr "消散"
 
 #. Translators: Menu item Verb/Branch/Dissipate/Resist
-#: ../objects/FS/function.c:917
+#: ../objects/FS/function.c:911
 msgid "Resist"
 msgstr "反抗"
 
 #. Translators: Menu item Verb/Provision
 #. Translators: Menu item Verb/Provision/Provision
-#: ../objects/FS/function.c:919 ../objects/FS/function.c:921
+#: ../objects/FS/function.c:913 ../objects/FS/function.c:915
 msgid "Provision"
 msgstr "供应"
 
 #. Translators: Menu item Verb/Provision/Store
 #. Translators: Menu item Verb/Provision/Store/Store
-#: ../objects/FS/function.c:923 ../objects/FS/function.c:925
+#: ../objects/FS/function.c:917 ../objects/FS/function.c:919
 msgid "Store"
 msgstr "存储"
 
 #. Translators: Menu item Verb/Provision/Store/Contain
-#: ../objects/FS/function.c:927
+#: ../objects/FS/function.c:921
 msgid "Contain"
 msgstr "包含"
 
 #. Translators: Menu item Verb/Provision/Store/Collect
-#: ../objects/FS/function.c:929
+#: ../objects/FS/function.c:923
 msgid "Collect"
 msgstr "收集"
 
 #. Translators: Menu item Verb/Provision/Store/Reserve
-#: ../objects/FS/function.c:931
+#: ../objects/FS/function.c:925
 msgid "Reserve"
 msgstr "保留"
 
 #. Translators: Menu item Verb/Provision/Supply
 #. Translators: Menu item Verb/Provision/Supply/Supply
-#: ../objects/FS/function.c:935 ../objects/FS/function.c:937
+#: ../objects/FS/function.c:929 ../objects/FS/function.c:931
 msgid "Supply"
 msgstr "供给"
 
-#. Translators: Menu item Verb/Provision/Supply/Fill
-#: ../objects/FS/function.c:939
-msgid "Fill"
-msgstr "填充"
-
 #. Translators: Menu item Verb/Provision/Supply/Provide
-#: ../objects/FS/function.c:941
+#: ../objects/FS/function.c:935
 msgid "Provide"
 msgstr "提供"
 
 #. Translators: Menu item Verb/Provision/Supply/Replenish
-#: ../objects/FS/function.c:943
+#: ../objects/FS/function.c:937
 msgid "Replenish"
 msgstr "补充"
 
 #. Translators: Menu item Verb/Provision/Supply/Expose
-#: ../objects/FS/function.c:945
+#: ../objects/FS/function.c:939
 msgid "Expose"
 msgstr "暴露"
 
 #. Translators: Menu item Verb/Provision/Extract
-#: ../objects/FS/function.c:947 ../sheets/Flowchart.sheet.in.h:9
+#: ../objects/FS/function.c:941 ../sheets/Flowchart.sheet.in.h:22
 msgid "Extract"
 msgstr "展开"
 
 #. Translators: Menu item Verb/Control Magnitude
 #. Translators: Menu item Verb/Control Magnitude/Control Magnitude
-#: ../objects/FS/function.c:949 ../objects/FS/function.c:951
+#: ../objects/FS/function.c:943 ../objects/FS/function.c:945
 msgid "Control Magnitude"
 msgstr "控制量质"
 
 #. Translators: Menu item Verb/Control Magnitude/Actuate
 #. Translators: Menu item Verb/Control Magnitude/Actuate/Actuate
-#: ../objects/FS/function.c:953 ../objects/FS/function.c:955
+#: ../objects/FS/function.c:947 ../objects/FS/function.c:949
 msgid "Actuate"
 msgstr "敦促"
 
 #. Translators: Menu item Verb/Control Magnitude/Actuate/Start
-#: ../objects/FS/function.c:957
+#: ../objects/FS/function.c:951
 msgid "Start"
 msgstr "开始"
 
 #. Translators: Menu item Verb/Control Magnitude/Actuate/Initiate
-#: ../objects/FS/function.c:959
+#: ../objects/FS/function.c:953
 msgid "Initiate"
 msgstr "初始化"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Regulate
-#: ../objects/FS/function.c:961 ../objects/FS/function.c:963
+#: ../objects/FS/function.c:955 ../objects/FS/function.c:957
 msgid "Regulate"
 msgstr "管制"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Control
 #. Translators: Menu item Noun/Signal/Control
-#: ../objects/FS/function.c:965 ../objects/FS/function.c:1183
-#: ../objects/UML/classicon.c:129
+#: ../objects/FS/function.c:959 ../objects/FS/function.c:1177
+#: ../objects/UML/classicon.c:127
 msgid "Control"
 msgstr "控制"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Enable
-#: ../objects/FS/function.c:971
+#: ../objects/FS/function.c:965
 msgid "Enable"
 msgstr "启用"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Disable
-#: ../objects/FS/function.c:973
+#: ../objects/FS/function.c:967
 msgid "Disable"
 msgstr "禁用"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Limit
-#: ../objects/FS/function.c:975
+#: ../objects/FS/function.c:969
 msgid "Limit"
 msgstr "限制"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Interrupt
-#: ../objects/FS/function.c:977
+#: ../objects/FS/function.c:971
 msgid "Interrupt"
 msgstr "中断"
 
 #. Translators: Menu item Verb/Control Magnitude/Change
 #. Translators: Menu item Verb/Control Magnitude/Change/Change
-#: ../objects/FS/function.c:979 ../objects/FS/function.c:981
+#: ../objects/FS/function.c:973 ../objects/FS/function.c:975
 msgid "Change"
 msgstr "更改"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Increase
-#: ../objects/FS/function.c:983
+#: ../objects/FS/function.c:977
 msgid "Increase"
 msgstr "增大"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Decrease
-#: ../objects/FS/function.c:985
+#: ../objects/FS/function.c:979
 msgid "Decrease"
 msgstr "减小"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Amplify
-#: ../objects/FS/function.c:987
+#: ../objects/FS/function.c:981
 msgid "Amplify"
 msgstr "放大"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Reduce
-#: ../objects/FS/function.c:989
+#: ../objects/FS/function.c:983
 msgid "Reduce"
 msgstr "缩小"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Normalize
-#: ../objects/FS/function.c:993
+#: ../objects/FS/function.c:987
 msgid "Normalize"
 msgstr "规格化"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Multiply
-#: ../objects/FS/function.c:995
+#: ../objects/FS/function.c:989
 msgid "Multiply"
 msgstr "增加"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Scale
 #. FIXME: mark read-only
-#: ../objects/FS/function.c:997 ../objects/Misc/measure.c:186
+#: ../objects/FS/function.c:991 ../objects/Misc/measure.c:185
 msgid "Scale"
 msgstr "缩放比例"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Rectify
-#: ../objects/FS/function.c:999
+#: ../objects/FS/function.c:993
 msgid "Rectify"
 msgstr "调整"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Adjust
-#: ../objects/FS/function.c:1001
+#: ../objects/FS/function.c:995
 msgid "Adjust"
 msgstr "校准"
 
 #. Translators: Menu item Verb/Control Magnitude/Form
 #. Translators: Menu item Verb/Control Magnitude/Form/Form
-#: ../objects/FS/function.c:1003 ../objects/FS/function.c:1005
+#: ../objects/FS/function.c:997 ../objects/FS/function.c:999
 msgid "Form"
 msgstr "排列"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Compact
-#: ../objects/FS/function.c:1007
+#: ../objects/FS/function.c:1001
 msgid "Compact"
 msgstr "紧凑"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Crush
-#: ../objects/FS/function.c:1009
+#: ../objects/FS/function.c:1003
 msgid "Crush"
 msgstr "碾压变形"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Shape
-#: ../objects/FS/function.c:1011
+#: ../objects/FS/function.c:1005
 msgid "Shape"
 msgstr "形状"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Compress
-#: ../objects/FS/function.c:1013
+#: ../objects/FS/function.c:1007
 msgid "Compress"
 msgstr "压缩"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Pierce
-#: ../objects/FS/function.c:1015
+#: ../objects/FS/function.c:1009
 msgid "Pierce"
 msgstr "穿透"
 
 #. Translators: Menu item Verb/Convert
 #. Translators: Menu item Verb/Convert/Convert
-#: ../objects/FS/function.c:1017 ../objects/FS/function.c:1019
+#: ../objects/FS/function.c:1011 ../objects/FS/function.c:1013
 msgid "Convert"
 msgstr "转换"
 
 #. Translators: Menu item Verb/Convert/Transform
-#: ../objects/FS/function.c:1021
+#: ../objects/FS/function.c:1015
 msgid "Transform"
 msgstr "变换"
 
 #. Translators: Menu item Verb/Convert/Liquefy
-#: ../objects/FS/function.c:1023
+#: ../objects/FS/function.c:1017
 msgid "Liquefy"
 msgstr "液化"
 
 #. Translators: Menu item Verb/Convert/Solidify
-#: ../objects/FS/function.c:1025
+#: ../objects/FS/function.c:1019
 msgid "Solidify"
 msgstr "固化"
 
 #. Translators: Menu item Verb/Convert/Evaporate
-#: ../objects/FS/function.c:1027
+#: ../objects/FS/function.c:1021
 msgid "Evaporate"
 msgstr "蒸发"
 
 #. Translators: Menu item Verb/Convert/Sublimate
-#: ../objects/FS/function.c:1029
+#: ../objects/FS/function.c:1023
 msgid "Sublimate"
 msgstr "升华"
 
 #. Translators: Menu item Verb/Convert/Condense
-#: ../objects/FS/function.c:1031
+#: ../objects/FS/function.c:1025
 msgid "Condense"
 msgstr "浓缩"
 
 #. Translators: Menu item Verb/Convert/Integrate
-#: ../objects/FS/function.c:1033
+#: ../objects/FS/function.c:1027
 msgid "Integrate"
 msgstr "整合"
 
 #. Translators: Menu item Verb/Convert/Differentiate
-#: ../objects/FS/function.c:1035
+#: ../objects/FS/function.c:1029
 msgid "Differentiate"
 msgstr "分离"
 
 #. Translators: Menu item Verb/Convert/Process
-#: ../objects/FS/function.c:1037 ../sheets/AADL.sheet.in.h:8
+#: ../objects/FS/function.c:1031 ../sheets/AADL.sheet.in.h:3
 #: ../sheets/Gane_and_Sarson.sheet.in.h:7
 msgid "Process"
 msgstr "处理"
 
 #. Translators: Menu item Verb/Signal/Sense
 #. Translators: Menu item Verb/Signal/Sense/Sense
-#: ../objects/FS/function.c:1043 ../objects/FS/function.c:1045
+#: ../objects/FS/function.c:1037 ../objects/FS/function.c:1039
 msgid "Sense"
 msgstr "理解"
 
 #. Translators: Menu item Verb/Signal/Sense/Perceive
-#: ../objects/FS/function.c:1047
+#: ../objects/FS/function.c:1041
 msgid "Perceive"
 msgstr "觉察"
 
 #. Translators: Menu item Verb/Signal/Sense/Recognize
-#: ../objects/FS/function.c:1049
+#: ../objects/FS/function.c:1043
 msgid "Recognize"
 msgstr "认可"
 
 #. Translators: Menu item Verb/Signal/Sense/Discern
-#: ../objects/FS/function.c:1051
+#: ../objects/FS/function.c:1045
 msgid "Discern"
 msgstr "洞悉"
 
 #. Translators: Menu item Verb/Signal/Sense/Check
-#: ../objects/FS/function.c:1053
+#: ../objects/FS/function.c:1047
 msgid "Check"
 msgstr "核对"
 
 #. Translators: Menu item Verb/Signal/Sense/Verify
-#: ../objects/FS/function.c:1057
+#: ../objects/FS/function.c:1051
 msgid "Verify"
 msgstr "校验"
 
 #. Translators: Menu item Verb/Signal/Indicate
 #. Translators: Menu item Verb/Signal/Indicate/Indicate
-#: ../objects/FS/function.c:1059 ../objects/FS/function.c:1061
+#: ../objects/FS/function.c:1053 ../objects/FS/function.c:1055
 msgid "Indicate"
 msgstr "指示"
 
 #. Translators: Menu item Verb/Signal/Indicate/Mark
-#: ../objects/FS/function.c:1063
+#: ../objects/FS/function.c:1057
 msgid "Mark"
 msgstr "标记"
 
 #. Translators: Menu item Verb/Signal/Display
-#: ../objects/FS/function.c:1065 ../sheets/Flowchart.sheet.in.h:7
+#: ../objects/FS/function.c:1059 ../sheets/Flowchart.sheet.in.h:7
 msgid "Display"
 msgstr "显示"
 
 #. Translators: Menu item Verb/Signal/Measure
 #. Translators: Menu item Verb/Signal/Measure/Measure
-#: ../objects/FS/function.c:1067 ../objects/FS/function.c:1069
+#: ../objects/FS/function.c:1061 ../objects/FS/function.c:1063
 msgid "Measure"
 msgstr "测量"
 
 #. Translators: Menu item Verb/Signal/Measure/Calculate
-#: ../objects/FS/function.c:1071
+#: ../objects/FS/function.c:1065
 msgid "Calculate"
 msgstr "计算"
 
 #. Translators: Menu item Verb/Signal/Represent
-#: ../objects/FS/function.c:1073
+#: ../objects/FS/function.c:1067
 msgid "Represent"
 msgstr "描绘"
 
 #. Translators: Menu item Noun
-#: ../objects/FS/function.c:1075
+#: ../objects/FS/function.c:1069
 msgid "Noun"
 msgstr "名词"
 
+#. Translators: Menu item Noun/Material/Solid
+#: ../objects/FS/function.c:1073
+msgid "Solid"
+msgstr "实心"
+
 #. Translators: Menu item Noun/Material/Liquid
-#: ../objects/FS/function.c:1081
+#: ../objects/FS/function.c:1075
 msgid "Liquid"
 msgstr "液体"
 
 #. Translators: Menu item Noun/Material/Gas
-#: ../objects/FS/function.c:1083
+#: ../objects/FS/function.c:1077
 msgid "Gas"
 msgstr "气体"
 
 #. Translators: Menu item Noun/Material/Human
 #. Translators: Menu item Noun/Material/Human/Human
 #. Translators: Menu item Noun/Energy/Human
-#: ../objects/FS/function.c:1085 ../objects/FS/function.c:1087
-#: ../objects/FS/function.c:1171
+#: ../objects/FS/function.c:1079 ../objects/FS/function.c:1081
+#: ../objects/FS/function.c:1165
 msgid "Human"
 msgstr "人"
 
 #. Translators: Menu item Noun/Material/Human/Hand
-#: ../objects/FS/function.c:1089
+#: ../objects/FS/function.c:1083
 msgid "Hand"
 msgstr "手"
 
 #. Translators: Menu item Noun/Material/Human/Foot
-#: ../objects/FS/function.c:1091
+#: ../objects/FS/function.c:1085
 msgid "Foot"
 msgstr "脚"
 
 #. Translators: Menu item Noun/Material/Human/Head
-#: ../objects/FS/function.c:1093
+#: ../objects/FS/function.c:1087
 msgid "Head"
 msgstr "头"
 
 #. Translators: Menu item Noun/Material/Human/Finger
-#: ../objects/FS/function.c:1095
+#: ../objects/FS/function.c:1089
 msgid "Finger"
 msgstr "手指"
 
 #. Translators: Menu item Noun/Material/Human/Toe
-#: ../objects/FS/function.c:1097
+#: ../objects/FS/function.c:1091
 msgid "Toe"
 msgstr "脚趾"
 
 #. Translators: Menu item Noun/Material/Biological
-#: ../objects/FS/function.c:1099
+#: ../objects/FS/function.c:1093
 msgid "Biological"
 msgstr "生物"
 
 #. Translators: Menu item Noun/Energy/Mechanical
-#: ../objects/FS/function.c:1103
+#: ../objects/FS/function.c:1097
 msgid "Mechanical"
 msgstr "机械"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Mech. Energy
-#: ../objects/FS/function.c:1105
+#: ../objects/FS/function.c:1099
 msgid "Mech. Energy"
 msgstr "机械能"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Translation
-#: ../objects/FS/function.c:1107
+#: ../objects/FS/function.c:1101
 msgid "Translation"
 msgstr "平动"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Force
-#: ../objects/FS/function.c:1109
+#: ../objects/FS/function.c:1103
 msgid "Force"
 msgstr "力"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Rotation
-#: ../objects/FS/function.c:1111 ../objects/standard/outline.c:206
+#: ../objects/FS/function.c:1105 ../objects/standard/outline.c:104
 msgid "Rotation"
 msgstr "旋转"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Torque
-#: ../objects/FS/function.c:1113
+#: ../objects/FS/function.c:1107
 msgid "Torque"
 msgstr "扭矩"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Random Motion
-#: ../objects/FS/function.c:1115
+#: ../objects/FS/function.c:1109
 msgid "Random Motion"
 msgstr "随机运动"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Vibration
-#: ../objects/FS/function.c:1117
+#: ../objects/FS/function.c:1111
 msgid "Vibration"
 msgstr "振动"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Rotational Energy
-#: ../objects/FS/function.c:1119
+#: ../objects/FS/function.c:1113
 msgid "Rotational Energy"
 msgstr "转动能"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Translational Energy
-#: ../objects/FS/function.c:1121
+#: ../objects/FS/function.c:1115
 msgid "Translational Energy"
 msgstr "平动能"
 
 #. Translators: Menu item Noun/Energy/Electricity
-#: ../objects/FS/function.c:1123
+#: ../objects/FS/function.c:1117
 msgid "Electrical"
 msgstr "电"
 
 #. Translators: Menu item Noun/Energy/Electricity/Electricity
-#: ../objects/FS/function.c:1125
+#: ../objects/FS/function.c:1119
 msgid "Electricity"
 msgstr "电力"
 
 #. Translators: Menu item Noun/Energy/Electricity/Voltage
-#: ../objects/FS/function.c:1127
+#: ../objects/FS/function.c:1121
 msgid "Voltage"
 msgstr "电压"
 
 #. Translators: Menu item Noun/Energy/Electricity/Current
-#: ../objects/FS/function.c:1129
+#: ../objects/FS/function.c:1123
 msgid "Current"
 msgstr "电流"
 
 #. Translators: Menu item Noun/Energy/Hydraulic
-#: ../objects/FS/function.c:1131
+#: ../objects/FS/function.c:1125
 msgid "Hydraulic"
 msgstr "水压"
 
 #. Translators: Menu item Noun/Energy/Hydraulic/Pressure
-#: ../objects/FS/function.c:1133
+#: ../objects/FS/function.c:1127
 msgid "Pressure"
 msgstr "压力"
 
 #. Translators: Menu item Noun/Energy/Hydraulic/Volumetric Flow
-#: ../objects/FS/function.c:1135
+#: ../objects/FS/function.c:1129
 msgid "Volumetric Flow"
 msgstr "容积流量"
 
 #. Translators: Menu item Noun/Energy/Thermal
-#: ../objects/FS/function.c:1137
+#: ../objects/FS/function.c:1131
 msgid "Thermal"
 msgstr "热能"
 
 #. Translators: Menu item Noun/Energy/Thermal/Heat
-#: ../objects/FS/function.c:1139
+#: ../objects/FS/function.c:1133
 msgid "Heat"
 msgstr "热"
 
 #. Translators: Menu item Noun/Energy/Thermal/Conduction
-#: ../objects/FS/function.c:1141
+#: ../objects/FS/function.c:1135
 msgid "Conduction"
 msgstr "热传导"
 
 #. Translators: Menu item Noun/Energy/Thermal/Convection
-#: ../objects/FS/function.c:1143
+#: ../objects/FS/function.c:1137
 msgid "Convection"
 msgstr "热对流"
 
 #. Translators: Menu item Noun/Energy/Thermal/Radiation
 #. Translators: Menu item Noun/Energy/Radioactive/Radiation
-#: ../objects/FS/function.c:1145 ../objects/FS/function.c:1153
+#: ../objects/FS/function.c:1139 ../objects/FS/function.c:1147
 msgid "Radiation"
 msgstr "热辐射"
 
 #. Translators: Menu item Noun/Energy/Pneumatic
-#: ../objects/FS/function.c:1147
+#: ../objects/FS/function.c:1141
 msgid "Pneumatic"
 msgstr "风能"
 
 #. Translators: Menu item Noun/Energy/Chemical
-#: ../objects/FS/function.c:1149
+#: ../objects/FS/function.c:1143
 msgid "Chemical"
 msgstr "化学能"
 
 #. Translators: Menu item Noun/Energy/Radioactive
-#: ../objects/FS/function.c:1151
+#: ../objects/FS/function.c:1145
 msgid "Radioactive"
 msgstr "辐射"
 
 #. Translators: Menu item Noun/Energy/Radioactive/Microwaves
-#: ../objects/FS/function.c:1155
+#: ../objects/FS/function.c:1149
 msgid "Microwaves"
 msgstr "微波"
 
 #. Translators: Menu item Noun/Energy/Radioactive/Radio waves
-#: ../objects/FS/function.c:1157
+#: ../objects/FS/function.c:1151
 msgid "Radio waves"
 msgstr "无线电波"
 
 #. Translators: Menu item Noun/Energy/Radioactive/X-Rays
-#: ../objects/FS/function.c:1159
+#: ../objects/FS/function.c:1153
 msgid "X-Rays"
 msgstr "X 射线"
 
 #. Translators: Menu item Noun/Energy/Radioactive/Gamma Rays
-#: ../objects/FS/function.c:1161
+#: ../objects/FS/function.c:1155
 msgid "Gamma Rays"
 msgstr "伽玛射线"
 
 #. Translators: Menu item Noun/Energy/Acoustic Energy
-#: ../objects/FS/function.c:1163
+#: ../objects/FS/function.c:1157
 msgid "Acoustic Energy"
 msgstr "声能"
 
 #. Translators: Menu item Noun/Energy/Optical Energy
-#: ../objects/FS/function.c:1165
+#: ../objects/FS/function.c:1159
 msgid "Optical Energy"
 msgstr "光能"
 
 #. Translators: Menu item Noun/Energy/Solar Energy
-#: ../objects/FS/function.c:1167
+#: ../objects/FS/function.c:1161
 msgid "Solar Energy"
 msgstr "太阳能"
 
 #. Translators: Menu item Noun/Energy/Magnetic Energy
-#: ../objects/FS/function.c:1169
+#: ../objects/FS/function.c:1163
 msgid "Magnetic Energy"
 msgstr "磁能"
 
 #. Translators: Menu item Noun/Energy/Human/Human Motion
-#: ../objects/FS/function.c:1173
+#: ../objects/FS/function.c:1167
 msgid "Human Motion"
 msgstr "人类运动"
 
 #. Translators: Menu item Noun/Energy/Human/Human Force
-#: ../objects/FS/function.c:1175
+#: ../objects/FS/function.c:1169
 msgid "Human Force"
 msgstr "人力"
 
 #. Translators: Menu item Noun/Signal/Status
-#: ../objects/FS/function.c:1181
+#: ../objects/FS/function.c:1175
 msgid "Status"
 msgstr "状态"
 
-#: ../objects/FS/function.c:1185
+#: ../objects/FS/function.c:1179
 msgid "User/Device Fn"
 msgstr "用户/设备 Fn"
 
-#: ../objects/FS/function.c:1186
+#: ../objects/FS/function.c:1180
 msgid "Wish Fn"
 msgstr "期望 Fn"
 
-#: ../objects/GRAFCET/action.c:137 ../sheets/SDL.sheet.in.h:9
+#: ../objects/GRAFCET/action.c:132 ../sheets/SDL.sheet.in.h:11
 msgid "Macro call"
 msgstr "调用宏"
 
-#: ../objects/GRAFCET/action.c:137
+#: ../objects/GRAFCET/action.c:132
 msgid "This action is a call to a macro-step"
 msgstr "此动作是对一个宏步骤的调用"
 
-#: ../objects/GRAFCET/condition.c:132
+#: ../objects/GRAFCET/condition.c:129
 msgid "Condition"
 msgstr "条件"
 
-#: ../objects/GRAFCET/condition.c:132
+#: ../objects/GRAFCET/condition.c:129
 msgid "The boolean equation of the condition"
 msgstr "条件的布尔等式"
 
-#: ../objects/GRAFCET/condition.c:134
+#: ../objects/GRAFCET/condition.c:131
 msgid "The condition's font"
 msgstr "该条件的字体"
 
-#: ../objects/GRAFCET/condition.c:136
+#: ../objects/GRAFCET/condition.c:133
 msgid "The condition's font size"
 msgstr "该条件的字体大小"
 
-#: ../objects/GRAFCET/condition.c:139 ../objects/GRAFCET/transition.c:149
+#: ../objects/GRAFCET/condition.c:136 ../objects/GRAFCET/transition.c:146
 msgid "Color"
 msgstr "颜色"
 
-#: ../objects/GRAFCET/condition.c:139
+#: ../objects/GRAFCET/condition.c:136
 msgid "The condition's color"
 msgstr "该条件的颜色"
 
@@ -4302,138 +4514,138 @@ msgstr "该条件的颜色"
 msgid "GRAFCET diagram objects"
 msgstr "GRAFCET 图表对象"
 
-#: ../objects/GRAFCET/step.c:148 ../sheets/GRAFCET.sheet.in.h:13
+#: ../objects/GRAFCET/step.c:146 ../sheets/GRAFCET.sheet.in.h:3
 msgid "Regular step"
 msgstr "标准步骤"
 
-#: ../objects/GRAFCET/step.c:149 ../sheets/GRAFCET.sheet.in.h:6
+#: ../objects/GRAFCET/step.c:147 ../sheets/GRAFCET.sheet.in.h:4
 msgid "Initial step"
 msgstr "初始化步骤"
 
-#: ../objects/GRAFCET/step.c:150 ../sheets/GRAFCET.sheet.in.h:8
+#: ../objects/GRAFCET/step.c:148 ../sheets/GRAFCET.sheet.in.h:5
 msgid "Macro entry step"
 msgstr "宏进入步骤"
 
-#: ../objects/GRAFCET/step.c:151 ../sheets/GRAFCET.sheet.in.h:9
+#: ../objects/GRAFCET/step.c:149 ../sheets/GRAFCET.sheet.in.h:6
 msgid "Macro exit step"
 msgstr "宏退出步骤"
 
-#: ../objects/GRAFCET/step.c:152 ../sheets/GRAFCET.sheet.in.h:7
+#: ../objects/GRAFCET/step.c:150 ../sheets/GRAFCET.sheet.in.h:7
 msgid "Macro call step"
 msgstr "宏调用步骤"
 
-#: ../objects/GRAFCET/step.c:153
+#: ../objects/GRAFCET/step.c:151
 msgid "Subprogram call step"
 msgstr "子程序调用步骤"
 
-#: ../objects/GRAFCET/step.c:160
+#: ../objects/GRAFCET/step.c:158
 msgid "Step name"
 msgstr "步骤名称"
 
-#: ../objects/GRAFCET/step.c:160
+#: ../objects/GRAFCET/step.c:158
 msgid "The name of the step"
 msgstr "步骤名称"
 
-#: ../objects/GRAFCET/step.c:163
+#: ../objects/GRAFCET/step.c:161
 msgid "Step type"
 msgstr "步骤类别"
 
-#: ../objects/GRAFCET/step.c:163
+#: ../objects/GRAFCET/step.c:161
 msgid "The kind of step"
 msgstr "步骤类型"
 
-#: ../objects/GRAFCET/step.c:165
+#: ../objects/GRAFCET/step.c:163
 msgid "Active"
 msgstr "活动的"
 
-#: ../objects/GRAFCET/step.c:165
+#: ../objects/GRAFCET/step.c:163
 msgid "Shows a red dot to figure the step's activity"
 msgstr "画一个红点来描绘步骤的活动"
 
-#: ../objects/GRAFCET/transition.c:142
+#: ../objects/GRAFCET/transition.c:139
 msgid "Receptivity"
 msgstr "接受度"
 
-#: ../objects/GRAFCET/transition.c:142
+#: ../objects/GRAFCET/transition.c:139
 msgid "The boolean equation of the receptivity"
 msgstr "接受度的布尔方程式"
 
-#: ../objects/GRAFCET/transition.c:144
+#: ../objects/GRAFCET/transition.c:141
 msgid "The receptivity's font"
 msgstr "接受度的字体"
 
-#: ../objects/GRAFCET/transition.c:146
+#: ../objects/GRAFCET/transition.c:143
 msgid "The receptivity's font size"
 msgstr "接受度的字体大小"
 
-#: ../objects/GRAFCET/transition.c:149
+#: ../objects/GRAFCET/transition.c:146
 msgid "The receptivity's color"
 msgstr "接受度的颜色"
 
-#: ../objects/GRAFCET/transition.c:150
+#: ../objects/GRAFCET/transition.c:147
 msgid "North point"
 msgstr "北点"
 
-#: ../objects/GRAFCET/transition.c:151
+#: ../objects/GRAFCET/transition.c:148
 msgid "South point"
 msgstr "南点"
 
-#: ../objects/GRAFCET/vector.c:131
+#: ../objects/GRAFCET/vector.c:126
 msgid "Draw arrow heads on upward arcs:"
 msgstr "在向上的弧线上绘制箭头"
 
-#: ../objects/GRAFCET/vergent.c:124
+#: ../objects/GRAFCET/vergent.c:120
 msgid "OR"
 msgstr "或"
 
-#: ../objects/GRAFCET/vergent.c:125
+#: ../objects/GRAFCET/vergent.c:121
 msgid "AND"
 msgstr "与"
 
-#: ../objects/GRAFCET/vergent.c:136
+#: ../objects/GRAFCET/vergent.c:132
 msgid "Vergent type:"
 msgstr "Vergent 种类:"
 
-#: ../objects/GRAFCET/vergent.c:407 ../objects/Istar/other.c:471
-#: ../objects/Jackson/domain.c:533 ../objects/KAOS/goal.c:574
-#: ../objects/KAOS/other.c:525 ../objects/SADT/box.c:454
-#: ../objects/standard/line.c:226
+#: ../objects/GRAFCET/vergent.c:403 ../objects/Istar/other.c: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
 msgid "Add connection point"
 msgstr "添加连接点"
 
-#: ../objects/GRAFCET/vergent.c:408 ../objects/Istar/other.c:472
-#: ../objects/Jackson/domain.c:534 ../objects/KAOS/goal.c:575
-#: ../objects/KAOS/other.c:526 ../objects/SADT/box.c:455
-#: ../objects/standard/line.c:227
+#: ../objects/GRAFCET/vergent.c:404 ../objects/Istar/other.c: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
 msgid "Delete connection point"
 msgstr "删除连接点"
 
-#: ../objects/GRAFCET/vergent.c:412
+#: ../objects/GRAFCET/vergent.c:408
 msgid "GRAFCET OR/AND vergent"
 msgstr "GRAFCET 或/与 vergent"
 
-#: ../objects/Istar/actor.c:68 ../objects/Istar/link.c:150
+#: ../objects/Istar/actor.c:66 ../objects/Istar/link.c:149
 msgid "Unspecified"
 msgstr "未指定的"
 
-#: ../objects/Istar/actor.c:69 ../objects/KAOS/other.c:75
+#: ../objects/Istar/actor.c:67 ../objects/KAOS/other.c:73
 msgid "Agent"
 msgstr "代理"
 
-#: ../objects/Istar/actor.c:71 ../objects/UML/association.c:247
+#: ../objects/Istar/actor.c:69 ../objects/UML/association.c:249
 msgid "Role"
 msgstr "角色:"
 
-#: ../objects/Istar/goal.c:76 ../objects/KAOS/goal.c:79
+#: ../objects/Istar/goal.c:74 ../objects/KAOS/goal.c:77
 msgid "Softgoal"
 msgstr "软目标"
 
-#: ../objects/Istar/goal.c:77 ../objects/KAOS/goal.c:80
+#: ../objects/Istar/goal.c:75 ../objects/KAOS/goal.c:78
 msgid "Goal"
 msgstr "目标"
 
-#: ../objects/Istar/goal.c:156 ../objects/Istar/goal.c:157
-#: ../objects/KAOS/goal.c:159 ../objects/KAOS/goal.c:160
+#: ../objects/Istar/goal.c:153 ../objects/Istar/goal.c:154
+#: ../objects/KAOS/goal.c:156 ../objects/KAOS/goal.c:157
 msgid "Goal Type"
 msgstr "目标类型"
 
@@ -4441,75 +4653,75 @@ msgstr "目标类型"
 msgid "Istar diagram"
 msgstr "Istar 图表"
 
-#: ../objects/Istar/link.c:151
+#: ../objects/Istar/link.c:150
 msgid "Positive contrib"
 msgstr "正 contrib"
 
-#: ../objects/Istar/link.c:152
+#: ../objects/Istar/link.c:151
 msgid "Negative contrib"
 msgstr "负 contrib"
 
-#: ../objects/Istar/link.c:153 ../sheets/UML.sheet.in.h:10
+#: ../objects/Istar/link.c:152 ../sheets/UML.sheet.in.h:6
 msgid "Dependency"
 msgstr "依赖"
 
-#: ../objects/Istar/link.c:154
+#: ../objects/Istar/link.c:153
 msgid "Decomposition"
 msgstr "分解"
 
-#: ../objects/Istar/link.c:155
+#: ../objects/Istar/link.c:154
 msgid "Means-Ends"
 msgstr "Means-Ends"
 
-#: ../objects/Istar/other.c:73
+#: ../objects/Istar/other.c:71
 msgid "Resource"
 msgstr "资源"
 
-#: ../objects/Istar/other.c:74 ../sheets/BPMN.sheet.in.h:43
+#: ../objects/Istar/other.c:72 ../sheets/BPMN.sheet.in.h:33
 msgid "Task"
 msgstr "任务"
 
-#: ../objects/Istar/other.c:477
+#: ../objects/Istar/other.c:472
 msgid "i* other"
 msgstr "i* other"
 
-#: ../objects/Jackson/domain.c:79
+#: ../objects/Jackson/domain.c:77
 msgid "Given Domain"
 msgstr "给定域"
 
-#: ../objects/Jackson/domain.c:80
+#: ../objects/Jackson/domain.c:78
 msgid "Designed Domain"
 msgstr "特定域"
 
-#: ../objects/Jackson/domain.c:81
+#: ../objects/Jackson/domain.c:79
 msgid "Machine Domain"
 msgstr "机器域"
 
-#: ../objects/Jackson/domain.c:97
+#: ../objects/Jackson/domain.c:95
 msgid "Causal"
 msgstr "随意"
 
-#: ../objects/Jackson/domain.c:98
+#: ../objects/Jackson/domain.c:96
 msgid "Biddable"
 msgstr "顺从"
 
-#: ../objects/Jackson/domain.c:99
+#: ../objects/Jackson/domain.c:97
 msgid "Lexical"
 msgstr "词汇"
 
-#: ../objects/Jackson/domain.c:178 ../objects/Jackson/domain.c:179
+#: ../objects/Jackson/domain.c:175 ../objects/Jackson/domain.c:176
 msgid "Domain Type"
 msgstr "域类型"
 
-#: ../objects/Jackson/domain.c:183
+#: ../objects/Jackson/domain.c:180
 msgid "Domain Kind"
 msgstr "域种类"
 
-#: ../objects/Jackson/domain.c:184
-msgid "Optional kind which appears in the lower right corner of the Domain"
+#: ../objects/Jackson/domain.c:181
+msgid "Optional kind which appears in the lower-right corner of the Domain"
 msgstr "出现在域右下角的可选种类"
 
-#: ../objects/Jackson/domain.c:539
+#: ../objects/Jackson/domain.c:534
 msgid "Jackson domain"
 msgstr "Jackson 域"
 
@@ -4517,30 +4729,30 @@ msgstr "Jackson 域"
 msgid "Jackson diagram"
 msgstr "Jackson 图"
 
-#: ../objects/Jackson/phenomenon.c:136
+#: ../objects/Jackson/phenomenon.c:135
 msgid "Shared"
 msgstr "共享"
 
-#: ../objects/Jackson/phenomenon.c:137 ../objects/KAOS/goal.c:81
+#: ../objects/Jackson/phenomenon.c:136 ../objects/KAOS/goal.c:79
 msgid "Requirement"
 msgstr "要件"
 
 #. how it used to be before 0.96+SVN
 #. new name matching "same name, same type"  rule
-#: ../objects/Jackson/phenomenon.c:144 ../objects/UML/message.c:153
-#: ../objects/UML/message.c:155
+#: ../objects/Jackson/phenomenon.c:143 ../objects/UML/message.c:149
+#: ../objects/UML/message.c:151
 msgid "Message:"
 msgstr "消息:"
 
-#: ../objects/KAOS/goal.c:82
+#: ../objects/KAOS/goal.c:80
 msgid "Assumption"
 msgstr "假设"
 
-#: ../objects/KAOS/goal.c:83
+#: ../objects/KAOS/goal.c:81
 msgid "Obstacle"
 msgstr "障碍"
 
-#: ../objects/KAOS/goal.c:580
+#: ../objects/KAOS/goal.c:575
 msgid "KAOS goal"
 msgstr "KAOS 目标"
 
@@ -4548,208 +4760,226 @@ msgstr "KAOS 目标"
 msgid "KAOS diagram"
 msgstr "KAOS 图表"
 
-#: ../objects/KAOS/metaandorrel.c:153
+#: ../objects/KAOS/metaandorrel.c:152
 msgid "AND Refinement"
 msgstr "AND 改进"
 
-#: ../objects/KAOS/metaandorrel.c:154
+#: ../objects/KAOS/metaandorrel.c:153
 msgid "Complete AND Refinement"
 msgstr "完成 AND 改进"
 
-#: ../objects/KAOS/metaandorrel.c:155
+#: ../objects/KAOS/metaandorrel.c:154
 msgid "OR Refinement"
 msgstr "OR 改进"
 
-#: ../objects/KAOS/metaandorrel.c:156
+#: ../objects/KAOS/metaandorrel.c:155
 msgid "Operationalization"
 msgstr "操作化"
 
-#: ../objects/KAOS/metaandorrel.c:163
+#: ../objects/KAOS/metaandorrel.c:162
 msgid "Text:"
 msgstr "文本:"
 
-#: ../objects/KAOS/metabinrel.c:157
+#: ../objects/KAOS/metabinrel.c:156
 msgid "Contributes"
 msgstr "贡献"
 
-#: ../objects/KAOS/metabinrel.c:158
+#: ../objects/KAOS/metabinrel.c:157
 msgid "Obstructs"
 msgstr "阻碍物"
 
-#: ../objects/KAOS/metabinrel.c:159
+#: ../objects/KAOS/metabinrel.c:158
 msgid "Conflicts"
 msgstr "冲突"
 
-#: ../objects/KAOS/metabinrel.c:160
+#: ../objects/KAOS/metabinrel.c:159
 msgid "Responsibility"
 msgstr "责任"
 
-#: ../objects/KAOS/metabinrel.c:161
+#: ../objects/KAOS/metabinrel.c:160
 msgid "Monitors"
 msgstr "监视器"
 
-#: ../objects/KAOS/metabinrel.c:162
+#: ../objects/KAOS/metabinrel.c:161
 msgid "Controls"
 msgstr "控制"
 
-#: ../objects/KAOS/metabinrel.c:163
+#: ../objects/KAOS/metabinrel.c:162
 msgid "CapableOf"
 msgstr "能够"
 
-#: ../objects/KAOS/metabinrel.c:164
+#: ../objects/KAOS/metabinrel.c:163
 msgid "Performs"
 msgstr "执行"
 
-#: ../objects/KAOS/metabinrel.c:166
+#: ../objects/KAOS/metabinrel.c:165
 msgid "Output"
 msgstr "输出"
 
-#: ../objects/KAOS/other.c:531
+#: ../objects/KAOS/other.c:526
 msgid "KAOS other"
 msgstr "KAOS 其它"
 
-#: ../objects/Misc/analog_clock.c:139
+#: ../objects/Misc/analog_clock.c:136
 msgid "Arrow color"
 msgstr "时针分针颜色"
 
-#: ../objects/Misc/analog_clock.c:141
+#: ../objects/Misc/analog_clock.c:138
 msgid "Arrow line width"
 msgstr "时针分针线宽"
 
-#: ../objects/Misc/analog_clock.c:143
+#: ../objects/Misc/analog_clock.c:140
 msgid "Seconds arrow color"
 msgstr "秒针顔色"
 
-#: ../objects/Misc/analog_clock.c:145
+#: ../objects/Misc/analog_clock.c:142
 msgid "Seconds arrow line width"
 msgstr "秒针线宽"
 
-#: ../objects/Misc/analog_clock.c:147
+#: ../objects/Misc/analog_clock.c:144
 msgid "Show hours"
 msgstr "显示小时"
 
-#: ../objects/Misc/grid_object.c:140
+#: ../objects/Misc/diagram_as_object.c:112
+msgid "Diagram file"
+msgstr "图表文件"
+
+#: ../objects/Misc/grid_object.c:137
 msgid "Rows"
 msgstr "行"
 
-#: ../objects/Misc/grid_object.c:142
+#: ../objects/Misc/grid_object.c:139
 msgid "Columns"
 msgstr "列"
 
-#: ../objects/Misc/grid_object.c:144
-msgid "Gridline color"
+#: ../objects/Misc/grid_object.c:141
+msgid "Grid line color"
 msgstr "网格线颜色"
 
-#: ../objects/Misc/grid_object.c:146
-msgid "Gridline width"
+#: ../objects/Misc/grid_object.c:143
+msgid "Grid line width"
 msgstr "网格线宽"
 
 #: ../objects/Misc/libmisc.c:42
 msgid "Miscellaneous objects"
 msgstr "其它对象"
 
-#: ../objects/Misc/measure.c:169
+#: ../objects/Misc/measure.c:168
 msgid "cm"
 msgstr "厘米"
 
-#: ../objects/Misc/measure.c:170
+#: ../objects/Misc/measure.c:169
 msgid "dm"
 msgstr "分米"
 
-#: ../objects/Misc/measure.c:171
+#: ../objects/Misc/measure.c:170
 msgid "ft"
 msgstr "英尺"
 
-#: ../objects/Misc/measure.c:172
+#: ../objects/Misc/measure.c:171
 msgid "in"
 msgstr "英寸"
 
-#: ../objects/Misc/measure.c:173
+#: ../objects/Misc/measure.c:172
 msgid "m"
 msgstr "米"
 
-#: ../objects/Misc/measure.c:174
+#: ../objects/Misc/measure.c:173
 msgid "mm"
 msgstr "毫米"
 
-#: ../objects/Misc/measure.c:175
+#: ../objects/Misc/measure.c:174
 msgid "pt"
 msgstr "点"
 
-#: ../objects/Misc/measure.c:176
+#: ../objects/Misc/measure.c:175
 msgid "pi"
 msgstr "倍卡"
 
 #. PROP_FLAG_VISIBLE|
-#: ../objects/Misc/measure.c:185 ../sheets/ChemEng.sheet.in.h:28
+#: ../objects/Misc/measure.c:184 ../sheets/ChemEng.sheet.in.h:8
 msgid "Measurement"
 msgstr "测量"
 
-#: ../objects/Misc/measure.c:187
+#: ../objects/Misc/measure.c:186
 msgid "Unit"
 msgstr "单位"
 
-#: ../objects/Misc/measure.c:188
+#: ../objects/Misc/measure.c:187
 msgid "Precision"
 msgstr "精度"
 
-#: ../objects/Misc/tree.c:605 ../objects/network/bus.c:613
+#: ../objects/Misc/tree.c:597 ../objects/network/bus.c:605
 msgid "Add Handle"
 msgstr "添加控制柄"
 
-#: ../objects/Misc/tree.c:606 ../objects/network/bus.c:614
+#: ../objects/Misc/tree.c:598 ../objects/network/bus.c:606
 msgid "Delete Handle"
 msgstr "删除控制柄"
 
-#: ../objects/SADT/arrow.c:138
+#: ../objects/network/basestation.c:134
+msgid "Sectors"
+msgstr "扇区"
+
+#: ../objects/network/basestation.c:395 ../objects/network/basestation.c:397
+msgid "Base Station"
+msgstr "基站"
+
+#: ../objects/network/network.c:43
+msgid "Network diagram objects"
+msgstr "网络图对象"
+
+#: ../objects/network/radiocell.c:119
+msgid "Radius"
+msgstr "半径"
+
+#: ../objects/network/wanlink.c:119
+msgid "Width"
+msgstr "宽度"
+
+#: ../objects/SADT/arrow.c:136
 msgid "Import resource (not shown upstairs)"
 msgstr "导入资源(不显示上层)"
 
-#: ../objects/SADT/arrow.c:139
+#: ../objects/SADT/arrow.c:137
 msgid "Imply resource (not shown downstairs)"
 msgstr "导入资源(不显示下层)"
 
-#: ../objects/SADT/arrow.c:140
+#: ../objects/SADT/arrow.c:138
 msgid "Dotted arrow"
 msgstr "点状箭头"
 
-#: ../objects/SADT/arrow.c:141
+#: ../objects/SADT/arrow.c:139
 msgid "disable arrow heads"
 msgstr "禁用箭头"
 
-#: ../objects/SADT/arrow.c:148
+#: ../objects/SADT/arrow.c:146
 msgid "Flow style:"
 msgstr "流程样式:"
 
-#: ../objects/SADT/arrow.c:150
+#: ../objects/SADT/arrow.c:148
 msgid "Automatically gray vertical flows:"
 msgstr "自动化灰阶垂直变化:"
 
-#: ../objects/SADT/arrow.c:151
+#: ../objects/SADT/arrow.c:149
 msgid ""
 "To improve the ease of reading, flows which begin and end vertically can be "
 "rendered gray"
 msgstr "为了提高易读性,竖直开始和结束的流可以使其变为灰色"
 
-#: ../objects/SADT/arrow.c:470
+#: ../objects/SADT/arrow.c:468
 msgid "SADT Arrow"
 msgstr "SADT 箭头"
 
-#: ../objects/SADT/box.c:140 ../objects/custom/custom_object.c:227
-#: ../objects/flowchart/box.c:154 ../objects/flowchart/diamond.c:152
-#: ../objects/flowchart/ellipse.c:151 ../objects/flowchart/parallelogram.c:156
-msgid "Text padding"
-msgstr "文本填充"
-
-#: ../objects/SADT/box.c:149
+#: ../objects/SADT/box.c:144
 msgid "Activity/Data identifier"
 msgstr "活动/数据标识符"
 
-#: ../objects/SADT/box.c:150
-msgid "The identifier which appears in the lower right corner of the Box"
+#: ../objects/SADT/box.c:145
+msgid "The identifier which appears in the lower-right corner of the Box"
 msgstr "出现在框右下角的标识符"
 
-#: ../objects/SADT/box.c:460
+#: ../objects/SADT/box.c:453
 msgid "SADT box"
 msgstr "SADT 方块"
 
@@ -4757,883 +4987,660 @@ msgstr "SADT 方块"
 msgid "SADT diagram objects"
 msgstr "SADT 图表对象"
 
-#: ../objects/SISSI/classification.h:38 ../objects/SISSI/sissi_dialog.c:42
-msgid "No Protection"
-msgstr "没有保护"
-
-#: ../objects/SISSI/classification.h:39 ../objects/SISSI/sissi_dialog.c:43
-msgid "Restricted Diffusion"
-msgstr "受限扩散"
-
-#: ../objects/SISSI/classification.h:40 ../objects/SISSI/sissi_dialog.c:44
-msgid "Special Country Confidential"
-msgstr "特别国家机密"
-
-#: ../objects/SISSI/classification.h:41
-msgid "Confidential"
-msgstr "机密"
-
-#: ../objects/SISSI/classification.h:42 ../objects/SISSI/sissi_dialog.c:45
-msgid "NATO Confidential"
-msgstr "北约机密"
-
-#: ../objects/SISSI/classification.h:43 ../objects/SISSI/sissi_dialog.c:46
-msgid "Personal Confidential"
-msgstr "个人机密"
-
-#: ../objects/SISSI/classification.h:44 ../objects/SISSI/sissi_dialog.c:47
-msgid "Medical Confidential"
-msgstr "医疗机密"
-
-#: ../objects/SISSI/classification.h:45
-msgid "Industrie Confidential"
-msgstr "工业机密"
-
-#: ../objects/SISSI/classification.h:46
-msgid "Defense Confidential"
-msgstr "国防机密"
-
-#: ../objects/SISSI/classification.h:47 ../objects/SISSI/sissi_dialog.c:49
-msgid "Secret"
-msgstr "秘密"
-
-#: ../objects/SISSI/classification.h:48
-msgid "Defense Secret"
-msgstr "国防秘密"
-
-#: ../objects/SISSI/classification.h:49 ../objects/SISSI/sissi_dialog.c:50
-msgid "Secret special country"
-msgstr "特别国家秘密"
-
-#: ../objects/SISSI/classification.h:50 ../objects/SISSI/sissi_dialog.c:51
-msgid "NATO Secret"
-msgstr "北约秘密"
-
-#: ../objects/SISSI/classification.h:51 ../objects/SISSI/sissi_dialog.c:52
-msgid "Very Secret"
-msgstr "高度秘密"
-
-#: ../objects/SISSI/classification.h:52 ../objects/SISSI/sissi_dialog.c:53
-msgid "NATO Very Secret"
-msgstr "北约高度秘密"
-
-#: ../objects/SISSI/sissi.c:66
-msgid "SISSI diagram"
-msgstr "SISSI 图表"
-
-#: ../objects/SISSI/sissi.c:923
-#, c-format
-msgid ""
-"Error loading object.\n"
-"Not a regular file: %s"
-msgstr ""
-"载入对象时发生错误。\n"
-"不是正常的文件:%s"
-
-#: ../objects/SISSI/sissi.c:928 ../objects/SISSI/sissi.c:932
-#, c-format
-msgid ""
-"Error loading object.\n"
-"Incorrect file type: %s"
-msgstr ""
-"载入对象时发生错误。\n"
-"不正确的文件类型:%s"
-
-#: ../objects/SISSI/sissi.c:940
-#, c-format
-msgid ""
-"Error loading object.\n"
-"Not a Dia file: %s"
-msgstr ""
-"载入对象时发生错误。\n"
-"不是 Dia 文件:%s"
-
-#: ../objects/SISSI/sissi_dialog.c:48
-msgid "Industrial Confidential"
-msgstr "工业机密"
-
-#: ../objects/SISSI/sissi_dialog.c:58
-msgid "No integrity"
-msgstr "无完整性"
-
-#: ../objects/SISSI/sissi_dialog.c:59
-msgid "Low integrity"
-msgstr "低完整性"
-
-#: ../objects/SISSI/sissi_dialog.c:60
-msgid "Average software integrity"
-msgstr "普通软件完整性"
-
-#: ../objects/SISSI/sissi_dialog.c:61
-msgid "High software integrity"
-msgstr "高软件完整性"
-
-#: ../objects/SISSI/sissi_dialog.c:62
-msgid "Average hardware integrity"
-msgstr "普通硬件完整性"
-
-#: ../objects/SISSI/sissi_dialog.c:63
-msgid "High hardware integrity"
-msgstr "高硬件完整性"
-
-#: ../objects/SISSI/sissi_dialog.c:68
-msgid "Millisecond"
-msgstr "毫秒"
-
-#: ../objects/SISSI/sissi_dialog.c:69
-msgid "Second"
-msgstr "秒"
-
-#: ../objects/SISSI/sissi_dialog.c:70
-msgid "Minute"
-msgstr "分钟"
-
-#: ../objects/SISSI/sissi_dialog.c:71
-msgid "Hour"
-msgstr "小时"
-
-#: ../objects/SISSI/sissi_dialog.c:72
-msgid "Day"
-msgstr "天"
-
-#: ../objects/SISSI/sissi_dialog.c:73
-msgid "Week"
-msgstr "星期"
-
-#: ../objects/SISSI/sissi_dialog.c:78
-msgid "SYSTEM"
-msgstr "系统"
-
-#: ../objects/SISSI/sissi_dialog.c:79
-msgid "Internet access device"
-msgstr "Internet 访问设备"
-
-#: ../objects/SISSI/sissi_dialog.c:80
-msgid "Electronic messaging"
-msgstr "电子传播信息"
-
-#: ../objects/SISSI/sissi_dialog.c:81
-msgid "Intranet"
-msgstr "Intranet"
-
-#: ../objects/SISSI/sissi_dialog.c:82
-msgid "Company directory"
-msgstr "公司目录"
-
-#: ../objects/SISSI/sissi_dialog.c:83
-msgid "External portal"
-msgstr "外部门户"
-
-#: ../objects/SISSI/sissi_dialog.c:88
-msgid "ORGANISATION"
-msgstr "组织"
-
-#: ../objects/SISSI/sissi_dialog.c:89
-msgid "Higher-tier organisation"
-msgstr "高层组织"
-
-#: ../objects/SISSI/sissi_dialog.c:90
-msgid "Structure of the organisation"
-msgstr "组织结构"
-
-#: ../objects/SISSI/sissi_dialog.c:91
-msgid "Project or system organisation"
-msgstr "项目或系统组织"
-
-#: ../objects/SISSI/sissi_dialog.c:92
-msgid "Subcontractors / Suppliers / Manufacturers"
-msgstr "分包商 / 供应商 / 制造商"
-
-#: ../objects/SISSI/sissi_dialog.c:97
-msgid "SITE"
-msgstr "地点"
-
-#: ../objects/SISSI/sissi_dialog.c:98
-msgid "Places"
-msgstr "位置"
-
-#: ../objects/SISSI/sissi_dialog.c:99
-msgid "External environment"
-msgstr "外部环境"
-
-#: ../objects/SISSI/sissi_dialog.c:100
-msgid "Premises"
-msgstr "房地"
-
-#: ../objects/SISSI/sissi_dialog.c:101
-msgid "Zone"
-msgstr "区域"
-
-#: ../objects/SISSI/sissi_dialog.c:102
-msgid "Essential Services"
-msgstr "基本服务"
-
-#: ../objects/SISSI/sissi_dialog.c:103
-msgid "Communication"
-msgstr "通讯"
-
-#: ../objects/SISSI/sissi_dialog.c:104
-msgid "Power"
-msgstr "电源"
-
-#: ../objects/SISSI/sissi_dialog.c:105
-msgid "Cooling / Pollution"
-msgstr "冷却 / 污染"
-
-#: ../objects/SISSI/sissi_dialog.c:109
-msgid "Thermal detection"
-msgstr "热量检测"
-
-#: ../objects/SISSI/sissi_dialog.c:113
-msgid "Fire detection"
-msgstr "燃烧检测"
-
-#
-#: ../objects/SISSI/sissi_dialog.c:117
-msgid "Water detection"
-msgstr "水浸检测"
-
-#: ../objects/SISSI/sissi_dialog.c:121
-msgid "Air detection"
-msgstr "空气检测"
-
-#: ../objects/SISSI/sissi_dialog.c:125
-msgid "Energy detection"
-msgstr "能量检测"
+#: ../objects/standard/arc.c:120
+msgid "Curve distance"
+msgstr "曲线距离"
 
-#
-#: ../objects/SISSI/sissi_dialog.c:129
-msgid "Intrusion detection"
-msgstr "入侵检测"
+#: ../objects/standard/bezier.c:145 ../objects/standard/line.c:126
+#: ../objects/standard/polyline.c:108
+msgid "Line gaps"
+msgstr "线间距"
 
-#: ../objects/SISSI/sissi_dialog.c:133
-msgid "Thermal action"
-msgstr "热量动作"
+#: ../objects/standard/bezier.c:147 ../objects/standard/line.c:128
+#: ../objects/standard/polyline.c:110
+msgid "Absolute start gap"
+msgstr "绝对起始空白"
 
-#: ../objects/SISSI/sissi_dialog.c:137
-msgid "Fire action"
-msgstr "燃烧动作"
+#: ../objects/standard/bezier.c:149 ../objects/standard/line.c:130
+#: ../objects/standard/polyline.c:112
+msgid "Absolute end gap"
+msgstr "绝对末尾空白"
 
-#: ../objects/SISSI/sissi_dialog.c:141
-msgid "Water action"
-msgstr "水浸动作"
+#: ../objects/standard/bezier.c:776 ../objects/standard/beziergon.c:515
+msgid "Add Segment"
+msgstr "添加段"
 
-#: ../objects/SISSI/sissi_dialog.c:145
-msgid "Air action"
-msgstr "空气动作"
+#: ../objects/standard/bezier.c:777 ../objects/standard/beziergon.c:516
+msgid "Delete Segment"
+msgstr "删除段"
 
-#: ../objects/SISSI/sissi_dialog.c:149
-msgid "Energy action"
-msgstr "能量动作"
+#: ../objects/standard/bezier.c:779 ../objects/standard/beziergon.c:518
+msgid "Symmetric control"
+msgstr "并发控制"
 
-#
-#: ../objects/SISSI/sissi_dialog.c:153
-msgid "Intrusion action"
-msgstr "入侵动作"
+#: ../objects/standard/bezier.c:781 ../objects/standard/beziergon.c:520
+msgid "Smooth control"
+msgstr "平滑控制"
 
-#: ../objects/SISSI/sissi_dialog.c:158
-msgid "Personal"
-msgstr "个人"
+#: ../objects/standard/bezier.c:783 ../objects/standard/beziergon.c:522
+msgid "Cusp control"
+msgstr "尖锐控制"
 
-#: ../objects/SISSI/sissi_dialog.c:159
-msgid "Decision maker"
-msgstr "决策者"
+#: ../objects/standard/box.c:125 ../objects/standard/ellipse.c:117
+msgid "Free"
+msgstr "自由"
 
-#: ../objects/SISSI/sissi_dialog.c:160
-msgid "SSI Responsible"
-msgstr "SSI 责任人"
+#: ../objects/standard/box.c:126 ../objects/standard/ellipse.c:118
+msgid "Fixed"
+msgstr "固定"
 
-#: ../objects/SISSI/sissi_dialog.c:161
-msgid "Users"
-msgstr "用户"
+#: ../objects/standard/box.c:127 ../objects/standard/box.c:747
+msgid "Square"
+msgstr "正方形"
 
-#: ../objects/SISSI/sissi_dialog.c:162
-msgid "Functional administrator"
-msgstr "功能管理员"
+#: ../objects/standard/box.c:140 ../objects/standard/ellipse.c:130
+msgid "Aspect ratio"
+msgstr "长宽比"
 
-#: ../objects/SISSI/sissi_dialog.c:163
-msgid "Technical administrator"
-msgstr "技术管理员"
+#: ../objects/standard/box.c:743 ../objects/standard/ellipse.c:663
+msgid "Free aspect"
+msgstr "自由长宽比"
 
-#: ../objects/SISSI/sissi_dialog.c:164
-msgid "SSI administrator"
-msgstr "SSI 管理员"
+#: ../objects/standard/box.c:745 ../objects/standard/ellipse.c:665
+msgid "Fixed aspect"
+msgstr "固定长宽比"
 
-#: ../objects/SISSI/sissi_dialog.c:165
-msgid "Developer"
-msgstr "开发者"
+#: ../objects/standard/ellipse.c:119 ../objects/standard/ellipse.c:667
+msgid "Circle"
+msgstr "圆"
 
-#: ../objects/SISSI/sissi_dialog.c:166
-msgid "Operator / Maintenance"
-msgstr "操作员 / 维修人员"
+#: ../objects/standard/image.c:118
+msgid "Image file"
+msgstr "图像文件"
 
-#: ../objects/SISSI/sissi_dialog.c:171 ../sheets/network.sheet.in.h:20
-msgid "Network"
-msgstr "网络"
+#: ../objects/standard/image.c:120
+msgid "Inline data"
+msgstr "内嵌数据"
 
-#: ../objects/SISSI/sissi_dialog.c:172
-msgid "Medium and support"
-msgstr "介质与支持"
+#: ../objects/standard/image.c:120
+msgid "Store image data in diagram"
+msgstr "在图表中保存图像数据"
 
-#: ../objects/SISSI/sissi_dialog.c:173
-msgid "Passive or active relay"
-msgstr "有源或无源中继"
+#: ../objects/standard/image.c:122
+msgid "Pixbuf"
+msgstr "Pixbuf"
 
-#: ../objects/SISSI/sissi_dialog.c:174
-msgid "Communication interface"
-msgstr "通讯接口"
+#: ../objects/standard/image.c:122
+msgid "The Pixbuf reference"
+msgstr "Pixbuf 参照"
 
-#: ../objects/SISSI/sissi_dialog.c:179 ../sheets/SISSI.sheet.in.h:54
-msgid "Software"
-msgstr "软件"
+#: ../objects/standard/image.c:124
+msgid "Draw border"
+msgstr "显示边框"
 
-#: ../objects/SISSI/sissi_dialog.c:180
-msgid "Operating System"
-msgstr "操作系统"
+#: ../objects/standard/image.c:126
+msgid "Keep aspect ratio"
+msgstr "保持长宽比"
 
-#: ../objects/SISSI/sissi_dialog.c:181
-msgid "Service - maintenance or administration software"
-msgstr "设备 - 维护或管理软件"
+#: ../objects/standard/image.c:676
+msgid "Inconsistent pixbuf during image save."
+msgstr "图像保存过程中 pixbuf 不固定。"
 
-#: ../objects/SISSI/sissi_dialog.c:182
-msgid "Packaged software or standard software"
-msgstr "打包软件或独立软件"
+#. Found file in same dir as diagram.
+#. Found file in current dir.
+#: ../objects/standard/image.c:773 ../objects/standard/image.c:784
+#, c-format
+msgid ""
+"The image file '%s' was not found in the specified directory.\n"
+"Using the file '%s' instead.\n"
+msgstr ""
+"指定目录中没有找到图像文件“%s”。\n"
+"改用文件“%s”\n"
 
-#: ../objects/SISSI/sissi_dialog.c:183
-msgid "Business application"
-msgstr "商业应用程序"
+#. Didn't find file in current dir.
+#: ../objects/standard/image.c:790 ../objects/standard/image.c:812
+#, c-format
+msgid "The image file '%s' was not found.\n"
+msgstr "未找到名为“%s”的图像文件。\n"
 
-#: ../objects/SISSI/sissi_dialog.c:184
-msgid "Standard business application"
-msgstr "标准商业应用程序"
+#: ../objects/standard/line.c:117
+msgid "Arrows"
+msgstr "箭头"
 
-#: ../objects/SISSI/sissi_dialog.c:185
-msgid "Specific business application"
-msgstr "专用商业应用程序"
+#: ../objects/standard/line.c:122
+msgid "Start point"
+msgstr "起始点"
 
-#: ../objects/SISSI/sissi_dialog.c:190
-msgid "HARDWARE"
-msgstr "硬件"
+#: ../objects/standard/line.c:124
+msgid "End point"
+msgstr "终止点"
 
-#: ../objects/SISSI/sissi_dialog.c:191
-msgid "Data-processing equipment (active)"
-msgstr "数据处理设备(活动)"
+#: ../objects/standard/line.c:320
+msgid "Upgrade to Polyline"
+msgstr "升级为折线"
 
-#: ../objects/SISSI/sissi_dialog.c:192
-msgid "Mobile equipment"
-msgstr "移动设备"
+#: ../objects/standard/line.c:321
+msgid "Upgrade to Zigzagline"
+msgstr "升级为横竖折线"
 
-#: ../objects/SISSI/sissi_dialog.c:193
-msgid "Fixed equipment"
-msgstr "固定设备"
+#: ../objects/standard/outline.c:102
+msgid "Text content"
+msgstr "文本内容"
 
-#: ../objects/SISSI/sissi_dialog.c:194
-msgid "Peripheral processing"
-msgstr "外设处理"
+#: ../objects/standard/outline.c:104
+msgid "Angle to rotate the outline"
+msgstr "轮廓字的转动角度"
 
-#: ../objects/SISSI/sissi_dialog.c:195
-msgid "Electronic medium"
-msgstr "电子介质"
+#: ../objects/standard/polygon.c:459 ../objects/standard/polyline.c:623
+msgid "Add Corner"
+msgstr "添加拐角"
 
-#: ../objects/SISSI/sissi_dialog.c:196
-msgid "Other media"
-msgstr "其它介质"
+#: ../objects/standard/polygon.c:460 ../objects/standard/polyline.c:624
+msgid "Delete Corner"
+msgstr "删除拐角"
 
-#: ../objects/SISSI/sissi_dialog.c:197
-msgid "Data medium (passive)"
-msgstr "数据介质(无源)"
+#: ../objects/standard/standard.c:58
+msgid "Standard objects"
+msgstr "标准对象"
 
-#. Class page:
-#: ../objects/SISSI/sissi_dialog.c:301
-msgid "_Menace"
-msgstr "威胁(_M)"
-
-#. ********* label of board *********
-#: ../objects/SISSI/sissi_dialog.c:317 ../objects/SISSI/sissi_dialog.c:326
-msgid "Menace"
-msgstr "威胁"
-
-#: ../objects/SISSI/sissi_dialog.c:319 ../objects/SISSI/sissi_dialog.c:328
-msgid "P Action"
-msgstr "P 动作"
-
-#: ../objects/SISSI/sissi_dialog.c:321 ../objects/SISSI/sissi_dialog.c:330
-msgid "P Detection"
-msgstr "P 检测"
-
-#: ../objects/SISSI/sissi_dialog.c:323 ../objects/SISSI/sissi_dialog.c:332
-msgid "Vulnerability"
-msgstr "弱点"
-
-#. Other properties of page:
-#: ../objects/SISSI/sissi_dialog.c:488
-msgid "Other properties"
-msgstr "其他属性"
-
-#. ********* selection menu of entity ********
-#. ********* Label of board *********
-#: ../objects/SISSI/sissi_dialog.c:726
-msgid "Label"
-msgstr "标签"
-
-#: ../objects/SISSI/sissi_dialog.c:728
-msgid "value"
-msgstr "值"
+#: ../objects/standard/textobj.c:112
+msgid "First Line"
+msgstr "第一行"
 
-#. Other properties of page
-#: ../objects/SISSI/sissi_dialog.c:862
-msgid "Documents"
-msgstr "文档"
+#: ../objects/standard/textobj.c:119
+msgid "Vertical text alignment"
+msgstr "垂直对齐文字"
 
-#: ../objects/SISSI/sissi_dialog.c:878
-msgid "Document title"
-msgstr "文档标题"
+#: ../objects/standard/zigzagline.c:448
+msgid "Upgrade to Bezierline"
+msgstr "升级为贝塞尔曲线"
 
-#: ../objects/UML/actor.c:356 ../objects/UML/actor.c:358
-#: ../sheets/UML.sheet.in.h:2
+#: ../objects/UML/actor.c:351 ../objects/UML/actor.c:353
+#: ../sheets/UML.sheet.in.h:15
 msgid "Actor"
 msgstr "角色"
 
-#: ../objects/UML/association.c:222
+#: ../objects/UML/association.c:221
 msgid "From A to B"
 msgstr "从 A 到 B"
 
-#: ../objects/UML/association.c:223
+#: ../objects/UML/association.c:222
 msgid "From B to A"
 msgstr "从 B 到 A"
 
-#: ../objects/UML/association.c:228
+#: ../objects/UML/association.c:227
 msgid "Aggregation"
 msgstr "聚集"
 
-#: ../objects/UML/association.c:229
+#: ../objects/UML/association.c:228
 msgid "Composition"
 msgstr "组成"
 
-#: ../objects/UML/association.c:236
+#: ../objects/UML/association.c:238
 msgid "Direction"
 msgstr "方向"
 
-#: ../objects/UML/association.c:238
+#: ../objects/UML/association.c:240
 msgid "Show direction"
 msgstr "显示方向"
 
-#: ../objects/UML/association.c:238
+#: ../objects/UML/association.c:240
 msgid "Show the small arrow denoting the reading direction"
 msgstr "绘制指示阅读方向的小箭头"
 
-#: ../objects/UML/association.c:245
+#: ../objects/UML/association.c:247
 msgid "Side A"
 msgstr "A 面"
 
-#: ../objects/UML/association.c:249
+#: ../objects/UML/association.c:251
 msgid "Multiplicity"
 msgstr "多重值"
 
-#: ../objects/UML/association.c:251 ../objects/UML/umlattribute.c:45
+#: ../objects/UML/association.c:253 ../objects/UML/umlattribute.c:45
 #: ../objects/UML/umloperation.c:71
 msgid "Visibility"
 msgstr "可见性"
 
-#: ../objects/UML/association.c:253
+#: ../objects/UML/association.c:255
 msgid "Show arrow"
 msgstr "显示箭头"
 
-#: ../objects/UML/association.c:256
+#: ../objects/UML/association.c:258
 msgid "Side B"
 msgstr "B 面"
 
-#: ../objects/UML/class.c:143 ../objects/UML/class.c:331
-#: ../objects/UML/class.c:1829 ../sheets/UML.sheet.in.h:6
+#. Attributes page:
+#: ../objects/UML/class_attributes_dialog.c:455
+msgid "_Attributes"
+msgstr "属性(_A)"
+
+#: ../objects/UML/class_attributes_dialog.c:507
+msgid "Attribute data"
+msgstr "属性数据"
+
+#: ../objects/UML/class_attributes_dialog.c:539
+msgid "Value:"
+msgstr "值:"
+
+#: ../objects/UML/class_attributes_dialog.c:550
+#: ../objects/UML/class_dialog.c:343
+#: ../objects/UML/class_operations_dialog.c:848
+#: ../objects/UML/class_operations_dialog.c:1010
+msgid "Comment:"
+msgstr "注释:"
+
+#: ../objects/UML/class_attributes_dialog.c:572
+#: ../objects/UML/class_operations_dialog.c:811
+msgid "Visibility:"
+msgstr "可见性:"
+
+#: ../objects/UML/class_attributes_dialog.c:577
+#: ../objects/UML/class_operations_dialog.c:816 ../objects/UML/uml.c:103
+msgid "Public"
+msgstr "公有"
+
+#: ../objects/UML/class_attributes_dialog.c:578
+#: ../objects/UML/class_operations_dialog.c:817 ../objects/UML/uml.c:104
+msgid "Private"
+msgstr "私有"
+
+#: ../objects/UML/class_attributes_dialog.c:579
+#: ../objects/UML/class_operations_dialog.c:818 ../objects/UML/uml.c:105
+msgid "Protected"
+msgstr "保护"
+
+#: ../objects/UML/class_attributes_dialog.c:580
+#: ../objects/UML/class_operations_dialog.c:819 ../objects/UML/uml.c:106
+msgid "Implementation"
+msgstr "实现"
+
+#. end: Inheritance type
+#: ../objects/UML/class_attributes_dialog.c:592
+#: ../objects/UML/class_operations_dialog.c:840
+msgid "Class scope"
+msgstr "类作用域"
+
+#: ../objects/UML/class.c:138 ../objects/UML/class.c:349
+#: ../objects/UML/class.c:1845 ../sheets/UML.sheet.in.h:3
 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:147 ../objects/UML/classicon.c:140
-#: ../objects/UML/classicon.c:142 ../objects/UML/component.c:126
-#: ../objects/UML/large_package.c:137 ../objects/UML/object.c:153
-#: ../objects/UML/small_package.c:131 ../objects/UML/umloperation.c:68
+#: ../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
 msgid "Stereotype"
 msgstr "定型"
 
-#: ../objects/UML/class.c:151 ../objects/UML/class.c:186
-#: ../objects/UML/class_dialog.c:468 ../objects/UML/class_dialog.c:580
-#: ../objects/UML/class_dialog.c:2087 ../objects/UML/uml.c:110
+#: ../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
 msgid "Abstract"
 msgstr "抽象"
 
-#: ../objects/UML/class.c:153 ../objects/UML/class.c:1826
-msgid "Template"
-msgstr "模板"
-
-#: ../objects/UML/class.c:156 ../objects/UML/class_dialog.c:477
-msgid "Suppress Attributes"
-msgstr "抑制属性"
-
-#: ../objects/UML/class.c:158
-msgid "Suppress Operations"
-msgstr "抑制操作"
-
-#: ../objects/UML/class.c:160
+#: ../objects/UML/class.c:151
 msgid "Visible Attributes"
 msgstr "可见属性"
 
-#: ../objects/UML/class.c:162
+#: ../objects/UML/class.c:153
 msgid "Visible Operations"
 msgstr "可见操作"
 
-#: ../objects/UML/class.c:164
+#: ../objects/UML/class.c:155 ../objects/UML/class_dialog.c:384
+msgid "Wrap Operations"
+msgstr "换行操作"
+
+#: ../objects/UML/class.c:157
 msgid "Visible Comments"
 msgstr "可见注释"
 
-#: ../objects/UML/class.c:166 ../objects/UML/class_dialog.c:493
-msgid "Wrap Operations"
-msgstr "换行操作"
+#: ../objects/UML/class.c:161 ../objects/UML/class.c:344
+msgid "Allow resizing"
+msgstr "允许尺寸调整"
+
+#: ../objects/UML/class.c:165 ../objects/UML/class.c:1842
+msgid "Template"
+msgstr "模板"
+
+#: ../objects/UML/class.c:167 ../objects/UML/class_dialog.c:368
+msgid "Suppress Attributes"
+msgstr "抑制属性"
+
+#: ../objects/UML/class.c:169
+msgid "Suppress Operations"
+msgstr "抑制操作"
 
-#: ../objects/UML/class.c:168
+#: ../objects/UML/class.c:171
 msgid "Wrap after char"
 msgstr "此字符后换行"
 
-#: ../objects/UML/class.c:170
+#: ../objects/UML/class.c:173
 msgid "Comment line length"
 msgstr "注释行长度"
 
-#: ../objects/UML/class.c:174 ../objects/UML/class.c:326
-msgid "Allow resizing"
-msgstr "允许尺寸调整"
+#. umlattribute_extra
+#: ../objects/UML/class.c:186
+msgid "Operations"
+msgstr "操作"
+
+#. umloperations_extra
+#: ../objects/UML/class.c:190
+msgid "Template Parameters"
+msgstr "模板参数"
 
-#: ../objects/UML/class.c:184 ../objects/UML/class_dialog.c:575
+#: ../objects/UML/class.c:203 ../objects/UML/class_dialog.c:466
 msgid "Polymorphic"
 msgstr "多态"
 
-#: ../objects/UML/class.c:188
-msgid "Classname"
+#: ../objects/UML/class.c:207 ../objects/UML/class_dialog.c:476
+msgid "Class Name"
 msgstr "类名"
 
-#: ../objects/UML/class.c:190
-msgid "Abstract Classname"
+#: ../objects/UML/class.c:209
+msgid "Abstract Class Name"
 msgstr "抽象类名"
 
-#: ../objects/UML/class.c:214
-msgid "Operations"
-msgstr "操作"
-
-#: ../objects/UML/class.c:217
-msgid "Template Parameters"
-msgstr "模板参数"
-
 #. Class page:
-#: ../objects/UML/class_dialog.c:429
+#: ../objects/UML/class_dialog.c:320
 msgid "_Class"
 msgstr "类(_C)"
 
-#: ../objects/UML/class_dialog.c:437
+#: ../objects/UML/class_dialog.c:328
 msgid "Class name:"
 msgstr "类名:"
 
-#: ../objects/UML/class_dialog.c:445 ../objects/UML/class_dialog.c:2036
-#: ../objects/UML/dependency.c:139 ../objects/UML/generalization.c:135
-#: ../objects/UML/realizes.c:136
+#: ../objects/UML/class_dialog.c:336
+#: ../objects/UML/class_operations_dialog.c:799
+#: ../objects/UML/dependency.c:134 ../objects/UML/generalization.c:131
+#: ../objects/UML/realizes.c:131
 msgid "Stereotype:"
 msgstr "定型:"
 
-#: ../objects/UML/class_dialog.c:474
+#: ../objects/UML/class_dialog.c:365
 msgid "Attributes visible"
 msgstr "属性可见"
 
-#: ../objects/UML/class_dialog.c:483
+#: ../objects/UML/class_dialog.c:374
 msgid "Operations visible"
 msgstr "操作可见"
 
-#: ../objects/UML/class_dialog.c:486
+#: ../objects/UML/class_dialog.c:377
 msgid "Suppress operations"
 msgstr "抑制动作"
 
-#: ../objects/UML/class_dialog.c:500
+#: ../objects/UML/class_dialog.c:391
 msgid "Wrap after this length: "
 msgstr "此长度后换行:"
 
-#: ../objects/UML/class_dialog.c:508
+#: ../objects/UML/class_dialog.c:399
 msgid "Comments visible"
 msgstr "注释可见"
 
-#: ../objects/UML/class_dialog.c:515
+#: ../objects/UML/class_dialog.c:406
 msgid "Wrap comment after this length: "
 msgstr "此长度后注释换行:"
 
-#: ../objects/UML/class_dialog.c:585
-msgid "Class Name"
-msgstr "类名"
+#: ../objects/UML/class_dialog.c:413
+msgid "Show documentation tag"
+msgstr "显示文档标签"
+
+#. * Fonts and Colors selection *
+#: ../objects/UML/class_dialog.c:442
+msgid "_Style"
+msgstr "样式(_S)"
 
-#: ../objects/UML/class_dialog.c:590
+#. head line
+#: ../objects/UML/class_dialog.c:452 ../objects/UML/umlparameter.c:51
+msgid "Kind"
+msgstr "种类"
+
+#: ../objects/UML/class_dialog.c:457
+msgid "Size"
+msgstr "尺寸"
+
+#: ../objects/UML/class_dialog.c:481
 msgid "Abstract Class"
 msgstr "抽象类"
 
 #. should probably be refactored too.
-#: ../objects/UML/class_dialog.c:607
+#: ../objects/UML/class_dialog.c:498
 msgid "Line Width"
 msgstr "线宽"
 
-#: ../objects/UML/class_dialog.c:616
+#: ../objects/UML/class_dialog.c:507
 msgid "Text Color"
 msgstr "文本颜色"
 
-#: ../objects/UML/class_dialog.c:624
+#: ../objects/UML/class_dialog.c:516
 msgid "Foreground Color"
 msgstr "前景色"
 
-#: ../objects/UML/class_dialog.c:632
+#: ../objects/UML/class_dialog.c:525
 msgid "Background Color"
 msgstr "背景色"
 
-#: ../objects/UML/class_dialog.c:1170
-msgid "Value:"
-msgstr "值:"
-
-#: ../objects/UML/class_dialog.c:1203 ../objects/UML/class_dialog.c:2048
-msgid "Visibility:"
-msgstr "可见性:"
-
-#: ../objects/UML/class_dialog.c:1212 ../objects/UML/class_dialog.c:2057
-#: ../objects/UML/uml.c:102
-msgid "Public"
-msgstr "公有"
-
-#: ../objects/UML/class_dialog.c:1215 ../objects/UML/class_dialog.c:2060
-#: ../objects/UML/uml.c:103
-msgid "Private"
-msgstr "私有"
-
-#: ../objects/UML/class_dialog.c:1218 ../objects/UML/class_dialog.c:2063
-#: ../objects/UML/uml.c:104
-msgid "Protected"
-msgstr "保护"
-
-#: ../objects/UML/class_dialog.c:1221 ../objects/UML/class_dialog.c:2066
-#: ../objects/UML/uml.c:105
-msgid "Implementation"
-msgstr "实现"
+#: ../objects/UML/classicon.c:128
+msgid "Boundary"
+msgstr "边界"
 
-#. end: Inheritance type
-#: ../objects/UML/class_dialog.c:1237 ../objects/UML/class_dialog.c:2103
-msgid "Class scope"
-msgstr "类作用域"
+#: ../objects/UML/classicon.c:141
+msgid "Is object"
+msgstr "是对象"
 
 #. end: Visibility
-#: ../objects/UML/class_dialog.c:2078
+#: ../objects/UML/class_operations_dialog.c:827
 msgid "Inheritance type:"
 msgstr "继承类型:"
 
-#: ../objects/UML/class_dialog.c:2090 ../objects/UML/uml.c:111
+#: ../objects/UML/class_operations_dialog.c:833 ../objects/UML/uml.c:112
 msgid "Polymorphic (virtual)"
 msgstr "多态(virtual)"
 
-#: ../objects/UML/class_dialog.c:2093 ../objects/UML/uml.c:112
+#: ../objects/UML/class_operations_dialog.c:834 ../objects/UML/uml.c:113
 msgid "Leaf (final)"
 msgstr "叶子(final)"
 
-#: ../objects/UML/class_dialog.c:2107
+#: ../objects/UML/class_operations_dialog.c:844
+#: ../objects/UML/umloperation.c:75
 msgid "Query"
 msgstr "查询"
 
-#: ../objects/UML/class_dialog.c:2154
+#: ../objects/UML/class_operations_dialog.c:888
 msgid "Parameters:"
 msgstr "参数:"
 
-#: ../objects/UML/class_dialog.c:2239
+#: ../objects/UML/class_operations_dialog.c:966
 msgid "Parameter data"
 msgstr "参数资料"
 
-#: ../objects/UML/class_dialog.c:2272
+#: ../objects/UML/class_operations_dialog.c:999
 msgid "Def. value:"
 msgstr "定义数值:"
 
-#: ../objects/UML/class_dialog.c:2306
+#: ../objects/UML/class_operations_dialog.c:1030
 msgid "Direction:"
 msgstr "方向:"
 
-#: ../objects/UML/class_dialog.c:2315 ../objects/UML/umlparameter.c:34
+#: ../objects/UML/class_operations_dialog.c:1035
+#: ../objects/UML/umlparameter.c:34
 msgid "Undefined"
 msgstr "未定义的"
 
-#: ../objects/UML/class_dialog.c:2318 ../objects/UML/umlparameter.c:35
+#: ../objects/UML/class_operations_dialog.c:1036
+#: ../objects/UML/umlparameter.c:35
 msgid "In"
 msgstr "输入"
 
-#: ../objects/UML/class_dialog.c:2321 ../objects/UML/umlparameter.c:36
+#: ../objects/UML/class_operations_dialog.c:1037
+#: ../objects/UML/umlparameter.c:36
 msgid "Out"
 msgstr "输出"
 
-#: ../objects/UML/class_dialog.c:2324 ../objects/UML/umlparameter.c:37
+#: ../objects/UML/class_operations_dialog.c:1038
+#: ../objects/UML/umlparameter.c:37
 msgid "In & Out"
 msgstr "输入输出"
 
 #. Operations page:
-#: ../objects/UML/class_dialog.c:2359
+#: ../objects/UML/class_operations_dialog.c:1069
 msgid "_Operations"
 msgstr "操作(_O)"
 
-#: ../objects/UML/class_dialog.c:2417
+#: ../objects/UML/class_operations_dialog.c:1124
 msgid "Operation data"
 msgstr "操作数据"
 
 #. Templates page:
-#: ../objects/UML/class_dialog.c:2780
+#: ../objects/UML/class_templates_dialog.c:368
 msgid "_Templates"
 msgstr "模板(_T)"
 
-#: ../objects/UML/class_dialog.c:2786 ../sheets/UML.sheet.in.h:29
+#: ../objects/UML/class_templates_dialog.c:374 ../sheets/UML.sheet.in.h:4
 msgid "Template class"
 msgstr "模板类"
 
-#: ../objects/UML/class_dialog.c:2843
+#: ../objects/UML/class_templates_dialog.c:426
 msgid "Formal parameter data"
 msgstr "形式参数数据"
 
-#: ../objects/UML/classicon.c:130
-msgid "Boundary"
-msgstr "边界"
-
-#: ../objects/UML/classicon.c:145
-msgid "Is object"
-msgstr "是对象"
-
-#: ../objects/UML/component_feature.c:150 ../sheets/UML.sheet.in.h:14
+#: ../objects/UML/component_feature.c:148 ../sheets/UML.sheet.in.h:21
 msgid "Facet"
 msgstr "小平面"
 
-#: ../objects/UML/component_feature.c:151 ../sheets/UML.sheet.in.h:26
+#: ../objects/UML/component_feature.c:149 ../sheets/UML.sheet.in.h:22
 msgid "Receptacle"
 msgstr "容器"
 
-#: ../objects/UML/component_feature.c:152 ../sheets/UML.sheet.in.h:13
+#: ../objects/UML/component_feature.c:150 ../sheets/UML.sheet.in.h:23
 msgid "Event Source"
 msgstr "事件源"
 
-#: ../objects/UML/component_feature.c:153 ../sheets/UML.sheet.in.h:12
+#: ../objects/UML/component_feature.c:151 ../sheets/UML.sheet.in.h:24
 msgid "Event Sink"
 msgstr "事件槽"
 
-#: ../objects/UML/constraint.c:127
+#: ../objects/UML/constraint.c:126
 msgid "Constraint:"
 msgstr "约束:"
 
-#: ../objects/UML/dependency.c:141
+#: ../objects/UML/dependency.c:136
 msgid "Show arrow:"
 msgstr "显示箭头:"
 
 #. how it used to be before 0.96+SVN
 #. new name matching "same name, same type"  rule - reverted, forward compatibility seems more important
-#: ../objects/UML/implements.c:131 ../objects/UML/implements.c:133
+#: ../objects/UML/implements.c:127 ../objects/UML/implements.c:129
 msgid "Interface:"
 msgstr "接口:"
 
-#: ../objects/UML/lifeline.c:152
+#: ../objects/UML/lifeline.c:164
 msgid "Draw focus of control:"
 msgstr "画控制的焦点:"
 
-#: ../objects/UML/lifeline.c:154
+#: ../objects/UML/lifeline.c:166
 msgid "Draw destruction mark:"
 msgstr "画毁坏标记:"
 
-#: ../objects/UML/lifeline.c:499
+#: ../objects/UML/lifeline.c:534
 msgid "Add connection points"
 msgstr "增加连接点"
 
-#: ../objects/UML/lifeline.c:500
+#: ../objects/UML/lifeline.c:535
 msgid "Remove connection points"
 msgstr "删除连接点"
 
-#: ../objects/UML/lifeline.c:501
+#: ../objects/UML/lifeline.c:536
 msgid "Increase connection points distance"
 msgstr "增大连接点间距"
 
-#: ../objects/UML/lifeline.c:502
+#: ../objects/UML/lifeline.c:537
 msgid "Decrease connection points distance"
 msgstr "缩小连接点间距"
 
-#: ../objects/UML/lifeline.c:503
+#: ../objects/UML/lifeline.c:538
 msgid "Set default connection points distance"
 msgstr "设置默认连接点间距"
 
-#: ../objects/UML/lifeline.c:507
+#: ../objects/UML/lifeline.c:542
 msgid "UML Lifeline"
 msgstr "UML生命线"
 
-#: ../objects/UML/message.c:137
+#: ../objects/UML/message.c:136
 msgid "Call"
 msgstr "联络"
 
-#: ../objects/UML/message.c:138
+#: ../objects/UML/message.c:137
 msgid "Create"
 msgstr "创建"
 
-#: ../objects/UML/message.c:139
+#: ../objects/UML/message.c:138
 msgid "Destroy"
 msgstr "销毁"
 
-#: ../objects/UML/message.c:140
+#: ../objects/UML/message.c:139
 msgid "Simple"
 msgstr "简单"
 
-#: ../objects/UML/message.c:141
+#: ../objects/UML/message.c:140
 msgid "Return"
 msgstr "返回"
 
-#: ../objects/UML/message.c:142
+#: ../objects/UML/message.c:141
 msgid "Send"
 msgstr "发送"
 
-#: ../objects/UML/message.c:143
+#: ../objects/UML/message.c:142
 msgid "Recursive"
 msgstr "递归"
 
-#: ../objects/UML/message.c:158
+#: ../objects/UML/message.c:153
 msgid "Message type:"
 msgstr "消息类型:"
 
-#: ../objects/UML/object.c:155
+#: ../objects/UML/object.c:148
 msgid "Explicit state"
 msgstr "明确的状态"
 
-#: ../objects/UML/object.c:160
+#: ../objects/UML/object.c:153
 msgid "Active object"
 msgstr "活动的对象"
 
-#: ../objects/UML/object.c:162
+#: ../objects/UML/object.c:155
 msgid "Show attributes"
 msgstr "显示属性"
 
-#: ../objects/UML/object.c:164
+#: ../objects/UML/object.c:157
 msgid "Multiple instance"
 msgstr "多实例"
 
-#: ../objects/UML/state.c:155
+#: ../objects/UML/state.c:147
 msgid "Entry action"
 msgstr "进入动作"
 
-#: ../objects/UML/state.c:156
+#: ../objects/UML/state.c:148
 msgid "Do action"
 msgstr "执行动作"
 
-#: ../objects/UML/state.c:157
+#: ../objects/UML/state.c:149
 msgid "Exit action"
 msgstr "退出动作"
 
 #. Would like to create a state_term instead, but making the connections
 #. * is a pain
-#: ../objects/UML/state.c:479
+#: ../objects/UML/state.c:486
 msgid ""
 "This diagram uses the State object for initial/final states.\n"
-"That option will go away in future versions.\n"
-"Please use the Initial/Final State object instead\n"
+"This option will go away in future versions.\n"
+"Please use the Initial/Final State object instead.\n"
 msgstr ""
 "此图表使用状态对象表示初始/最终状态。\n"
 "未来的 Dia 版本将去掉该选项。\n"
-"请使用初始/最终状态对象来取代它\n"
+"请使用初始/最终状态对象来取代它。\n"
 
-#: ../objects/UML/state_term.c:127
+#: ../objects/UML/state_term.c:125
 msgid "Is final"
 msgstr "是最终的"
 
@@ -5653,7 +5660,7 @@ msgstr "动作"
 msgid "Action to perform when this transition is taken"
 msgstr "当产生此转换时要进行的动作"
 
-#: ../objects/UML/transition.c:145 ../sheets/cisconetwork.sheet.in.h:43
+#: ../objects/UML/transition.c:145 ../sheets/cisconetwork.sheet.in.h:22
 msgid "Guard"
 msgstr "防护"
 
@@ -5661,429 +5668,135 @@ msgstr "防护"
 msgid "Condition for taking this transition when the event is fired"
 msgstr "当事件触发的情况下采取转变"
 
-#: ../objects/UML/uml.c:66
-msgid "Unified Modelling Language diagram objects UML 1.3"
-msgstr "统一建模语言图表对象 UML 1.3"
-
-#: ../objects/UML/umlattribute.c:41 ../objects/UML/umlparameter.c:47
-msgid "Value"
-msgstr "值"
+#: ../objects/UML/umlattribute.c:50 ../objects/UML/umloperation.c:77
+msgid "Scope"
+msgstr "作用域"
 
-#: ../objects/UML/umlattribute.c:47
-msgid "Abstract (?)"
-msgstr "摘要(?)"
+#: ../objects/UML/umlattribute.c:50
+msgid "Class scope (C++ static class variable)"
+msgstr "类作用域(C++ 静态 类变量)"
 
-#: ../objects/UML/umlattribute.c:49 ../objects/UML/umloperation.c:77
-msgid "Class scope (static)"
-msgstr "类作用域(static)"
+#: ../objects/UML/uml.c:67
+msgid "Unified Modelling Language diagram objects UML 1.3"
+msgstr "统一建模语言图表对象 UML 1.3"
 
 #: ../objects/UML/umloperation.c:73
-msgid "Inheritance type"
-msgstr "继承类型:"
+msgid "Inheritance"
+msgstr "继承"
 
 #: ../objects/UML/umloperation.c:75
-msgid "Query (const)"
-msgstr "查询(const)"
-
-#: ../objects/UML/umloperation.c:79 ../objects/chronogram/chronoline.c:164
-msgid "Parameters"
-msgstr "参数"
+msgid "C++ const method"
+msgstr "C++ const 方法"
 
-#: ../objects/UML/usecase.c:136
-msgid "Text outside"
-msgstr "正文外"
+#: ../objects/UML/umloperation.c:77
+msgid "Class scope (C++ static method)"
+msgstr "类作用域(C++  static 方法)"
 
-#: ../objects/UML/usecase.c:138
+#: ../objects/UML/usecase.c:130
 msgid "Collaboration"
 msgstr "合作"
 
-#: ../objects/chronogram/chronogram.c:40
-msgid "Chronogram diagram objects"
-msgstr "Chronogram 图表对象"
-
-#: ../objects/chronogram/chronoline.c:150 ../sheets/AADL.sheet.in.h:4
-msgid "Data"
-msgstr "数据"
-
-#: ../objects/chronogram/chronoline.c:152
-msgid "Data name"
-msgstr "数据名称"
-
-#: ../objects/chronogram/chronoline.c:154
-msgid "Events"
-msgstr "事件"
-
-#: ../objects/chronogram/chronoline.c:157
-msgid "Event specification"
-msgstr "事件规格"
-
-#: ../objects/chronogram/chronoline.c:158
-msgid ""
-"@ time    set the pointer at an absolute time.\n"
-"( duration  sets the signal up, then wait 'duration'.\n"
-") duration  sets the signal down, then wait 'duration'.\n"
-"u duration  sets the signal to \"unknown\" state, then wait 'duration'.\n"
-"example : @ 1.0 (2.0)1.0(2.0)\n"
-msgstr ""
-"@ 时间    将指针指向一个绝对时间。\n"
-"( 时间段  设置 up 信号,然后等待“时间段”。\n"
-") 时间段  设置 down 信号,然后等待“时间段”。\n"
-"u 时间段  将信号设置为“未知”状态,然后等待“时间段”。\n"
-"例如:@ 1.0 (2.0)1.0(2.0)\n"
-
-#: ../objects/chronogram/chronoline.c:166
-#: ../objects/chronogram/chronoref.c:148
-msgid "Start time"
-msgstr "开始时间"
-
-#: ../objects/chronogram/chronoline.c:168
-#: ../objects/chronogram/chronoref.c:150
-msgid "End time"
-msgstr "结束时间"
-
-#: ../objects/chronogram/chronoline.c:170
-msgid "Rise time"
-msgstr "上升时间"
-
-#: ../objects/chronogram/chronoline.c:172
-msgid "Fall time"
-msgstr "下降时间"
-
-#: ../objects/chronogram/chronoline.c:173
-msgid "Multi-bit data"
-msgstr "多位数据"
-
-#: ../objects/chronogram/chronoline.c:175
-#: ../objects/chronogram/chronoref.c:158
-msgid "Aspect"
-msgstr "外观"
-
-#: ../objects/chronogram/chronoline.c:177
-msgid "Data color"
-msgstr "数据颜色"
-
-#: ../objects/chronogram/chronoline.c:179
-msgid "Data line width"
-msgstr "数据线宽度"
-
-#: ../objects/chronogram/chronoref.c:146
-msgid "Time data"
-msgstr "时间数据"
-
-#: ../objects/chronogram/chronoref.c:152
-msgid "Major time step"
-msgstr "主时间步"
-
-#: ../objects/chronogram/chronoref.c:154
-msgid "Minor time step"
-msgstr "副时间步"
-
-#: ../objects/chronogram/chronoref.c:164
-msgid "Minor step line width"
-msgstr "主步线的宽度"
-
-#: ../objects/custom/custom.c:140
-msgid "Custom"
-msgstr "定制"
-
-#: ../objects/custom/custom.c:140
-msgid "Custom XML shapes loader"
-msgstr "定制 XML 形状载入器"
-
-#: ../objects/custom/custom_object.c:208 ../objects/custom/custom_object.c:240
-msgid "Flip horizontal"
-msgstr "水平翻转"
-
-#: ../objects/custom/custom_object.c:210 ../objects/custom/custom_object.c:242
-msgid "Flip vertical"
-msgstr "垂直翻转"
-
-#: ../objects/custom/custom_object.c:213 ../objects/custom/custom_object.c:245
-msgid "Scale of the subshapes"
-msgstr "子形状的缩放比例"
-
-#: ../objects/custom/custom_object.c:1737
-msgid "Flip Horizontal"
-msgstr "水平翻转"
-
-#: ../objects/custom/custom_object.c:1738
-msgid "Flip Vertical"
-msgstr "垂直翻转"
-
-#: ../objects/custom/custom_object.c:1775
-#: ../objects/custom_lines/custom_linetypes.c:264
-#, c-format
-msgid "Cannot open icon file %s for object type '%s'."
-msgstr "无法为“%2$s”类型的对象打开图标文件%1$s。"
-
-#: ../objects/custom_lines/custom_lines.c:160
-msgid "CustomLines"
-msgstr "定制线"
-
-#: ../objects/custom_lines/custom_lines.c:160
-msgid "Custom XML lines loader"
-msgstr "定制 XML 线形载入器"
-
-#: ../objects/custom_lines/custom_linetypes.c:227
-msgid "INTERNAL: CustomLines: Illegal line type in LineInfo object."
-msgstr "INTERNAL:CustomLines:LineInfo 对象中的非法线类型。"
-
-#: ../objects/custom_lines/custom_linetypes.c:252
-#, c-format
-msgid "INTERNAL: CustomLines: Illegal line type in LineInfo object %s."
-msgstr "INTERNAL:CustomLines:LineInfo 对象 %s 中的非法线类型。"
-
-#: ../objects/custom/shape_info.c:163
-#, c-format
-msgid ""
-"The file '%s' has invalid path data.\n"
-"svg:path data must start with moveto."
-msgstr ""
-"文件“%s”含有无效的路径数据。\n"
-"svg:路径数据必须以 moveto 开始。"
-
-#: ../objects/flowchart/flowchart.c:37
-msgid "Flowchart objects"
-msgstr "流程图对象"
-
-#: ../objects/flowchart/parallelogram.c:154
-msgid "Shear angle"
-msgstr "圆角"
-
-#: ../objects/network/basestation.c:137
-msgid "Sectors"
-msgstr "扇区"
-
-#: ../objects/network/basestation.c:401 ../objects/network/basestation.c:403
-msgid "Base Station"
-msgstr "基站"
-
-#: ../objects/network/network.c:43
-msgid "Network diagram objects"
-msgstr "网络图对象"
-
-#: ../objects/network/radiocell.c:121
-msgid "Radius"
-msgstr "半径"
-
-#: ../objects/network/wanlink.c:119
-msgid "Width"
-msgstr "宽度"
-
-#: ../objects/standard/arc.c:143
-msgid "Curve distance"
-msgstr "曲线距离"
-
-#: ../objects/standard/bezier.c:143 ../objects/standard/line.c:145
-#: ../objects/standard/polyline.c:141
-msgid "Line gaps"
-msgstr "线间距"
-
-#: ../objects/standard/bezier.c:145 ../objects/standard/line.c:147
-#: ../objects/standard/polyline.c:143
-msgid "Absolute start gap"
-msgstr "绝对起始空白"
-
-#: ../objects/standard/bezier.c:147 ../objects/standard/line.c:149
-#: ../objects/standard/polyline.c:145
-msgid "Absolute end gap"
-msgstr "绝对末尾空白"
-
-#: ../objects/standard/bezier.c:755 ../objects/standard/beziergon.c:507
-msgid "Add Segment"
-msgstr "添加段"
-
-#: ../objects/standard/bezier.c:756 ../objects/standard/beziergon.c:508
-msgid "Delete Segment"
-msgstr "删除段"
-
-#: ../objects/standard/bezier.c:758 ../objects/standard/beziergon.c:510
-msgid "Symmetric control"
-msgstr "并发控制"
-
-#: ../objects/standard/bezier.c:760 ../objects/standard/beziergon.c:512
-msgid "Smooth control"
-msgstr "平滑控制"
-
-#: ../objects/standard/bezier.c:762 ../objects/standard/beziergon.c:514
-msgid "Cusp control"
-msgstr "尖锐控制"
-
-#: ../objects/standard/box.c:139 ../objects/standard/ellipse.c:133
-msgid "Free"
-msgstr "自由"
-
-#: ../objects/standard/box.c:140 ../objects/standard/ellipse.c:134
-msgid "Fixed"
-msgstr "固定"
-
-#: ../objects/standard/box.c:141 ../objects/standard/box.c:699
-msgid "Square"
-msgstr "正方形"
-
-#: ../objects/standard/box.c:154 ../objects/standard/ellipse.c:146
-msgid "Aspect ratio"
-msgstr "长宽比"
-
-#: ../objects/standard/box.c:695 ../objects/standard/ellipse.c:673
-msgid "Free aspect"
-msgstr "自由长宽比"
-
-#: ../objects/standard/box.c:697 ../objects/standard/ellipse.c:675
-msgid "Fixed aspect"
-msgstr "固定长宽比"
-
-#: ../objects/standard/ellipse.c:135 ../objects/standard/ellipse.c:677
-msgid "Circle"
-msgstr "圆"
-
-#: ../objects/standard/image.c:139
-msgid "Image file"
-msgstr "图像文件"
-
-#: ../objects/standard/image.c:141
-msgid "Draw border"
-msgstr "显示边框"
-
-#: ../objects/standard/image.c:143
-msgid "Keep aspect ratio"
-msgstr "保持长宽比"
-
-#. Found file in same dir as diagram.
-#. Found file in current dir.
-#: ../objects/standard/image.c:697 ../objects/standard/image.c:708
-#, c-format
-msgid ""
-"The image file '%s' was not found in that directory.\n"
-"Using the file '%s' instead\n"
-msgstr ""
-"目录中没有找到图像文件“%s”。\n"
-"改用文件“%s”\n"
+#: ../objects/UML/usecase.c:132
+msgid "Text outside"
+msgstr "正文外"
 
-#. Didn't find file in current dir.
-#: ../objects/standard/image.c:714 ../objects/standard/image.c:736
+#: ../plug-ins/cairo/diacairo.c:125 ../plug-ins/drs/dia-render-script.c:124
+#: ../plug-ins/hpgl/hpgl.c:710
 #, c-format
-msgid "The image file '%s' was not found.\n"
-msgstr "未找到名为“%s”的图像文件。\n"
-
-#: ../objects/standard/line.c:136
-msgid "Arrows"
-msgstr "箭头"
-
-#: ../objects/standard/line.c:141
-msgid "Start point"
-msgstr "起始点"
-
-#: ../objects/standard/line.c:143
-msgid "End point"
-msgstr "终止点"
-
-#: ../objects/standard/outline.c:204
-msgid "Text content"
-msgstr "文本内容"
-
-#: ../objects/standard/outline.c:206
-msgid "Angle to rotate the outline"
-msgstr "轮廓字的转动角度"
-
-#: ../objects/standard/polygon.c:473 ../objects/standard/polyline.c:638
-msgid "Add Corner"
-msgstr "添加拐角"
-
-#: ../objects/standard/polygon.c:474 ../objects/standard/polyline.c:639
-msgid "Delete Corner"
-msgstr "删除拐角"
-
-#: ../objects/standard/standard.c:46
-msgid "Standard objects"
-msgstr "标准对象"
-
-#: ../objects/standard/textobj.c:139
-msgid "First Line"
-msgstr "第一行"
-
-#: ../objects/standard/textobj.c:146
-msgid "Vertical text alignment"
-msgstr "垂直对齐文字"
-
-#: ../plug-ins/cairo/diacairo-interactive.c:261
-#: ../plug-ins/cairo/diacairo-interactive.c:262
-msgid "Zoom pointer"
-msgstr "缩放指针"
-
-#: ../plug-ins/cairo/diacairo-interactive.c:268
-#: ../plug-ins/cairo/diacairo-interactive.c:269
-msgid "Visible rect pointer"
-msgstr "可见矩形指针"
+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"
+"Please choose a different name to save with Cairo.\n"
 msgstr ""
 "无法将输出文件名“%s”转换成区域设置中的编码格式。\n"
 "请选择另外一个名字用于保存。\n"
 
-#: ../plug-ins/cairo/diacairo.c:276 ../plug-ins/cairo/diacairo.c:292
+#: ../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:305
+#: ../plug-ins/cairo/diacairo.c:334
 msgid "Clipboard copy failed"
 msgstr "剪切板复制失败"
 
-#: ../plug-ins/cairo/diacairo.c:330 ../plug-ins/postscript/postscript.c:39
-#: ../plug-ins/wmf/wmf.cpp:1444
+#: ../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:345
+#: ../plug-ins/cairo/diacairo.c:379
 msgid "Cairo PostScript"
 msgstr "Cairo PostScript"
 
-#: ../plug-ins/cairo/diacairo.c:356
+#: ../plug-ins/cairo/diacairo.c:390
 msgid "Cairo Portable Document Format"
 msgstr "Cairo PDF (可移植文档格式)"
 
-#: ../plug-ins/cairo/diacairo.c:367
+#: ../plug-ins/cairo/diacairo.c:402
 msgid "Cairo Scalable Vector Graphics"
 msgstr "Cairo SVG (可缩放矢量图形)"
 
-#: ../plug-ins/cairo/diacairo.c:379
+#: ../plug-ins/cairo/diacairo.c:414
 msgid "CairoScript"
 msgstr "CairoScript"
 
-#: ../plug-ins/cairo/diacairo.c:390
+#: ../plug-ins/cairo/diacairo.c:425
 msgid "Cairo PNG"
 msgstr "Cairo PNG"
 
-#: ../plug-ins/cairo/diacairo.c:398
+#: ../plug-ins/cairo/diacairo.c:433
 msgid "Cairo PNG (with alpha)"
 msgstr "Cairo PNG (含 alpha 通道)"
 
-#: ../plug-ins/cairo/diacairo.c:408
+#: ../plug-ins/cairo/diacairo.c:443
 msgid "Cairo EMF"
 msgstr "Cairo EMF"
 
-#: ../plug-ins/cairo/diacairo.c:418
+#: ../plug-ins/cairo/diacairo.c:453
 msgid "Cairo WMF"
 msgstr "Cairo WMF"
 
-#: ../plug-ins/cairo/diacairo.c:440
+#: ../plug-ins/cairo/diacairo.c:467
+msgid "Cairo Clipboard Copy"
+msgstr "Cairo 剪切板复制"
+
+#: ../plug-ins/cairo/diacairo.c:481
 msgid "Copy _Diagram"
 msgstr "复制图表(_D)"
 
-#: ../plug-ins/cairo/diacairo.c:449
-msgid "Print (GTK) ..."
-msgstr "打印(GTK) ..."
+#: ../plug-ins/cairo/diacairo.c:490
+msgid "Print (GTK) …"
+msgstr "打印(GTK) …"
 
-#: ../plug-ins/cairo/diacairo.c:496
-msgid "Cairo based Rendering"
+#: ../plug-ins/cairo/diacairo.c:539
+msgid "Cairo-based Rendering"
 msgstr "基于 Cairo 的渲染"
 
-#: ../plug-ins/cgm/cgm.c:1106
+#: ../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
 msgid ""
 "Image row length larger than maximum cell array.\n"
 "Image not exported to CGM."
@@ -6091,57 +5804,124 @@ msgstr ""
 "影像高度大于最大储存格高。\n"
 "影像未导出至 CGM。"
 
-#: ../plug-ins/cgm/cgm.c:1362
+#: ../plug-ins/cgm/cgm.c:1383
 msgid "Computer Graphics Metafile"
 msgstr "计算机图形文件 (CGM)"
 
-#: ../plug-ins/cgm/cgm.c:1387
+#: ../plug-ins/cgm/cgm.c:1408
 msgid "Computer Graphics Metafile export filter"
 msgstr "计算机图形文件 (CGM) 输出过滤器"
 
-#: ../plug-ins/drs/dia-render-script-import.c:223
-msgid "Broken file?"
-msgstr "文件损坏?"
-
-#: ../plug-ins/drs/dia-render-script.c:156
-#: ../plug-ins/drs/dia-render-script.c:161
+#: ../plug-ins/drs/dia-render-script.c:158
+#: ../plug-ins/drs/dia-render-script.c:163
 msgid "DiaRenderScript"
 msgstr "DiaRenderScript"
 
-#: ../plug-ins/drs/dia-render-script.c:185
+#: ../plug-ins/drs/dia-render-script.c:187
 msgid "DiaRenderScript filter"
 msgstr "DiaRenderScript 过滤器"
 
-#: ../plug-ins/dxf/dxf-export.c:598 ../plug-ins/dxf/dxf-import.c:1405
+#: ../plug-ins/drs/dia-render-script-import.c:224
+msgid "Broken file?"
+msgstr "文件损坏?"
+
+#: ../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
 msgid "Drawing Interchange File"
 msgstr "制图交换文件 (DIF)"
 
-#: ../plug-ins/dxf/dxf-import.c:1322
+#: ../plug-ins/dxf/dxf-import.c:1299
 #, c-format
-msgid "read_dxf_codes failed on '%s'\n"
-msgstr "文件“%s” read_dxf_codes 失败\n"
+msgid "read_dxf_codes failed on '%s'"
+msgstr "文件“%s” read_dxf_codes 失败"
 
-#: ../plug-ins/dxf/dxf-import.c:1329
+#: ../plug-ins/dxf/dxf-import.c:1306
 #, c-format
-msgid "Binary DXF from '%s' not supported\n"
-msgstr "不支持来自“%s”的二进制的 DXF\n"
+msgid "Binary DXF from '%s' not supported"
+msgstr "不支持来自“%s”的二进制的 DXF"
 
-#: ../plug-ins/dxf/dxf.c:50
-msgid "Drawing Interchange File import and export filters"
-msgstr "制图交换文件 (DIF) 导入/导出过滤器"
-
-#: ../plug-ins/hpgl/hpgl.c:751
+#: ../plug-ins/hpgl/hpgl.c:753
 msgid "HP Graphics Language"
 msgstr "HP 图形语言(HPGL)"
 
-#: ../plug-ins/hpgl/hpgl.c:776
+#: ../plug-ins/hpgl/hpgl.c:778
 msgid "HP Graphics Language export filter"
 msgstr "HP 图形语言(HPGL)导出过滤器"
 
-#: ../plug-ins/libart/dialibart.c:59
-msgid "Libart based rendering"
+#: ../plug-ins/layout/layout.cpp:228
+#, fuzzy
+msgid "Please select edges and nodes to layout."
+msgstr "请选择要布局的边和节点。"
+
+#: ../plug-ins/layout/layout.cpp:233
+msgid "Graph creation failed"
+msgstr "Graph 创建失败"
+
+#: ../plug-ins/layout/layout.cpp:259
+msgid "No such module."
+msgstr "没有这样的模块。"
+
+#: ../plug-ins/layout/layout.cpp:260
+msgid "Out of memory."
+msgstr "内存不足。"
+
+#: ../plug-ins/layout/layout.cpp:261
+msgid "Not a tree."
+msgstr "不是树。"
+
+#: ../plug-ins/layout/layout.cpp:262
+msgid "Not a forest."
+msgstr "不是森林。"
+
+#: ../plug-ins/layout/layout.cpp:263
+msgid "Failed algorithm."
+msgstr "算法失败。"
+
+#: ../plug-ins/layout/layout.cpp:264
+msgid "Failed precondition."
+msgstr "预准备失败。"
+
+#: ../plug-ins/layout/layout.cpp:265
+msgid "OGDF crashed."
+msgstr "OGDF 已崩溃"
+
+#: ../plug-ins/layout/layout.cpp:266
+msgid "Unknown reason"
+msgstr "未知原因"
+
+#: ../plug-ins/layout/layout.cpp:268
+#, c-format
+msgid ""
+"Layout '%s' failed.\n"
+"%s"
+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 写入结构"
@@ -6155,69 +5935,95 @@ msgid "Error occurred while writing PNG"
 msgstr "写入 PNG 时发生错误"
 
 #. Create a dialog
-#: ../plug-ins/libart/export_png.c:327
+#: ../plug-ins/libart/export_png.c:328
 msgid "PNG Export Options"
 msgstr "PNG 导出选项"
 
-#: ../plug-ins/libart/export_png.c:333
+#: ../plug-ins/libart/export_png.c:334
 msgid "Image width:"
 msgstr "图像宽度:"
 
-#: ../plug-ins/libart/export_png.c:336
+#: ../plug-ins/libart/export_png.c:337
 msgid "Image height:"
 msgstr "图像高度:"
 
 #
-#: ../plug-ins/libart/export_png.c:382
-msgid "PNG (anti-aliased)"
+#: ../plug-ins/libart/export_png.c:383
+msgid "PNG (antialiased)"
 msgstr "PNG(反锯齿)"
 
-#: ../plug-ins/libart/dialibartrenderer.c:304
-msgid "gdk_renderer: Unsupported fill mode specified!\n"
-msgstr "gdk_renderer:指定了不支持的填充模式!\n"
-
-#: ../plug-ins/libart/dialibartrenderer.c:1478
-msgid "Renderer transformation"
-msgstr "渲染器变换"
-
-#: ../plug-ins/libart/dialibartrenderer.c:1479
-msgid "Transform pointer"
-msgstr "变换指针"
-
 #: ../plug-ins/metapost/metapost.c:46
 msgid "TeX Metapost export filter"
 msgstr "TeX Metapost 导出过滤器"
 
-#: ../plug-ins/metapost/render_metapost.c:1259
+#: ../plug-ins/metapost/render_metapost.c:1267
 msgid "TeX Metapost macros"
 msgstr "TeX Metapost 宏"
 
+#: ../plug-ins/pdf/pdf.c:30
+msgid "Portable Document File"
+msgstr "PDF 文件"
+
+#: ../plug-ins/pdf/pdf.c:44
+msgid "PDF import filter"
+msgstr "PDF 导入过滤器"
+
+#: ../plug-ins/pdf/pdf-import.cpp:311
+#, c-format
+msgid "Page %d"
+msgstr "第 %d 页"
+
+#: ../plug-ins/pdf/pdf-import.cpp:706
+#, c-format
+msgid ""
+"PDF document not OK.\n"
+"%s"
+msgstr ""
+"PDF 文档未就绪。\n"
+"%s"
+
 #: ../plug-ins/pgf/pgf.c:26
 msgid "LaTeX PGF export filter"
 msgstr "LaTeX PGF 导出过滤器"
 
 #: ../plug-ins/pgf/render_pgf.c:1112
 #: ../plug-ins/pstricks/render_pstricks.c:733
-msgid "Not valid UTF8"
-msgstr "不是有效的 UTF8"
+msgid "Not valid UTF-8"
+msgstr "不是有效的 UTF-8"
 
-#: ../plug-ins/pgf/render_pgf.c:1262
+#: ../plug-ins/pgf/render_pgf.c:1271
 msgid "LaTeX PGF macros"
 msgstr "LaTeX PGF 宏"
 
-#: ../plug-ins/pixbuf/pixbuf.c:93
+#: ../plug-ins/pixbuf/pixbuf.c:86
+#, fuzzy
+msgid "Failed to create pixbuf from drawable."
+msgstr "从可绘画对象创建 pixbuf 失败。"
+
+#: ../plug-ins/pixbuf/pixbuf.c:91
 #, c-format
 msgid ""
 "Could not save file:\n"
-"%s\n"
 "%s"
 msgstr ""
 "无法保存文件:\n"
-"%s\n"
 "%s"
 
-#: ../plug-ins/pixbuf/pixbuf.c:199
-msgid "gdk-pixbuf based bitmap export/import"
+#: ../plug-ins/pixbuf/pixbuf.c:112
+msgid "Calling error, missing user_data."
+msgstr "调用错误,缺少 user_data。"
+
+#: ../plug-ins/pixbuf/pixbuf.c:141
+#, c-format
+msgid ""
+"Pixbuf[%s] can't load:\n"
+"%s"
+msgstr ""
+"Pixbuf[%s] 无法加载:\n"
+"%s"
+
+#: ../plug-ins/pixbuf/pixbuf.c:196
+msgid "gdk-pixbuf-based bitmap export/import"
 msgstr "基于 gdk-pixbuf 的点阵图导入/导出过滤器"
 
 #: ../plug-ins/postscript/paginate_psprint.c:273
@@ -6225,92 +6031,92 @@ msgid "Select Printer"
 msgstr "选择打印机"
 
 #: ../plug-ins/postscript/paginate_psprint.c:285
-#: ../sheets/ciscocomputer.sheet.in.h:36
+#: ../sheets/ciscocomputer.sheet.in.h:37
 msgid "Printer"
 msgstr "打印机"
 
-#: ../plug-ins/postscript/paginate_psprint.c:299 ../sheets/Misc.sheet.in.h:1
+#: ../plug-ins/postscript/paginate_psprint.c:299 ../sheets/Misc.sheet.in.h:5
 msgid "File"
 msgstr "文件"
 
-#: ../plug-ins/postscript/paginate_psprint.c:314
-msgid "OK"
-msgstr "确定"
-
-#: ../plug-ins/postscript/paginate_psprint.c:456
+#: ../plug-ins/postscript/paginate_psprint.c:464
 #, c-format
 msgid "Could not run command '%s': %s"
 msgstr "无法运行命令“%s”:%s"
 
-#: ../plug-ins/postscript/paginate_psprint.c:459
+#: ../plug-ins/postscript/paginate_psprint.c:467
 #, c-format
 msgid "Could not open '%s' for writing: %s"
 msgstr "无法打开“%s”来写入:%s"
 
-#: ../plug-ins/postscript/paginate_psprint.c:481
+#: ../plug-ins/postscript/paginate_psprint.c:489
 #, c-format
 msgid "Printing error: command '%s' returned %d\n"
 msgstr "打印错误:命令“%s”返回 %d\n"
 
-#: ../plug-ins/postscript/paginate_psprint.c:492
+#: ../plug-ins/postscript/paginate_psprint.c:500
 #, c-format
 msgid "Printing error: command '%s' caused sigpipe."
 msgstr "打印错误:命令“%s”导致 sigpipe。"
 
-#: ../plug-ins/postscript/render_eps.c:150
-msgid "Encapsulated Postscript (using Pango fonts)"
-msgstr "内嵌的 Postscript (使用 Pango 字体)"
+#: ../plug-ins/postscript/postscript.c:47
+msgid "Print (PS)"
+msgstr "打印(PS)"
 
-#: ../plug-ins/postscript/render_eps.c:159
-msgid "Encapsulated Postscript with preview (using Pango fonts)"
-msgstr "带预览的内嵌 Postscript (使用 Pango 字体) "
+#: ../plug-ins/postscript/postscript.c:82
+msgid "PostScript Rendering"
+msgstr "PostScript 渲染"
 
-#: ../plug-ins/postscript/render_eps.c:169
-msgid "Encapsulated Postscript (using PostScript Latin-1 fonts)"
-msgstr "内嵌的 Postscript(使用 PostScript Latin-1 字体)"
+#: ../plug-ins/postscript/render_eps.c:168
+msgid "Encapsulated PostScript (using Pango fonts)"
+msgstr "内嵌的 PostScript (使用 Pango 字体)"
 
-#: ../plug-ins/postscript/postscript.c:46
-msgid "Print (PS)"
-msgstr "打印(PS)"
+#: ../plug-ins/postscript/render_eps.c:177
+msgid "Encapsulated Postscript with preview (using Pango fonts)"
+msgstr "带预览的内嵌 Postscript (使用 Pango 字体) "
 
-#: ../plug-ins/postscript/postscript.c:70
-msgid "Postscript Rendering"
-msgstr "Postscript 渲染"
+#: ../plug-ins/postscript/render_eps.c:187
+msgid "Encapsulated PostScript (using PostScript Latin-1 fonts)"
+msgstr "内嵌的 PostScript(使用 PostScript Latin-1 字体)"
 
 #: ../plug-ins/pstricks/pstricks.c:26
-msgid "TeX Pstricks export filter"
-msgstr "TeX Pstricks 导出过滤器"
+msgid "TeX PSTricks export filter"
+msgstr "TeX PStricks 导出过滤器"
 
-#: ../plug-ins/pstricks/render_pstricks.c:987
+#: ../plug-ins/pstricks/render_pstricks.c:990
 msgid "TeX PSTricks macros"
 msgstr "TeX PSTricks 宏"
 
-#: ../plug-ins/python/pydia-render.c:779
+#: ../plug-ins/python/pydia-render.c:1115
 #, c-format
 msgid "Couldn't open '%s' for writing.\n"
 msgstr "无法以写方式打开:“%s”。\n"
 
-#: ../plug-ins/python/python.c:96
+#: ../plug-ins/python/python.c:95
 msgid "Python scripting support"
 msgstr "Python 脚本支持"
 
-#: ../plug-ins/shape/shape-export.c:474
+#: ../plug-ins/shape/shape.c:36
+msgid "Dia shape export filter"
+msgstr "Dia 形状导出过滤器"
+
+#: ../plug-ins/shape/shape-export.c:525
 msgid "Shape files must end in .shape, or they cannot be loaded by Dia"
 msgstr "形状文件必须以 .shape 作为扩展名,否则无法被 Dia 载入"
 
-#: ../plug-ins/shape/shape-export.c:488
-msgid "Can't export png icon without export plug-in!"
-msgstr "缺少导出插件不能导出 png 图标!"
+#: ../plug-ins/shape/shape-export.c:539
+msgid "Can't export PNG icon without export plugin!"
+msgstr "缺少导出插件不能导出 PNG 图标!"
 
-#: ../plug-ins/shape/shape-export.c:512
+#: ../plug-ins/shape/shape-export.c:565
 msgid "Dia Shape File"
 msgstr "Dia 形状文件"
 
-#: ../plug-ins/shape/shape.c:36
-msgid "dia shape export filter"
-msgstr "dia 形状导出过滤器"
+#: ../plug-ins/svg/svg.c:50
+msgid "Scalable Vector Graphics import and export filters"
+msgstr "可缩放矢量图(SVG)导入/导出过滤器"
 
-#: ../plug-ins/svg/svg-import.c:258
+#: ../plug-ins/svg/svg-import.c:427
 msgid ""
 "Invalid path data.\n"
 "svg:path data must start with moveto."
@@ -6318,380 +6124,398 @@ msgstr ""
 "路径数据无效。\n"
 "svg:path 数据须以 moveto 开始。"
 
-#: ../plug-ins/svg/svg-import.c:806
+#: ../plug-ins/svg/svg-import.c:1274
+msgid "'Shape Design' shapes missing."
+msgstr "“形状设计”形状缺失。"
+
+#: ../plug-ins/svg/svg-import.c:1308
+#, c-format
+msgid "Object '%s' creation failed"
+msgstr "创建对象 “%s”失败"
+
+#: ../plug-ins/svg/svg-import.c:1330
+#, c-format
+msgid ""
+"Parse error for memory block.\n"
+"%s"
+msgstr ""
+"存储块解析出错。\n"
+"%s"
+
+#: ../plug-ins/svg/svg-import.c:1343 ../plug-ins/vdx/vdx-import.c:2887
+#, c-format
+msgid "Parse error for %s"
+msgstr "%s 解析错误"
+
+#: ../plug-ins/svg/svg-import.c:1376
 msgid "Expected SVG Namespace not found in file"
 msgstr "文件中找不到预期的 SVG 命名空间"
 
-#: ../plug-ins/svg/svg-import.c:826
+#: ../plug-ins/svg/svg-import.c:1396
 #, c-format
 msgid "root element was '%s' -- expecting 'svg'."
 msgstr "根元素为“%s” - 应当是“svg”。"
 
-#: ../plug-ins/svg/svg.c:50
-msgid "Scalable Vector Graphics import and export filters"
-msgstr "可缩放矢量图(SVG)导入/导出过滤器"
+#: ../plug-ins/vdx/vdx.c:54
+msgid "Visio XML Format import and export filter"
+msgstr "Visio XML 格式导入和导出过滤器"
 
-#: ../plug-ins/vdx/vdx-export.c:1375 ../plug-ins/vdx/vdx-export.c:1384
+#: ../plug-ins/vdx/vdx-export.c:1857
 #, c-format
-msgid "Couldn't read file %s"
-msgstr "无法读取文件 %s"
+msgid "Saving file '%s' failed."
+msgstr "保存文件“%s”失败。"
 
-#: ../plug-ins/vdx/vdx-export.c:1911
+#: ../plug-ins/vdx/vdx-export.c:1868
 msgid "Visio XML format"
 msgstr "Visio XML 格式"
 
-#: ../plug-ins/vdx/vdx-import.c:227 ../plug-ins/xfig/xfig-import.c:1046
+#: ../plug-ins/vdx/vdx-import.c:222
 #, c-format
-msgid "Couldn't read color: %s\n"
-msgstr "无法读颜色:%s\n"
+msgid "Couldn't read color: %s"
+msgstr "无法读颜色:%s"
 
-#: ../plug-ins/vdx/vdx-import.c:540
+#: ../plug-ins/vdx/vdx-import.c:536
 #, c-format
-msgid "Couldn't find shape %d\n"
-msgstr "无法找到形状 %d\n"
+msgid "Couldn't find shape %d"
+msgstr "无法找到形状 %d"
 
-#: ../plug-ins/vdx/vdx-import.c:1048
+#: ../plug-ins/vdx/vdx-import.c:1011
 #, c-format
-msgid "Unexpected Ellipse object: %s\n"
-msgstr "不应有的椭圆对象:%s\n"
+msgid "Unexpected Ellipse object: %s"
+msgstr "不应有的椭圆对象:%s"
 
-#: ../plug-ins/vdx/vdx-import.c:1062
-msgid "Can't rotate ellipse\n"
-msgstr "无法旋转椭圆\n"
+#: ../plug-ins/vdx/vdx-import.c:1025
+msgid "Can't rotate ellipse"
+msgstr "无法旋转椭圆"
 
-#: ../plug-ins/vdx/vdx-import.c:1393
-msgid "MoveTo not at start of Bezier\n"
-msgstr "MoveTo 没有在 Bezier 开始\n"
+#: ../plug-ins/vdx/vdx-import.c:1356
+msgid "MoveTo not at start of Bezier"
+msgstr "MoveTo 没有在 Bezier 开始"
 
-#: ../plug-ins/vdx/vdx-import.c:1743
+#: ../plug-ins/vdx/vdx-import.c:1706
 msgid "Invalid NURBS formula"
 msgstr "非法的 NURBS 公式"
 
-#: ../plug-ins/vdx/vdx-import.c:1990 ../plug-ins/vdx/vdx-import.c:2002
-#, c-format
-msgid "Couldn't write file %s"
-msgstr "不能写入文件 %s"
-
-#: ../plug-ins/vdx/vdx-import.c:2055 ../plug-ins/vdx/vdx-import.c:2068
+#: ../plug-ins/vdx/vdx-import.c:1964
 #, c-format
 msgid "Couldn't handle foreign object type %s"
 msgstr "不能处理外来的对象类型 %s"
 
-#: ../plug-ins/vdx/vdx-import.c:2096
+#: ../plug-ins/vdx/vdx-import.c:2898
+msgid "Nothing in document!"
+msgstr "文档无内容!"
+
+#: ../plug-ins/vdx/vdx-import.c:2903
 #, c-format
-msgid "Couldn't make object dir %s"
-msgstr "无法创建对象目录 %s"
+msgid "Expecting VisioDocument, got %s"
+msgstr "应为 VisioDocument,却得到 %s"
 
-#: ../plug-ins/vdx/vdx-import.c:3086
+#: ../plug-ins/vdx/vdx-import.c:2987
 msgid "Visio XML File Format"
 msgstr "Visio XML 文件格式"
 
-#: ../plug-ins/vdx/vdx-xml.c:3344
+#: ../plug-ins/vdx/vdx-xml.c:3343
 #, c-format
 msgid "Can't decode object %s"
 msgstr "无法解码对象 %s"
 
-#: ../plug-ins/vdx/vdx-xml.c:5125
+#: ../plug-ins/wmf/wmf.cpp:316
 #, c-format
-msgid "Can't write object %u"
-msgstr "无法写入对象 %u"
-
-#: ../plug-ins/vdx/vdx.c:53
-msgid "Visio XML Format import and export filter"
-msgstr "Visio XML 格式导入和导出过滤器"
+msgid ""
+"Couldn't write file %s\n"
+"%s"
+msgstr ""
+"不能写入文件 %s\n"
+"%s"
 
-#: ../plug-ins/wmf/wmf.cpp:515
+#: ../plug-ins/wmf/wmf.cpp:567
 #, c-format
 msgid ""
-"Can not render unknown font:\n"
+"Cannot render unknown font:\n"
 "%s"
 msgstr ""
 "无法渲染未知字体:\n"
 "%s"
 
-#: ../plug-ins/wmf/wmf.cpp:1321
-#, c-format
-msgid "Couldn't open: '%s' for writing.\n"
-msgstr "无法以写方式打开:“%s”。\n"
-
-#: ../plug-ins/wmf/wmf.cpp:1420
-msgid "Windows Meta File"
-msgstr "Windows 图元文件"
-
-#: ../plug-ins/wmf/wmf.cpp:1429
-msgid "Enhanced Meta File"
-msgstr "增强型图元文件"
-
-#: ../plug-ins/wmf/wmf.cpp:1451
+#: ../plug-ins/wmf/wmf.cpp:1515
 msgid "Print (GDI) ..."
 msgstr "打印(GDI) ..."
 
-#: ../plug-ins/wmf/wmf.cpp:1466
+#: ../plug-ins/wmf/wmf.cpp:1531
 msgid "WMF export filter"
 msgstr "WMF 导出过滤器"
 
-#: ../plug-ins/wpg/wpg.c:1190
+#: ../plug-ins/wpg/wpg.c:1198
 #, c-format
 msgid "File: %s type/version unsupported.\n"
 msgstr "文件:%s 类型/版本不支持。\n"
 
-#: ../plug-ins/wpg/wpg.c:1321 ../plug-ins/wpg/wpg.c:1328
+#: ../plug-ins/wpg/wpg.c:1328 ../plug-ins/wpg/wpg.c:1335
 msgid "WPG"
 msgstr "WPG"
 
-#: ../plug-ins/wpg/wpg.c:1356
+#: ../plug-ins/wpg/wpg.c:1363
 msgid "WordPerfect Graphics export filter"
 msgstr "WordPerfect 图形导出过滤器"
 
-#: ../plug-ins/xfig/xfig-export.c:461
-#, c-format
-msgid "FIG format has no equivalent of arrow style %s, using simple arrow.\n"
-msgstr "FIG 格式没有等同的箭头样式 %s,使用普通箭头。\n"
+#: ../plug-ins/xfig/xfig.c:52
+msgid "Fig Format import and export filter"
+msgstr "Fig 格式导入和导出过滤器"
 
 #: ../plug-ins/xfig/xfig-export.c:484
+#, 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
 msgid "No more user-definable colors - using black"
 msgstr "没有更多的用户可定义颜色 - 使用黑色"
 
-#: ../plug-ins/xfig/xfig-export.c:1205
-msgid "XFig format"
-msgstr "XFig 格式"
+#: ../plug-ins/xfig/xfig-export.c:1234
+msgid "Xfig format"
+msgstr "Xfig 格式"
 
-#: ../plug-ins/xfig/xfig-import.c:111
+#: ../plug-ins/xfig/xfig-import.c:109
 #, c-format
-msgid "Color index %d too high, only 512 colors allowed. Using black instead."
-msgstr "颜色索引值 %d 太高,只允许 512 色。改为使用黑色。"
+msgid "Color index %d too high; only 512 colors allowed. Using black instead."
+msgstr "颜色索引值 %d 太高;只允许 512 色。改为使用黑色。"
 
-#: ../plug-ins/xfig/xfig-import.c:138
+#: ../plug-ins/xfig/xfig-import.c:140
 msgid "Patterns are not supported by Dia"
 msgstr "Dia 不支持模式"
 
-#: ../plug-ins/xfig/xfig-import.c:166
-msgid "Triple-dotted lines are not supported by Dia, using double-dotted"
-msgstr "Dia 不支持三个一组的点的行,请使用双点"
+#: ../plug-ins/xfig/xfig-import.c:168
+msgid "Triple-dotted lines are not supported by Dia; using double-dotted"
+msgstr "Dia 不支持三个一组的点的行;使用双点"
 
-#: ../plug-ins/xfig/xfig-import.c:170
+#: ../plug-ins/xfig/xfig-import.c:172
 #, c-format
-msgid "Line style %d should not appear\n"
-msgstr "线型 %d 不应该出现\n"
+msgid "Line style %d should not appear"
+msgstr "线型 %d 不应该出现"
 
-#: ../plug-ins/xfig/xfig-import.c:238
+#: ../plug-ins/xfig/xfig-import.c:244
 #, c-format
-msgid "Error while reading %dth of %d points: %s\n"
-msgstr "读 %2$d 个点中的第 %1$d 个点时出错: %3$s\n"
+msgid "Error while reading %dth of %d points"
+msgstr "读 %2$d 个点中的第 %1$d 个点时出错"
 
-#: ../plug-ins/xfig/xfig-import.c:266
-msgid "Error while reading arrowhead\n"
-msgstr "读箭头时出错\n"
+#: ../plug-ins/xfig/xfig-import.c:253
+msgid "Unexpected end of file."
+msgstr "意外的文件结束。"
 
-#: ../plug-ins/xfig/xfig-import.c:288
+#: ../plug-ins/xfig/xfig-import.c:273
+msgid "Error while reading arrowhead"
+msgstr "读箭头时出错"
+
+#: ../plug-ins/xfig/xfig-import.c:295
 #, c-format
 msgid "Unknown arrow type %d\n"
 msgstr "未知的箭头类型 %d\n"
 
-#: ../plug-ins/xfig/xfig-import.c:379
+#: ../plug-ins/xfig/xfig-import.c:387
 #, c-format
 msgid "Depth %d of of range, only 0-%d allowed.\n"
 msgstr "深度值 %d 超出范围,只允许 0-%d。\n"
 
-#: ../plug-ins/xfig/xfig-import.c:426
-#, c-format
-msgid "Couldn't read ellipse info: %s\n"
-msgstr "无法读椭圆信息:%s\n"
+#: ../plug-ins/xfig/xfig-import.c:435
+msgid "Couldn't read ellipse info."
+msgstr "无法读椭圆信息:%s"
 
-#: ../plug-ins/xfig/xfig-import.c:494
-#, c-format
-msgid "Couldn't read polyline info: %s\n"
-msgstr "无法读折线信息:%s\n"
+#: ../plug-ins/xfig/xfig-import.c:504
+msgid "Couldn't read polyline info.\n"
+msgstr "无法读折线信息。\n"
 
-#: ../plug-ins/xfig/xfig-import.c:509
-#, c-format
-msgid "Couldn't read flipped bit: %s\n"
-msgstr "无法读翻转位:%s\n"
+#: ../plug-ins/xfig/xfig-import.c:519
+msgid "Couldn't read flipped bit."
+msgstr "无法读翻转位。"
 
-#: ../plug-ins/xfig/xfig-import.c:527
-msgid "Negative corner radius, negating"
-msgstr "负的角半径, 求反"
+#: ../plug-ins/xfig/xfig-import.c:537
+msgid "Negative corner radius; negating"
+msgstr "负的角半径; 求反"
 
-#: ../plug-ins/xfig/xfig-import.c:570
+#: ../plug-ins/xfig/xfig-import.c:580
 #, c-format
 msgid "Unknown polyline subtype: %d\n"
 msgstr "未知的折线子类型:%d\n"
 
-#: ../plug-ins/xfig/xfig-import.c:720 ../plug-ins/xfig/xfig-import.c:752
-#, c-format
-msgid "Couldn't read spline info: %s\n"
-msgstr "不能读取样条曲线信息:%s\n"
+#: ../plug-ins/xfig/xfig-import.c:732 ../plug-ins/xfig/xfig-import.c:764
+msgid "Couldn't read spline info."
+msgstr "不能读取样条曲线信息。"
 
 #. Open approximated spline
 #. Closed approximated spline
-#: ../plug-ins/xfig/xfig-import.c:739 ../plug-ins/xfig/xfig-import.c:757
+#: ../plug-ins/xfig/xfig-import.c:751 ../plug-ins/xfig/xfig-import.c:768
 msgid "Cannot convert approximated spline yet."
 msgstr "无法转换逼近的样条曲线"
 
-#: ../plug-ins/xfig/xfig-import.c:795
+#: ../plug-ins/xfig/xfig-import.c:806
 #, c-format
 msgid "Unknown spline subtype: %d\n"
 msgstr "未知的样条曲线类型:%d\n"
 
-#: ../plug-ins/xfig/xfig-import.c:860
-#, c-format
-msgid "Couldn't read arc info: %s\n"
-msgstr "无法读弧的信息:%s\n"
+#: ../plug-ins/xfig/xfig-import.c:871
+msgid "Couldn't read arc info."
+msgstr "无法读弧的信息。"
 
 #. set new fill property on arc?
-#: ../plug-ins/xfig/xfig-import.c:889
+#: ../plug-ins/xfig/xfig-import.c:899
 msgid "Filled arc treated as unfilled"
 msgstr "填充弧按非填充弧处理"
 
-#: ../plug-ins/xfig/xfig-import.c:893
+#: ../plug-ins/xfig/xfig-import.c:903
 #, c-format
 msgid "Unknown polyline arc: %d\n"
 msgstr "未知的折线子类型:%d\n"
 
-#: ../plug-ins/xfig/xfig-import.c:957
+#: ../plug-ins/xfig/xfig-import.c:968
+msgid "Couldn't read text info."
+msgstr "无法读文本信息。"
+
+#: ../plug-ins/xfig/xfig-import.c:996
 #, c-format
-msgid "Couldn't read text info: %s\n"
-msgstr "无法读文本信息: %s\n"
+msgid "Can't find LaTeX font nr. %d, using sans"
+msgstr "找不到 LaTeX 字体 nr. %d,将使用 sans"
 
-#: ../plug-ins/xfig/xfig-import.c:1019
+#: ../plug-ins/xfig/xfig-import.c:1004
 #, c-format
-msgid "Couldn't identify FIG object: %s\n"
-msgstr "无法识别 FIG 对象: %s\n"
+msgid "Can't find Postscript font nr. %d, using sans"
+msgstr "找不到 Postscript 字体 nr. %d,将使用 sans"
 
-#: ../plug-ins/xfig/xfig-import.c:1027
+#: ../plug-ins/xfig/xfig-import.c:1032
+msgid "Couldn't identify Fig object."
+msgstr "无法识别 FIG 对象。"
+
+#: ../plug-ins/xfig/xfig-import.c:1040
 msgid "Compound end outside compound\n"
 msgstr "复合对象末端在复合对象之外\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1051
+#: ../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:1064
 #, c-format
 msgid "Color number %d out of range 0..%d.  Discarding color.\n"
 msgstr "顔色编号 %d 超出 0..%d。范围。丢弃顔色。\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1097
-#, c-format
-msgid "Couldn't read group extend: %s\n"
-msgstr "不能读组扩展:%s\n"
+#: ../plug-ins/xfig/xfig-import.c:1111
+msgid "Couldn't read group extend."
+msgstr "不能读组扩展。"
 
-#: ../plug-ins/xfig/xfig-import.c:1108
+#: ../plug-ins/xfig/xfig-import.c:1122
 #, c-format
 msgid "Unknown object type %d\n"
 msgstr "未知对象类型 %d\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1132
+#: ../plug-ins/xfig/xfig-import.c:1147
 #, c-format
 msgid "`%s' is not one of `%s' or `%s'\n"
 msgstr "“%s”不是一个“%s”或“%s”\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1142
-#, c-format
-msgid "Error reading paper size: %s\n"
-msgstr "读页面尺寸时出错:%s\n"
+#: ../plug-ins/xfig/xfig-import.c:1157
+msgid "Error reading paper size."
+msgstr "读页面尺寸时出错。"
 
-#: ../plug-ins/xfig/xfig-import.c:1153
+#: ../plug-ins/xfig/xfig-import.c:1168
 #, c-format
 msgid "Unknown paper size `%s', using default\n"
 msgstr "未知的页面尺寸“%s”,使用默认值\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1165
-#, c-format
-msgid "Error reading paper orientation: %s\n"
-msgstr "读页面方向时出错:%s\n"
+#: ../plug-ins/xfig/xfig-import.c:1181
+msgid "Error reading paper orientation."
+msgstr "读页面方向时出错。"
 
-#: ../plug-ins/xfig/xfig-import.c:1175
-#, c-format
-msgid "Error reading justification: %s\n"
-msgstr "读取对齐时出错:%s\n"
-
-#: ../plug-ins/xfig/xfig-import.c:1185
-#, c-format
-msgid "Error reading units: %s\n"
-msgstr "读量度单位时出错:%s\n"
+#: ../plug-ins/xfig/xfig-import.c:1191
+msgid "Error reading justification."
+msgstr "读取对齐时出错。"
 
 #: ../plug-ins/xfig/xfig-import.c:1201
-#, c-format
-msgid "Error reading magnification: %s\n"
-msgstr "读放大率时出错:%s\n"
+msgid "Error reading units."
+msgstr "读量度单位时出错。"
 
-#: ../plug-ins/xfig/xfig-import.c:1214
-#, c-format
-msgid "Error reading multipage indicator: %s\n"
-msgstr "读多页指示时出错:%s\n"
+#: ../plug-ins/xfig/xfig-import.c:1217
+msgid "Error reading magnification."
+msgstr "读放大率时出错。"
 
-#: ../plug-ins/xfig/xfig-import.c:1225
-#, c-format
-msgid "Error reading transparent color: %s\n"
-msgstr "读透明色时出错:%s\n"
+#: ../plug-ins/xfig/xfig-import.c:1230
+msgid "Error reading multipage indicator."
+msgstr "读多页指示时出错。"
 
-#: ../plug-ins/xfig/xfig-import.c:1234 ../plug-ins/xfig/xfig-import.c:1290
-#: ../plug-ins/xfig/xfig-import.c:1308
-#, c-format
-msgid "Error reading FIG file: %s\n"
-msgstr "读 FIG 文件时出错:%s\n"
+#: ../plug-ins/xfig/xfig-import.c:1241
+msgid "Error reading transparent color."
+msgstr "读透明色时出错。"
 
-#: ../plug-ins/xfig/xfig-import.c:1236 ../plug-ins/xfig/xfig-import.c:1292
-msgid "Premature end of FIG file\n"
-msgstr "FIG 文件过早的结束\n"
+#: ../plug-ins/xfig/xfig-import.c:1250 ../plug-ins/xfig/xfig-import.c:1311
+#: ../plug-ins/xfig/xfig-import.c:1329
+msgid "Error reading Fig file."
+msgstr "读 FIG 文件时出错。"
 
-#: ../plug-ins/xfig/xfig-import.c:1245
-#, c-format
-msgid "Error reading resolution: %s\n"
-msgstr "读取分辨率时出错:%s\n"
+#: ../plug-ins/xfig/xfig-import.c:1252
+msgid "Premature end of Fig file\n"
+msgstr "Fig 文件过早的结束\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1277
-#, c-format
-msgid "Doesn't look like a Fig file: %s\n"
-msgstr "不是一个 Fig 文件:%s\n"
+#: ../plug-ins/xfig/xfig-import.c:1261
+msgid "Error reading resolution."
+msgstr "读取分辨率时出错。"
+
+#: ../plug-ins/xfig/xfig-import.c:1297
+msgid "Doesn't look like a Fig file"
+msgstr "不是一个 Fig 文件"
 
-#: ../plug-ins/xfig/xfig-import.c:1283
+#: ../plug-ins/xfig/xfig-import.c:1303
 #, c-format
-msgid "This is a FIG version %d.%d file, I may not understand it\n"
-msgstr "这是一个版本为 %d.%d 的 FIG 文件,可能无法处理\n"
+msgid ""
+"This is a Fig version %d.%d file.\n"
+" It may not be importable."
+msgstr ""
+"这是一个版本为 %d.%d 的 Fig 文件。\n"
+"它可能无法导入。"
 
-#: ../plug-ins/xfig/xfig-import.c:1331
-msgid "XFig File Format"
-msgstr "XFig 文件格式"
+#: ../plug-ins/xfig/xfig-import.c:1313
+msgid "Premature end of Fig file"
+msgstr "Fig 文件过早的结束"
 
-#: ../plug-ins/xfig/xfig.c:51
-msgid "Fig Format import and export filter"
-msgstr "Fig 格式导入和导出过滤器"
+#: ../plug-ins/xfig/xfig-import.c:1352
+msgid "Xfig File Format"
+msgstr "Xfig 文件格式"
 
-#: ../plug-ins/xslt/xslt.c:110
+#: ../plug-ins/xslt/xslt.c:113
 #, c-format
 msgid "Error while parsing %s\n"
 msgstr "解析 %s 时发生错误\n"
 
-#: ../plug-ins/xslt/xslt.c:119
+#: ../plug-ins/xslt/xslt.c:122
 #, c-format
 msgid "Error while parsing stylesheet %s\n"
 msgstr "解析样式表 %s 时发生错误\n"
 
-#: ../plug-ins/xslt/xslt.c:126
+#: ../plug-ins/xslt/xslt.c:129
 #, c-format
 msgid "Error while applying stylesheet %s\n"
 msgstr "应用样式表 %s 时发生错误\n"
 
-#: ../plug-ins/xslt/xslt.c:135
+#: ../plug-ins/xslt/xslt.c:138
 #, c-format
 msgid "Error while parsing stylesheet: %s\n"
 msgstr "解析样式表时发生错误:%s\n"
 
-#: ../plug-ins/xslt/xslt.c:144
+#: ../plug-ins/xslt/xslt.c:147
 #, c-format
 msgid "Error while applying stylesheet: %s\n"
 msgstr "应用样式表时发生错误:%s\n"
 
-#: ../plug-ins/xslt/xslt.c:152
+#: ../plug-ins/xslt/xslt.c:155
 #, c-format
 msgid "Error while saving result: %s\n"
 msgstr "保存结果时发生错误:%s\n"
 
-#: ../plug-ins/xslt/xslt.c:336
+#: ../plug-ins/xslt/xslt.c:339
 msgid "XSL Transformation filter"
 msgstr "XSL 变换过滤器"
 
-#: ../plug-ins/xslt/xslt.c:363
-msgid "No valid configuration files found for the XSLT plugin, not loading."
-msgstr "找不到用于 XSLT 插件的有效配置文件,不予载入"
+#: ../plug-ins/xslt/xslt.c:366
+msgid "No valid configuration files found for the XSLT plugin; not loading."
+msgstr "找不到用于 XSLT 插件的有效配置文件;不予载入"
 
 #: ../plug-ins/xslt/xsltdialog.c:99
 msgid "Export through XSLT"
@@ -6713,605 +6537,621 @@ msgstr "AADL"
 msgid "AADL Shapes"
 msgstr "AADL 形状"
 
-#: ../sheets/AADL.sheet.in.h:3
-msgid "Bus"
-msgstr "总线"
-
-#: ../sheets/AADL.sheet.in.h:5
-msgid "Device"
-msgstr "设备"
+#: ../sheets/AADL.sheet.in.h:4
+msgid "Thread"
+msgstr "线程"
 
 #: ../sheets/AADL.sheet.in.h:6
+msgid "Processor"
+msgstr "处理器"
+
+#: ../sheets/AADL.sheet.in.h:7
 msgid "Memory"
 msgstr "内存"
 
-#: ../sheets/AADL.sheet.in.h:7
-msgid "Package"
-msgstr "包"
+#: ../sheets/AADL.sheet.in.h:8
+msgid "Bus"
+msgstr "总线"
 
 #: ../sheets/AADL.sheet.in.h:9
-msgid "Processor"
-msgstr "处理器"
+msgid "System"
+msgstr "系统"
 
 #: ../sheets/AADL.sheet.in.h:10
 msgid "Subprogram"
 msgstr "子程序"
 
 #: ../sheets/AADL.sheet.in.h:11
-msgid "System"
-msgstr "系统"
+msgid "Thread Group"
+msgstr "线程组"
 
 #: ../sheets/AADL.sheet.in.h:12
-msgid "Thread"
-msgstr "线程"
+msgid "Device"
+msgstr "设备"
 
 #: ../sheets/AADL.sheet.in.h:13
-msgid "Thread Group"
-msgstr "线程组"
+msgid "Package"
+msgstr "包"
+
+#. Please talk to me before making any changes to this sheet
+#: ../sheets/Assorted.sheet.in.h:2
+msgid "Assorted"
+msgstr "基本图形"
 
 #. Sheet Name: Assorted, was Geometric, maybe Basic Shapes instead?
 #. Leave as is for now, renaming too much hassle.
 #. Will probably need to split into seperate sheets soon anyway.
-#: ../sheets/Assorted.sheet.in.h:4
+#: ../sheets/Assorted.sheet.in.h:6
 msgid ""
 "An Assorted Collection of Polygons, Beziergons and other Miscellaneous "
 "Geometric Shapes"
 msgstr "多边形、贝塞尔曲线和其他各式几何图形集"
 
-#. Please talk to me before making any changes to this sheet
-#: ../sheets/Assorted.sheet.in.h:6
-msgid "Assorted"
-msgstr "基本图形"
-
 #: ../sheets/Assorted.sheet.in.h:7
-msgid "Chevron"
-msgstr "锯齿形"
+msgid "Right angle triangle"
+msgstr "直角三角形"
 
 #: ../sheets/Assorted.sheet.in.h:8
-msgid "Curved eight point star"
-msgstr "曲八角星"
+msgid "Isosceles triangle"
+msgstr "等腰三角形"
 
 #: ../sheets/Assorted.sheet.in.h:9
-msgid "Curved four point star"
-msgstr "曲四角星"
+msgid "Perfect square, height equals width"
+msgstr "正方形"
 
 #: ../sheets/Assorted.sheet.in.h:10
-msgid "Diamond"
-msgstr "菱形"
+msgid "Perfect circle"
+msgstr "正园形"
 
 #: ../sheets/Assorted.sheet.in.h:11
-msgid "Down arrow"
-msgstr "箭头 (下)"
+msgid "Quarter circle"
+msgstr "四分之一圆形"
 
 #: ../sheets/Assorted.sheet.in.h:12
-msgid "Eight point star"
-msgstr "八角星"
+msgid "Diamond"
+msgstr "菱形"
 
 #: ../sheets/Assorted.sheet.in.h:13
-msgid "Five point star"
-msgstr "五角星"
+msgid "Pentagon. Five-point shape"
+msgstr "五边形。五点形状"
 
 #: ../sheets/Assorted.sheet.in.h:14
-msgid "Four point star"
-msgstr "四角星"
+msgid "Hexagon. Six-point shape"
+msgstr "六边形。六点形状"
 
 #: ../sheets/Assorted.sheet.in.h:15
-msgid "Heart"
-msgstr "心形"
+msgid "Heptagon. Seven-point shape"
+msgstr "七边形。七点形状"
 
 #: ../sheets/Assorted.sheet.in.h:16
-msgid "Heptagon. Seven sided shape"
-msgstr "七边形"
+msgid "Octogon. Eight-point shape"
+msgstr "八边形。八点形状"
 
 #: ../sheets/Assorted.sheet.in.h:17
-msgid "Hexagon. Six sided shape"
-msgstr "六边形"
-
-#: ../sheets/Assorted.sheet.in.h:18
 msgid "Horizontal parallelogram"
 msgstr "平行四边形"
 
+#: ../sheets/Assorted.sheet.in.h:18
+msgid "Vertical parallelogram"
+msgstr "垂直平行四边形"
+
 #: ../sheets/Assorted.sheet.in.h:19
-msgid "Isoceles triangle"
-msgstr "等腰三角形"
+msgid "Trapezoid"
+msgstr "梯形"
 
 #: ../sheets/Assorted.sheet.in.h:20
-msgid "Left arrow"
-msgstr "箭头(左)"
+msgid "Four-point star"
+msgstr "四角星"
 
 #: ../sheets/Assorted.sheet.in.h:21
-msgid "Left-right arrow"
-msgstr "箭头(左、右)"
+msgid "Curved four-point star"
+msgstr "曲四角星"
 
 #: ../sheets/Assorted.sheet.in.h:22
-msgid "Left-right-up arrow"
-msgstr "箭头(左、右、上)"
+msgid "Five-point star"
+msgstr "五角星"
 
 #: ../sheets/Assorted.sheet.in.h:23
-msgid "Left-up arrow"
-msgstr "箭头(左、上)"
+msgid "Six-point star"
+msgstr "六角星"
 
 #: ../sheets/Assorted.sheet.in.h:24
-msgid "Maltese cross"
-msgstr "马尔他(Maltese)十字"
+msgid "Seven-point star"
+msgstr "七角星"
 
 #: ../sheets/Assorted.sheet.in.h:25
-msgid "Notched left arrow"
-msgstr "左方凹箭头"
+msgid "Eight-point star"
+msgstr "八角星"
 
 #: ../sheets/Assorted.sheet.in.h:26
-msgid "Notched right arrow"
-msgstr "右方凹箭头"
+msgid "Sharp eight-point star"
+msgstr "尖八角星"
 
 #: ../sheets/Assorted.sheet.in.h:27
-msgid "Octogon. Eight sided shape"
-msgstr "八边形"
+msgid "Curved eight-point star"
+msgstr "曲八角星"
 
 #: ../sheets/Assorted.sheet.in.h:28
-msgid "Pentagon block arrow"
-msgstr "五角箭头"
+msgid "Swiss cross"
+msgstr "瑞士十字"
 
 #: ../sheets/Assorted.sheet.in.h:29
-msgid "Pentagon. Five sided shape"
-msgstr "五边形"
+msgid "Maltese cross"
+msgstr "马尔他(Maltese)十字"
 
 #: ../sheets/Assorted.sheet.in.h:30
-msgid "Perfect circle"
-msgstr "正园形"
+msgid "Down arrow"
+msgstr "箭头 (下)"
 
 #: ../sheets/Assorted.sheet.in.h:31
-msgid "Perfect square, height equals width"
-msgstr "正方形"
+msgid "Up arrow"
+msgstr "箭头(上)"
 
 #: ../sheets/Assorted.sheet.in.h:32
-msgid "Quad arrow"
-msgstr "箭头(上下左右)"
+msgid "Left arrow"
+msgstr "箭头(左)"
 
 #: ../sheets/Assorted.sheet.in.h:33
-msgid "Quarter circle"
-msgstr "四分之一圆形"
+msgid "Right arrow"
+msgstr "箭头(右)"
 
 #: ../sheets/Assorted.sheet.in.h:34
-msgid "Quarter moon"
-msgstr "四分之一月形"
+msgid "Notched left arrow"
+msgstr "左方凹箭头"
 
 #: ../sheets/Assorted.sheet.in.h:35
-msgid "Right angle triangle"
-msgstr "直角三角形"
+msgid "Notched right arrow"
+msgstr "右方凹箭头"
 
 #: ../sheets/Assorted.sheet.in.h:36
-msgid "Right arrow"
-msgstr "箭头(右)"
+msgid "Left-up arrow"
+msgstr "箭头(左、上)"
 
 #: ../sheets/Assorted.sheet.in.h:37
-msgid "Seven point star"
-msgstr "七角星"
+msgid "Turn-up arrow"
+msgstr "上弯箭头"
 
 #: ../sheets/Assorted.sheet.in.h:38
-msgid "Sharp eight point star"
-msgstr "尖八角星"
+msgid "Left-right arrow"
+msgstr "箭头(左、右)"
 
 #: ../sheets/Assorted.sheet.in.h:39
-msgid "Six point star"
-msgstr "六角星"
+msgid "Up-down arrow"
+msgstr "箭头(上、下)"
 
 #: ../sheets/Assorted.sheet.in.h:40
-msgid "Sun"
-msgstr "太阳"
+msgid "Quad arrow"
+msgstr "箭头(上下左右)"
 
 #: ../sheets/Assorted.sheet.in.h:41
-msgid "Swiss cross"
-msgstr "瑞士十字"
+msgid "Left-right-up arrow"
+msgstr "箭头(左、右、上)"
 
 #: ../sheets/Assorted.sheet.in.h:42
-msgid "Trapezoid"
-msgstr "梯形"
+msgid "Up-down-left arrow"
+msgstr "箭头(上、下、左)"
 
 #: ../sheets/Assorted.sheet.in.h:43
-msgid "Turn-up arrow"
-msgstr "上弯箭头"
+msgid "Pentagon block arrow"
+msgstr "五角箭头"
 
 #: ../sheets/Assorted.sheet.in.h:44
-msgid "Up arrow"
-msgstr "箭头(上)"
+msgid "Chevron"
+msgstr "锯齿形"
 
 #: ../sheets/Assorted.sheet.in.h:45
-msgid "Up-down arrow"
-msgstr "箭头(上、下)"
+msgid "Heart"
+msgstr "心形"
 
 #: ../sheets/Assorted.sheet.in.h:46
-msgid "Up-down-left arrow"
-msgstr "箭头(上、下、左)"
+msgid "Sun"
+msgstr "太阳"
 
 #: ../sheets/Assorted.sheet.in.h:47
-msgid "Vertical parallelogram"
-msgstr "垂直平行四边形"
-
-#: ../sheets/BPMN.sheet.in.h:1
-msgid "Activity Looping"
-msgstr "活动回路"
-
-#: ../sheets/BPMN.sheet.in.h:2
-msgid "Ad-Hoc Collapsed Sub-Process"
-msgstr "临时(Ad-Hoc) 折叠子进程"
+msgid "Quarter moon"
+msgstr "四分之一月形"
 
 #. For: anthonym
-#: ../sheets/BPMN.sheet.in.h:4
+#: ../sheets/BPMN.sheet.in.h:2
 msgid "BPMN"
 msgstr "BPMN"
 
-#: ../sheets/BPMN.sheet.in.h:5
+#: ../sheets/BPMN.sheet.in.h:3
 msgid "Business Process Modeling Notation"
 msgstr "商业进程模型表示法"
 
+#: ../sheets/BPMN.sheet.in.h:4
+msgid "Start Event"
+msgstr "起始事件"
+
+#: ../sheets/BPMN.sheet.in.h:5
+msgid "Start Event — Message"
+msgstr "起始事件 — 信息"
+
 #: ../sheets/BPMN.sheet.in.h:6
-msgid "Collapsed Sub-Process"
-msgstr "折叠子进程"
+msgid "Start Event — Timer"
+msgstr "起始事件 — 计时"
 
 #: ../sheets/BPMN.sheet.in.h:7
-msgid "Compensation Collapsed Sub-Process"
-msgstr "补偿折叠子进程"
+msgid "Start Event — Rule"
+msgstr "起始事件 — 规则"
 
 #: ../sheets/BPMN.sheet.in.h:8
-msgid "Compensation Task"
-msgstr "补偿工作"
+msgid "Start Event — Link"
+msgstr "起始事件 — 连接"
 
 #: ../sheets/BPMN.sheet.in.h:9
-msgid "Complex"
-msgstr "复合"
+msgid "Start Event — Multiple"
+msgstr "起始事件 — 多重"
 
 #: ../sheets/BPMN.sheet.in.h:10
-msgid "Data Object"
-msgstr "数据对象"
+msgid "Intermediate Event"
+msgstr "中间事件"
 
 #: ../sheets/BPMN.sheet.in.h:11
-msgid "End Event"
-msgstr "结束事件"
+msgid "Intermediate Event — Message"
+msgstr "中间事件 — 信息"
 
 #: ../sheets/BPMN.sheet.in.h:12
-msgid "End Event - Cancel"
-msgstr "结束事件 - 取消"
+msgid "Intermediate Event — Timer"
+msgstr "中间事件 — 计时"
 
 #: ../sheets/BPMN.sheet.in.h:13
-msgid "End Event - Compensation"
-msgstr "结束事件 - 补偿"
+msgid "Intermediate Event — Error"
+msgstr "中间事件 — 错误"
 
 #: ../sheets/BPMN.sheet.in.h:14
-msgid "End Event - Error"
-msgstr "结束事件 - 错误"
+msgid "Intermediate Event — Cancel"
+msgstr "中间事件 — 取消"
 
 #: ../sheets/BPMN.sheet.in.h:15
-msgid "End Event - Link"
-msgstr "结束事件 - 连结"
+msgid "Intermediate Event — Compensation"
+msgstr "中间事件 — 补偿"
 
 #: ../sheets/BPMN.sheet.in.h:16
-msgid "End Event - Message"
-msgstr "结束事件 - 信息"
+msgid "Intermediate Event — Rule"
+msgstr "中间事件 — 规则"
 
 #: ../sheets/BPMN.sheet.in.h:17
-msgid "End Event - Multiple"
-msgstr "结束事件 - 多重"
+msgid "Intermediate Event — Link"
+msgstr "中间事件 — 连接"
 
 #: ../sheets/BPMN.sheet.in.h:18
-msgid "End Event - Terminate"
-msgstr "结束事件 - 终结"
+msgid "Intermediate Event — Multiple"
+msgstr "中间事件 — 多重"
 
 #: ../sheets/BPMN.sheet.in.h:19
-msgid "Exclusive (XOR) Data Based"
-msgstr "唯一的 (XOR) 资料基地"
+msgid "End Event"
+msgstr "结束事件"
 
 #: ../sheets/BPMN.sheet.in.h:20
-msgid "Exclusive (XOR) Event Based"
-msgstr "唯一的 (XOR) 事件基地"
+msgid "End Event — Message"
+msgstr "结束事件 — 信息"
 
 #: ../sheets/BPMN.sheet.in.h:21
-msgid "Gateway"
-msgstr "网关"
+msgid "End Event — Error"
+msgstr "结束事件 — 错误"
 
 #: ../sheets/BPMN.sheet.in.h:22
-msgid "Group"
-msgstr "组"
+msgid "End Event — Cancel"
+msgstr "结束事件 — 取消"
 
 #: ../sheets/BPMN.sheet.in.h:23
-msgid "Inclusive (OR)"
-msgstr "包括(OR)"
+msgid "End Event — Compensation"
+msgstr "结束事件 — 补偿"
 
 #: ../sheets/BPMN.sheet.in.h:24
-msgid "Intermediate Event"
-msgstr "中间事件"
+msgid "End Event — Link"
+msgstr "结束事件 — 连结"
 
 #: ../sheets/BPMN.sheet.in.h:25
-msgid "Intermediate Event - Cancel"
-msgstr "中间事件 - 取消"
+msgid "End Event — Multiple"
+msgstr "结束事件 — 多重"
 
 #: ../sheets/BPMN.sheet.in.h:26
-msgid "Intermediate Event - Compensation"
-msgstr "中间事件 - 补偿"
+msgid "End Event — Terminate"
+msgstr "结束事件 — 终结"
 
 #: ../sheets/BPMN.sheet.in.h:27
-msgid "Intermediate Event - Error"
-msgstr "中间事件 - 错误"
+msgid "Gateway"
+msgstr "网关"
 
 #: ../sheets/BPMN.sheet.in.h:28
-msgid "Intermediate Event - Link"
-msgstr "中间事件 - 连接"
+msgid "Exclusive (XOR) Data Based"
+msgstr "唯一的 (XOR) 资料基地"
 
 #: ../sheets/BPMN.sheet.in.h:29
-msgid "Intermediate Event - Message"
-msgstr "中间事件 - 信息"
+msgid "Exclusive (XOR) Event Based"
+msgstr "唯一的 (XOR) 事件基地"
 
 #: ../sheets/BPMN.sheet.in.h:30
-msgid "Intermediate Event - Multiple"
-msgstr "中间事件 - 多重"
+msgid "Inclusive (OR)"
+msgstr "包括(OR)"
 
 #: ../sheets/BPMN.sheet.in.h:31
-msgid "Intermediate Event - Rule"
-msgstr "中间事件 - 规则"
+msgid "Complex"
+msgstr "复合"
 
 #: ../sheets/BPMN.sheet.in.h:32
-msgid "Intermediate Event - Timer"
-msgstr "中间事件 - 计时"
-
-#: ../sheets/BPMN.sheet.in.h:33
-msgid "Looping Collapsed Sub-Process"
-msgstr "回环折叠子进程"
+msgid "Parallel (AND)"
+msgstr "平行(AND)"
 
 #: ../sheets/BPMN.sheet.in.h:34
-msgid "Multiple Instance Collapsed Sub-Process"
-msgstr "多重实例折叠子进程"
+msgid "Activity Looping"
+msgstr "活动回路"
 
 #: ../sheets/BPMN.sheet.in.h:35
 msgid "Multiple Instance Task"
 msgstr "多重实例工作"
 
 #: ../sheets/BPMN.sheet.in.h:36
-msgid "Parallel (AND)"
-msgstr "平行(AND)"
+msgid "Compensation Task"
+msgstr "补偿工作"
 
 #: ../sheets/BPMN.sheet.in.h:37
-msgid "Start Event"
-msgstr "起始事件"
+msgid "Collapsed Sub-Process"
+msgstr "折叠子进程"
 
 #: ../sheets/BPMN.sheet.in.h:38
-msgid "Start Event - Link"
-msgstr "起始事件 - 连接"
+msgid "Looping Collapsed Sub-Process"
+msgstr "回环折叠子进程"
 
 #: ../sheets/BPMN.sheet.in.h:39
-msgid "Start Event - Message"
-msgstr "起始事件 - 信息"
+msgid "Multiple Instance Collapsed Sub-Process"
+msgstr "多重实例折叠子进程"
 
 #: ../sheets/BPMN.sheet.in.h:40
-msgid "Start Event - Multiple"
-msgstr "起始事件 - 多重"
+msgid "Ad-Hoc Collapsed Sub-Process"
+msgstr "临时(Ad-Hoc) 折叠子进程"
 
 #: ../sheets/BPMN.sheet.in.h:41
-msgid "Start Event - Rule"
-msgstr "起始事件 - 规则"
+msgid "Compensation Collapsed Sub-Process"
+msgstr "补偿折叠子进程"
 
 #: ../sheets/BPMN.sheet.in.h:42
-msgid "Start Event - Timer"
-msgstr "起始事件 - 计时"
-
-#: ../sheets/BPMN.sheet.in.h:44
-msgid "Text Annotation"
-msgstr "文字注解"
+msgid "Group"
+msgstr "组"
 
-#: ../sheets/BPMN.sheet.in.h:45
+#: ../sheets/BPMN.sheet.in.h:43
 msgid "Transaction"
 msgstr "事务"
 
-#: ../sheets/ChemEng.sheet.in.h:1
-msgid "AC Generator"
-msgstr "交流发电机"
+#: ../sheets/BPMN.sheet.in.h:44
+msgid "Data Object"
+msgstr "数据对象"
 
+#: ../sheets/BPMN.sheet.in.h:45
+msgid "Text Annotation"
+msgstr "文字注解"
+
+#. For: zenith
 #: ../sheets/ChemEng.sheet.in.h:2
-msgid "Air Cooler"
-msgstr "空气冷卻器"
+msgid "ChemEng"
+msgstr "化学工程"
 
 #: ../sheets/ChemEng.sheet.in.h:3
-msgid "Autoclave"
-msgstr "蒸气灭菌"
+msgid "Collection for chemical engineering"
+msgstr "化学工程图集"
 
 #: ../sheets/ChemEng.sheet.in.h:4
-msgid "Axial Flow Fan"
-msgstr "轴式气流扇"
+msgid "Fan or Stirrer"
+msgstr "风扇或搅拌器"
 
 #: ../sheets/ChemEng.sheet.in.h:5
-msgid "Basic Filter"
-msgstr "基本过滤器"
+msgid "Spraying Device"
+msgstr "喷雾设备"
 
 #: ../sheets/ChemEng.sheet.in.h:6
-msgid "Centrifugal Pump or Fan"
-msgstr "离心式泵或风扇"
+msgid "Pneumatic Line"
+msgstr "空气压力管"
 
 #: ../sheets/ChemEng.sheet.in.h:7
-msgid "Centrifuge"
-msgstr "离心机"
+msgid "Pneumatic Line, vertical"
+msgstr "空气压力管,垂直"
 
-#. For: zenith
 #: ../sheets/ChemEng.sheet.in.h:9
-msgid "ChemEng"
-msgstr "化学工程"
+msgid "Simple Heat Exchanger"
+msgstr "简易交换器"
 
 #: ../sheets/ChemEng.sheet.in.h:10
-msgid "Clarifier or Settling Tank"
-msgstr "净化或沉淀池"
+msgid "Simple Heat Exchanger, vertical"
+msgstr "简易交换器,垂直"
 
 #: ../sheets/ChemEng.sheet.in.h:11
-msgid "Collection for chemical engineering"
-msgstr "化学工程图集"
+msgid "Water Cooler"
+msgstr "冷水机"
 
 #: ../sheets/ChemEng.sheet.in.h:12
-msgid "Compressor or Turbine"
-msgstr "压缩机或涡轮机"
+msgid "Water Cooler, vertical"
+msgstr "冷水机,垂直"
 
 #: ../sheets/ChemEng.sheet.in.h:13
-msgid "Covered tank"
-msgstr "有盖子的水槽"
+msgid "Fixed-Sheet Exchanger"
+msgstr "Fixed-Sheet 交换器"
 
 #: ../sheets/ChemEng.sheet.in.h:14
-msgid "Cyclone and hydrocyclone"
-msgstr "旋流器和水力旋流器"
+msgid "Floating-Head or U-Tube Exchanger"
+msgstr "Floating-Head or U-Tube 交换器"
 
 #: ../sheets/ChemEng.sheet.in.h:15
-msgid "Double-Pipe Exchanger"
-msgstr "套管交换器"
+msgid "Kettle Reboiler"
+msgstr "Kettle Reboiler"
 
 #: ../sheets/ChemEng.sheet.in.h:16
-msgid "Ejector or Injector"
-msgstr "喷射器或注入器"
+msgid "Air Cooler"
+msgstr "空气冷卻器"
 
 #: ../sheets/ChemEng.sheet.in.h:17
-msgid "Fan or Stirrer"
-msgstr "风扇或搅拌器"
+msgid "Forced-Flow Air Cooler"
+msgstr "Forced-Flow Air Cooler"
 
 #: ../sheets/ChemEng.sheet.in.h:18
-msgid "Fixed-Sheet Exchanger"
-msgstr "Fixed-Sheet 交换器"
+msgid "Induced-Flow Air Cooler"
+msgstr "Induced-Flow Air Cooler"
 
 #: ../sheets/ChemEng.sheet.in.h:19
-msgid "Floating-Head or U-Tube Exchanger"
-msgstr "Floating-Head or U-Tube 交换器"
+msgid "Plate Exchanger"
+msgstr "平板式交换器"
 
 #: ../sheets/ChemEng.sheet.in.h:20
-msgid "Fluid Contacting Vessel, simple"
-msgstr "Fluid Contacting Vessel, simple"
+msgid "Double-Pipe Exchanger"
+msgstr "套管交换器"
 
 #: ../sheets/ChemEng.sheet.in.h:21
-msgid "Forced-Flow Air Cooler"
-msgstr "Forced-Flow Air Cooler"
+msgid "Heating/Cooling Coil"
+msgstr "Heating/Cooling Coil"
 
 #: ../sheets/ChemEng.sheet.in.h:22
-msgid "Gas Holder, basic"
-msgstr "Gas Holder, basic"
+msgid "Heating/Cooling Coil, vertical"
+msgstr "Heating/Cooling Coil, vertical"
 
 #: ../sheets/ChemEng.sheet.in.h:23
-msgid "Heating/Cooling Coil"
-msgstr "Heating/Cooling Coil"
+msgid "Simple Furnace"
+msgstr "简易炉"
 
 #: ../sheets/ChemEng.sheet.in.h:24
-msgid "Heating/Cooling Coil, vertical"
-msgstr "Heating/Cooling Coil, vertical"
+msgid "Simple Vessel"
+msgstr "简易容器"
 
 #: ../sheets/ChemEng.sheet.in.h:25
-msgid "Induced-Flow Air Cooler"
-msgstr "Induced-Flow Air Cooler"
+msgid "Knock-out Drum (with demister pad)"
+msgstr "Knock-out Drum (with demister pad)"
 
 #: ../sheets/ChemEng.sheet.in.h:26
-msgid "Kettle Reboiler"
-msgstr "Kettle Reboiler"
+msgid "Tray Column, simple"
+msgstr "普通的板式塔"
 
 #: ../sheets/ChemEng.sheet.in.h:27
-msgid "Knock-out Drum (with demister pad)"
-msgstr "Knock-out Drum (with demister pad)"
+msgid "Tray Column, detailed"
+msgstr "复杂的板式塔"
+
+#: ../sheets/ChemEng.sheet.in.h:28
+msgid "Fluid Contacting Vessel, simple"
+msgstr "Fluid Contacting Vessel, simple"
 
 #: ../sheets/ChemEng.sheet.in.h:29
-msgid "Mixer"
-msgstr "混合器"
+msgid "Reactor or Absorption Vessel, simple"
+msgstr "普通的反应器或吸收容器"
 
 #: ../sheets/ChemEng.sheet.in.h:30
-msgid "Open Tank"
-msgstr "打开水槽"
+msgid "Autoclave"
+msgstr "蒸气灭菌"
 
 #: ../sheets/ChemEng.sheet.in.h:31
-msgid "Plate Exchanger"
-msgstr "平板式交换器"
+msgid "Open Tank"
+msgstr "打开水槽"
 
 #: ../sheets/ChemEng.sheet.in.h:32
-msgid "Pneumatic Line"
-msgstr "空气压力管"
+msgid "Clarifier or Settling Tank"
+msgstr "净化或沉淀池"
 
 #: ../sheets/ChemEng.sheet.in.h:33
-msgid "Pneumatic Line, vertical"
-msgstr "空气压力管,垂直"
+msgid "Sealed Tank"
+msgstr "密封水槽"
 
 #: ../sheets/ChemEng.sheet.in.h:34
-msgid "Positive Displacement Rotary Pump or Compressor"
-msgstr "正确的换置旋转的抽水机或压缩机"
+msgid "Covered tank"
+msgstr "有盖子的水槽"
 
 #: ../sheets/ChemEng.sheet.in.h:35
-msgid "Pressure Relief Valve"
-msgstr "减压阀"
+msgid "Tank with Fixed Roof"
+msgstr "固定顶槽"
 
 #: ../sheets/ChemEng.sheet.in.h:36
-msgid "Reactor or Absorption Vessel, simple"
-msgstr "普通的反应器或吸收容器"
+msgid "Tank with Floating Roof"
+msgstr "浮动顶槽"
 
 #: ../sheets/ChemEng.sheet.in.h:37
-msgid "Reciprocating Compressor or Pump"
-msgstr "交互的压缩机或抽水机"
+msgid "Storage Sphere"
+msgstr "球形存储器"
 
 #: ../sheets/ChemEng.sheet.in.h:38
-msgid "Regulable Valve"
-msgstr "可调整的阀"
+msgid "Gas Holder, basic"
+msgstr "Gas Holder, basic"
 
 #: ../sheets/ChemEng.sheet.in.h:39
-msgid "Regulable Valve, vertical"
-msgstr "可调整的阀,垂直"
+msgid "Centrifugal Pump or Fan"
+msgstr "离心式泵或风扇"
 
 #: ../sheets/ChemEng.sheet.in.h:40
-msgid "Sealed Tank"
-msgstr "密封水槽"
+msgid "Positive Displacement Rotary Pump or Compressor"
+msgstr "正确的换置旋转的抽水机或压缩机"
 
 #: ../sheets/ChemEng.sheet.in.h:41
-msgid "Simple Furnace"
-msgstr "简易炉"
+msgid "Reciprocating Compressor or Pump"
+msgstr "交互的压缩机或抽水机"
 
 #: ../sheets/ChemEng.sheet.in.h:42
-msgid "Simple Heat Exchanger"
-msgstr "简易交换器"
+msgid "Axial Flow Fan"
+msgstr "轴式气流扇"
 
 #: ../sheets/ChemEng.sheet.in.h:43
-msgid "Simple Heat Exchanger, vertical"
-msgstr "简易交换器,垂直"
+msgid "Compressor or Turbine"
+msgstr "压缩机或涡轮机"
 
 #: ../sheets/ChemEng.sheet.in.h:44
-msgid "Simple Vessel"
-msgstr "简易容器"
+msgid "Ejector or Injector"
+msgstr "喷射器或注入器"
 
 #: ../sheets/ChemEng.sheet.in.h:45
-msgid "Spray Drier"
-msgstr "喷雾式干燥机"
+msgid "AC Generator"
+msgstr "交流发电机"
 
 #: ../sheets/ChemEng.sheet.in.h:46
-msgid "Spraying Device"
-msgstr "喷雾设备"
+msgid "Valve"
+msgstr "阀"
 
 #: ../sheets/ChemEng.sheet.in.h:47
-msgid "Storage Sphere"
-msgstr "球形存储器"
+msgid "Valve, vertical"
+msgstr "阀, 垂直"
 
 #: ../sheets/ChemEng.sheet.in.h:48
-msgid "Tank with Fixed Roof"
-msgstr "固定顶槽"
+msgid "Regulable Valve"
+msgstr "可调整的阀"
 
 #: ../sheets/ChemEng.sheet.in.h:49
-msgid "Tank with Floating Roof"
-msgstr "浮动顶槽"
+msgid "Regulable Valve, vertical"
+msgstr "可调整的阀,垂直"
 
 #: ../sheets/ChemEng.sheet.in.h:50
-msgid "Tray Column, detailed"
-msgstr "复杂的板式塔"
+msgid "Basic Filter"
+msgstr "基本过滤器"
 
 #: ../sheets/ChemEng.sheet.in.h:51
-msgid "Tray Column, simple"
-msgstr "普通的板式塔"
+msgid "Mixer"
+msgstr "混合器"
 
 #: ../sheets/ChemEng.sheet.in.h:52
-msgid "Valve"
-msgstr "阀"
+msgid "Cyclone and hydrocyclone"
+msgstr "旋流器和水力旋流器"
 
 #: ../sheets/ChemEng.sheet.in.h:53
-msgid "Valve, vertical"
-msgstr "阀, 垂直"
+msgid "Spray Drier"
+msgstr "喷雾式干燥机"
 
 #: ../sheets/ChemEng.sheet.in.h:54
-msgid "Water Cooler"
-msgstr "冷水机"
+msgid "Centrifuge"
+msgstr "离心机"
 
 #: ../sheets/ChemEng.sheet.in.h:55
-msgid "Water Cooler, vertical"
-msgstr "冷水机,垂直"
+msgid "Pressure Relief Valve"
+msgstr "减压阀"
+
+#: ../sheets/chronogram.sheet.in.h:1
+msgid "Chronogram"
+msgstr "纪年铭"
+
+#: ../sheets/chronogram.sheet.in.h:2
+msgid "Objects to design chronogram charts"
+msgstr "用于设计纪年铭图表的对象"
+
+#: ../sheets/chronogram.sheet.in.h:3
+msgid "Time scale"
+msgstr "时间刻度"
+
+#: ../sheets/chronogram.sheet.in.h:4
+msgid "Data line"
+msgstr "数据线"
 
 #: ../sheets/Circuit.sheet.in.h:1
 msgid "Circuit"
@@ -7322,2100 +7162,688 @@ msgid "Components for circuit diagrams"
 msgstr "电路图的部件"
 
 #: ../sheets/Circuit.sheet.in.h:3
-msgid "Ground point"
-msgstr "接地点"
+msgid "Vertically aligned resistor"
+msgstr "竖直排列的电阻器"
 
 #: ../sheets/Circuit.sheet.in.h:4
-msgid "Horizontal jumper"
-msgstr "水平的跳接器"
+msgid "Horizontally aligned inductor"
+msgstr "水平排列的电感器"
 
 #: ../sheets/Circuit.sheet.in.h:5
-msgid "Horizontally aligned LED"
-msgstr "水平排列的 LED"
+msgid "Vertically aligned inductor"
+msgstr "竖直排列的电感器"
 
 #: ../sheets/Circuit.sheet.in.h:6
-msgid "Horizontally aligned capacitor"
-msgstr "水平排列的电容器"
+msgid "Horizontally aligned resistor"
+msgstr "水平排列的电阻器"
 
 #: ../sheets/Circuit.sheet.in.h:7
-msgid "Horizontally aligned diode"
-msgstr "水平排列的二极管"
+msgid "Vertically aligned resistor (European)"
+msgstr "竖直排列的电阻器 (欧洲)"
 
 #: ../sheets/Circuit.sheet.in.h:8
-msgid "Horizontally aligned fuse"
-msgstr "水平排列的保险丝"
-
-#: ../sheets/Circuit.sheet.in.h:9
-msgid "Horizontally aligned inductor"
-msgstr "水平排列的电感器"
-
-#: ../sheets/Circuit.sheet.in.h:10
 msgid "Horizontally aligned inductor (European)"
 msgstr "水平排列的电感器(欧洲)"
 
-#: ../sheets/Circuit.sheet.in.h:11
-msgid "Horizontally aligned powersource"
-msgstr "水平排列的电源"
-
-#: ../sheets/Circuit.sheet.in.h:12
-msgid "Horizontally aligned resistor"
-msgstr "水平排列的电阻器"
+#: ../sheets/Circuit.sheet.in.h:9
+msgid "Vertically aligned inductor (European)"
+msgstr "竖直排列的电感器(欧洲)"
 
-#: ../sheets/Circuit.sheet.in.h:13
+#: ../sheets/Circuit.sheet.in.h:10
 msgid "Horizontally aligned resistor (European)"
 msgstr "水平排列的电阻器(欧洲)"
 
-#: ../sheets/Circuit.sheet.in.h:14
-msgid "Horizontally aligned zener diode"
-msgstr "水平排列的齐纳二极管"
-
-#: ../sheets/Circuit.sheet.in.h:15
-msgid "Lamp"
-msgstr "灯"
-
-#: ../sheets/Circuit.sheet.in.h:16 ../sheets/ciscomisc.sheet.in.h:30
-msgid "Microphone"
-msgstr "麦克风"
+#: ../sheets/Circuit.sheet.in.h:11
+msgid "Horizontally aligned capacitor"
+msgstr "水平排列的电容器"
 
-#: ../sheets/Circuit.sheet.in.h:17
-msgid "NMOS transistor"
-msgstr "NMOS 晶体管"
+#: ../sheets/Circuit.sheet.in.h:12
+msgid "Vertically aligned capacitor"
+msgstr "竖直排列的电容器"
 
 #.
 #.
-#: ../sheets/Circuit.sheet.in.h:20
+#: ../sheets/Circuit.sheet.in.h:15
 msgid "NPN bipolar transistor"
 msgstr "NPN 双极性晶体管"
 
-#: ../sheets/Circuit.sheet.in.h:21
-msgid "Operational amplifier"
-msgstr "运算放大器"
-
-#: ../sheets/Circuit.sheet.in.h:22
-msgid "PMOS transistor"
-msgstr "PMOS 晶体管"
-
 #.
 #.
-#: ../sheets/Circuit.sheet.in.h:25
+#: ../sheets/Circuit.sheet.in.h:18
 msgid "PNP bipolar transistor"
 msgstr "PNP 双极性晶体管"
 
-#: ../sheets/Circuit.sheet.in.h:26 ../sheets/ciscomisc.sheet.in.h:42
-msgid "Speaker"
-msgstr "扬声器"
-
-#: ../sheets/Circuit.sheet.in.h:27
-msgid "Vertically aligned LED"
-msgstr "竖直排列的 LED"
-
-#: ../sheets/Circuit.sheet.in.h:28
-msgid "Vertically aligned capacitor"
-msgstr "竖直排列的电容器"
+#: ../sheets/Circuit.sheet.in.h:19
+msgid "Horizontally aligned diode"
+msgstr "水平排列的二极管"
 
-#: ../sheets/Circuit.sheet.in.h:29
+#: ../sheets/Circuit.sheet.in.h:20
 msgid "Vertically aligned diode"
 msgstr "竖直排列的二极管"
 
-#: ../sheets/Circuit.sheet.in.h:30
-msgid "Vertically aligned fuse"
-msgstr "竖直排列的保险丝"
-
-#: ../sheets/Circuit.sheet.in.h:31
-msgid "Vertically aligned inductor"
-msgstr "竖直排列的电感器"
-
-#: ../sheets/Circuit.sheet.in.h:32
-msgid "Vertically aligned inductor (European)"
-msgstr "竖直排列的电感器(欧洲)"
-
-#: ../sheets/Circuit.sheet.in.h:33
-msgid "Vertically aligned powersource"
-msgstr "竖直排列的电源"
-
-#: ../sheets/Circuit.sheet.in.h:34
-msgid "Vertically aligned resistor"
-msgstr "竖直排列的电阻器"
-
-#: ../sheets/Circuit.sheet.in.h:35
-msgid "Vertically aligned resistor (European)"
-msgstr "竖直排列的电阻器 (欧洲)"
+#: ../sheets/Circuit.sheet.in.h:21
+msgid "Horizontally aligned zener diode"
+msgstr "水平排列的齐纳二极管"
 
-#: ../sheets/Circuit.sheet.in.h:36
+#: ../sheets/Circuit.sheet.in.h:22
 msgid "Vertically aligned zener diode"
 msgstr "竖直排列的齐纳二极管"
 
-#: ../sheets/Contact.sheet.in.h:1
-msgid "'if not' (normally closed) ladder contact"
-msgstr "“if not” (常闭) 连接 ladder"
-
-#: ../sheets/Contact.sheet.in.h:2
-msgid "'if' (normally open) ladder contact"
-msgstr "“if” (常开) 连接 ladder"
-
-#: ../sheets/Contact.sheet.in.h:3
-msgid "'jump' output variable"
-msgstr "“jump” 输出变量"
-
-#: ../sheets/Contact.sheet.in.h:4
-msgid "'reset' output variable"
-msgstr "“reset” 输出变量"
-
-#: ../sheets/Contact.sheet.in.h:5
-msgid "'set' output variable"
-msgstr "“set” 输出变量"
-
-#: ../sheets/Contact.sheet.in.h:6
-msgid "Components for LADDER circuits"
-msgstr "LADDER 电路的部件"
-
-#: ../sheets/Contact.sheet.in.h:7
-msgid "Ladder"
-msgstr "Ladder"
-
-#: ../sheets/Contact.sheet.in.h:8
-msgid "Negative output variable"
-msgstr "负输出变量"
-
-#: ../sheets/Contact.sheet.in.h:9
-msgid "Power-saved 'reset' output variable"
-msgstr "节电“reset”输出变量"
-
-#: ../sheets/Contact.sheet.in.h:10
-msgid "Power-saved 'set' output variable"
-msgstr "节电“set”输出变量"
-
-#: ../sheets/Contact.sheet.in.h:11
-msgid "Power-saved negative output variable"
-msgstr "节电的负输出变量"
-
-#: ../sheets/Contact.sheet.in.h:12
-msgid "Power-saved simple output variable"
-msgstr "节电的简单输出变量"
-
-#: ../sheets/Contact.sheet.in.h:13
-msgid "Receptivity output variable"
-msgstr "可接接度输出变量"
-
-#: ../sheets/Contact.sheet.in.h:14
-msgid "Simple output variable"
-msgstr "简单的输出变量"
-
-#: ../sheets/Cybernetics.sheet.in.h:1
-msgid "Constant factor below -1"
-msgstr "因定系统小于 -1"
-
-#: ../sheets/Cybernetics.sheet.in.h:2
-msgid "Constant factor between 0 and -1"
-msgstr "固定系数 0 和 -1"
-
-#: ../sheets/Cybernetics.sheet.in.h:3
-msgid "Constant factor between 0 and 1"
-msgstr "固定系数 0 和 1"
-
-#: ../sheets/Cybernetics.sheet.in.h:4
-msgid "Constant factor greater 1"
-msgstr "固定系数大于 1"
-
-#: ../sheets/Cybernetics.sheet.in.h:5
-msgid "Constant negative shift on the y-axis"
-msgstr "y 轴的负向平移"
-
-#: ../sheets/Cybernetics.sheet.in.h:6
-msgid "Constant positive shift on the y-axis"
-msgstr "y 轴的正向平移"
-
-#: ../sheets/Cybernetics.sheet.in.h:7
-msgid "Cybernetics"
-msgstr "控制论"
-
-#: ../sheets/Cybernetics.sheet.in.h:8
-msgid "Elements of cybernetic circuits"
-msgstr "控制电路的部件"
-
-#: ../sheets/Cybernetics.sheet.in.h:9
-msgid "Full wave rectifier (absolute value)"
-msgstr "全波整流器(绝对值)"
-
-#: ../sheets/Cybernetics.sheet.in.h:10
-msgid "Half wave rectifier or ramp input"
-msgstr "半波整流器或 ramp 输入"
-
-#: ../sheets/Cybernetics.sheet.in.h:11
-msgid "High pass filter"
-msgstr "高通滤波器"
-
-#: ../sheets/Cybernetics.sheet.in.h:12
-msgid "Integrator - input bottom"
-msgstr "积分器 - 输入(下)"
-
-#: ../sheets/Cybernetics.sheet.in.h:13
-msgid "Integrator - input left"
-msgstr "积分器 - 输入(左)"
-
-#: ../sheets/Cybernetics.sheet.in.h:14
-msgid "Integrator - input right"
-msgstr "积分器 - 输入(右)"
-
-#: ../sheets/Cybernetics.sheet.in.h:15
-msgid "Integrator - input top"
-msgstr "积分器 - 输入(上)"
-
-#: ../sheets/Cybernetics.sheet.in.h:16
-msgid "Low pass filter"
-msgstr "低通滤波器"
-
-#: ../sheets/Cybernetics.sheet.in.h:17
-msgid "Product"
-msgstr "产物"
-
-#: ../sheets/Cybernetics.sheet.in.h:18
-msgid "Relay characteristic (sigma)"
-msgstr "继电器特性(sigma)"
-
-#: ../sheets/Cybernetics.sheet.in.h:19
-msgid "Saturation characteristic"
-msgstr "饱和特性"
-
-#: ../sheets/Cybernetics.sheet.in.h:20
-msgid "Sensor - bottom"
-msgstr "传感器 - (下)"
-
-#: ../sheets/Cybernetics.sheet.in.h:21
-msgid "Sensor - left"
-msgstr "传感器 - (左)"
-
-#: ../sheets/Cybernetics.sheet.in.h:22
-msgid "Sensor - right"
-msgstr "传感器 - (右)"
-
-#: ../sheets/Cybernetics.sheet.in.h:23
-msgid "Sensor - top"
-msgstr "传感器 - (上)"
-
-#: ../sheets/Cybernetics.sheet.in.h:24
-msgid "Sigmoid characteristic"
-msgstr "双弯曲特性"
-
-#: ../sheets/Cybernetics.sheet.in.h:25
-msgid "Sine characteristic or input"
-msgstr "正弦特性或输出"
-
-#: ../sheets/Cybernetics.sheet.in.h:26
-msgid "Sum"
-msgstr "总数"
-
-#: ../sheets/Cybernetics.sheet.in.h:27
-msgid "Sum, subtracting bottom input"
-msgstr "总数, 减去下方输入"
-
-#: ../sheets/Cybernetics.sheet.in.h:28
-msgid "Sum, subtracting left input"
-msgstr "总数, 减去左方输入"
-
-#: ../sheets/Cybernetics.sheet.in.h:29
-msgid "Sum, subtracting right input"
-msgstr "总数, 减去右方输入"
-
-#: ../sheets/Cybernetics.sheet.in.h:30
-msgid "Sum, subtracting top input"
-msgstr "总数, 减去上方输入"
-
-#: ../sheets/Cybernetics.sheet.in.h:31
-msgid "Template for custom characteristics"
-msgstr "自选特性的模板"
-
-#: ../sheets/Cybernetics.sheet.in.h:32
-msgid "Time delay"
-msgstr "时间延迟"
-
-#: ../sheets/Database.sheet.in.h:1
-msgid "Attribute compound"
-msgstr "属性复合"
-
-#: ../sheets/Database.sheet.in.h:2
-msgid "Database"
-msgstr "数据库"
-
-#: ../sheets/Database.sheet.in.h:3
-msgid "Editor for Database Table Relation Diagrams"
-msgstr "数据库表关系图编辑器"
-
-#: ../sheets/ER.sheet.in.h:2
-msgid "ER"
-msgstr "ER"
-
-#: ../sheets/ER.sheet.in.h:3
-msgid "Editor for Entity Relations Diagrams"
-msgstr "Entity Relations 图编辑器"
-
-#: ../sheets/ER.sheet.in.h:5
-msgid "Participation"
-msgstr "参与"
-
-#: ../sheets/ER.sheet.in.h:7
-msgid "Weak entity"
-msgstr "弱实体"
-
-#: ../sheets/Electric.sheet.in.h:1
-msgid "Components for electric circuits"
-msgstr "电路部件"
-
-#: ../sheets/Electric.sheet.in.h:2 ../sheets/Pneumatic.sheet.in.h:7
-msgid "Connection point"
-msgstr "连接点"
-
-#: ../sheets/Electric.sheet.in.h:3
-msgid "Electric"
-msgstr "电"
-
-#: ../sheets/Electric.sheet.in.h:4
-msgid "Lamp or indicator light (horizontal)"
-msgstr "灯或指示灯(水平)"
-
-#: ../sheets/Electric.sheet.in.h:5
-msgid "Lamp or indicator light (vertical)"
-msgstr "灯或指示灯(垂直)"
-
-#: ../sheets/Electric.sheet.in.h:6
-msgid "Normally closed contact (horizontal)"
-msgstr "常闭触点(水平)"
-
-#: ../sheets/Electric.sheet.in.h:7
-msgid "Normally closed contact (vertical)"
-msgstr "常闭触点(垂直)"
-
-#: ../sheets/Electric.sheet.in.h:8
-msgid "Normally closed position switch (horizontal)"
-msgstr "常闭位置开关(水平)"
-
-#: ../sheets/Electric.sheet.in.h:9
-msgid "Normally closed position switch (vertical)"
-msgstr "常闭位置开关(垂直)"
-
-#: ../sheets/Electric.sheet.in.h:10
-msgid "Normally open contact (horizontal)"
-msgstr "常开触点(水平)"
-
-#: ../sheets/Electric.sheet.in.h:11
-msgid "Normally open contact (vertical)"
-msgstr "常开触点(垂直)"
-
-#: ../sheets/Electric.sheet.in.h:12
-msgid "Normally open position switch (horizontal)"
-msgstr "常开位置开关(水平)"
-
-#: ../sheets/Electric.sheet.in.h:13
-msgid "Normally open position switch (vertical)"
-msgstr "常开位置开关(垂直)"
-
-#: ../sheets/Electric.sheet.in.h:14
-msgid "Relay (horizontal)"
-msgstr "继电器(水平)"
-
-#: ../sheets/Electric.sheet.in.h:15
-msgid "Relay (vertical)"
-msgstr "继电器(垂直)"
-
-#: ../sheets/Electric.sheet.in.h:16
-msgid "The command organ of a relay (horizontal)"
-msgstr "继电器命令元件(水平)"
-
-#: ../sheets/Electric.sheet.in.h:17
-msgid "The command organ of a relay (vertical)"
-msgstr "继电器命令元件(垂直)"
-
-#: ../sheets/FS.sheet.in.h:1
-msgid "Editor for Function Structure Diagrams."
-msgstr "函数结构图编辑器。"
-
-#: ../sheets/FS.sheet.in.h:2
-msgid "FS"
-msgstr "FS"
-
-#: ../sheets/FS.sheet.in.h:3
-msgid "Flow"
-msgstr "流程"
-
-#: ../sheets/FS.sheet.in.h:4
-msgid "Function"
-msgstr "函数"
-
-#: ../sheets/FS.sheet.in.h:5
-msgid "Orthogonal polyline flow"
-msgstr "创建一个正交多线流"
-
-#. XXX
-#: ../sheets/Flowchart.sheet.in.h:2
-msgid "Collate"
-msgstr "对照"
-
-#: ../sheets/Flowchart.sheet.in.h:3
-msgid "Connector"
-msgstr "连接器"
-
-#: ../sheets/Flowchart.sheet.in.h:4
-msgid "Data source"
-msgstr "资料来源"
-
-#: ../sheets/Flowchart.sheet.in.h:5 ../sheets/SDL.sheet.in.h:4
-msgid "Decision"
-msgstr "决定"
-
-#: ../sheets/Flowchart.sheet.in.h:6
-msgid "Delay"
-msgstr "延迟"
-
-#: ../sheets/Flowchart.sheet.in.h:8
-msgid "Document"
-msgstr "文档"
-
-#: ../sheets/Flowchart.sheet.in.h:11
-msgid "Input/Output"
-msgstr "输入/输出"
-
-#: ../sheets/Flowchart.sheet.in.h:12
-msgid "Internal storage"
-msgstr "内部的存储器"
-
-#: ../sheets/Flowchart.sheet.in.h:13
-msgid "Magnetic disk"
-msgstr "磁盘"
-
-#: ../sheets/Flowchart.sheet.in.h:14
-msgid "Magnetic drum"
-msgstr "磁鼓"
-
-#: ../sheets/Flowchart.sheet.in.h:15
-msgid "Magnetic tape"
-msgstr "磁带"
-
-#: ../sheets/Flowchart.sheet.in.h:16
-msgid "Manual input"
-msgstr "手工输入"
-
-#: ../sheets/Flowchart.sheet.in.h:17
-msgid "Manual operation"
-msgstr "手工操作"
-
-#: ../sheets/Flowchart.sheet.in.h:18
-msgid "Merge"
-msgstr "合并"
-
-#: ../sheets/Flowchart.sheet.in.h:19
-msgid "Objects to draw flowcharts"
-msgstr "画流量图的对象"
-
-#. XXX
-#: ../sheets/Flowchart.sheet.in.h:21
-msgid "Off page connector"
-msgstr "脱离页面连接器"
-
-#: ../sheets/Flowchart.sheet.in.h:22
-msgid "Offline storage"
-msgstr "脱机存储"
-
-#: ../sheets/Flowchart.sheet.in.h:23
-msgid "Or"
-msgstr "Or"
-
-#: ../sheets/Flowchart.sheet.in.h:24
-msgid "Predefined process"
-msgstr "预定义的进程"
-
-#: ../sheets/Flowchart.sheet.in.h:25
-msgid "Preparation"
-msgstr "预备"
-
-#: ../sheets/Flowchart.sheet.in.h:26
-msgid "Process/Auxiliary Operation"
-msgstr "程序/辅助操作"
-
-#: ../sheets/Flowchart.sheet.in.h:27
-msgid "Punched card"
-msgstr "穿孔卡片"
-
-#: ../sheets/Flowchart.sheet.in.h:28
-msgid "Punched tape"
-msgstr "穿孔带"
-
-#: ../sheets/Flowchart.sheet.in.h:29
-msgid "Sort"
-msgstr "排序"
-
-#. XXX
-#: ../sheets/Flowchart.sheet.in.h:31
-msgid "Summing junction"
-msgstr "相交点"
-
-#: ../sheets/Flowchart.sheet.in.h:32
-msgid "Terminal Interrupt"
-msgstr "终端中断"
-
-#: ../sheets/Flowchart.sheet.in.h:33
-msgid "Transaction file"
-msgstr "事务文件"
-
-#: ../sheets/Flowchart.sheet.in.h:34
-msgid "Transmittal tape"
-msgstr "传送带"
-
-#: ../sheets/GRAFCET.sheet.in.h:1
-msgid "AND vergent"
-msgstr "AND vergent"
-
-#: ../sheets/GRAFCET.sheet.in.h:2
-msgid "Action to associate to a step"
-msgstr "与步骤相关的动作"
-
-#: ../sheets/GRAFCET.sheet.in.h:3
-msgid "Arc (upward)"
-msgstr "弧形(向上)"
-
-#: ../sheets/GRAFCET.sheet.in.h:4
-msgid "Condition (of an action)"
-msgstr "条件(一个动作的)"
-
-#: ../sheets/GRAFCET.sheet.in.h:5
-msgid "GRAFCET"
-msgstr "GRAFCET"
-
-#: ../sheets/GRAFCET.sheet.in.h:10
-msgid "Macro sub-program call step"
-msgstr "宏子程序调用步骤"
-
-#: ../sheets/GRAFCET.sheet.in.h:11
-msgid "OR vergent"
-msgstr "OR vergent"
-
-#: ../sheets/GRAFCET.sheet.in.h:12
-msgid "Objects to design GRAFCET charts"
-msgstr "设计 GRAFCET 图表所需的对象"
-
-#: ../sheets/GRAFCET.sheet.in.h:14 ../sheets/UML.sheet.in.h:30
-msgid "Transition"
-msgstr "推移"
-
-#: ../sheets/Gane_and_Sarson.sheet.in.h:1
-msgid "Alternate external entity"
-msgstr "替代外部实体"
-
-#: ../sheets/Gane_and_Sarson.sheet.in.h:2
-msgid "Data store"
-msgstr "资料储存"
-
-#: ../sheets/Gane_and_Sarson.sheet.in.h:3
-msgid "External entity"
-msgstr "外部实体"
-
-#. Author: Nicholas Moore, 2005. mailto: shiny nickel gmail com
-#: ../sheets/Gane_and_Sarson.sheet.in.h:5
-msgid "Gane and Sarson"
-msgstr "Gane and Sarson"
-
-#: ../sheets/Gane_and_Sarson.sheet.in.h:6
-msgid "Gane and Sarson DFD"
-msgstr "Gane and Sarson DFD"
-
-#: ../sheets/IsometricMap.sheet.in.h:1
-msgid "Block 1, 2:4"
-msgstr "区块 1, 2:4"
-
-#: ../sheets/IsometricMap.sheet.in.h:2
-msgid "Block 2, 2:8"
-msgstr "区块 2, 2:8"
-
-#: ../sheets/IsometricMap.sheet.in.h:3
-msgid "Block 3, 4:4"
-msgstr "区块 3, 4:4"
-
-#: ../sheets/IsometricMap.sheet.in.h:4
-msgid "Block 4, 4:8"
-msgstr "区块 4, 4:8"
-
-#: ../sheets/IsometricMap.sheet.in.h:5
-msgid "Block 5, 3:3"
-msgstr "区块 5, 3:3"
-
-#: ../sheets/IsometricMap.sheet.in.h:6
-msgid "Block 6, 4:6"
-msgstr "区块 6, 4:6"
-
-#: ../sheets/IsometricMap.sheet.in.h:7
-msgid "Block 7"
-msgstr "区块 7"
-
-#: ../sheets/IsometricMap.sheet.in.h:8
-msgid "Car 1, Front View"
-msgstr "车 1,前视图"
-
-#: ../sheets/IsometricMap.sheet.in.h:9
-msgid "Car 2, Rear View"
-msgstr "车 2,后视图"
-
-#: ../sheets/IsometricMap.sheet.in.h:10
-msgid "Corner 1"
-msgstr "角落 1"
-
-#: ../sheets/IsometricMap.sheet.in.h:11
-msgid "Corner 2"
-msgstr "角落 2"
-
-#: ../sheets/IsometricMap.sheet.in.h:12
-msgid "Crossroads"
-msgstr "交叉点"
-
-#: ../sheets/IsometricMap.sheet.in.h:13
-msgid "Elevated Road"
-msgstr "高架道路"
-
-#: ../sheets/IsometricMap.sheet.in.h:14
-msgid "Factory"
-msgstr "工厂"
-
-#: ../sheets/IsometricMap.sheet.in.h:15
-msgid "Footbridge, Pedestrian Bridge"
-msgstr "行人天桥"
-
-#. use dc:description instead?
-#: ../sheets/IsometricMap.sheet.in.h:17
-msgid "Isometric Directional Map Shapes"
-msgstr "Isometric Directional 地图图形"
-
-#: ../sheets/IsometricMap.sheet.in.h:18
-msgid "Long Straight Road Section"
-msgstr "长直线道路"
-
-#. use dc:title instead?
-#: ../sheets/IsometricMap.sheet.in.h:20
-msgid "Map, Isometric"
-msgstr "地图, Isometric"
-
-#: ../sheets/IsometricMap.sheet.in.h:21
-msgid "One Way Road Sign"
-msgstr "单行道标志"
-
-#: ../sheets/IsometricMap.sheet.in.h:22
-msgid "River"
-msgstr "河流"
-
-#: ../sheets/IsometricMap.sheet.in.h:23
-msgid "Road Section"
-msgstr "道路"
-
-#: ../sheets/IsometricMap.sheet.in.h:24
-msgid "Roof1"
-msgstr "屋顶1"
-
-#: ../sheets/IsometricMap.sheet.in.h:25
-msgid "T-Junction"
-msgstr "三叉路"
-
-#: ../sheets/IsometricMap.sheet.in.h:26
-msgid "Train 1, angled downward"
-msgstr "火车 1,下行"
-
-#: ../sheets/IsometricMap.sheet.in.h:27
-msgid "Train 2, angled upward"
-msgstr "火车 2,上行"
-
-#: ../sheets/IsometricMap.sheet.in.h:28
-msgid "Tree 1"
-msgstr "树 1"
-
-#: ../sheets/Istar.sheet.in.h:1
-msgid "An i* agent"
-msgstr "An i* agent"
-
-#: ../sheets/Istar.sheet.in.h:2
-msgid "An i* decomposition link"
-msgstr "An i* decomposition link"
-
-#: ../sheets/Istar.sheet.in.h:3
-msgid "An i* dependency link"
-msgstr "An i* dependency link"
-
-#: ../sheets/Istar.sheet.in.h:4
-msgid "An i* goal"
-msgstr "An i* goal"
-
-#: ../sheets/Istar.sheet.in.h:5
-msgid "An i* means-ends link"
-msgstr "An i* means-ends link"
-
-#: ../sheets/Istar.sheet.in.h:6
-msgid "An i* negative contribution"
-msgstr "An i* negative contribution"
-
-#: ../sheets/Istar.sheet.in.h:7
-msgid "An i* position"
-msgstr "An i* position"
-
-#: ../sheets/Istar.sheet.in.h:8
-msgid "An i* positive contribution"
-msgstr "An i* positive contribution"
-
-#: ../sheets/Istar.sheet.in.h:9
-msgid "An i* resource"
-msgstr "An i* resource"
-
-#: ../sheets/Istar.sheet.in.h:10
-msgid "An i* role"
-msgstr "An i* role"
-
-#: ../sheets/Istar.sheet.in.h:11
-msgid "An i* softgoal"
-msgstr "An i* softgoal"
-
-#: ../sheets/Istar.sheet.in.h:12
-msgid "An i* task"
-msgstr "An i* task"
-
-#: ../sheets/Istar.sheet.in.h:13
-msgid "An i* unspecified actor"
-msgstr "An i* unspecified actor"
-
-#: ../sheets/Istar.sheet.in.h:14
-msgid "An i* unspecified link"
-msgstr "An i* unspecified link"
-
-#: ../sheets/Istar.sheet.in.h:15
-msgid "Objects to design i* diagrams"
-msgstr "设计 i* 所用的对象"
-
-#: ../sheets/Istar.sheet.in.h:16
-msgid "RE-i*"
-msgstr "RE-i*"
-
-#: ../sheets/Jackson.sheet.in.h:1
-msgid "A Jackson designed domain"
-msgstr "Jackson 设计的域"
-
-#: ../sheets/Jackson.sheet.in.h:2
-msgid "A Jackson given domain"
-msgstr "Jackson 指定的域"
-
-#: ../sheets/Jackson.sheet.in.h:3
-msgid "A Jackson machine domain"
-msgstr "Jackson 机器域"
-
-#: ../sheets/Jackson.sheet.in.h:4
-msgid "A Jackson requirement"
-msgstr "Jackson 必要条件"
-
-#: ../sheets/Jackson.sheet.in.h:5
-msgid "A Jackson requirement phenomenon"
-msgstr "Jackson 需要的现象"
-
-#: ../sheets/Jackson.sheet.in.h:6
-msgid "A Jackson shared phenomenon"
-msgstr "Jackson 分担的现象"
-
-#: ../sheets/Jackson.sheet.in.h:7
-msgid "Objects to design Jackson diagrams"
-msgstr "设计 Jackson 图所用的对象"
-
-#: ../sheets/Jackson.sheet.in.h:8
-msgid "RE-Jackson"
-msgstr "RE-Jackson"
-
-#: ../sheets/KAOS.sheet.in.h:1
-msgid "A KAOS AND refinement"
-msgstr "A KAOS AND refinement"
-
-#: ../sheets/KAOS.sheet.in.h:2
-msgid "A KAOS OR refinement"
-msgstr "A KAOS OR refinement"
-
-#: ../sheets/KAOS.sheet.in.h:3
-msgid "A KAOS agent"
-msgstr "KAOS 代理程序"
-
-#: ../sheets/KAOS.sheet.in.h:4
-msgid "A KAOS assumption"
-msgstr "KAOS 假设"
-
-#: ../sheets/KAOS.sheet.in.h:5
-msgid "A KAOS binary conflict"
-msgstr "KAOS 二进制冲突"
-
-#: ../sheets/KAOS.sheet.in.h:6
-msgid "A KAOS capable-of"
-msgstr "A KAOS capable-of"
-
-#: ../sheets/KAOS.sheet.in.h:7
-msgid "A KAOS complete AND refinement"
-msgstr "A KAOS complete AND refinement"
-
-#: ../sheets/KAOS.sheet.in.h:8
-msgid "A KAOS complete OR refinement"
-msgstr "A KAOS complete OR refinement"
-
-#: ../sheets/KAOS.sheet.in.h:9
-msgid "A KAOS contribution"
-msgstr "A KAOS contribution"
-
-#: ../sheets/KAOS.sheet.in.h:10
-msgid "A KAOS control link"
-msgstr "KAOS 控制连接"
-
-#: ../sheets/KAOS.sheet.in.h:11
-msgid "A KAOS goal"
-msgstr "KAOS 目标"
-
-#: ../sheets/KAOS.sheet.in.h:12
-msgid "A KAOS input"
-msgstr "KAOS 输入"
-
-#: ../sheets/KAOS.sheet.in.h:13
-msgid "A KAOS monitor link"
-msgstr "KAOS 连接监控"
-
-#: ../sheets/KAOS.sheet.in.h:14
-msgid "A KAOS obstacle"
-msgstr "KAOS 障碍"
-
-#: ../sheets/KAOS.sheet.in.h:15
-msgid "A KAOS obstruction"
-msgstr "KAOS 障碍物"
-
-#: ../sheets/KAOS.sheet.in.h:16
-msgid "A KAOS operation"
-msgstr "KAOS 操作"
-
-#: ../sheets/KAOS.sheet.in.h:17
-msgid "A KAOS operationalization"
-msgstr "KAOS 操作化"
-
-#: ../sheets/KAOS.sheet.in.h:18
-msgid "A KAOS output"
-msgstr "KAOS 输出"
-
-#: ../sheets/KAOS.sheet.in.h:19
-msgid "A KAOS performs"
-msgstr "KAOS 执行"
-
-#: ../sheets/KAOS.sheet.in.h:20
-msgid "A KAOS requirement"
-msgstr "KAOS 需求"
-
-#: ../sheets/KAOS.sheet.in.h:21
-msgid "A KAOS responsibility"
-msgstr "KAOS 责任"
-
-#: ../sheets/KAOS.sheet.in.h:22
-msgid "A KAOS softgoal"
-msgstr "KAOS 软目标"
-
-#: ../sheets/KAOS.sheet.in.h:23
-msgid "Objects to design KAOS diagrams"
-msgstr "设计 KAOS 图表所用的对象"
-
-#: ../sheets/KAOS.sheet.in.h:24
-msgid "RE-KAOS"
-msgstr "RE-KAOS"
-
-#: ../sheets/Lights.sheet.in.h:1
-msgid "ACL"
-msgstr "ACL"
-
-#: ../sheets/Lights.sheet.in.h:2
-msgid "Black light"
-msgstr "黑光管"
-
-#: ../sheets/Lights.sheet.in.h:3
-msgid "Blinders"
-msgstr "眼罩"
-
-#: ../sheets/Lights.sheet.in.h:4
-msgid "Ellipsoidal Reflector Spotlight"
-msgstr "椭圆形聚光灯"
-
-#: ../sheets/Lights.sheet.in.h:5
-#, fuzzy
-#| msgid "Fresel lantern"
-msgid "Fresnel lantern"
-msgstr "屈折反光灯"
-
-#: ../sheets/Lights.sheet.in.h:6
-msgid "Lights"
-msgstr "照明"
-
-#: ../sheets/Lights.sheet.in.h:7
-msgid "Moving head"
-msgstr "摇头灯"
-
-#: ../sheets/Lights.sheet.in.h:8
-msgid "Objects to design simple lighting plots"
-msgstr "用于设计简易照明图的对象"
-
-#: ../sheets/Lights.sheet.in.h:9
-msgid "PAR"
-msgstr "PAR"
-
-#: ../sheets/Lights.sheet.in.h:10
-msgid "PAR on the floor"
-msgstr "地板上的 PAR"
-
-#: ../sheets/Lights.sheet.in.h:11
-msgid "Pebble Convex lantern"
-msgstr "柔边灯"
-
-#: ../sheets/Lights.sheet.in.h:12 ../sheets/ciscocomputer.sheet.in.h:39
-msgid "Scanner"
-msgstr "扫描仪"
-
-#: ../sheets/Lights.sheet.in.h:13
-msgid "Striplight"
-msgstr "长条状灯"
-
-#: ../sheets/Lights.sheet.in.h:14
-msgid "Stroboscope light"
-msgstr "频闪灯"
-
-#: ../sheets/Lights.sheet.in.h:15
-msgid "Structure"
-msgstr "结构"
-
-#: ../sheets/Logic.sheet.in.h:1
-msgid "AND gate"
-msgstr "非门"
-
-#: ../sheets/Logic.sheet.in.h:2
-msgid "Boolean Logic"
-msgstr "布尔逻辑"
-
-#: ../sheets/Logic.sheet.in.h:3
-msgid "Crossconnector"
-msgstr "交叉连接器"
-
-#: ../sheets/Logic.sheet.in.h:4 ../sheets/SISSI.sheet.in.h:27
-msgid "Inverter"
-msgstr "换流器"
-
-#: ../sheets/Logic.sheet.in.h:5
-msgid "Logic"
-msgstr "逻辑"
-
-#: ../sheets/Logic.sheet.in.h:6
-msgid "NAND gate"
-msgstr "与非门"
-
-#: ../sheets/Logic.sheet.in.h:7
-msgid "NOR gate"
-msgstr "或非门"
-
-#: ../sheets/Logic.sheet.in.h:8
-msgid "NOT"
-msgstr "非"
-
-#: ../sheets/Logic.sheet.in.h:9
-msgid "OR gate"
-msgstr "或门"
-
-#: ../sheets/Logic.sheet.in.h:10
-msgid "Simple buffer"
-msgstr "单个缓冲区"
-
-#: ../sheets/Logic.sheet.in.h:11
-msgid "XOR gate"
-msgstr "异或门"
-
-#: ../sheets/MSE.sheet.in.h:1
-msgid "Demultiplexer"
-msgstr "信号分离器"
-
-#: ../sheets/MSE.sheet.in.h:2
-msgid "Large extension node"
-msgstr "大扩展节点"
-
-#: ../sheets/MSE.sheet.in.h:3
-msgid "MSE"
-msgstr "MSE"
-
-#: ../sheets/MSE.sheet.in.h:4
-msgid "Multiplexer"
-msgstr "多路复用器"
-
-#: ../sheets/MSE.sheet.in.h:5
-msgid "Node center"
-msgstr "节点中心"
-
-#: ../sheets/MSE.sheet.in.h:6
-msgid "Small extension node"
-msgstr "小扩展节点"
-
-#: ../sheets/MSE.sheet.in.h:7
-msgid "Tactical satellite communications terminal"
-msgstr "战略卫星通信终端"
-
-#: ../sheets/MSE.sheet.in.h:8
-msgid "U.S. Army Mobile Subscriber Equipment Components"
-msgstr "美军移动设备组件 (Mobile Subscriber Equipment)"
-
-#: ../sheets/Misc.sheet.in.h:2
-msgid "Folder"
-msgstr "文件夹"
-
-#: ../sheets/Misc.sheet.in.h:3
-msgid "Measure distance"
-msgstr "测量距离"
-
-#: ../sheets/Misc.sheet.in.h:4
-msgid "Misc"
-msgstr "其它"
-
-#: ../sheets/Misc.sheet.in.h:5
-msgid "Miscellaneous Shapes"
-msgstr "其它外形"
-
-#: ../sheets/Misc.sheet.in.h:6
-msgid "New-style group object, for testing"
-msgstr "测试 New-style 组对象"
-
-#: ../sheets/Misc.sheet.in.h:7
-msgid "Resizable grid"
-msgstr "可变大小网格"
-
-#: ../sheets/Misc.sheet.in.h:8
-msgid "Traditional clock"
-msgstr "传统时钟"
-
-#: ../sheets/Misc.sheet.in.h:9
-msgid "Tree"
-msgstr "树"
-
-#: ../sheets/Misc.sheet.in.h:10
-msgid "expended node"
-msgstr "扩展节点"
-
-#: ../sheets/Misc.sheet.in.h:11
-msgid "expensible node"
-msgstr "可扩展节点"
-
-#: ../sheets/Pneumatic.sheet.in.h:1
-msgid "2/2 distributor"
-msgstr "2/2 分配器"
-
-#: ../sheets/Pneumatic.sheet.in.h:2
-msgid "3/2 distributor"
-msgstr "3/2 分配器"
-
-#: ../sheets/Pneumatic.sheet.in.h:3
-msgid "4/2 distributor"
-msgstr "4/2 分配器"
-
-#: ../sheets/Pneumatic.sheet.in.h:4
-msgid "5/2 distributor"
-msgstr "5/2 分配器"
-
-#: ../sheets/Pneumatic.sheet.in.h:5
-msgid "Air exhaust orifice"
-msgstr "排气孔"
-
-#: ../sheets/Pneumatic.sheet.in.h:6
-msgid "Components for pneumatic and hydraulic circuits"
-msgstr "气动的和液压的电路部件"
-
-#: ../sheets/Pneumatic.sheet.in.h:8
-msgid "Double-effect jack"
-msgstr "双效千斤顶"
-
-#: ../sheets/Pneumatic.sheet.in.h:9
-msgid "Electric command (double coil)"
-msgstr "Electric command (double coil)"
-
-#: ../sheets/Pneumatic.sheet.in.h:10
-msgid "Electric command (single coil)"
-msgstr "Electric command (single coil)"
-
-#: ../sheets/Pneumatic.sheet.in.h:11
-msgid "Generic pressure source"
-msgstr "一般压力来源"
-
-#: ../sheets/Pneumatic.sheet.in.h:12
-msgid "Hydraulic pressure source"
-msgstr "液压源"
-
-#: ../sheets/Pneumatic.sheet.in.h:13
-msgid "Indirect command by hydraulic driver"
-msgstr "Indirect command by hydraulic driver"
-
-#: ../sheets/Pneumatic.sheet.in.h:14
-msgid "Indirect command by pneumatic driver"
-msgstr "Indirect command by pneumatic driver"
-
-#: ../sheets/Pneumatic.sheet.in.h:15
-msgid "Mechanical command by spring"
-msgstr "Mechanical command by spring"
-
-#: ../sheets/Pneumatic.sheet.in.h:16
-msgid "Mechanical command by tappet"
-msgstr "Mechanical command by tappet"
-
-#: ../sheets/Pneumatic.sheet.in.h:17
-msgid "Muscular command"
-msgstr "Muscular 控制"
-
-#: ../sheets/Pneumatic.sheet.in.h:18
-msgid "Normally-in simple-effect jack"
-msgstr "常入单效千斤顶"
-
-#: ../sheets/Pneumatic.sheet.in.h:19
-msgid "Normally-out simple-effect jack"
-msgstr "Normally-out simple-effect jack"
-
-#: ../sheets/Pneumatic.sheet.in.h:20
-msgid "Pneumatic pressure source"
-msgstr "气压源"
-
-#: ../sheets/Pneumatic.sheet.in.h:21
-msgid "Pneumatic/Hydraulic"
-msgstr "气压/水压"
-
-#: ../sheets/Pneumatic.sheet.in.h:22
-msgid "Push-button command"
-msgstr "按钮控制"
-
-#: ../sheets/SADT.sheet.in.h:1
-msgid "Activity/data box"
-msgstr "活动/数据框"
-
-#: ../sheets/SADT.sheet.in.h:2
-msgid "Activity/data flow arrow"
-msgstr "活动/数据 流量箭头"
-
-#: ../sheets/SADT.sheet.in.h:3
-msgid "Flow label"
-msgstr "流量标记"
-
-#: ../sheets/SADT.sheet.in.h:4
-msgid "Objects to design SADT diagrams"
-msgstr "设计 SADT 图的对象"
-
-#: ../sheets/SADT.sheet.in.h:5
-msgid "SADT/IDEF0"
-msgstr "SADT/IDEF0"
-
-#: ../sheets/SDL.sheet.in.h:1
-msgid "Action being executed"
-msgstr "执行的动作"
-
-#: ../sheets/SDL.sheet.in.h:2
-msgid "Block type reference"
-msgstr "块类型参考"
-
-#: ../sheets/SDL.sheet.in.h:5
-msgid "Function call"
-msgstr "功能调用"
-
-#: ../sheets/SDL.sheet.in.h:6
-msgid "Function header"
-msgstr "函数头部"
-
-#: ../sheets/SDL.sheet.in.h:7
-msgid "Generic text note"
-msgstr "普通文字注释"
-
-#: ../sheets/SDL.sheet.in.h:8
-msgid "In/Out connector"
-msgstr "输入/输出 连接器"
-
-#: ../sheets/SDL.sheet.in.h:10
-msgid "Procedure return"
-msgstr "过程返回"
-
-#: ../sheets/SDL.sheet.in.h:11
-msgid "Process type reference"
-msgstr "程序类型参考"
-
-#: ../sheets/SDL.sheet.in.h:12
-msgid "Receive message"
-msgstr "接收消息"
-
-#: ../sheets/SDL.sheet.in.h:13
-msgid "SDL"
-msgstr "SDL"
-
-#: ../sheets/SDL.sheet.in.h:14
-msgid "Save state"
-msgstr "保存状态"
-
-#: ../sheets/SDL.sheet.in.h:15
-msgid "Send message"
-msgstr "发送消息"
-
-#: ../sheets/SDL.sheet.in.h:16
-msgid "Service type reference"
-msgstr "服务类型参考"
-
-#: ../sheets/SDL.sheet.in.h:17
-msgid "Specification and Description Language."
-msgstr "规格说明和描述语言。"
-
-#: ../sheets/SDL.sheet.in.h:18 ../sheets/UML.sheet.in.h:28
-msgid "State"
-msgstr "状态"
-
-#: ../sheets/SISSI.sheet.in.h:1
-msgid "Air filter"
-msgstr "空气过滤器"
-
-#: ../sheets/SISSI.sheet.in.h:2
-msgid "Air quality detector"
-msgstr "空气质量探测器"
-
-#: ../sheets/SISSI.sheet.in.h:3
-msgid "Airconditioner"
-msgstr "空调"
-
-#: ../sheets/SISSI.sheet.in.h:4
-msgid "Alarm center"
-msgstr "警报中心"
-
-#: ../sheets/SISSI.sheet.in.h:5
-msgid "Axial Ventilator"
-msgstr "轴流式通风机"
-
-#: ../sheets/SISSI.sheet.in.h:6
-msgid "Backup"
-msgstr "备份"
-
-#: ../sheets/SISSI.sheet.in.h:7
-msgid "Badge reader"
-msgstr "门卡阅读器"
-
-#: ../sheets/SISSI.sheet.in.h:8
-msgid "Badge reader/keyboard"
-msgstr "门卡阅读器/键盘"
-
-#: ../sheets/SISSI.sheet.in.h:9
-msgid "Biometric reader"
-msgstr "生物计量阅读器"
-
-#: ../sheets/SISSI.sheet.in.h:10
-msgid "Cell phone"
-msgstr "蜂窝电话"
-
-#: ../sheets/SISSI.sheet.in.h:11
-msgid "Centrifugal Ventilator"
-msgstr "离心式通风机"
-
-#: ../sheets/SISSI.sheet.in.h:12
-msgid "Cipher machine"
-msgstr "密码机"
-
-#: ../sheets/SISSI.sheet.in.h:13
-msgid "Circulation pump"
-msgstr "循环泵"
-
-#: ../sheets/SISSI.sheet.in.h:14
-msgid "Condensator"
-msgstr "冷凝器"
-
-#: ../sheets/SISSI.sheet.in.h:15
-msgid "Current transducer"
-msgstr "电流传感器"
-
-#: ../sheets/SISSI.sheet.in.h:16
-msgid "Digital code"
-msgstr "数位码"
-
-#: ../sheets/SISSI.sheet.in.h:17
-msgid "Enthalpy transducer"
-msgstr "热函传感器"
-
-#: ../sheets/SISSI.sheet.in.h:18
-msgid "Extinguisher"
-msgstr "灭火器"
-
-#: ../sheets/SISSI.sheet.in.h:19
-msgid "Faraday cage"
-msgstr "法拉第罩"
-
-#: ../sheets/SISSI.sheet.in.h:20 ../sheets/ciscomisc.sheet.in.h:9
-msgid "File cabinet"
-msgstr "文件柜"
-
-#: ../sheets/SISSI.sheet.in.h:21
-msgid "Gate"
-msgstr "闸门"
-
-#: ../sheets/SISSI.sheet.in.h:22
-msgid "Geographic site"
-msgstr "地理位置"
-
-#: ../sheets/SISSI.sheet.in.h:23
-msgid "Glass-break sensor"
-msgstr "玻璃破碎传感器"
-
-#: ../sheets/SISSI.sheet.in.h:24 ../sheets/ciscohub.sheet.in.h:29
-msgid "Hub"
-msgstr "集线器"
-
-#: ../sheets/SISSI.sheet.in.h:25
-msgid "Information"
-msgstr "信息"
-
-#: ../sheets/SISSI.sheet.in.h:26
-msgid "Information system"
-msgstr "信息系统"
-
-#: ../sheets/SISSI.sheet.in.h:28 ../sheets/ciscocomputer.sheet.in.h:21
-msgid "Laptop"
-msgstr "手提电脑"
-
-#: ../sheets/SISSI.sheet.in.h:29
-msgid "Level detector"
-msgstr "电位探测器"
-
-#: ../sheets/SISSI.sheet.in.h:30
-msgid "Light detector"
-msgstr "光线探测器"
-
-#: ../sheets/SISSI.sheet.in.h:31
-msgid "Log analysis"
-msgstr "日志分析"
-
-#: ../sheets/SISSI.sheet.in.h:32
-msgid "Magnetic storage"
-msgstr "磁质存储"
-
-#: ../sheets/SISSI.sheet.in.h:33 ../sheets/ciscocomputer.sheet.in.h:25
-msgid "Modem"
-msgstr "调制解调器"
-
-#: ../sheets/SISSI.sheet.in.h:34
-msgid "Moisture extractor"
-msgstr "去湿器"
-
-#: ../sheets/SISSI.sheet.in.h:35
-msgid "Moisture sensor"
-msgstr "湿度传感器"
-
-#: ../sheets/SISSI.sheet.in.h:36
-msgid "Movement detector"
-msgstr "移动检测器"
-
-#: ../sheets/SISSI.sheet.in.h:37 ../sheets/network.sheet.in.h:21
-msgid "Network cloud"
-msgstr "网络云"
-
-#: ../sheets/SISSI.sheet.in.h:38
-msgid "Objects to design sissi diagrams"
-msgstr "用于设计 SISSI 图表的对象"
-
-#: ../sheets/SISSI.sheet.in.h:39 ../sheets/ciscocomputer.sheet.in.h:35
-msgid "PDA"
-msgstr "PDA"
-
-#: ../sheets/SISSI.sheet.in.h:40
-msgid "Paper storage"
-msgstr "纸存储"
-
-#: ../sheets/SISSI.sheet.in.h:41
-msgid "Person"
-msgstr "人"
-
-#: ../sheets/SISSI.sheet.in.h:42
-msgid "Power transducer"
-msgstr "功率传感器"
-
-#: ../sheets/SISSI.sheet.in.h:43
-msgid "Pressure transducer"
-msgstr "压力传感器"
-
-#: ../sheets/SISSI.sheet.in.h:44
-msgid "Pump"
-msgstr "泵"
-
-#: ../sheets/SISSI.sheet.in.h:45 ../sheets/ciscocomputer.sheet.in.h:37
-msgid "Relational Database"
-msgstr "关系数据库"
-
-#: ../sheets/SISSI.sheet.in.h:46
-msgid "Revolving door"
-msgstr "旋转门"
-
-#: ../sheets/SISSI.sheet.in.h:47
-msgid "Room"
-msgstr "房间"
-
-#: ../sheets/SISSI.sheet.in.h:48 ../sheets/ciscohub.sheet.in.h:53
-msgid "Router"
-msgstr "路由器"
-
-#: ../sheets/SISSI.sheet.in.h:49
-msgid "Safe"
-msgstr "安全"
-
-#: ../sheets/SISSI.sheet.in.h:50
-msgid "Security area"
-msgstr "安全区域"
-
-#: ../sheets/SISSI.sheet.in.h:51
-msgid "Sensor beam"
-msgstr "光线传感器"
-
-#: ../sheets/SISSI.sheet.in.h:52
-msgid "Server"
-msgstr "服务器"
-
-#: ../sheets/SISSI.sheet.in.h:53
-msgid "Smoke detector"
-msgstr "烟雾检测器"
-
-#: ../sheets/SISSI.sheet.in.h:55 ../sheets/ciscocomputer.sheet.in.h:42
-msgid "Storage array"
-msgstr "存储阵列"
-
-#: ../sheets/SISSI.sheet.in.h:56 ../sheets/network.sheet.in.h:33
-msgid "Telephone"
-msgstr "电话"
-
-#: ../sheets/SISSI.sheet.in.h:57
-msgid "Vehicle detector"
-msgstr "车辆检测器"
-
-#: ../sheets/SISSI.sheet.in.h:58
-msgid "Ventilator"
-msgstr "通风机"
-
-#: ../sheets/SISSI.sheet.in.h:59
-msgid "Vibration sensor"
-msgstr "振动传感器"
-
-#: ../sheets/SISSI.sheet.in.h:60
-msgid "Video camera"
-msgstr "视频照相机"
-
-#: ../sheets/SISSI.sheet.in.h:61
-msgid "Video movement detector"
-msgstr "视频移动检测器"
-
-#: ../sheets/SISSI.sheet.in.h:62
-msgid "Voltage detector"
-msgstr "电压检测器"
-
-#: ../sheets/SISSI.sheet.in.h:63
-msgid "Workstation"
-msgstr "工作站"
-
-#: ../sheets/UML.sheet.in.h:1
-msgid "Activity"
-msgstr "活动"
-
-#: ../sheets/UML.sheet.in.h:3
-msgid "Aggregation, one class is part of another"
-msgstr "聚集,一个类是另一个的一部分"
-
-#: ../sheets/UML.sheet.in.h:4
-msgid "Association, two classes are associated"
-msgstr "关联,两个类是相关的"
-
-#: ../sheets/UML.sheet.in.h:7
-msgid "Class stereotype icon"
-msgstr "类定性图标"
-
-#: ../sheets/UML.sheet.in.h:8
-msgid "Component"
-msgstr "组件"
-
-#: ../sheets/UML.sheet.in.h:9
-msgid "Constraint, place a constraint on something"
-msgstr "约束,对某事添加一个约束"
-
-#: ../sheets/UML.sheet.in.h:11
-msgid "Editor for UML Static Structure Diagrams"
-msgstr "UML 静态结构图编辑器"
-
-#: ../sheets/UML.sheet.in.h:15
-msgid "Fork/union"
-msgstr "Fork/联合"
-
-#: ../sheets/UML.sheet.in.h:16
-msgid "Generalization, class inheritance"
-msgstr "泛化,类继承"
+#: ../sheets/Circuit.sheet.in.h:23
+msgid "Ground point"
+msgstr "接地点"
 
-#: ../sheets/UML.sheet.in.h:17
-msgid "Implements, class implements a specific interface"
-msgstr "实现,类实现了一个指定的接口"
+#: ../sheets/Circuit.sheet.in.h:24
+msgid "Operational amplifier"
+msgstr "运算放大器"
 
-#: ../sheets/UML.sheet.in.h:18
-msgid "Initial/end state"
-msgstr "初始/结束状态"
+#: ../sheets/Circuit.sheet.in.h:25
+msgid "Horizontally aligned fuse"
+msgstr "水平排列的保险丝"
 
-#: ../sheets/UML.sheet.in.h:19
-msgid "Large package"
-msgstr "大型软件包"
+#: ../sheets/Circuit.sheet.in.h:26
+msgid "Vertically aligned fuse"
+msgstr "竖直排列的保险丝"
 
-#: ../sheets/UML.sheet.in.h:20
-msgid "Lifeline"
-msgstr "生命线"
+#: ../sheets/Circuit.sheet.in.h:27
+msgid "Horizontally aligned power source"
+msgstr "水平排列的电源"
 
-#: ../sheets/UML.sheet.in.h:21
-msgid "Message"
-msgstr "消息"
+#: ../sheets/Circuit.sheet.in.h:28
+msgid "Vertically aligned power source"
+msgstr "竖直排列的电源"
 
-#: ../sheets/UML.sheet.in.h:22
-msgid "Node"
-msgstr "节点"
+#: ../sheets/Circuit.sheet.in.h:29
+msgid "Lamp"
+msgstr "灯"
 
-#: ../sheets/UML.sheet.in.h:23
-msgid "Note"
-msgstr "注解"
+#: ../sheets/Circuit.sheet.in.h:30 ../sheets/ciscomisc.sheet.in.h:55
+msgid "Speaker"
+msgstr "扬声器"
 
-#: ../sheets/UML.sheet.in.h:24
-msgid "Object"
-msgstr "对象"
+#: ../sheets/Circuit.sheet.in.h:31 ../sheets/ciscomisc.sheet.in.h:53
+msgid "Microphone"
+msgstr "麦克风"
 
-#: ../sheets/UML.sheet.in.h:25
-msgid "Realizes, implements a specific interface"
-msgstr "实现,实现一个特定的接口"
+#: ../sheets/Circuit.sheet.in.h:32
+msgid "Horizontally aligned LED"
+msgstr "水平排列的 LED"
 
-#: ../sheets/UML.sheet.in.h:27
-msgid "Small package"
-msgstr "小的软件包"
+#: ../sheets/Circuit.sheet.in.h:33
+msgid "Vertically aligned LED"
+msgstr "竖直排列的 LED"
 
-#: ../sheets/UML.sheet.in.h:31
-msgid "UML"
-msgstr "UML"
+#: ../sheets/Circuit.sheet.in.h:34
+msgid "NMOS transistor"
+msgstr "NMOS 晶体管"
 
-#: ../sheets/UML.sheet.in.h:32
-msgid "Use case"
-msgstr "用例"
+#: ../sheets/Circuit.sheet.in.h:35
+msgid "PMOS transistor"
+msgstr "PMOS 晶体管"
 
-#: ../sheets/chronogram.sheet.in.h:1
-msgid "Chronogram"
-msgstr "纪年铭"
+#: ../sheets/Circuit.sheet.in.h:36
+msgid "Horizontal jumper"
+msgstr "水平的跳接器"
 
-#: ../sheets/chronogram.sheet.in.h:2
-msgid "Data line"
-msgstr "数据线"
+#: ../sheets/Circuit.sheet.in.h:37
+msgid "Horizontal xtal"
+msgstr "水平的 xtal"
 
-#: ../sheets/chronogram.sheet.in.h:3
-msgid "Objects to design chronogram charts"
-msgstr "用于设计纪年铭图表的对象"
-
-#: ../sheets/chronogram.sheet.in.h:4
-msgid "Time scale"
-msgstr "时间刻度"
+#: ../sheets/Circuit.sheet.in.h:38
+msgid "Vertical xtal"
+msgstr "垂直的 xtal"
 
 #: ../sheets/ciscocomputer.sheet.in.h:1
-msgid "BBS"
-msgstr "BBS"
+msgid "Cisco — Computer"
+msgstr "Cisco — 计算机"
 
 #: ../sheets/ciscocomputer.sheet.in.h:2
-msgid "Cisco - Computer"
-msgstr "Cisco - 计算机"
+msgid "Computer shapes by Cisco"
+msgstr "Cisco 电脑形状"
 
 #: ../sheets/ciscocomputer.sheet.in.h:3
-msgid "Cisco CA"
-msgstr "Cisco CA"
+msgid "PC"
+msgstr "PC"
 
 #: ../sheets/ciscocomputer.sheet.in.h:4
-msgid "CiscoSecurity"
-msgstr "CiscoSecurity"
+msgid "Macintosh"
+msgstr "Macintosh"
 
 #: ../sheets/ciscocomputer.sheet.in.h:5
-msgid "CiscoWorks workstation"
-msgstr "CiscoWorks 工作站"
+msgid "Terminal"
+msgstr "终端"
 
 #: ../sheets/ciscocomputer.sheet.in.h:6
-msgid "Computer shapes by Cisco"
-msgstr "Cisco 电脑形状"
+msgid "SUN workstation"
+msgstr "SUN 工作站"
 
 #: ../sheets/ciscocomputer.sheet.in.h:7
-msgid "Disk subsystem"
-msgstr "磁盘子系统"
+msgid "CiscoWorks workstation"
+msgstr "CiscoWorks 工作站"
 
 #: ../sheets/ciscocomputer.sheet.in.h:8
-msgid "Diskette"
-msgstr "磁盘"
+msgid "PC Router Card"
+msgstr "PC 路由器卡"
 
 #: ../sheets/ciscocomputer.sheet.in.h:9
-msgid "EtherClient"
-msgstr "以太客户端"
+msgid "PC Software"
+msgstr "PC 软件"
 
 #: ../sheets/ciscocomputer.sheet.in.h:10
-msgid "FC Storage"
-msgstr "FC 存储器"
+msgid "PC with Router-Based Software"
+msgstr "有路由软件的 PC"
 
 #: ../sheets/ciscocomputer.sheet.in.h:11
-msgid "File Server"
-msgstr "文件服务器"
+msgid "Workgroup director"
+msgstr "工作组管理"
 
 #: ../sheets/ciscocomputer.sheet.in.h:12
-msgid "Front End Processor"
-msgstr "前端处理器"
+msgid "CiscoSecurity"
+msgstr "CiscoSecurity"
 
 #: ../sheets/ciscocomputer.sheet.in.h:13
-msgid "HP Mini"
-msgstr "HP Mini"
+msgid "Cisco CA"
+msgstr "Cisco CA"
 
 #: ../sheets/ciscocomputer.sheet.in.h:14
-msgid "Handheld"
-msgstr "手持式"
+msgid "WWW server"
+msgstr "WWW 服务器"
 
 #: ../sheets/ciscocomputer.sheet.in.h:15
-msgid "Host"
-msgstr "主机"
+msgid "Web browser"
+msgstr "网页浏览器"
 
 #: ../sheets/ciscocomputer.sheet.in.h:16
-msgid "IBM Mini (AS400)"
-msgstr "IBM Mini (AS400)"
+msgid "File Server"
+msgstr "文件服务器"
 
 #: ../sheets/ciscocomputer.sheet.in.h:17
-msgid "IBM Tower"
-msgstr "IBM Tower"
+msgid "Software-Based Router on File Server"
+msgstr "文件服务器上的软件路由器"
 
 #: ../sheets/ciscocomputer.sheet.in.h:18
-msgid "IBM mainframe"
-msgstr "IBM 大型机"
+msgid "Server with PC Router"
+msgstr "有 PC 路由器的服务器"
 
 #: ../sheets/ciscocomputer.sheet.in.h:19
-msgid "IBM mainframe with FEP"
-msgstr "带 FEP 的 IBM 大型机"
+msgid "IBM Tower"
+msgstr "IBM Tower"
 
 #: ../sheets/ciscocomputer.sheet.in.h:20
-msgid "JBOD"
-msgstr "JBOD"
+msgid "IBM Mini (AS400)"
+msgstr "IBM Mini (AS400)"
+
+#: ../sheets/ciscocomputer.sheet.in.h:21
+msgid "Front End Processor"
+msgstr "前端处理器"
 
 #: ../sheets/ciscocomputer.sheet.in.h:22
-msgid "Macintosh"
-msgstr "Macintosh"
+msgid "IBM mainframe"
+msgstr "IBM 大型机"
 
 #: ../sheets/ciscocomputer.sheet.in.h:23
-msgid "MicroWebserver"
-msgstr "微型网页服务器"
+msgid "IBM mainframe with FEP"
+msgstr "带 FEP 的 IBM 大型机"
 
 #: ../sheets/ciscocomputer.sheet.in.h:24
-msgid "Mini VAX"
-msgstr "Mini VAX"
+msgid "HP Mini"
+msgstr "HP Mini"
 
-#: ../sheets/ciscocomputer.sheet.in.h:26 ../sheets/network.sheet.in.h:19
-msgid "Monitor"
-msgstr "监视器"
+#: ../sheets/ciscocomputer.sheet.in.h:25
+msgid "Supercomputer"
+msgstr "超级计算机"
+
+#: ../sheets/ciscocomputer.sheet.in.h:26
+msgid "Web cluster"
+msgstr "网页簇"
 
 #: ../sheets/ciscocomputer.sheet.in.h:27
-msgid "Newton"
-msgstr "牛顿"
+msgid "Mini VAX"
+msgstr "Mini VAX"
 
 #: ../sheets/ciscocomputer.sheet.in.h:28
-msgid "PC"
-msgstr "PC"
+msgid "PC Card"
+msgstr "PC 卡"
 
-#: ../sheets/ciscocomputer.sheet.in.h:29
-msgid "PC Adapter Card"
-msgstr "PC 适配卡"
+#: ../sheets/ciscocomputer.sheet.in.h:29 ../sheets/Lights.sheet.in.h:14
+msgid "Scanner"
+msgstr "扫描仪"
 
 #: ../sheets/ciscocomputer.sheet.in.h:30
-msgid "PC Card"
-msgstr "PC 卡"
+msgid "Tablet"
+msgstr "平板电脑"
 
 #: ../sheets/ciscocomputer.sheet.in.h:31
-msgid "PC Router Card"
-msgstr "PC 路由器卡"
+msgid "EtherClient"
+msgstr "以太客户端"
 
 #: ../sheets/ciscocomputer.sheet.in.h:32
-msgid "PC Software"
-msgstr "PC 软件"
+msgid "Handheld"
+msgstr "手持式"
 
 #: ../sheets/ciscocomputer.sheet.in.h:33
-msgid "PC Video"
-msgstr "PC 视频"
+msgid "Wireless"
+msgstr "无线网络"
 
 #: ../sheets/ciscocomputer.sheet.in.h:34
-msgid "PC with Router-Based Software"
-msgstr "有路由软件的 PC"
+msgid "PDA"
+msgstr "PDA"
 
-#: ../sheets/ciscocomputer.sheet.in.h:38
-msgid "SUN workstation"
-msgstr "SUN 工作站"
+#: ../sheets/ciscocomputer.sheet.in.h:35
+msgid "Newton"
+msgstr "牛顿"
+
+#: ../sheets/ciscocomputer.sheet.in.h:36
+msgid "Laptop"
+msgstr "手提电脑"
+
+#: ../sheets/ciscocomputer.sheet.in.h:38 ../sheets/network.sheet.in.h:4
+msgid "Monitor"
+msgstr "监视器"
+
+#: ../sheets/ciscocomputer.sheet.in.h:39
+msgid "PC Video"
+msgstr "PC 视频"
 
 #: ../sheets/ciscocomputer.sheet.in.h:40
-msgid "Server with PC Router"
-msgstr "有 PC 路由器的服务器"
+msgid "Modem"
+msgstr "调制解调器"
 
 #: ../sheets/ciscocomputer.sheet.in.h:41
-msgid "Software-Based Router on File Server"
-msgstr "文件服务器上的软件路由器"
+msgid "BBS"
+msgstr "BBS"
+
+#: ../sheets/ciscocomputer.sheet.in.h:42
+msgid "MicroWebserver"
+msgstr "微型网页服务器"
 
 #: ../sheets/ciscocomputer.sheet.in.h:43
-msgid "Supercomputer"
-msgstr "超级计算机"
+msgid "Relational Database"
+msgstr "关系数据库"
 
 #: ../sheets/ciscocomputer.sheet.in.h:44
-msgid "Tablet"
-msgstr "平板电脑"
+msgid "Diskette"
+msgstr "磁盘"
 
 #: ../sheets/ciscocomputer.sheet.in.h:45
-msgid "Tape array"
-msgstr "磁带阵列"
+msgid "Host"
+msgstr "主机"
 
 #: ../sheets/ciscocomputer.sheet.in.h:46
-msgid "Terminal"
-msgstr "终端"
+msgid "Tape array"
+msgstr "磁带阵列"
 
 #: ../sheets/ciscocomputer.sheet.in.h:47
-msgid "WWW server"
-msgstr "WWW 服务器"
+msgid "Disk subsystem"
+msgstr "磁盘子系统"
 
 #: ../sheets/ciscocomputer.sheet.in.h:48
-msgid "Web browser"
-msgstr "网页浏览器"
+msgid "JBOD"
+msgstr "JBOD"
 
 #: ../sheets/ciscocomputer.sheet.in.h:49
-msgid "Web cluster"
-msgstr "网页簇"
+msgid "Storage array"
+msgstr "存储阵列"
 
 #: ../sheets/ciscocomputer.sheet.in.h:50
-msgid "Wireless"
-msgstr "无线网络"
+msgid "FC Storage"
+msgstr "FC 存储器"
 
 #: ../sheets/ciscocomputer.sheet.in.h:51
-msgid "Workgroup director"
-msgstr "工作组管理"
+msgid "PC Adapter Card"
+msgstr "PC 适配卡"
 
 #: ../sheets/ciscohub.sheet.in.h:1
-msgid "100BaseT Hub"
-msgstr "100BaseT 集线器"
+msgid "Cisco — Switch"
+msgstr "Cisco — 交换机"
 
 #: ../sheets/ciscohub.sheet.in.h:2
-msgid "7500ARS (7513) Router"
-msgstr "7500ARS (7513) 路由器"
+msgid "Router and switch shapes by Cisco"
+msgstr "由 Cisco 提供的路由器和交换机"
 
 #: ../sheets/ciscohub.sheet.in.h:3
-msgid "7505 Router"
-msgstr "7505 路由器"
+msgid "Router"
+msgstr "路由器"
 
 #: ../sheets/ciscohub.sheet.in.h:4
-msgid "7507 Router"
-msgstr "7507 路由器"
+msgid "Router subdued"
+msgstr "路由器(柔和)"
 
 #: ../sheets/ciscohub.sheet.in.h:5
-msgid "ASIC Processor"
-msgstr "ASIC 处理器"
+msgid "Router with Silicon Switch"
+msgstr "带有硅交换机的路由器"
 
 #: ../sheets/ciscohub.sheet.in.h:6
-msgid "ATM 3800"
-msgstr "ATM 3800"
+msgid "NetFlow router"
+msgstr "NetFlow 路由器"
 
 #: ../sheets/ciscohub.sheet.in.h:7
-msgid "ATM Fast Gigabit Etherswitch"
-msgstr "ATM Fast Gigabit Etherswitch"
+msgid "Broadband router"
+msgstr "宽带路由器"
 
 #: ../sheets/ciscohub.sheet.in.h:8
-msgid "ATM Switch"
-msgstr "ATM 交换机"
+msgid "Wavelength router"
+msgstr "波长路由器"
 
 #: ../sheets/ciscohub.sheet.in.h:9
-msgid "ATM Tag Switch Router"
-msgstr "ATM 标记交换路由器"
+msgid "Wireless router"
+msgstr "无线路由器"
 
 #: ../sheets/ciscohub.sheet.in.h:10
-msgid "Access Gateway"
-msgstr "接入网关"
+msgid "7507 Router"
+msgstr "7507 路由器"
 
 #: ../sheets/ciscohub.sheet.in.h:11
-msgid "BBSM"
-msgstr "BBSM"
+msgid "7505 Router"
+msgstr "7505 路由器"
 
 #: ../sheets/ciscohub.sheet.in.h:12
-msgid "Broadband router"
-msgstr "宽带路由器"
+msgid "7500ARS (7513) Router"
+msgstr "7500ARS (7513) 路由器"
 
 #: ../sheets/ciscohub.sheet.in.h:13
-msgid "CSM-S"
-msgstr "CSM-S"
+msgid "Edge Label Switch Router with NetFlow"
+msgstr "支持 NetFlow 的边界标签交换路由器"
 
 #: ../sheets/ciscohub.sheet.in.h:14
-msgid "Carrier Routing System"
-msgstr "传送路由选择系统"
+msgid "Edge Label Switch Router"
+msgstr "边界标签交换路由器"
 
 #: ../sheets/ciscohub.sheet.in.h:15
-msgid "Cisco - Switch"
-msgstr "Cisco - 交换机"
+msgid "Router with Firewall"
+msgstr "有防火墙的路由器"
 
 #: ../sheets/ciscohub.sheet.in.h:16
-msgid "Cisco 1000"
-msgstr "Cisco 1000"
+msgid "Optical Services Router"
+msgstr "光学服务路由器"
 
 #: ../sheets/ciscohub.sheet.in.h:17
-msgid "Cisco Hub"
-msgstr "Cisco 集线器"
-
-#: ../sheets/ciscohub.sheet.in.h:18
 msgid "Content Router"
 msgstr "内容路由器"
 
+#: ../sheets/ciscohub.sheet.in.h:18
+msgid "Carrier Routing System"
+msgstr "传送路由选择系统"
+
 #: ../sheets/ciscohub.sheet.in.h:19
-msgid "Content Service Module"
-msgstr "内容服务模块"
+msgid "Storage Router"
+msgstr "存储路由器"
 
 #: ../sheets/ciscohub.sheet.in.h:20
-msgid "Content Service Switch 1100"
-msgstr "内容服务交换机 1100"
+msgid "NetSonar"
+msgstr "NetSonar"
 
 #: ../sheets/ciscohub.sheet.in.h:21
-msgid "Content Switch"
-msgstr "内容交换机"
+msgid "Hub"
+msgstr "集线器"
 
 #: ../sheets/ciscohub.sheet.in.h:22
-msgid "Data Center Switch"
-msgstr "数据中心交换机"
+msgid "Hub subdued"
+msgstr "集线器(柔和)"
 
 #: ../sheets/ciscohub.sheet.in.h:23
-msgid "Data Center Switch Reversed"
-msgstr "数据中心交换机 (反向)"
+msgid "Cisco Hub"
+msgstr "Cisco 集线器"
 
 #: ../sheets/ciscohub.sheet.in.h:24
-msgid "Data Switch Processor"
-msgstr "数据交换机处理器"
+msgid "Small Hub"
+msgstr "小型集线器"
 
 #: ../sheets/ciscohub.sheet.in.h:25
-msgid "Director-class Fibre Channel intelligent switch"
-msgstr "导向器级光纤智能交换机"
+msgid "100BaseT Hub"
+msgstr "100BaseT 集线器"
 
 #: ../sheets/ciscohub.sheet.in.h:26
-msgid "Edge Label Switch Router"
-msgstr "边界标签交换路由器"
+msgid "Workgroup switch"
+msgstr "工作组交换机"
 
 #: ../sheets/ciscohub.sheet.in.h:27
-msgid "Edge Label Switch Router with NetFlow"
-msgstr "支持 NetFlow 的边界标签交换路由器"
+msgid "Workgroup switch Subdued"
+msgstr "工作组交换机(柔和)"
 
 #: ../sheets/ciscohub.sheet.in.h:28
-msgid "Generic Processor"
-msgstr "通用处理器"
+msgid "Workgroup Switch Voice-Enabled"
+msgstr "工作组交换机 Voice-Enabled"
+
+#: ../sheets/ciscohub.sheet.in.h:29
+msgid "BBSM"
+msgstr "BBSM"
 
 #: ../sheets/ciscohub.sheet.in.h:30
-msgid "Hub subdued"
-msgstr "集线器(柔和)"
+msgid "ATM Tag Switch Router"
+msgstr "ATM 标记交换路由器"
 
 #: ../sheets/ciscohub.sheet.in.h:31
-msgid "ISDN switch"
-msgstr "ISDN 交换机"
+msgid "Switch Processor"
+msgstr "交换机处理器"
 
 #: ../sheets/ciscohub.sheet.in.h:32
-msgid "LAN2LAN Switch"
-msgstr "LAN2LAN 交换机"
+msgid "Route Switch Processor"
+msgstr "路由交换机处理器"
 
 #: ../sheets/ciscohub.sheet.in.h:33
-msgid "Label Switch Router"
-msgstr "标签交换路由器"
+msgid "Route Switch Processor with Si"
+msgstr "路由交换机处理器 Si"
 
 #: ../sheets/ciscohub.sheet.in.h:34
-msgid "Layer 2 Remote Switch"
-msgstr "Layer 2 远程交换机"
+msgid "PXF"
+msgstr "PXF"
 
 #: ../sheets/ciscohub.sheet.in.h:35
-msgid "MGX 8220"
-msgstr "MGX 8220"
+msgid "ASIC Processor"
+msgstr "ASIC 处理器"
 
 #: ../sheets/ciscohub.sheet.in.h:36
-msgid "MGX 8240"
-msgstr "MGX 8240"
+msgid "Generic Processor"
+msgstr "通用处理器"
 
 #: ../sheets/ciscohub.sheet.in.h:37
-msgid "MGX 8260"
-msgstr "MGX 8260"
+msgid "Data Center Switch"
+msgstr "数据中心交换机"
 
 #: ../sheets/ciscohub.sheet.in.h:38
-msgid "Multi-Fabric Server Switch"
-msgstr "Multi-Fabric 服务器交换机"
+msgid "Data Center Switch Reversed"
+msgstr "数据中心交换机 (反向)"
 
 #: ../sheets/ciscohub.sheet.in.h:39
-msgid "MultiSwitch Device"
-msgstr "MultiSwitch 设备"
+msgid "Data Switch Processor"
+msgstr "数据交换机处理器"
 
 #: ../sheets/ciscohub.sheet.in.h:40
-msgid "Multilayer Remote Switch"
-msgstr "多层远程交换机"
+msgid "Content Switch"
+msgstr "内容交换机"
 
 #: ../sheets/ciscohub.sheet.in.h:41
-msgid "Multilayer Switch"
-msgstr "多层交换机"
+msgid "Content Service Module"
+msgstr "内容服务模块"
 
 #: ../sheets/ciscohub.sheet.in.h:42
-msgid "Multilayer Switch with Silicon"
-msgstr "多层硅交换机"
+msgid "CSM-S"
+msgstr "CSM-S"
 
 #: ../sheets/ciscohub.sheet.in.h:43
-msgid "Multilayer Switch with Silicon subdued"
-msgstr "多层硅交换机(柔和)"
+msgid "Access Gateway"
+msgstr "接入网关"
 
 #: ../sheets/ciscohub.sheet.in.h:44
-msgid "NetFlow router"
-msgstr "NetFlow 路由器"
+msgid "ATM Switch"
+msgstr "ATM 交换机"
 
 #: ../sheets/ciscohub.sheet.in.h:45
-msgid "NetRanger"
-msgstr "NetRanger"
+msgid "ATM 3800"
+msgstr "ATM 3800"
 
 #: ../sheets/ciscohub.sheet.in.h:46
-msgid "NetSonar"
-msgstr "NetSonar"
+msgid "Cisco 1000"
+msgstr "Cisco 1000"
 
 #: ../sheets/ciscohub.sheet.in.h:47
-msgid "Optical Services Router"
-msgstr "光学服务路由器"
+msgid "ISDN switch"
+msgstr "ISDN 交换机"
 
 #: ../sheets/ciscohub.sheet.in.h:48
-msgid "PXF"
-msgstr "PXF"
+msgid "Label Switch Router"
+msgstr "标签交换路由器"
 
 #: ../sheets/ciscohub.sheet.in.h:49
-msgid "Programmable Switch"
-msgstr "可编程路由器"
+msgid "MultiSwitch Device"
+msgstr "MultiSwitch 设备"
 
 #: ../sheets/ciscohub.sheet.in.h:50
-msgid "RateMUX"
-msgstr "RateMUX"
+msgid "LAN2LAN Switch"
+msgstr "LAN2LAN 交换机"
 
 #: ../sheets/ciscohub.sheet.in.h:51
-msgid "Route Switch Processor"
-msgstr "路由交换机处理器"
+msgid "Multilayer Switch"
+msgstr "多层交换机"
 
 #: ../sheets/ciscohub.sheet.in.h:52
-msgid "Route Switch Processor with Si"
-msgstr "路由交换机处理器 Si"
+msgid "Multilayer Switch with Silicon"
+msgstr "多层硅交换机"
+
+#: ../sheets/ciscohub.sheet.in.h:53
+msgid "Multilayer Switch with Silicon subdued"
+msgstr "多层硅交换机(柔和)"
 
 #: ../sheets/ciscohub.sheet.in.h:54
-msgid "Router and switch shapes by Cisco"
-msgstr "由 Cisco 提供的路由器和交换机"
+msgid "Programmable Switch"
+msgstr "可编程路由器"
 
 #: ../sheets/ciscohub.sheet.in.h:55
-msgid "Router subdued"
-msgstr "路由器(柔和)"
+msgid "Content Service Switch 1100"
+msgstr "内容服务交换机 1100"
 
 #: ../sheets/ciscohub.sheet.in.h:56
-msgid "Router with Firewall"
-msgstr "有防火墙的路由器"
+msgid "ATM Fast Gigabit Etherswitch"
+msgstr "ATM Fast Gigabit Etherswitch"
 
 #: ../sheets/ciscohub.sheet.in.h:57
-msgid "Router with Silicon Switch"
-msgstr "带有硅交换机的路由器"
+msgid "RateMUX"
+msgstr "RateMUX"
 
 #: ../sheets/ciscohub.sheet.in.h:58
-msgid "Server Switch"
-msgstr "服务器路由器"
+msgid "Workgroup 5500"
+msgstr "工作组 5500"
 
 #: ../sheets/ciscohub.sheet.in.h:59
-msgid "Small Hub"
-msgstr "小型集线器"
+msgid "Workgroup 5000"
+msgstr "工作组 5000"
 
 #: ../sheets/ciscohub.sheet.in.h:60
-msgid "Storage Router"
-msgstr "存储路由器"
+msgid "Workgroup 5002"
+msgstr "工作组 5002"
 
 #: ../sheets/ciscohub.sheet.in.h:61
-msgid "Switch Processor"
-msgstr "交换机处理器"
+msgid "NetRanger"
+msgstr "NetRanger"
 
 #: ../sheets/ciscohub.sheet.in.h:62
-msgid "Universal Gateway"
-msgstr "通用的网关"
+msgid "MGX 8220"
+msgstr "MGX 8220"
 
 #: ../sheets/ciscohub.sheet.in.h:63
-msgid "Virtual Layer Switch"
-msgstr "虚拟层交换机"
+msgid "MGX 8240"
+msgstr "MGX 8240"
 
 #: ../sheets/ciscohub.sheet.in.h:64
-msgid "Wavelength router"
-msgstr "波长路由器"
+msgid "MGX 8260"
+msgstr "MGX 8260"
 
 #: ../sheets/ciscohub.sheet.in.h:65
-msgid "Wireless router"
-msgstr "无线路由器"
+msgid "Universal Gateway"
+msgstr "通用的网关"
 
 #: ../sheets/ciscohub.sheet.in.h:66
-msgid "Workgroup 5000"
-msgstr "工作组 5000"
+msgid "iSCSI switch"
+msgstr "iSCSI 交换机"
 
 #: ../sheets/ciscohub.sheet.in.h:67
-msgid "Workgroup 5002"
-msgstr "工作组 5002"
+msgid "Workgroup Fibre Channel intelligent switch"
+msgstr "工作组光纤通道智慧型交换机"
 
 #: ../sheets/ciscohub.sheet.in.h:68
-msgid "Workgroup 5500"
-msgstr "工作组 5500"
+msgid "Director-class Fibre Channel intelligent switch"
+msgstr "导向器级光纤智能交换机"
 
 #: ../sheets/ciscohub.sheet.in.h:69
-msgid "Workgroup Fibre Channel intelligent switch"
-msgstr "工作组光纤通道智慧型交换机"
+msgid "Multi-Fabric Server Switch"
+msgstr "Multi-Fabric 服务器交换机"
 
 #: ../sheets/ciscohub.sheet.in.h:70
-msgid "Workgroup Switch Voice-Enabled"
-msgstr "工作组交换机 Voice-Enabled"
+msgid "Server Switch"
+msgstr "服务器路由器"
 
 #: ../sheets/ciscohub.sheet.in.h:71
-msgid "Workgroup switch"
-msgstr "工作组交换机"
+msgid "Multilayer Remote Switch"
+msgstr "多层远程交换机"
 
 #: ../sheets/ciscohub.sheet.in.h:72
-msgid "Workgroup switch Subdued"
-msgstr "工作组交换机(柔和)"
+msgid "Layer 2 Remote Switch"
+msgstr "Layer 2 远程交换机"
 
 #: ../sheets/ciscohub.sheet.in.h:73
-msgid "iSCSI switch"
-msgstr "iSCSI 交换机"
+msgid "Virtual Layer Switch"
+msgstr "虚拟层交换机"
 
 #: ../sheets/ciscomisc.sheet.in.h:1
-msgid "Androgynous Person"
-msgstr "中性人"
+msgid "Cisco — Miscellaneous"
+msgstr "Cisco — 其它"
 
 #: ../sheets/ciscomisc.sheet.in.h:2
-msgid "Antenna"
-msgstr "天线"
+msgid "Miscellaneous shapes by Cisco"
+msgstr "Cisco 提供的其它形状"
 
 #: ../sheets/ciscomisc.sheet.in.h:3
-msgid "Branch office"
-msgstr "分支办公室"
+msgid "Government Building"
+msgstr "政府建筑"
 
 #: ../sheets/ciscomisc.sheet.in.h:4
-msgid "Branch office blue"
-msgstr "分支办公室(蓝色)"
+msgid "University"
+msgstr "大学"
 
 #: ../sheets/ciscomisc.sheet.in.h:5
-msgid "Branch office subdued"
-msgstr "分支办公室(柔和)"
+msgid "Small Business"
+msgstr "小公司"
 
 #: ../sheets/ciscomisc.sheet.in.h:6
-msgid "Car"
-msgstr "车"
+msgid "Home office"
+msgstr "家庭办公室"
 
 #: ../sheets/ciscomisc.sheet.in.h:7
-msgid "Cisco - Misc"
-msgstr "Cisco - 其它"
+msgid "Branch office"
+msgstr "分支办公室"
 
 #: ../sheets/ciscomisc.sheet.in.h:8
-msgid "CiscoWorks Man"
-msgstr "CiscoWorks Man"
+msgid "Branch office subdued"
+msgstr "分支办公室(柔和)"
+
+#: ../sheets/ciscomisc.sheet.in.h:9
+msgid "Branch office blue"
+msgstr "分支办公室(蓝色)"
 
 #: ../sheets/ciscomisc.sheet.in.h:10
 msgid "Generic Building"
 msgstr "普通建筑"
 
 #: ../sheets/ciscomisc.sheet.in.h:11
-msgid "Generic Building blue"
-msgstr "普通建筑(蓝色)"
-
-#: ../sheets/ciscomisc.sheet.in.h:12
 msgid "Generic Building subdued"
 msgstr "普通建筑(柔和)"
 
+#: ../sheets/ciscomisc.sheet.in.h:12
+msgid "Generic Building blue"
+msgstr "普通建筑(蓝色)"
+
 #: ../sheets/ciscomisc.sheet.in.h:13
-msgid "Government Building"
-msgstr "政府建筑"
+msgid "Medium Building"
+msgstr "中型建筑"
 
 #: ../sheets/ciscomisc.sheet.in.h:14
-msgid "Headphones"
-msgstr "耳机"
+msgid "Medium Building subdued"
+msgstr "中型建筑(柔和)"
 
 #: ../sheets/ciscomisc.sheet.in.h:15
-msgid "Home office"
-msgstr "家庭办公室"
+msgid "Medium Building blue"
+msgstr "中型建筑(蓝色)"
 
 #: ../sheets/ciscomisc.sheet.in.h:16
 msgid "House"
@@ -9426,1192 +7854,2437 @@ msgid "House blue"
 msgstr "蓝色房子"
 
 #: ../sheets/ciscomisc.sheet.in.h:18
-msgid "Key"
-msgstr "钥匙"
+msgid "Telecommuter house"
+msgstr "远程工作者之家"
 
-#: ../sheets/ciscomisc.sheet.in.h:20
-msgid "Lock and Key"
-msgstr "锁和钥匙"
+#: ../sheets/ciscomisc.sheet.in.h:19
+msgid "Telecommuter house subdued"
+msgstr "远程工作者之家(柔和)"
 
-#: ../sheets/ciscomisc.sheet.in.h:21
+#: ../sheets/ciscomisc.sheet.in.h:20
 msgid "MDU"
 msgstr "MDU"
 
+#: ../sheets/ciscomisc.sheet.in.h:21
+msgid "Man"
+msgstr "男性"
+
 #: ../sheets/ciscomisc.sheet.in.h:22
-msgid "Mac Woman"
-msgstr "Mac 女性"
+msgid "Man red"
+msgstr "男性(红色)"
 
 #: ../sheets/ciscomisc.sheet.in.h:23
-msgid "Man"
-msgstr "男性"
+msgid "Man gold"
+msgstr "男性(金色)"
 
 #: ../sheets/ciscomisc.sheet.in.h:24
 msgid "Man blue"
 msgstr "男性(蓝色)"
 
 #: ../sheets/ciscomisc.sheet.in.h:25
-msgid "Man gold"
-msgstr "男性(金色)"
+msgid "Standing Man"
+msgstr "站立的男性"
 
 #: ../sheets/ciscomisc.sheet.in.h:26
-msgid "Man red"
-msgstr "男性(红色)"
+msgid "Standing woman"
+msgstr "站立的女性"
 
 #: ../sheets/ciscomisc.sheet.in.h:27
-msgid "Medium Building"
-msgstr "中型建筑"
+msgid "Woman"
+msgstr "女性"
 
 #: ../sheets/ciscomisc.sheet.in.h:28
-msgid "Medium Building blue"
-msgstr "中型建筑(蓝色)"
+msgid "Woman red"
+msgstr "女性(红色)"
 
 #: ../sheets/ciscomisc.sheet.in.h:29
-msgid "Medium Building subdued"
-msgstr "中型建筑(柔和)"
+msgid "Woman gold"
+msgstr "女性(金色)"
+
+#: ../sheets/ciscomisc.sheet.in.h:30
+msgid "Woman blue"
+msgstr "女性(蓝色)"
 
 #: ../sheets/ciscomisc.sheet.in.h:31
-msgid "Miscellaneous shapes by Cisco"
-msgstr "Cisco 提供的其它形状"
+msgid "Running man"
+msgstr "奔跑的男性"
 
 #: ../sheets/ciscomisc.sheet.in.h:32
-msgid "PC Man"
-msgstr "PC 男性"
+msgid "Running man subdued"
+msgstr "奔跑的男性(柔和)"
 
 #: ../sheets/ciscomisc.sheet.in.h:33
-msgid "PC Man left"
-msgstr "PC 男性(左)"
+msgid "Telecommuter"
+msgstr "远程工作者"
 
 #: ../sheets/ciscomisc.sheet.in.h:34
-msgid "Running man"
-msgstr "奔跑的男性"
+msgid "Running woman"
+msgstr "奔跑的女性"
 
 #: ../sheets/ciscomisc.sheet.in.h:35
-msgid "Running man subdued"
-msgstr "奔跑的男性(柔和)"
+msgid "CiscoWorks Man"
+msgstr "CiscoWorks Man"
 
 #: ../sheets/ciscomisc.sheet.in.h:36
-msgid "Running woman"
-msgstr "奔跑的女性"
+msgid "PC Man left"
+msgstr "PC 男性(左)"
 
 #: ../sheets/ciscomisc.sheet.in.h:37
-msgid "Satellite"
-msgstr "卫星"
+msgid "PC Man"
+msgstr "PC 男性"
 
 #: ../sheets/ciscomisc.sheet.in.h:38
-msgid "Satellite dish"
-msgstr "卫星天线"
-
-#: ../sheets/ciscomisc.sheet.in.h:39
 msgid "Sitting Woman"
 msgstr "坐着的女性"
 
-#: ../sheets/ciscomisc.sheet.in.h:40
+#: ../sheets/ciscomisc.sheet.in.h:39
 msgid "Sitting Woman right"
 msgstr "坐着的女性(右)"
 
-#: ../sheets/ciscomisc.sheet.in.h:41
-msgid "Small Business"
-msgstr "小公司"
+#: ../sheets/ciscomisc.sheet.in.h:40
+msgid "Mac Woman"
+msgstr "Mac 女性"
 
-#: ../sheets/ciscomisc.sheet.in.h:43
-msgid "Standing Man"
-msgstr "站立的男性"
+#: ../sheets/ciscomisc.sheet.in.h:41
+msgid "Androgynous Person"
+msgstr "中性人"
 
 #: ../sheets/ciscomisc.sheet.in.h:44
-msgid "Standing woman"
-msgstr "站立的女性"
+msgid "Lock and Key"
+msgstr "锁和钥匙"
 
 #: ../sheets/ciscomisc.sheet.in.h:45
-msgid "Telecommuter"
-msgstr "远程工作者"
+msgid "Satellite dish"
+msgstr "卫星天线"
 
 #: ../sheets/ciscomisc.sheet.in.h:46
-msgid "Telecommuter house"
-msgstr "远程工作者之家"
+msgid "Satellite"
+msgstr "卫星"
 
 #: ../sheets/ciscomisc.sheet.in.h:47
-msgid "Telecommuter house subdued"
-msgstr "远程工作者之家(柔和)"
+msgid "Antenna"
+msgstr "天线"
 
 #: ../sheets/ciscomisc.sheet.in.h:48
-msgid "Truck"
-msgstr "卡车"
+msgid "File cabinet"
+msgstr "文件柜"
 
 #: ../sheets/ciscomisc.sheet.in.h:49
-msgid "University"
-msgstr "大学"
+msgid "Car"
+msgstr "车"
 
 #: ../sheets/ciscomisc.sheet.in.h:50
+msgid "Truck"
+msgstr "卡车"
+
+#: ../sheets/ciscomisc.sheet.in.h:51
 msgid "Video Camera"
 msgstr "视频照相机"
 
-#: ../sheets/ciscomisc.sheet.in.h:51
+#: ../sheets/ciscomisc.sheet.in.h:52
 msgid "Video Camera right"
 msgstr "视频照相机(右)"
 
-#: ../sheets/ciscomisc.sheet.in.h:52
-msgid "Woman"
-msgstr "女性"
-
-#: ../sheets/ciscomisc.sheet.in.h:53
-msgid "Woman blue"
-msgstr "女性(蓝色)"
-
 #: ../sheets/ciscomisc.sheet.in.h:54
-msgid "Woman gold"
-msgstr "女性(金色)"
-
-#: ../sheets/ciscomisc.sheet.in.h:55
-msgid "Woman red"
-msgstr "女性(红色)"
+msgid "Headphones"
+msgstr "耳机"
 
 #: ../sheets/cisconetwork.sheet.in.h:1
-msgid "10700"
-msgstr "10700"
+msgid "Cisco — Network"
+msgstr "Cisco — 网络"
 
 #: ../sheets/cisconetwork.sheet.in.h:2
-msgid "15200"
-msgstr "15200"
+msgid "Network shapes by Cisco"
+msgstr "Cisco 网络形状"
 
 #: ../sheets/cisconetwork.sheet.in.h:3
-msgid "15800"
-msgstr "15800"
+msgid "Network Management"
+msgstr "网络管理"
 
 #: ../sheets/cisconetwork.sheet.in.h:4
-msgid "3174 (desktop) cluster controller"
-msgstr "3174 (桌面)簇控制器"
+msgid "Detector"
+msgstr "检测器"
 
 #: ../sheets/cisconetwork.sheet.in.h:5
-msgid "3X74 (floor) cluster controller"
-msgstr "3X74 (地面)簇控制器"
+msgid "Protocol Translator"
+msgstr "协议翻译器"
 
 #: ../sheets/cisconetwork.sheet.in.h:6
-msgid "Access Server"
-msgstr "接入服务器"
+msgid "IP"
+msgstr "IP"
 
 #: ../sheets/cisconetwork.sheet.in.h:7
-msgid "AccessPoint"
-msgstr "接入点"
+msgid "IP Old-style"
+msgstr "IP (旧式样)"
 
 #: ../sheets/cisconetwork.sheet.in.h:8
-msgid "Automatic Protection Switching"
-msgstr "自动保护交换"
+msgid "NAT"
+msgstr "NAT"
 
 #: ../sheets/cisconetwork.sheet.in.h:9
-msgid "BBFW"
-msgstr "BBFW"
+msgid "VIP"
+msgstr "VIP"
 
 #: ../sheets/cisconetwork.sheet.in.h:10
-msgid "BBFW media"
-msgstr "BBFW 媒体"
+msgid "Terminal Server"
+msgstr "终端服务器"
 
 #: ../sheets/cisconetwork.sheet.in.h:11
-msgid "Breakout box"
-msgstr "中断箱"
+msgid "Access Server"
+msgstr "接入服务器"
 
 #: ../sheets/cisconetwork.sheet.in.h:12
-msgid "Bridge"
-msgstr "桥接器"
+msgid "System controller"
+msgstr "系统控制器"
 
 #: ../sheets/cisconetwork.sheet.in.h:13
-msgid "CDDI/FDDI Concentrator"
-msgstr "CDDI/FDDI Concentrator"
+msgid "Directory Server"
+msgstr "目录服务器"
 
 #: ../sheets/cisconetwork.sheet.in.h:14
-msgid "CDM Content Distribution Manager"
-msgstr "CDM Content Distribution Manager"
+msgid "Firewall"
+msgstr "防火墙"
 
 #: ../sheets/cisconetwork.sheet.in.h:15
-msgid "CSU/DSU"
-msgstr "CSU/DSU"
+msgid "Firewall subdued"
+msgstr "防火墙(柔和)"
 
 #: ../sheets/cisconetwork.sheet.in.h:16
-msgid "Cable Modem"
-msgstr "电缆调制解调器"
+msgid "Firewall horizontal"
+msgstr "防火墙(水平)"
 
 #: ../sheets/cisconetwork.sheet.in.h:17
-msgid "Catalyst Access Gateway"
-msgstr "Catalyst 存取网关"
+msgid "Firewall Service Module"
+msgstr "防火墙服务模块"
 
 #: ../sheets/cisconetwork.sheet.in.h:18
-msgid "Centri Firewall"
-msgstr "Centri 防火墙"
+msgid "IOS Firewall"
+msgstr "IOS 防火墙"
 
 #: ../sheets/cisconetwork.sheet.in.h:19
-msgid "Channelized Pipe"
-msgstr "信道化管道"
+msgid "PIX Firewall"
+msgstr "PIX 防火墙"
 
 #: ../sheets/cisconetwork.sheet.in.h:20
-msgid "Cisco - Network"
-msgstr "Cisco - 网络"
+msgid "PIX Firewall Left"
+msgstr "PIX 防火墙(左)"
 
 #: ../sheets/cisconetwork.sheet.in.h:21
-msgid "Cloud"
-msgstr "Cloud"
-
-#: ../sheets/cisconetwork.sheet.in.h:22
-msgid "Cloud Dark"
-msgstr "Cloud (暗)"
+msgid "Centri Firewall"
+msgstr "Centri 防火墙"
 
 #: ../sheets/cisconetwork.sheet.in.h:23
-msgid "Cloud Gold"
-msgstr "Cloud (金色)"
+msgid "Security appliance"
+msgstr "保安器具"
 
 #: ../sheets/cisconetwork.sheet.in.h:24
-msgid "Cloud White"
-msgstr "Cloud (白色)"
+msgid "VPN Concentrator"
+msgstr "VPN 集中器"
 
 #: ../sheets/cisconetwork.sheet.in.h:25
-msgid "Concatenated Payload"
-msgstr "级联载荷"
+msgid "VPN Gateway"
+msgstr "VPN 网关"
 
 #: ../sheets/cisconetwork.sheet.in.h:26
-msgid "Content Engine (Cache Director)"
-msgstr "内容引擎(Cache Director)"
+msgid "LAN to LAN"
+msgstr "LAN to LAN"
 
 #: ../sheets/cisconetwork.sheet.in.h:27
-msgid "Content Transformation Engine (CTE)"
-msgstr "内容转换引擎(CTE)"
+msgid "SSL Terminator"
+msgstr "SSL 终端器"
 
 #: ../sheets/cisconetwork.sheet.in.h:28
-msgid "DSLAM"
-msgstr "DSLAM"
+msgid "IP DSL Switch"
+msgstr "IP DSL 交换机"
 
 #: ../sheets/cisconetwork.sheet.in.h:29
-msgid "DWDM Filter"
-msgstr "DWDM 过滤器"
+msgid "DSLAM"
+msgstr "DSLAM"
 
 #: ../sheets/cisconetwork.sheet.in.h:30
-msgid "Detector"
-msgstr "检测器"
+msgid "Cable Modem"
+msgstr "电缆调制解调器"
 
 #: ../sheets/cisconetwork.sheet.in.h:31
-msgid "Digital Cross-Connect"
-msgstr "交叉连接器"
+msgid "Wireless Connectivity"
+msgstr "无线网络连通性"
 
 #: ../sheets/cisconetwork.sheet.in.h:32
-msgid "Directory Server"
-msgstr "目录服务器"
+msgid "Wireless Transport"
+msgstr "无线网络传输"
 
 #: ../sheets/cisconetwork.sheet.in.h:33
-msgid "Distributed Director"
-msgstr "分布式导向器"
+msgid "AccessPoint"
+msgstr "接入点"
 
 #: ../sheets/cisconetwork.sheet.in.h:34
-msgid "Dual Mode AccessPoint"
-msgstr "双模式存取点"
+msgid "Wireless Bridge"
+msgstr "无线网络桥接器"
 
 #: ../sheets/cisconetwork.sheet.in.h:35
-msgid "FDDI Ring"
-msgstr "FDDI 环"
+msgid "Dual Mode AccessPoint"
+msgstr "双模式存取点"
 
 #: ../sheets/cisconetwork.sheet.in.h:36
-msgid "File Engine"
-msgstr "文件引擎"
+msgid "Wi-Fi Tag"
+msgstr "Wi-Fi 标签"
 
 #: ../sheets/cisconetwork.sheet.in.h:37
-msgid "Firewall"
-msgstr "防火墙"
+msgid "Wireless Location Appliance"
+msgstr "无线网络位置器械"
 
 #: ../sheets/cisconetwork.sheet.in.h:38
-msgid "Firewall Service Module"
-msgstr "防火墙服务模块"
+msgid "Location server"
+msgstr "位置服务器"
 
 #: ../sheets/cisconetwork.sheet.in.h:39
-msgid "Firewall horizontal"
-msgstr "防火墙(水平)"
+msgid "Lightweight AP"
+msgstr "轻量级的 AP"
 
 #: ../sheets/cisconetwork.sheet.in.h:40
-msgid "Firewall subdued"
-msgstr "防火墙(柔和)"
+msgid "WLAN controller"
+msgstr "无线网控制器"
 
 #: ../sheets/cisconetwork.sheet.in.h:41
-msgid "General Appliance"
-msgstr "普通设备"
+msgid "BBFW"
+msgstr "BBFW"
 
 #: ../sheets/cisconetwork.sheet.in.h:42
-msgid "Generic Gateway"
-msgstr "普通网关"
+msgid "BBFW media"
+msgstr "BBFW 媒体"
+
+#: ../sheets/cisconetwork.sheet.in.h:43
+msgid "Channelized Pipe"
+msgstr "信道化管道"
 
 #: ../sheets/cisconetwork.sheet.in.h:44
-msgid "IOS Firewall"
-msgstr "IOS 防火墙"
+msgid "Concatenated Payload"
+msgstr "级联载荷"
 
 #: ../sheets/cisconetwork.sheet.in.h:45
-msgid "IOS SLB"
-msgstr "IOS SLB"
+msgid "Optical Cross-Connect"
+msgstr "光学交叉连接"
 
 #: ../sheets/cisconetwork.sheet.in.h:46
-msgid "IP"
-msgstr "IP"
+msgid "Optical Transport"
+msgstr "光学传输"
 
 #: ../sheets/cisconetwork.sheet.in.h:47
-msgid "IP DSL Switch"
-msgstr "IP DSL 交换机"
+msgid "Optical Fiber"
+msgstr "光学纤维"
 
 #: ../sheets/cisconetwork.sheet.in.h:48
-msgid "IP Old-style"
-msgstr "IP (旧式样)"
+msgid "Optical Amplifier"
+msgstr "光学放大器"
 
 #: ../sheets/cisconetwork.sheet.in.h:49
-msgid "IP Transport Concentrator"
-msgstr "IP 运输集中器"
+msgid "Digital Cross-Connect"
+msgstr "交叉连接器"
 
 #: ../sheets/cisconetwork.sheet.in.h:50
-msgid "IPTV broadcast server"
-msgstr "IPTV 广播服务器"
+msgid "IP Transport Concentrator"
+msgstr "IP 运输集中器"
 
 #: ../sheets/cisconetwork.sheet.in.h:51
-msgid "IPTV content manager"
-msgstr "IPTV 内容管理器"
+msgid "DWDM Filter"
+msgstr "DWDM 过滤器"
 
 #: ../sheets/cisconetwork.sheet.in.h:52
-msgid "LAN to LAN"
-msgstr "LAN to LAN"
+msgid "WDM"
+msgstr "WDM"
 
 #: ../sheets/cisconetwork.sheet.in.h:53
-msgid "Lightweight AP"
-msgstr "轻量级的 AP"
+msgid "15200"
+msgstr "15200"
 
 #: ../sheets/cisconetwork.sheet.in.h:54
-msgid "LocalDirector"
-msgstr "LocalDirector"
+msgid "15800"
+msgstr "15800"
 
 #: ../sheets/cisconetwork.sheet.in.h:55
-msgid "Location server"
-msgstr "位置服务器"
+msgid "ONS15104"
+msgstr "ONS15104"
 
 #: ../sheets/cisconetwork.sheet.in.h:56
-msgid "LongReach CPE"
-msgstr "LongReach CPE"
+msgid "10700"
+msgstr "10700"
 
 #: ../sheets/cisconetwork.sheet.in.h:57
-msgid "MAS Gateway"
-msgstr "MAS 网关"
+msgid "Metro 1500"
+msgstr "Metro 1500"
 
 #: ../sheets/cisconetwork.sheet.in.h:58
-msgid "MAU"
-msgstr "MAU"
+msgid "ONS15540"
+msgstr "ONS15540"
 
 #: ../sheets/cisconetwork.sheet.in.h:59
-msgid "ME 1100"
-msgstr "ME 1100"
+msgid "Automatic Protection Switching"
+msgstr "自动保护交换"
 
 #: ../sheets/cisconetwork.sheet.in.h:60
-msgid "MUX"
-msgstr "MUX"
+msgid "RPS"
+msgstr "RPS"
 
 #: ../sheets/cisconetwork.sheet.in.h:61
-msgid "Metro 1500"
-msgstr "Metro 1500"
+msgid "UPS"
+msgstr "UPS"
 
 #: ../sheets/cisconetwork.sheet.in.h:62
-msgid "NAT"
-msgstr "NAT"
+msgid "LongReach CPE"
+msgstr "LongReach CPE"
 
 #: ../sheets/cisconetwork.sheet.in.h:63
-msgid "Network Management"
-msgstr "网络管理"
+msgid "3X74 (floor) cluster controller"
+msgstr "3X74 (地面)簇控制器"
 
 #: ../sheets/cisconetwork.sheet.in.h:64
-msgid "Network shapes by Cisco"
-msgstr "Cisco 网络形状"
+msgid "3174 (desktop) cluster controller"
+msgstr "3174 (桌面)簇控制器"
 
 #: ../sheets/cisconetwork.sheet.in.h:65
-msgid "ONS15104"
-msgstr "ONS15104"
+msgid "CSU/DSU"
+msgstr "CSU/DSU"
 
 #: ../sheets/cisconetwork.sheet.in.h:66
-msgid "ONS15540"
-msgstr "ONS15540"
+msgid "WAN"
+msgstr "WAN"
 
 #: ../sheets/cisconetwork.sheet.in.h:67
-msgid "Optical Amplifier"
-msgstr "光学放大器"
+msgid "Cloud"
+msgstr "Cloud"
 
 #: ../sheets/cisconetwork.sheet.in.h:68
-msgid "Optical Cross-Connect"
-msgstr "光学交叉连接"
+msgid "Cloud Gold"
+msgstr "Cloud (金色)"
 
 #: ../sheets/cisconetwork.sheet.in.h:69
-msgid "Optical Fiber"
-msgstr "光学纤维"
+msgid "Cloud White"
+msgstr "Cloud (白色)"
 
 #: ../sheets/cisconetwork.sheet.in.h:70
-msgid "Optical Transport"
-msgstr "光学传输"
+msgid "Cloud Dark"
+msgstr "Cloud (暗)"
 
 #: ../sheets/cisconetwork.sheet.in.h:71
-msgid "PAD"
-msgstr "PAD"
+msgid "Distributed Director"
+msgstr "分布式导向器"
 
 #: ../sheets/cisconetwork.sheet.in.h:72
-msgid "PIX Firewall"
-msgstr "PIX 防火墙"
+msgid "LocalDirector"
+msgstr "LocalDirector"
 
 #: ../sheets/cisconetwork.sheet.in.h:73
-msgid "PIX Firewall Left"
-msgstr "PIX 防火墙(左)"
+msgid "IOS SLB"
+msgstr "IOS SLB"
 
 #: ../sheets/cisconetwork.sheet.in.h:74
-msgid "Protocol Translator"
-msgstr "协议翻译器"
+msgid "MUX"
+msgstr "MUX"
 
 #: ../sheets/cisconetwork.sheet.in.h:75
-msgid "RPS"
-msgstr "RPS"
-
-#: ../sheets/cisconetwork.sheet.in.h:76
-msgid "Repeater"
-msgstr "中继器"
-
-#: ../sheets/cisconetwork.sheet.in.h:77
-msgid "SSL Terminator"
-msgstr "SSL 终端器"
+msgid "General Appliance"
+msgstr "普通设备"
 
+#. compatibility
+#. <alias name="Cisco - PAD"/>
 #: ../sheets/cisconetwork.sheet.in.h:78
-msgid "STB (set top box)"
-msgstr "STB (机顶盒)"
+msgid "PAD"
+msgstr "PAD"
 
 #: ../sheets/cisconetwork.sheet.in.h:79
-msgid "Security appliance"
-msgstr "保安器具"
+msgid "CDDI/FDDI Concentrator"
+msgstr "CDDI/FDDI Concentrator"
 
 #: ../sheets/cisconetwork.sheet.in.h:80
-msgid "Service Control"
-msgstr "服务控制"
+msgid "FDDI Ring"
+msgstr "FDDI 环"
 
 #: ../sheets/cisconetwork.sheet.in.h:81
-msgid "Storage Solution Engine"
-msgstr "储存方案引擎"
+msgid "TokenRing"
+msgstr "令牌环"
 
 #: ../sheets/cisconetwork.sheet.in.h:82
-msgid "System controller"
-msgstr "系统控制器"
+msgid "MAU"
+msgstr "MAU"
 
 #: ../sheets/cisconetwork.sheet.in.h:83
-msgid "TV"
-msgstr "TV"
+msgid "Repeater"
+msgstr "中继器"
 
 #: ../sheets/cisconetwork.sheet.in.h:84
-msgid "Terminal Server"
-msgstr "终端服务器"
+msgid "Bridge"
+msgstr "桥接器"
 
 #: ../sheets/cisconetwork.sheet.in.h:85
-msgid "TokenRing"
-msgstr "令牌环"
+msgid "Breakout box"
+msgstr "中断箱"
 
 #: ../sheets/cisconetwork.sheet.in.h:86
-msgid "TransPath"
-msgstr "TransPath"
+msgid "STB (set top box)"
+msgstr "STB (机顶盒)"
 
 #: ../sheets/cisconetwork.sheet.in.h:87
-msgid "UPS"
-msgstr "UPS"
+msgid "TV"
+msgstr "TV"
 
 #: ../sheets/cisconetwork.sheet.in.h:88
-msgid "VIP"
-msgstr "VIP"
+msgid "IPTV broadcast server"
+msgstr "IPTV 广播服务器"
 
 #: ../sheets/cisconetwork.sheet.in.h:89
-msgid "VN2900"
-msgstr "VN2900"
+msgid "IPTV content manager"
+msgstr "IPTV 内容管理器"
 
 #: ../sheets/cisconetwork.sheet.in.h:90
-msgid "VN5900"
-msgstr "VN5900"
+msgid "VN2900"
+msgstr "VN2900"
 
 #: ../sheets/cisconetwork.sheet.in.h:91
 msgid "VN5902"
 msgstr "VN5902"
 
 #: ../sheets/cisconetwork.sheet.in.h:92
-msgid "VPN Concentrator"
-msgstr "VPN 集中器"
+msgid "VN5900"
+msgstr "VN5900"
 
 #: ../sheets/cisconetwork.sheet.in.h:93
-msgid "VPN Gateway"
-msgstr "VPN 网关"
+msgid "Catalyst Access Gateway"
+msgstr "Catalyst 存取网关"
 
 #: ../sheets/cisconetwork.sheet.in.h:94
-msgid "WAN"
-msgstr "WAN"
+msgid "Generic Gateway"
+msgstr "普通网关"
 
 #: ../sheets/cisconetwork.sheet.in.h:95
-msgid "WDM"
-msgstr "WDM"
+msgid "TransPath"
+msgstr "TransPath"
 
 #: ../sheets/cisconetwork.sheet.in.h:96
-msgid "WLAN controller"
-msgstr "无线网控制器"
+msgid "uBR910 Cable DSU"
+msgstr "uBR910 Cable DSU"
 
 #: ../sheets/cisconetwork.sheet.in.h:97
-msgid "Wi-Fi Tag"
-msgstr "Wi-Fi 标签"
+msgid "Storage Solution Engine"
+msgstr "储存方案引擎"
 
 #: ../sheets/cisconetwork.sheet.in.h:98
-msgid "Wireless Bridge"
-msgstr "无线网络桥接器"
+msgid "Content Engine (Cache Director)"
+msgstr "内容引擎(Cache Director)"
 
 #: ../sheets/cisconetwork.sheet.in.h:99
-msgid "Wireless Connectivity"
-msgstr "无线网络连通性"
+msgid "CDM Content Distribution Manager"
+msgstr "CDM Content Distribution Manager"
 
 #: ../sheets/cisconetwork.sheet.in.h:100
-msgid "Wireless Location Appliance"
-msgstr "无线网络位置器械"
+msgid "Content Transformation Engine (CTE)"
+msgstr "内容转换引擎(CTE)"
 
 #: ../sheets/cisconetwork.sheet.in.h:101
-msgid "Wireless Transport"
-msgstr "无线网络传输"
+msgid "ME 1100"
+msgstr "ME 1100"
 
 #: ../sheets/cisconetwork.sheet.in.h:102
-msgid "uBR910 Cable DSU"
-msgstr "uBR910 Cable DSU"
+msgid "MAS Gateway"
+msgstr "MAS 网关"
+
+#: ../sheets/cisconetwork.sheet.in.h:103
+msgid "File Engine"
+msgstr "文件引擎"
+
+#: ../sheets/cisconetwork.sheet.in.h:104
+msgid "Service Control"
+msgstr "服务控制"
 
 #: ../sheets/ciscotelephony.sheet.in.h:1
-msgid "6701"
-msgstr "6701"
+msgid "Cisco — Telephony"
+msgstr "Cisco — 电话"
 
 #: ../sheets/ciscotelephony.sheet.in.h:2
-msgid "6705"
-msgstr "6705"
+msgid "Telephony shapes by Cisco"
+msgstr "Cisco 提供的电话通讯形状"
 
 #: ../sheets/ciscotelephony.sheet.in.h:3
-msgid "6732"
-msgstr "6732"
+msgid "Phone"
+msgstr "电话"
 
 #: ../sheets/ciscotelephony.sheet.in.h:4
-msgid "ADM"
-msgstr "ADM"
+msgid "Phone 2"
+msgstr "电话 2"
 
 #: ../sheets/ciscotelephony.sheet.in.h:5
-msgid "ATA"
-msgstr "ATA"
+msgid "Phone Ethernet"
+msgstr "电话以太网"
 
 #: ../sheets/ciscotelephony.sheet.in.h:6
-msgid "BTS 10200"
-msgstr "BTS 10200"
+msgid "Phone Appliance"
+msgstr "电话装置"
 
 #: ../sheets/ciscotelephony.sheet.in.h:7
-msgid "CallManager"
-msgstr "访问管理器"
+msgid "Phone Feature"
+msgstr "电话功能"
 
 #: ../sheets/ciscotelephony.sheet.in.h:8
-msgid "Cellular Phone"
-msgstr "蜂窝电话"
+msgid "Phone/Fax"
+msgstr "电话/传真"
 
 #: ../sheets/ciscotelephony.sheet.in.h:9
-msgid "Cisco - Telephony"
-msgstr "Cisco - 电话"
+msgid "HootPhone"
+msgstr "HootPhone"
 
 #: ../sheets/ciscotelephony.sheet.in.h:10
-msgid "Class 4/5 switch"
-msgstr "Class 4/5 交换机"
+msgid "IP Phone"
+msgstr "IP 电话"
 
 #: ../sheets/ciscotelephony.sheet.in.h:11
-msgid "End Office"
-msgstr "终端办公室"
+msgid "IP Softphone"
+msgstr "IP 软件电话"
 
 #: ../sheets/ciscotelephony.sheet.in.h:12
-msgid "Fax"
-msgstr "Fax"
+msgid "Softphone"
+msgstr "软件电话"
 
 #: ../sheets/ciscotelephony.sheet.in.h:13
-msgid "Gatekeeper"
-msgstr "Gatekeeper"
+msgid "Cellular Phone"
+msgstr "蜂窝电话"
 
 #: ../sheets/ciscotelephony.sheet.in.h:14
-msgid "Generic softswitch"
-msgstr "普通软件交换机"
+msgid "Mobile Access IP Phone"
+msgstr "移动存取 IP 电话"
 
 #: ../sheets/ciscotelephony.sheet.in.h:15
-msgid "H.323"
-msgstr "H.323"
+msgid "Pager"
+msgstr "寻呼机"
 
 #: ../sheets/ciscotelephony.sheet.in.h:16
-msgid "HootPhone"
-msgstr "HootPhone"
+msgid "Fax"
+msgstr "Fax"
 
 #: ../sheets/ciscotelephony.sheet.in.h:17
-msgid "IAD router"
-msgstr "IAD 路由器"
+msgid "Turret"
+msgstr "塔楼"
 
 #: ../sheets/ciscotelephony.sheet.in.h:18
-msgid "ICM"
-msgstr "ICM"
+msgid "Octel"
+msgstr "Octel"
 
 #: ../sheets/ciscotelephony.sheet.in.h:19
-msgid "ICS"
-msgstr "ICS"
+msgid "Radio Tower"
+msgstr "无线电塔"
 
 #: ../sheets/ciscotelephony.sheet.in.h:20
-msgid "IP Phone"
-msgstr "IP 电话"
+msgid "PBX"
+msgstr "专用小交换机"
 
 #: ../sheets/ciscotelephony.sheet.in.h:21
-msgid "IP Softphone"
-msgstr "IP 软件电话"
+msgid "PBX Switch"
+msgstr "PBX 交换机"
 
 #: ../sheets/ciscotelephony.sheet.in.h:22
-msgid "IP Telephony Router"
-msgstr "IP 电话通讯路由器"
+msgid "Class 4/5 switch"
+msgstr "Class 4/5 交换机"
 
 #: ../sheets/ciscotelephony.sheet.in.h:23
-msgid "ITP"
-msgstr "ITP"
+msgid "SONET MUX"
+msgstr "SONET MUX"
 
 #: ../sheets/ciscotelephony.sheet.in.h:24
-msgid "IntelliSwitch Stack"
-msgstr "IntelliSwitch Stack"
+msgid "ADM"
+msgstr "ADM"
 
 #: ../sheets/ciscotelephony.sheet.in.h:25
-msgid "MCU"
-msgstr "MCU"
+msgid "ITP"
+msgstr "ITP"
 
 #: ../sheets/ciscotelephony.sheet.in.h:26
-msgid "MGX 8000 Series Voice Gateway"
-msgstr "MGX 8000 系列语音网关"
+msgid "ATA"
+msgstr "ATA"
 
 #: ../sheets/ciscotelephony.sheet.in.h:27
-msgid "MoH server (Music on Hold)"
-msgstr "MoH 服务(Music on Hold)"
+msgid "SIP Proxy Server"
+msgstr "SIP 代理服务器"
 
 #: ../sheets/ciscotelephony.sheet.in.h:28
-msgid "Mobile Access IP Phone"
-msgstr "移动存取 IP 电话"
+msgid "Gatekeeper"
+msgstr "Gatekeeper"
 
 #: ../sheets/ciscotelephony.sheet.in.h:29
-msgid "Mobile Access Router"
-msgstr "移动存取路由器"
+msgid "MGX 8000 Series Voice Gateway"
+msgstr "MGX 8000 系列语音网关"
 
 #: ../sheets/ciscotelephony.sheet.in.h:30
-msgid "Octel"
-msgstr "Octel"
+msgid "End Office"
+msgstr "终端办公室"
 
 #: ../sheets/ciscotelephony.sheet.in.h:31
-msgid "PBX"
-msgstr "专用小交换机"
+msgid "Voice-Enabled Access Server"
+msgstr "有语音功能的存取服务器"
 
 #: ../sheets/ciscotelephony.sheet.in.h:32
-msgid "PBX Switch"
-msgstr "PBX 交换机"
+msgid "Voice-Enabled Router"
+msgstr "防火墙路由器"
 
 #: ../sheets/ciscotelephony.sheet.in.h:33
-msgid "Pager"
-msgstr "寻呼机"
+msgid "Voice-Enabled ATM Switch"
+msgstr "有语音功能的 ATM 交换机"
 
 #: ../sheets/ciscotelephony.sheet.in.h:34
-msgid "Phone"
-msgstr "电话"
+msgid "CallManager"
+msgstr "访问管理器"
 
 #: ../sheets/ciscotelephony.sheet.in.h:35
-msgid "Phone 2"
-msgstr "电话 2"
+msgid "IP Telephony Router"
+msgstr "IP 电话通讯路由器"
 
 #: ../sheets/ciscotelephony.sheet.in.h:36
-msgid "Phone Appliance"
-msgstr "电话装置"
+msgid "Mobile Access Router"
+msgstr "移动存取路由器"
 
 #: ../sheets/ciscotelephony.sheet.in.h:37
-msgid "Phone Ethernet"
-msgstr "电话以太网"
+msgid "H.323"
+msgstr "H.323"
 
 #: ../sheets/ciscotelephony.sheet.in.h:38
-msgid "Phone Feature"
-msgstr "电话功能"
+msgid "STP"
+msgstr "STP"
 
 #: ../sheets/ciscotelephony.sheet.in.h:39
-msgid "Phone/Fax"
-msgstr "电话/传真"
+msgid "BTS 10200"
+msgstr "BTS 10200"
 
 #: ../sheets/ciscotelephony.sheet.in.h:40
-msgid "Radio Tower"
-msgstr "无线电塔"
+msgid "Generic softswitch"
+msgstr "普通软件交换机"
 
 #: ../sheets/ciscotelephony.sheet.in.h:41
-msgid "SC2200 (Signalling Controller)"
-msgstr "SC2200 (信号控制器)"
-
-#: ../sheets/ciscotelephony.sheet.in.h:42
 msgid "SC2200/VSC3000 host"
 msgstr "SC2200/VSC3000 主机"
 
+#: ../sheets/ciscotelephony.sheet.in.h:42
+msgid "Virtual switch controller (VSC 3000)"
+msgstr "虚似交换机控制器 (VSC 3000)"
+
 #: ../sheets/ciscotelephony.sheet.in.h:43
-msgid "SIP Proxy Server"
-msgstr "SIP 代理服务器"
+msgid "SC2200 (Signalling Controller)"
+msgstr "SC2200 (信号控制器)"
 
 #: ../sheets/ciscotelephony.sheet.in.h:44
-msgid "SONET MUX"
-msgstr "SONET MUX"
+msgid "MoH server (Music on Hold)"
+msgstr "MoH 服务(Music on Hold)"
 
 #: ../sheets/ciscotelephony.sheet.in.h:45
-msgid "STP"
-msgstr "STP"
+msgid "TDM router"
+msgstr "TDM 路由器"
 
 #: ../sheets/ciscotelephony.sheet.in.h:46
-msgid "Softphone"
-msgstr "软件电话"
+msgid "6701"
+msgstr "6701"
 
 #: ../sheets/ciscotelephony.sheet.in.h:47
-msgid "TDM router"
-msgstr "TDM 路由器"
+msgid "6705"
+msgstr "6705"
 
 #: ../sheets/ciscotelephony.sheet.in.h:48
-msgid "Telephony shapes by Cisco"
-msgstr "Cisco 提供的电话通讯形状"
+msgid "6732"
+msgstr "6732"
 
 #: ../sheets/ciscotelephony.sheet.in.h:49
-msgid "Turret"
-msgstr "塔楼"
+msgid "IAD router"
+msgstr "IAD 路由器"
 
 #: ../sheets/ciscotelephony.sheet.in.h:50
-msgid "Unity Express"
-msgstr "UUnity Express"
+msgid "ICS"
+msgstr "ICS"
 
 #: ../sheets/ciscotelephony.sheet.in.h:51
-msgid "Unity server"
-msgstr "Unity 服务器"
+msgid "ICM"
+msgstr "ICM"
 
 #: ../sheets/ciscotelephony.sheet.in.h:52
-msgid "Virtual switch controller (VSC 3000)"
-msgstr "虚似交换机控制器 (VSC 3000)"
+msgid "IntelliSwitch Stack"
+msgstr "IntelliSwitch Stack"
 
 #: ../sheets/ciscotelephony.sheet.in.h:53
-msgid "Voice-Enabled ATM Switch"
-msgstr "有语音功能的 ATM 交换机"
+msgid "Unity server"
+msgstr "Unity 服务器"
 
 #: ../sheets/ciscotelephony.sheet.in.h:54
-msgid "Voice-Enabled Access Server"
-msgstr "有语音功能的存取服务器"
+msgid "Unity Express"
+msgstr "UUnity Express"
 
 #: ../sheets/ciscotelephony.sheet.in.h:55
-msgid "Voice-Enabled Router"
-msgstr "防火墙路由器"
+msgid "MCU"
+msgstr "MCU"
 
 #: ../sheets/ciscotelephony.sheet.in.h:56
 msgid "uMG series"
 msgstr "uMG 系列"
 
 #: ../sheets/civil.sheet.in.h:1
-msgid "Aerator with bubbles"
-msgstr "气泡曝气器"
+msgid "Civil"
+msgstr "民用"
 
 #: ../sheets/civil.sheet.in.h:2
-msgid "Backflow preventer"
-msgstr "逆流防止设备"
+msgid "Civil Engineering Components"
+msgstr "民用的工程部件"
 
 #: ../sheets/civil.sheet.in.h:3
-msgid "Basin"
-msgstr "水池"
+msgid "Vertical rest"
+msgstr "垂直的支架"
 
 #: ../sheets/civil.sheet.in.h:4
-msgid "Bivalent vertical rest"
-msgstr "Bivalent vertical rest"
+msgid "Horizontal rest"
+msgstr "水平的支架"
 
 #: ../sheets/civil.sheet.in.h:5
-msgid "Civil"
-msgstr "民用"
+msgid "Bivalent vertical rest"
+msgstr "Bivalent vertical rest"
 
 #: ../sheets/civil.sheet.in.h:6
-msgid "Civil Engineering Components"
-msgstr "民用的工程部件"
+msgid "Reference line"
+msgstr "参考线"
 
 #: ../sheets/civil.sheet.in.h:7
-msgid "Container"
-msgstr "容器"
+msgid "Water level"
+msgstr "水位"
 
 #: ../sheets/civil.sheet.in.h:8
-msgid "Final-settling basin"
-msgstr "最后沉淀池"
+msgid "Soil"
+msgstr "泥土"
 
 #: ../sheets/civil.sheet.in.h:9
-msgid "Frequency converter"
-msgstr "变频器"
+msgid "Horizontally aligned arrow"
+msgstr "水平排列的箭头"
 
 #: ../sheets/civil.sheet.in.h:10
-msgid "Gas bottle"
-msgstr "气体瓶子"
+msgid "Vertically aligned arrow"
+msgstr "竖直排列的箭头"
 
 #: ../sheets/civil.sheet.in.h:11
 msgid "Horizontal limiting line"
 msgstr "水平的限定线"
 
 #: ../sheets/civil.sheet.in.h:12
-msgid "Horizontal rest"
-msgstr "水平的支架"
+msgid "Vertical limiting line"
+msgstr "垂直的限定值线"
 
 #: ../sheets/civil.sheet.in.h:13
-msgid "Horizontally aligned arrow"
-msgstr "水平排列的箭头"
+msgid "Horizontally aligned pump"
+msgstr "水平排列的泵"
 
 #: ../sheets/civil.sheet.in.h:14
-msgid "Horizontally aligned compressor"
-msgstr "水平排列的压缩机"
+msgid "Vertically aligned pump"
+msgstr "竖直排列的泵"
 
 #: ../sheets/civil.sheet.in.h:15
-msgid "Horizontally aligned pump"
-msgstr "水平排列的泵"
+msgid "Horizontally aligned compressor"
+msgstr "水平排列的压缩机"
 
 #: ../sheets/civil.sheet.in.h:16
-msgid "Horizontally aligned valve"
-msgstr "水平排列的阀"
+msgid "Vertically aligned compressor"
+msgstr "竖直排列的压缩机"
 
 #: ../sheets/civil.sheet.in.h:17
-msgid "Motor"
-msgstr "马达"
+msgid "Vertically aligned valve"
+msgstr "竖直排列的阀"
 
 #: ../sheets/civil.sheet.in.h:18
-msgid "Preliminary clarification tank"
-msgstr "初步净化槽"
+msgid "Horizontally aligned valve"
+msgstr "水平排列的阀"
 
 #: ../sheets/civil.sheet.in.h:19
-msgid "Reference line"
-msgstr "参考线"
+msgid "Backflow preventer"
+msgstr "逆流防止设备"
 
 #: ../sheets/civil.sheet.in.h:20
-msgid "Rotor"
-msgstr "转子"
+msgid "Motor"
+msgstr "马达"
 
 #: ../sheets/civil.sheet.in.h:21
-msgid "Soil"
-msgstr "泥土"
+msgid "Gas bottle"
+msgstr "气体瓶子"
 
 #: ../sheets/civil.sheet.in.h:22
-msgid "Vertical limiting line"
-msgstr "垂直的限定值线"
+msgid "Frequency converter"
+msgstr "变频器"
 
 #: ../sheets/civil.sheet.in.h:23
-msgid "Vertical rest"
-msgstr "垂直的支架"
+msgid "Vertically aligned propeller"
+msgstr "竖直排列的推进器"
 
 #: ../sheets/civil.sheet.in.h:24
-msgid "Vertically aligned arrow"
-msgstr "竖直排列的箭头"
+msgid "Aerator with bubbles"
+msgstr "气泡曝气器"
 
 #: ../sheets/civil.sheet.in.h:25
-msgid "Vertically aligned compressor"
-msgstr "竖直排列的压缩机"
+msgid "Rotor"
+msgstr "转子"
 
 #: ../sheets/civil.sheet.in.h:26
-msgid "Vertically aligned propeller"
-msgstr "竖直排列的推进器"
+msgid "Final-settling basin"
+msgstr "最后沉淀池"
 
 #: ../sheets/civil.sheet.in.h:27
-msgid "Vertically aligned pump"
-msgstr "竖直排列的泵"
+msgid "Preliminary clarification tank"
+msgstr "初步净化槽"
 
 #: ../sheets/civil.sheet.in.h:28
-msgid "Vertically aligned valve"
-msgstr "竖直排列的阀"
+msgid "Basin"
+msgstr "水池"
 
 #: ../sheets/civil.sheet.in.h:29
-msgid "Water level"
-msgstr "水位"
+msgid "Container"
+msgstr "容器"
+
+#: ../sheets/Contact.sheet.in.h:1
+msgid "Ladder"
+msgstr "Ladder"
+
+#: ../sheets/Contact.sheet.in.h:2
+msgid "Components for LADDER circuits"
+msgstr "LADDER 电路的部件"
+
+#: ../sheets/Contact.sheet.in.h:3
+msgid "'if' (normally open) ladder contact"
+msgstr "“if” (常开) 连接 ladder"
+
+#: ../sheets/Contact.sheet.in.h:4
+msgid "'if not' (normally closed) ladder contact"
+msgstr "“if not” (常闭) 连接 ladder"
+
+#: ../sheets/Contact.sheet.in.h:5
+msgid "Simple output variable"
+msgstr "简单的输出变量"
+
+#: ../sheets/Contact.sheet.in.h:6
+msgid "Negative output variable"
+msgstr "负输出变量"
+
+#: ../sheets/Contact.sheet.in.h:7
+msgid "'set' output variable"
+msgstr "“set” 输出变量"
+
+#: ../sheets/Contact.sheet.in.h:8
+msgid "'reset' output variable"
+msgstr "“reset” 输出变量"
+
+#: ../sheets/Contact.sheet.in.h:9
+msgid "'jump' output variable"
+msgstr "“jump” 输出变量"
+
+#: ../sheets/Contact.sheet.in.h:10
+msgid "Receptivity output variable"
+msgstr "可接接度输出变量"
+
+#: ../sheets/Contact.sheet.in.h:11
+msgid "Power-saved simple output variable"
+msgstr "节电的简单输出变量"
+
+#: ../sheets/Contact.sheet.in.h:12
+msgid "Power-saved negative output variable"
+msgstr "节电的负输出变量"
+
+#: ../sheets/Contact.sheet.in.h:13
+msgid "Power-saved 'set' output variable"
+msgstr "节电“set”输出变量"
+
+#: ../sheets/Contact.sheet.in.h:14
+msgid "Power-saved 'reset' output variable"
+msgstr "节电“reset”输出变量"
+
+#: ../sheets/Cybernetics.sheet.in.h:1
+msgid "Cybernetics"
+msgstr "控制论"
+
+#: ../sheets/Cybernetics.sheet.in.h:2
+msgid "Elements of cybernetic circuits"
+msgstr "控制电路的部件"
+
+#: ../sheets/Cybernetics.sheet.in.h:3
+msgid "Sensor — left"
+msgstr "传感器 — (左)"
+
+#: ../sheets/Cybernetics.sheet.in.h:4
+msgid "Sensor — right"
+msgstr "传感器 — (右)"
+
+#: ../sheets/Cybernetics.sheet.in.h:5
+msgid "Sensor — bottom"
+msgstr "传感器 — (下)"
+
+#: ../sheets/Cybernetics.sheet.in.h:6
+msgid "Sensor — top"
+msgstr "传感器 — (上)"
+
+#: ../sheets/Cybernetics.sheet.in.h:7
+msgid "Sum, subtracting left input"
+msgstr "总数, 减去左方输入"
+
+#: ../sheets/Cybernetics.sheet.in.h:8
+msgid "Sum, subtracting right input"
+msgstr "总数, 减去右方输入"
+
+#: ../sheets/Cybernetics.sheet.in.h:9
+msgid "Sum, subtracting bottom input"
+msgstr "总数, 减去下方输入"
+
+#: ../sheets/Cybernetics.sheet.in.h:10
+msgid "Sum, subtracting top input"
+msgstr "总数, 减去上方输入"
+
+#: ../sheets/Cybernetics.sheet.in.h:11
+msgid "Integrator — input left"
+msgstr "积分器 — 输入(左)"
+
+#: ../sheets/Cybernetics.sheet.in.h:12
+msgid "Integrator — input right"
+msgstr "积分器 — 输入(右)"
+
+#: ../sheets/Cybernetics.sheet.in.h:13
+msgid "Integrator — input bottom"
+msgstr "积分器 — 输入(下)"
+
+#: ../sheets/Cybernetics.sheet.in.h:14
+msgid "Integrator — input top"
+msgstr "积分器 — 输入(上)"
+
+#: ../sheets/Cybernetics.sheet.in.h:15
+msgid "Sum"
+msgstr "总数"
+
+#: ../sheets/Cybernetics.sheet.in.h:16
+msgid "Product"
+msgstr "产物"
+
+#: ../sheets/Cybernetics.sheet.in.h:17
+msgid "High pass filter"
+msgstr "高通滤波器"
+
+#: ../sheets/Cybernetics.sheet.in.h:18
+msgid "Low pass filter"
+msgstr "低通滤波器"
+
+#: ../sheets/Cybernetics.sheet.in.h:19
+msgid "Sine characteristic or input"
+msgstr "正弦特性或输出"
+
+#: ../sheets/Cybernetics.sheet.in.h:20
+msgid "Sigmoid characteristic"
+msgstr "双弯曲特性"
+
+#: ../sheets/Cybernetics.sheet.in.h:21
+msgid "Saturation characteristic"
+msgstr "饱和特性"
+
+#: ../sheets/Cybernetics.sheet.in.h:22
+msgid "Relay characteristic (sigma)"
+msgstr "继电器特性(sigma)"
+
+#: ../sheets/Cybernetics.sheet.in.h:23
+msgid "Half wave rectifier or ramp input"
+msgstr "半波整流器或 ramp 输入"
+
+#: ../sheets/Cybernetics.sheet.in.h:24
+msgid "Full wave rectifier (absolute value)"
+msgstr "全波整流器(绝对值)"
+
+#: ../sheets/Cybernetics.sheet.in.h:25
+msgid "Constant positive shift on the y-axis"
+msgstr "y 轴的正向平移"
+
+#: ../sheets/Cybernetics.sheet.in.h:26
+msgid "Constant negative shift on the y-axis"
+msgstr "y 轴的负向平移"
+
+#: ../sheets/Cybernetics.sheet.in.h:27
+msgid "Constant factor greater 1"
+msgstr "固定系数大于 1"
+
+#: ../sheets/Cybernetics.sheet.in.h:28
+msgid "Constant factor between 0 and 1"
+msgstr "固定系数 0 和 1"
+
+#: ../sheets/Cybernetics.sheet.in.h:29
+msgid "Constant factor between 0 and -1"
+msgstr "固定系数 0 和 -1"
+
+#: ../sheets/Cybernetics.sheet.in.h:30
+msgid "Constant factor below -1"
+msgstr "因定系统小于 -1"
+
+#: ../sheets/Cybernetics.sheet.in.h:31
+msgid "Template for custom characteristics"
+msgstr "自选特性的模板"
+
+#: ../sheets/Cybernetics.sheet.in.h:32
+msgid "Time delay"
+msgstr "时间延迟"
+
+#: ../sheets/Database.sheet.in.h:1
+msgid "Database"
+msgstr "数据库"
+
+#: ../sheets/Database.sheet.in.h:2
+msgid "Editor for Database Table Relation Diagrams"
+msgstr "数据库表关系图编辑器"
+
+#: ../sheets/Database.sheet.in.h:5
+msgid "Attribute compound"
+msgstr "属性复合"
+
+#: ../sheets/Electric.sheet.in.h:1
+msgid "Electric"
+msgstr "电"
+
+#: ../sheets/Electric.sheet.in.h:2
+msgid "Components for electric circuits"
+msgstr "电路部件"
+
+#: ../sheets/Electric.sheet.in.h:3
+msgid "Normally open contact (horizontal)"
+msgstr "常开触点(水平)"
+
+#: ../sheets/Electric.sheet.in.h:4
+msgid "Normally closed contact (horizontal)"
+msgstr "常闭触点(水平)"
+
+#: ../sheets/Electric.sheet.in.h:5
+msgid "Normally open position switch (horizontal)"
+msgstr "常开位置开关(水平)"
+
+#: ../sheets/Electric.sheet.in.h:6
+msgid "Normally closed position switch (horizontal)"
+msgstr "常闭位置开关(水平)"
+
+#: ../sheets/Electric.sheet.in.h:7
+msgid "Normally open contact (vertical)"
+msgstr "常开触点(垂直)"
+
+#: ../sheets/Electric.sheet.in.h:8
+msgid "Normally closed contact (vertical)"
+msgstr "常闭触点(垂直)"
+
+#: ../sheets/Electric.sheet.in.h:9
+msgid "Normally open position switch (vertical)"
+msgstr "常开位置开关(垂直)"
+
+#: ../sheets/Electric.sheet.in.h:10
+msgid "Normally closed position switch (vertical)"
+msgstr "常闭位置开关(垂直)"
+
+#: ../sheets/Electric.sheet.in.h:11
+msgid "The command organ of a relay (horizontal)"
+msgstr "继电器命令元件(水平)"
+
+#: ../sheets/Electric.sheet.in.h:12
+msgid "Relay (horizontal)"
+msgstr "继电器(水平)"
+
+#: ../sheets/Electric.sheet.in.h:13
+msgid "Lamp or indicator light (horizontal)"
+msgstr "灯或指示灯(水平)"
+
+#: ../sheets/Electric.sheet.in.h:14
+msgid "The command organ of a relay (vertical)"
+msgstr "继电器命令元件(垂直)"
+
+#: ../sheets/Electric.sheet.in.h:15
+msgid "Relay (vertical)"
+msgstr "继电器(垂直)"
+
+#: ../sheets/Electric.sheet.in.h:16
+msgid "Lamp or indicator light (vertical)"
+msgstr "灯或指示灯(垂直)"
+
+#: ../sheets/Electric.sheet.in.h:17 ../sheets/Pneumatic.sheet.in.h:22
+msgid "Connection point"
+msgstr "连接点"
+
+#: ../sheets/ER.sheet.in.h:1
+msgid "ER"
+msgstr "ER"
+
+#: ../sheets/ER.sheet.in.h:2
+msgid "Editor for Entity Relations Diagrams"
+msgstr "Entity Relations 图编辑器"
+
+#: ../sheets/ER.sheet.in.h:4
+msgid "Weak entity"
+msgstr "弱实体"
+
+#: ../sheets/ER.sheet.in.h:7
+msgid "Participation"
+msgstr "参与"
+
+#: ../sheets/Flowchart.sheet.in.h:2
+msgid "Objects to draw flowcharts"
+msgstr "画流量图的对象"
+
+#: ../sheets/Flowchart.sheet.in.h:3
+msgid "Process/Auxiliary Operation"
+msgstr "程序/辅助操作"
+
+#: ../sheets/Flowchart.sheet.in.h:4
+msgid "Input/Output"
+msgstr "输入/输出"
+
+#: ../sheets/Flowchart.sheet.in.h:5 ../sheets/SDL.sheet.in.h:14
+msgid "Decision"
+msgstr "决定"
+
+#: ../sheets/Flowchart.sheet.in.h:6
+msgid "Connector"
+msgstr "连接器"
+
+#: ../sheets/Flowchart.sheet.in.h:8
+msgid "Transaction file"
+msgstr "事务文件"
+
+#. XXX
+#: ../sheets/Flowchart.sheet.in.h:10
+msgid "Off page connector"
+msgstr "脱离页面连接器"
+
+#: ../sheets/Flowchart.sheet.in.h:11
+msgid "Document"
+msgstr "文档"
+
+#: ../sheets/Flowchart.sheet.in.h:12
+msgid "Manual operation"
+msgstr "手工操作"
+
+#: ../sheets/Flowchart.sheet.in.h:13
+msgid "Preparation"
+msgstr "预备"
+
+#: ../sheets/Flowchart.sheet.in.h:14
+msgid "Manual input"
+msgstr "手工输入"
+
+#: ../sheets/Flowchart.sheet.in.h:15
+msgid "Predefined process"
+msgstr "预定义的进程"
+
+#: ../sheets/Flowchart.sheet.in.h:16
+msgid "Terminal Interrupt"
+msgstr "终端中断"
+
+#: ../sheets/Flowchart.sheet.in.h:17
+msgid "Magnetic disk"
+msgstr "磁盘"
+
+#: ../sheets/Flowchart.sheet.in.h:18
+msgid "Magnetic drum"
+msgstr "磁鼓"
+
+#: ../sheets/Flowchart.sheet.in.h:19
+msgid "Magnetic tape"
+msgstr "磁带"
+
+#: ../sheets/Flowchart.sheet.in.h:20
+msgid "Internal storage"
+msgstr "内部的存储器"
+
+#: ../sheets/Flowchart.sheet.in.h:21
+msgid "Merge"
+msgstr "合并"
+
+#: ../sheets/Flowchart.sheet.in.h:23
+msgid "Delay"
+msgstr "延迟"
+
+#. XXX
+#: ../sheets/Flowchart.sheet.in.h:25
+msgid "Summing junction"
+msgstr "相交点"
+
+#. XXX
+#: ../sheets/Flowchart.sheet.in.h:27
+msgid "Collate"
+msgstr "对照"
+
+#: ../sheets/Flowchart.sheet.in.h:28
+msgid "Sort"
+msgstr "排序"
+
+#: ../sheets/Flowchart.sheet.in.h:29
+msgid "Or"
+msgstr "Or"
+
+#: ../sheets/Flowchart.sheet.in.h:30
+msgid "Punched card"
+msgstr "穿孔卡片"
+
+#: ../sheets/Flowchart.sheet.in.h:31
+msgid "Punched tape"
+msgstr "穿孔带"
+
+#: ../sheets/Flowchart.sheet.in.h:32
+msgid "Transmittal tape"
+msgstr "传送带"
+
+#: ../sheets/Flowchart.sheet.in.h:33
+msgid "Offline storage"
+msgstr "脱机存储"
+
+#: ../sheets/Flowchart.sheet.in.h:34
+msgid "Data source"
+msgstr "资料来源"
+
+#: ../sheets/FS.sheet.in.h:1
+msgid "FS"
+msgstr "FS"
+
+#: ../sheets/FS.sheet.in.h:2
+msgid "Editor for Function Structure Diagrams."
+msgstr "函数结构图编辑器。"
+
+#: ../sheets/FS.sheet.in.h:3
+msgid "Flow"
+msgstr "流程"
+
+#: ../sheets/FS.sheet.in.h:4
+msgid "Orthogonal polyline flow"
+msgstr "创建一个正交多线流"
+
+#: ../sheets/FS.sheet.in.h:5
+msgid "Function"
+msgstr "函数"
+
+#. Author: Nicholas Moore, 2005. mailto: shiny nickel gmail com
+#: ../sheets/Gane_and_Sarson.sheet.in.h:2
+msgid "Gane and Sarson"
+msgstr "Gane and Sarson"
+
+#: ../sheets/Gane_and_Sarson.sheet.in.h:3
+msgid "Gane and Sarson DFD"
+msgstr "Gane and Sarson DFD"
+
+#: ../sheets/Gane_and_Sarson.sheet.in.h:4
+msgid "Alternate external entity"
+msgstr "替代外部实体"
+
+#: ../sheets/Gane_and_Sarson.sheet.in.h:5
+msgid "Data store"
+msgstr "资料储存"
+
+#: ../sheets/Gane_and_Sarson.sheet.in.h:6
+msgid "External entity"
+msgstr "外部实体"
+
+#: ../sheets/GRAFCET.sheet.in.h:1
+msgid "GRAFCET"
+msgstr "GRAFCET"
+
+#: ../sheets/GRAFCET.sheet.in.h:2
+msgid "Objects to design GRAFCET charts"
+msgstr "设计 GRAFCET 图表所需的对象"
+
+#: ../sheets/GRAFCET.sheet.in.h:8
+msgid "Macro sub-program call step"
+msgstr "宏子程序调用步骤"
+
+#: ../sheets/GRAFCET.sheet.in.h:9
+msgid "Action to associate to a step"
+msgstr "与步骤相关的动作"
+
+#: ../sheets/GRAFCET.sheet.in.h:10
+msgid "Condition (of an action)"
+msgstr "条件(一个动作的)"
+
+#: ../sheets/GRAFCET.sheet.in.h:11 ../sheets/UML.sheet.in.h:32
+msgid "Transition"
+msgstr "推移"
+
+#: ../sheets/GRAFCET.sheet.in.h:12
+msgid "OR vergent"
+msgstr "OR vergent"
+
+#: ../sheets/GRAFCET.sheet.in.h:13
+msgid "AND vergent"
+msgstr "AND vergent"
+
+#: ../sheets/GRAFCET.sheet.in.h:14
+msgid "Arc (upward)"
+msgstr "弧形(向上)"
+
+#. use dc:title instead?
+#: ../sheets/IsometricMap.sheet.in.h:2
+msgid "Map, Isometric"
+msgstr "地图, Isometric"
+
+#. use dc:description instead?
+#: ../sheets/IsometricMap.sheet.in.h:4
+msgid "Isometric Directional Map Shapes"
+msgstr "Isometric Directional 地图图形"
+
+#: ../sheets/IsometricMap.sheet.in.h:5
+msgid "Road Section"
+msgstr "道路"
+
+#: ../sheets/IsometricMap.sheet.in.h:6
+msgid "Long Straight Road Section"
+msgstr "长直线道路"
+
+#: ../sheets/IsometricMap.sheet.in.h:7
+msgid "Crossroads"
+msgstr "交叉点"
+
+#: ../sheets/IsometricMap.sheet.in.h:8
+msgid "T-Junction"
+msgstr "三叉路"
+
+#: ../sheets/IsometricMap.sheet.in.h:9
+msgid "Elevated Road"
+msgstr "高架道路"
+
+#: ../sheets/IsometricMap.sheet.in.h:10
+msgid "Corner 1"
+msgstr "角落 1"
+
+#: ../sheets/IsometricMap.sheet.in.h:11
+msgid "Corner 2"
+msgstr "角落 2"
+
+#: ../sheets/IsometricMap.sheet.in.h:12
+msgid "River"
+msgstr "河流"
+
+#: ../sheets/IsometricMap.sheet.in.h:13
+msgid "Roof 1"
+msgstr "屋顶 1"
+
+#: ../sheets/IsometricMap.sheet.in.h:14
+msgid "Block 1, 2:4"
+msgstr "区块 1, 2:4"
+
+#: ../sheets/IsometricMap.sheet.in.h:15
+msgid "Block 2, 2:8"
+msgstr "区块 2, 2:8"
+
+#: ../sheets/IsometricMap.sheet.in.h:16
+msgid "Block 3, 4:4"
+msgstr "区块 3, 4:4"
+
+#: ../sheets/IsometricMap.sheet.in.h:17
+msgid "Block 4, 4:8"
+msgstr "区块 4, 4:8"
+
+#: ../sheets/IsometricMap.sheet.in.h:18
+msgid "Block 5, 3:3"
+msgstr "区块 5, 3:3"
+
+#: ../sheets/IsometricMap.sheet.in.h:19
+msgid "Block 6, 4:6"
+msgstr "区块 6, 4:6"
+
+#: ../sheets/IsometricMap.sheet.in.h:20
+msgid "Block 7"
+msgstr "区块 7"
+
+#: ../sheets/IsometricMap.sheet.in.h:21
+msgid "Factory"
+msgstr "工厂"
+
+#: ../sheets/IsometricMap.sheet.in.h:22
+msgid "Car 1, Front View"
+msgstr "车 1,前视图"
+
+#: ../sheets/IsometricMap.sheet.in.h:23
+msgid "Car 2, Rear View"
+msgstr "车 2,后视图"
+
+#: ../sheets/IsometricMap.sheet.in.h:24
+msgid "Train 1, angled downward"
+msgstr "火车 1,下行"
+
+#: ../sheets/IsometricMap.sheet.in.h:25
+msgid "Train 2, angled upward"
+msgstr "火车 2,上行"
+
+#: ../sheets/IsometricMap.sheet.in.h:26
+msgid "Tree 1"
+msgstr "树 1"
+
+#: ../sheets/IsometricMap.sheet.in.h:27
+msgid "Footbridge, Pedestrian Bridge"
+msgstr "行人天桥"
+
+#: ../sheets/IsometricMap.sheet.in.h:28
+msgid "One Way Road Sign"
+msgstr "单行道标志"
+
+#: ../sheets/Istar.sheet.in.h:1
+msgid "RE-i*"
+msgstr "RE-i*"
+
+#: ../sheets/Istar.sheet.in.h:2
+msgid "Objects to design i* diagrams"
+msgstr "设计 i* 所用的对象"
+
+#: ../sheets/Istar.sheet.in.h:3
+msgid "An i* softgoal"
+msgstr "An i* softgoal"
+
+#: ../sheets/Istar.sheet.in.h:4
+msgid "An i* goal"
+msgstr "An i* goal"
+
+#: ../sheets/Istar.sheet.in.h:5
+msgid "An i* resource"
+msgstr "An i* resource"
+
+#: ../sheets/Istar.sheet.in.h:6
+msgid "An i* task"
+msgstr "An i* task"
+
+#: ../sheets/Istar.sheet.in.h:7
+msgid "An i* unspecified actor"
+msgstr "An i* unspecified actor"
+
+#: ../sheets/Istar.sheet.in.h:8
+msgid "An i* agent"
+msgstr "An i* agent"
+
+#: ../sheets/Istar.sheet.in.h:9
+msgid "An i* position"
+msgstr "An i* position"
+
+#: ../sheets/Istar.sheet.in.h:10
+msgid "An i* role"
+msgstr "An i* role"
+
+#: ../sheets/Istar.sheet.in.h:11
+msgid "An i* unspecified link"
+msgstr "An i* unspecified link"
+
+#: ../sheets/Istar.sheet.in.h:12
+msgid "An i* positive contribution"
+msgstr "An i* positive contribution"
+
+#: ../sheets/Istar.sheet.in.h:13
+msgid "An i* negative contribution"
+msgstr "An i* negative contribution"
+
+#: ../sheets/Istar.sheet.in.h:14
+msgid "An i* dependency link"
+msgstr "An i* dependency link"
+
+#: ../sheets/Istar.sheet.in.h:15
+msgid "An i* decomposition link"
+msgstr "An i* decomposition link"
+
+#: ../sheets/Istar.sheet.in.h:16
+msgid "An i* means-ends link"
+msgstr "An i* means-ends link"
+
+#: ../sheets/Jackson.sheet.in.h:1
+msgid "RE-Jackson"
+msgstr "RE-Jackson"
+
+#: ../sheets/Jackson.sheet.in.h:2
+msgid "Objects to design Jackson diagrams"
+msgstr "设计 Jackson 图所用的对象"
+
+#: ../sheets/Jackson.sheet.in.h:3
+msgid "A Jackson given domain"
+msgstr "Jackson 指定的域"
+
+#: ../sheets/Jackson.sheet.in.h:4
+msgid "A Jackson designed domain"
+msgstr "Jackson 设计的域"
+
+#: ../sheets/Jackson.sheet.in.h:5
+msgid "A Jackson machine domain"
+msgstr "Jackson 机器域"
+
+#: ../sheets/Jackson.sheet.in.h:6
+msgid "A Jackson requirement"
+msgstr "Jackson 必要条件"
+
+#: ../sheets/Jackson.sheet.in.h:7
+msgid "A Jackson shared phenomenon"
+msgstr "Jackson 分担的现象"
+
+#: ../sheets/Jackson.sheet.in.h:8
+msgid "A Jackson requirement phenomenon"
+msgstr "Jackson 需要的现象"
 
 #: ../sheets/jigsaw.sheet.in.h:1
 msgid "Jigsaw"
 msgstr "拼图"
 
 #: ../sheets/jigsaw.sheet.in.h:2
-msgid "Jigsaw - part_iiii"
-msgstr "拼图 - 凹凹凹凹"
+msgid "Pieces of a jigsaw"
+msgstr "拼图的组成部份"
 
 #: ../sheets/jigsaw.sheet.in.h:3
-msgid "Jigsaw - part_iiio"
-msgstr "拼图 - 凹凹凹凸"
+msgid "Jigsaw — part_oioi"
+msgstr "拼图 — 凹凸凹凸"
 
 #: ../sheets/jigsaw.sheet.in.h:4
-msgid "Jigsaw - part_iioi"
-msgstr "拼图 - 凹凹凸凹"
+msgid "Jigsaw — part_ioio"
+msgstr "拼图 — 凹凸凹凸"
 
 #: ../sheets/jigsaw.sheet.in.h:5
-msgid "Jigsaw - part_iioo"
-msgstr "拼图 - 凹凹凸凸"
+msgid "Jigsaw — part_iiii"
+msgstr "拼图 — 凹凹凹凹"
 
 #: ../sheets/jigsaw.sheet.in.h:6
-msgid "Jigsaw - part_ioii"
-msgstr "拼图 - 凹凸凹凹"
+msgid "Jigsaw — part_oooo"
+msgstr "拼图 — 凸凸凸凸"
 
 #: ../sheets/jigsaw.sheet.in.h:7
-msgid "Jigsaw - part_ioio"
-msgstr "拼图 - 凹凸凹凸"
+msgid "Jigsaw — part_oooi"
+msgstr "拼图 — 凹凹凹凸"
 
 #: ../sheets/jigsaw.sheet.in.h:8
-msgid "Jigsaw - part_iooi"
-msgstr "拼图 - 凹凸凸凹"
+msgid "Jigsaw — part_iooo"
+msgstr "拼图 — 凹凸凸凸"
 
 #: ../sheets/jigsaw.sheet.in.h:9
-msgid "Jigsaw - part_iooo"
-msgstr "拼图 - 凹凸凸凸"
+msgid "Jigsaw — part_oioo"
+msgstr "拼图 — 凹凸凹凹"
 
 #: ../sheets/jigsaw.sheet.in.h:10
-msgid "Jigsaw - part_oiii"
-msgstr "拼图 - 凸凹凹凹"
+msgid "Jigsaw — part_ooio"
+msgstr "拼图 — 凹凹凸凹"
 
 #: ../sheets/jigsaw.sheet.in.h:11
-msgid "Jigsaw - part_oiio"
-msgstr "拼图 - 凸凹凹凸"
+msgid "Jigsaw — part_iioo"
+msgstr "拼图 — 凹凹凸凸"
 
 #: ../sheets/jigsaw.sheet.in.h:12
-msgid "Jigsaw - part_oioi"
-msgstr "拼图 - 凹凸凹凸"
+msgid "Jigsaw — part_oiio"
+msgstr "拼图 — 凸凹凹凸"
 
 #: ../sheets/jigsaw.sheet.in.h:13
-msgid "Jigsaw - part_oioo"
-msgstr "拼图 - 凹凸凹凹"
+msgid "Jigsaw — part_ooii"
+msgstr "拼图 — 凹凹凸凸"
 
 #: ../sheets/jigsaw.sheet.in.h:14
-msgid "Jigsaw - part_ooii"
-msgstr "拼图 - 凹凹凸凸"
+msgid "Jigsaw — part_iooi"
+msgstr "拼图 — 凹凸凸凹"
 
 #: ../sheets/jigsaw.sheet.in.h:15
-msgid "Jigsaw - part_ooio"
-msgstr "拼图 - 凹凹凸凹"
+msgid "Jigsaw — part_oiii"
+msgstr "拼图 — 凸凹凹凹"
 
 #: ../sheets/jigsaw.sheet.in.h:16
-msgid "Jigsaw - part_oooi"
-msgstr "拼图 - 凹凹凹凸"
+msgid "Jigsaw — part_ioii"
+msgstr "拼图 — 凹凸凹凹"
 
 #: ../sheets/jigsaw.sheet.in.h:17
-msgid "Jigsaw - part_oooo"
-msgstr "拼图 - 凸凸凸凸"
+msgid "Jigsaw — part_iioi"
+msgstr "拼图 — 凹凹凸凹"
 
 #: ../sheets/jigsaw.sheet.in.h:18
-msgid "Pieces of a jigsaw"
-msgstr "拼图的组成部份"
+msgid "Jigsaw — part_iiio"
+msgstr "拼图 — 凹凹凹凸"
+
+#: ../sheets/KAOS.sheet.in.h:1
+msgid "RE-KAOS"
+msgstr "RE-KAOS"
+
+#: ../sheets/KAOS.sheet.in.h:2
+msgid "Objects to design KAOS diagrams"
+msgstr "设计 KAOS 图表所用的对象"
+
+#: ../sheets/KAOS.sheet.in.h:3
+msgid "A KAOS softgoal"
+msgstr "KAOS 软目标"
+
+#: ../sheets/KAOS.sheet.in.h:4
+msgid "A KAOS goal"
+msgstr "KAOS 目标"
+
+#: ../sheets/KAOS.sheet.in.h:5
+msgid "A KAOS requirement"
+msgstr "KAOS 需求"
+
+#: ../sheets/KAOS.sheet.in.h:6
+msgid "A KAOS assumption"
+msgstr "KAOS 假设"
+
+#: ../sheets/KAOS.sheet.in.h:7
+msgid "A KAOS obstacle"
+msgstr "KAOS 障碍"
+
+#: ../sheets/KAOS.sheet.in.h:8
+msgid "A KAOS AND refinement"
+msgstr "A KAOS AND refinement"
+
+#: ../sheets/KAOS.sheet.in.h:9
+msgid "A KAOS complete AND refinement"
+msgstr "A KAOS complete AND refinement"
+
+#: ../sheets/KAOS.sheet.in.h:10
+msgid "A KAOS OR refinement"
+msgstr "A KAOS OR refinement"
+
+#: ../sheets/KAOS.sheet.in.h:11
+msgid "A KAOS complete OR refinement"
+msgstr "A KAOS complete OR refinement"
+
+#: ../sheets/KAOS.sheet.in.h:12
+msgid "A KAOS operationalization"
+msgstr "KAOS 操作化"
+
+#: ../sheets/KAOS.sheet.in.h:13
+msgid "A KAOS contribution"
+msgstr "A KAOS contribution"
+
+#: ../sheets/KAOS.sheet.in.h:14
+msgid "A KAOS obstruction"
+msgstr "KAOS 障碍物"
+
+#: ../sheets/KAOS.sheet.in.h:15
+msgid "A KAOS binary conflict"
+msgstr "KAOS 二进制冲突"
+
+#: ../sheets/KAOS.sheet.in.h:16
+msgid "A KAOS agent"
+msgstr "KAOS 代理程序"
+
+#: ../sheets/KAOS.sheet.in.h:17
+msgid "A KAOS responsibility"
+msgstr "KAOS 责任"
+
+#: ../sheets/KAOS.sheet.in.h:18
+msgid "A KAOS monitor link"
+msgstr "KAOS 连接监控"
+
+#: ../sheets/KAOS.sheet.in.h:19
+msgid "A KAOS control link"
+msgstr "KAOS 控制连接"
+
+#: ../sheets/KAOS.sheet.in.h:20
+msgid "A KAOS capable-of"
+msgstr "A KAOS capable-of"
+
+#: ../sheets/KAOS.sheet.in.h:21
+msgid "A KAOS performs"
+msgstr "KAOS 执行"
+
+#: ../sheets/KAOS.sheet.in.h:22
+msgid "A KAOS input"
+msgstr "KAOS 输入"
+
+#: ../sheets/KAOS.sheet.in.h:23
+msgid "A KAOS output"
+msgstr "KAOS 输出"
+
+#: ../sheets/Lights.sheet.in.h:1
+msgid "Lights"
+msgstr "照明"
+
+#: ../sheets/Lights.sheet.in.h:2
+msgid "Objects to design simple lighting plots"
+msgstr "用于设计简易照明图的对象"
+
+#: ../sheets/Lights.sheet.in.h:3
+msgid "PAR"
+msgstr "PAR"
+
+#: ../sheets/Lights.sheet.in.h:4
+msgid "PAR on the floor"
+msgstr "地板上的 PAR"
+
+#: ../sheets/Lights.sheet.in.h:5
+msgid "ACL"
+msgstr "ACL"
+
+#: ../sheets/Lights.sheet.in.h:6
+msgid "Pebble Convex lantern"
+msgstr "柔边灯"
+
+#: ../sheets/Lights.sheet.in.h:7
+msgid "Fresnel lantern"
+msgstr "曲折反光灯"
+
+#: ../sheets/Lights.sheet.in.h:8
+msgid "Striplight"
+msgstr "长条状灯"
+
+#: ../sheets/Lights.sheet.in.h:9
+msgid "Ellipsoidal Reflector Spotlight"
+msgstr "椭圆形聚光灯"
+
+#: ../sheets/Lights.sheet.in.h:10
+msgid "Blinders"
+msgstr "眼罩"
+
+#: ../sheets/Lights.sheet.in.h:11
+msgid "Black light"
+msgstr "黑光管"
+
+#: ../sheets/Lights.sheet.in.h:12
+msgid "Stroboscope light"
+msgstr "频闪灯"
+
+#: ../sheets/Lights.sheet.in.h:13
+msgid "Moving head"
+msgstr "摇头灯"
+
+#: ../sheets/Lights.sheet.in.h:15
+msgid "Structure"
+msgstr "结构"
+
+#: ../sheets/Logic.sheet.in.h:1
+msgid "Logic"
+msgstr "逻辑"
+
+#: ../sheets/Logic.sheet.in.h:2
+msgid "Boolean Logic"
+msgstr "布尔逻辑"
+
+#: ../sheets/Logic.sheet.in.h:3
+msgid "OR gate"
+msgstr "或门"
+
+#: ../sheets/Logic.sheet.in.h:4
+msgid "AND gate"
+msgstr "非门"
+
+#: ../sheets/Logic.sheet.in.h:5
+msgid "XOR gate"
+msgstr "异或门"
+
+#: ../sheets/Logic.sheet.in.h:6
+msgid "Simple buffer"
+msgstr "单个缓冲区"
+
+#: ../sheets/Logic.sheet.in.h:7
+msgid "Inverter"
+msgstr "换流器"
+
+#: ../sheets/Logic.sheet.in.h:8
+msgid "NAND gate"
+msgstr "与非门"
+
+#: ../sheets/Logic.sheet.in.h:9
+msgid "NOR gate"
+msgstr "或非门"
+
+#: ../sheets/Logic.sheet.in.h:10
+msgid "NOT"
+msgstr "非"
+
+#: ../sheets/Logic.sheet.in.h:11
+msgid "Cross-connector"
+msgstr "交叉连接器"
+
+#: ../sheets/Misc.sheet.in.h:1
+msgid "Miscellaneous"
+msgstr "其它"
+
+#: ../sheets/Misc.sheet.in.h:2
+msgid "Miscellaneous Shapes"
+msgstr "其它外形"
+
+#: ../sheets/Misc.sheet.in.h:3
+msgid "Tree"
+msgstr "树"
+
+#: ../sheets/Misc.sheet.in.h:4
+msgid "Folder"
+msgstr "文件夹"
+
+#: ../sheets/Misc.sheet.in.h:6
+msgid "expansible node"
+msgstr "可扩展节点"
+
+#: ../sheets/Misc.sheet.in.h:7
+msgid "expanded node"
+msgstr "扩展节点"
+
+#: ../sheets/Misc.sheet.in.h:8
+msgid "Traditional clock"
+msgstr "传统时钟"
+
+#: ../sheets/Misc.sheet.in.h:9
+msgid "Measure distance"
+msgstr "测量距离"
+
+#: ../sheets/Misc.sheet.in.h:10
+msgid "Resizable grid"
+msgstr "可变大小网格"
+
+#: ../sheets/Misc.sheet.in.h:11
+msgid "New-style group object, for testing"
+msgstr "测试 New-style 组对象"
+
+#: ../sheets/MSE.sheet.in.h:1
+msgid "MSE"
+msgstr "MSE"
+
+#: ../sheets/MSE.sheet.in.h:2
+msgid "U.S. Army Mobile Subscriber Equipment Components"
+msgstr "美军移动设备组件 (Mobile Subscriber Equipment)"
+
+#: ../sheets/MSE.sheet.in.h:3
+msgid "Node center"
+msgstr "节点中心"
+
+#: ../sheets/MSE.sheet.in.h:4
+msgid "Large extension node"
+msgstr "大扩展节点"
+
+#: ../sheets/MSE.sheet.in.h:5
+msgid "Small extension node"
+msgstr "小扩展节点"
+
+#: ../sheets/MSE.sheet.in.h:6
+msgid "Tactical satellite communications terminal"
+msgstr "战略卫星通信终端"
+
+#: ../sheets/MSE.sheet.in.h:7
+msgid "Multiplexer"
+msgstr "多路复用器"
+
+#: ../sheets/MSE.sheet.in.h:8
+msgid "Demultiplexer"
+msgstr "信号分离器"
 
 #: ../sheets/network.sheet.in.h:1
-msgid "24 Port Patch Panel"
-msgstr "24 埠配线面板"
+msgid "Network"
+msgstr "网络"
 
 #: ../sheets/network.sheet.in.h:2
-msgid "3 1/2 inch diskette"
-msgstr "3 1/2 英寸软盘"
+msgid "Objects to design network diagrams with"
+msgstr "用于设计网络图的对象"
 
 #: ../sheets/network.sheet.in.h:3
-msgid "ATM switch symbol"
-msgstr "ATM 开关符号"
-
-#: ../sheets/network.sheet.in.h:4
-msgid "Antenna for wireless transmission"
-msgstr "无线发送天线"
+msgid "Computer"
+msgstr "计算机"
 
 #: ../sheets/network.sheet.in.h:5
-msgid "Bigtower PC"
-msgstr "Bigtower PC"
+msgid "Storage"
+msgstr "存储"
 
 #: ../sheets/network.sheet.in.h:6
-msgid "Computer"
-msgstr "计算机"
+msgid "Ethernet bus"
+msgstr "以太总线"
 
 #: ../sheets/network.sheet.in.h:7
-msgid "Desktop PC"
-msgstr "桌面 PC"
+msgid "Simple printer"
+msgstr "简单打印机"
 
 #: ../sheets/network.sheet.in.h:8
-msgid "Digitizing board"
-msgstr "数字化插件板"
+msgid "WAN connection"
+msgstr "WAN 连接"
 
 #: ../sheets/network.sheet.in.h:9
-msgid "Ethernet bus"
-msgstr "以太总线"
+msgid "WAN link"
+msgstr "WAN 链接"
 
 #: ../sheets/network.sheet.in.h:10
-msgid "External DAT drive"
-msgstr "外部的 DAT 驱动器"
+msgid "Stackable hub or switch"
+msgstr "层叠式集线器或交换机"
 
 #: ../sheets/network.sheet.in.h:11
-msgid "Firewall router"
-msgstr "防火墙路由器"
+msgid "Modular switching system"
+msgstr "模块化的交换系统"
 
 #: ../sheets/network.sheet.in.h:12
-msgid "Laptop PC"
-msgstr "便携 PC"
+msgid "24 Port Patch Panel"
+msgstr "24 埠配线面板"
 
 #: ../sheets/network.sheet.in.h:13
-msgid "Miditower PC"
-msgstr "Miditower PC"
+msgid "RJ45 wall-plug"
+msgstr "RJ45 墙壁插座"
 
 #: ../sheets/network.sheet.in.h:14
-msgid "Minitower PC"
-msgstr "Minitower PC"
+msgid "Wall-plug for the scEAD cabling system"
+msgstr "scEAD 电缆系统墙壁插座"
 
 #: ../sheets/network.sheet.in.h:15
-msgid "Mobile phone"
-msgstr "移动电话"
+msgid "Simple modem"
+msgstr "简单的调制解调器"
 
 #: ../sheets/network.sheet.in.h:16
+msgid "Antenna for wireless transmission"
+msgstr "无线发送天线"
+
+#: ../sheets/network.sheet.in.h:17
 msgid "Mobile telephony base station"
 msgstr "移动电话基站"
 
-#: ../sheets/network.sheet.in.h:17
+#: ../sheets/network.sheet.in.h:18
+msgid "Network cloud"
+msgstr "网络云"
+
+#: ../sheets/network.sheet.in.h:19
 msgid "Mobile telephony cell"
 msgstr "移动电话"
 
-#: ../sheets/network.sheet.in.h:18
-msgid "Modular switching system"
-msgstr "模块化的交换系统"
+#: ../sheets/network.sheet.in.h:20
+msgid "Router symbol"
+msgstr "路由器符号"
+
+#: ../sheets/network.sheet.in.h:21
+msgid "Switch symbol"
+msgstr "开关符号"
 
 #: ../sheets/network.sheet.in.h:22
-msgid "Objects to design network diagrams with"
-msgstr "用于设计网络图的对象"
+msgid "ATM switch symbol"
+msgstr "ATM 开关符号"
 
 #: ../sheets/network.sheet.in.h:23
-msgid "Plotter"
-msgstr "保护"
+msgid "Firewall router"
+msgstr "防火墙路由器"
 
 #: ../sheets/network.sheet.in.h:24
-msgid "RJ45 wall-plug"
-msgstr "RJ45 墙壁插座"
+msgid "Workstation monitor"
+msgstr "工作站监视器"
 
 #: ../sheets/network.sheet.in.h:25
-msgid "Router symbol"
-msgstr "路由器符号"
+msgid "UNIX workstation"
+msgstr "UNIX 工作站"
 
 #: ../sheets/network.sheet.in.h:26
-msgid "Simple modem"
-msgstr "简单的调制解调器"
+msgid "Desktop PC"
+msgstr "桌面 PC"
 
 #: ../sheets/network.sheet.in.h:27
-msgid "Simple printer"
-msgstr "简单打印机"
+msgid "Laptop PC"
+msgstr "便携 PC"
 
 #: ../sheets/network.sheet.in.h:28
-msgid "Speaker with integrated amplifier"
-msgstr "有源音箱"
+msgid "Bigtower PC"
+msgstr "Bigtower PC"
 
 #: ../sheets/network.sheet.in.h:29
-msgid "Speaker without amplifier"
-msgstr "无源音箱"
+msgid "Miditower PC"
+msgstr "Miditower PC"
 
 #: ../sheets/network.sheet.in.h:30
-msgid "Stackable hub or switch"
-msgstr "层叠式集线器或交换机"
+msgid "Minitower PC"
+msgstr "Minitower PC"
 
 #: ../sheets/network.sheet.in.h:31
-msgid "Storage"
-msgstr "存储"
+msgid "Speaker with integrated amplifier"
+msgstr "有源音箱"
 
 #: ../sheets/network.sheet.in.h:32
-msgid "Switch symbol"
-msgstr "开关符号"
+msgid "Speaker without amplifier"
+msgstr "无源音箱"
+
+#: ../sheets/network.sheet.in.h:33
+msgid "3 1/2 inch diskette"
+msgstr "3 1/2 英寸软盘"
 
 #: ../sheets/network.sheet.in.h:34
-msgid "UNIX workstation"
-msgstr "UNIX 工作站"
+msgid "ZIP disk"
+msgstr "ZIP 磁盘"
 
 #: ../sheets/network.sheet.in.h:35
-msgid "WAN connection"
-msgstr "WAN 连接"
+msgid "External DAT drive"
+msgstr "外部的 DAT 驱动器"
 
 #: ../sheets/network.sheet.in.h:36
-msgid "WAN link"
-msgstr "WAN 链接"
+msgid "Mobile phone"
+msgstr "移动电话"
 
 #: ../sheets/network.sheet.in.h:37
-msgid "Wall-plug for the scEAD cabling system"
-msgstr "scEAD 电缆系统墙壁插座"
+msgid "Telephone"
+msgstr "电话"
 
 #: ../sheets/network.sheet.in.h:38
-msgid "Workstation monitor"
-msgstr "工作站监视器"
+msgid "Plotter"
+msgstr "保护"
 
 #: ../sheets/network.sheet.in.h:39
-msgid "ZIP disk"
-msgstr "ZIP 磁盘"
+msgid "Digitizing board"
+msgstr "数字化插件板"
+
+#: ../sheets/Pneumatic.sheet.in.h:1
+msgid "Pneumatic/Hydraulic"
+msgstr "气压/水压"
+
+#: ../sheets/Pneumatic.sheet.in.h:2
+msgid "Components for pneumatic and hydraulic circuits"
+msgstr "气动的和液压的电路部件"
+
+#: ../sheets/Pneumatic.sheet.in.h:3
+msgid "Double-effect jack"
+msgstr "双效千斤顶"
+
+#: ../sheets/Pneumatic.sheet.in.h:4
+msgid "Normally-in simple-effect jack"
+msgstr "常入单效千斤顶"
+
+#: ../sheets/Pneumatic.sheet.in.h:5
+msgid "Normally-out simple-effect jack"
+msgstr "Normally-out simple-effect jack"
+
+#: ../sheets/Pneumatic.sheet.in.h:6
+msgid "Generic pressure source"
+msgstr "一般压力来源"
+
+#: ../sheets/Pneumatic.sheet.in.h:7
+msgid "Hydraulic pressure source"
+msgstr "液压源"
+
+#: ../sheets/Pneumatic.sheet.in.h:8
+msgid "Pneumatic pressure source"
+msgstr "气压源"
+
+#: ../sheets/Pneumatic.sheet.in.h:9
+msgid "Air exhaust orifice"
+msgstr "排气孔"
+
+#: ../sheets/Pneumatic.sheet.in.h:10
+msgid "2/2 distributor"
+msgstr "2/2 分配器"
+
+#: ../sheets/Pneumatic.sheet.in.h:11
+msgid "3/2 distributor"
+msgstr "3/2 分配器"
+
+#: ../sheets/Pneumatic.sheet.in.h:12
+msgid "4/2 distributor"
+msgstr "4/2 分配器"
+
+#: ../sheets/Pneumatic.sheet.in.h:13
+msgid "5/2 distributor"
+msgstr "5/2 分配器"
+
+#: ../sheets/Pneumatic.sheet.in.h:14
+msgid "Muscular command"
+msgstr "Muscular 控制"
+
+#: ../sheets/Pneumatic.sheet.in.h:15
+msgid "Push-button command"
+msgstr "按钮控制"
+
+#: ../sheets/Pneumatic.sheet.in.h:16
+msgid "Mechanical command by tappet"
+msgstr "Mechanical command by tappet"
+
+#: ../sheets/Pneumatic.sheet.in.h:17
+msgid "Mechanical command by spring"
+msgstr "Mechanical command by spring"
+
+#: ../sheets/Pneumatic.sheet.in.h:18
+msgid "Electric command (single coil)"
+msgstr "Electric command (single coil)"
+
+#: ../sheets/Pneumatic.sheet.in.h:19
+msgid "Electric command (double coil)"
+msgstr "Electric command (double coil)"
+
+#: ../sheets/Pneumatic.sheet.in.h:20
+msgid "Indirect command by hydraulic driver"
+msgstr "Indirect command by hydraulic driver"
+
+#: ../sheets/Pneumatic.sheet.in.h:21
+msgid "Indirect command by pneumatic driver"
+msgstr "Indirect command by pneumatic driver"
+
+#: ../sheets/SADT.sheet.in.h:1
+msgid "SADT/IDEF0"
+msgstr "SADT/IDEF0"
+
+#: ../sheets/SADT.sheet.in.h:2
+msgid "Objects to design SADT diagrams"
+msgstr "设计 SADT 图的对象"
+
+#: ../sheets/SADT.sheet.in.h:3
+msgid "Activity/data flow arrow"
+msgstr "活动/数据 流量箭头"
+
+#: ../sheets/SADT.sheet.in.h:4
+msgid "Activity/data box"
+msgstr "活动/数据框"
+
+#: ../sheets/SADT.sheet.in.h:5
+msgid "Flow label"
+msgstr "流量标记"
+
+#: ../sheets/SDL.sheet.in.h:1
+msgid "SDL"
+msgstr "SDL"
+
+#: ../sheets/SDL.sheet.in.h:2
+msgid "Specification and Description Language."
+msgstr "规格说明和描述语言。"
+
+#: ../sheets/SDL.sheet.in.h:3
+msgid "Block type reference"
+msgstr "块类型参考"
+
+#: ../sheets/SDL.sheet.in.h:4
+msgid "Service type reference"
+msgstr "服务类型参考"
+
+#: ../sheets/SDL.sheet.in.h:5
+msgid "Process type reference"
+msgstr "程序类型参考"
+
+#: ../sheets/SDL.sheet.in.h:6 ../sheets/UML.sheet.in.h:28
+msgid "State"
+msgstr "状态"
+
+#: ../sheets/SDL.sheet.in.h:7
+msgid "Function header"
+msgstr "函数头部"
+
+#: ../sheets/SDL.sheet.in.h:8
+msgid "Send message"
+msgstr "发送消息"
+
+#: ../sheets/SDL.sheet.in.h:9
+msgid "Receive message"
+msgstr "接收消息"
+
+#: ../sheets/SDL.sheet.in.h:10
+msgid "Function call"
+msgstr "功能调用"
+
+#: ../sheets/SDL.sheet.in.h:12
+msgid "Action being executed"
+msgstr "执行的动作"
+
+#: ../sheets/SDL.sheet.in.h:13
+msgid "Save state"
+msgstr "保存状态"
+
+#: ../sheets/SDL.sheet.in.h:15
+msgid "In/Out connector"
+msgstr "输入/输出 连接器"
+
+#: ../sheets/SDL.sheet.in.h:17
+msgid "Procedure return"
+msgstr "过程返回"
+
+#: ../sheets/SDL.sheet.in.h:19
+msgid "Generic text note"
+msgstr "普通文字注释"
+
+#: ../sheets/Shape_Design.sheet.in.h:1
+msgid "Shape Design"
+msgstr "形状设计"
+
+#: ../sheets/Shape_Design.sheet.in.h:2
+msgid "Design Dia objects with individual connection points"
+msgstr "由独立的连接点设计 Dia 对象"
+
+#: ../sheets/Shape_Design.sheet.in.h:3
+msgid "Connection Point"
+msgstr "连接点"
+
+#: ../sheets/Shape_Design.sheet.in.h:4
+msgid "Main Connection Point"
+msgstr "主连接点"
 
 #: ../sheets/sybase.sheet.in.h:1
-msgid "Log transfer manager or rep agent"
-msgstr "日志传输管理程序或 Rep 代理"
+msgid "Sybase"
+msgstr "Sybase"
 
 #: ../sheets/sybase.sheet.in.h:2
 msgid "Objects to design Sybase replication domain diagrams with"
 msgstr "用来设计 Sybase 复制定义域图的对象"
 
 #: ../sheets/sybase.sheet.in.h:3
-msgid "Replication server manager"
-msgstr "复制服务器管理程序"
+msgid "Sybase dataserver"
+msgstr "Sybase 数据服务器"
 
 #: ../sheets/sybase.sheet.in.h:4
-msgid "Stable storage device"
-msgstr "稳定的存储设备"
+msgid "Sybase replication server"
+msgstr "Sybase 复制服务器"
 
 #: ../sheets/sybase.sheet.in.h:5
-msgid "Sybase"
-msgstr "Sybase"
+msgid "Log transfer manager or rep agent"
+msgstr "日志传输管理程序或 Rep 代理"
 
 #: ../sheets/sybase.sheet.in.h:6
-msgid "Sybase client application"
-msgstr "Sybase 客户端应用程序"
+msgid "Stable storage device"
+msgstr "稳定的存储设备"
 
 #: ../sheets/sybase.sheet.in.h:7
-msgid "Sybase dataserver"
-msgstr "Sybase 数据服务器"
+msgid "Sybase client application"
+msgstr "Sybase 客户端应用程序"
 
 #: ../sheets/sybase.sheet.in.h:8
-msgid "Sybase replication server"
-msgstr "Sybase 复制服务器"
+msgid "Replication server manager"
+msgstr "复制服务器管理程序"
+
+#: ../sheets/UML.sheet.in.h:1
+msgid "UML"
+msgstr "UML"
+
+#: ../sheets/UML.sheet.in.h:2
+msgid "Editor for UML Static Structure Diagrams"
+msgstr "UML 静态结构图编辑器"
+
+#: ../sheets/UML.sheet.in.h:5
+msgid "Note"
+msgstr "注解"
+
+#: ../sheets/UML.sheet.in.h:7
+msgid "Realizes, implements a specific interface"
+msgstr "实现,实现一个特定的接口"
+
+#: ../sheets/UML.sheet.in.h:8
+msgid "Generalization, class inheritance"
+msgstr "泛化,类继承"
+
+#: ../sheets/UML.sheet.in.h:9
+msgid "Association, two classes are associated"
+msgstr "关联,两个类是相关的"
+
+#: ../sheets/UML.sheet.in.h:10
+msgid "Aggregation, one class is part of another"
+msgstr "聚集,一个类是另一个的一部分"
+
+#: ../sheets/UML.sheet.in.h:11
+msgid "Implements, class implements a specific interface"
+msgstr "实现,类实现了一个指定的接口"
+
+#: ../sheets/UML.sheet.in.h:12
+msgid "Constraint, place a constraint on something"
+msgstr "约束,对某事添加一个约束"
+
+#: ../sheets/UML.sheet.in.h:13
+msgid "Small package"
+msgstr "小的软件包"
+
+#: ../sheets/UML.sheet.in.h:14
+msgid "Large package"
+msgstr "大型软件包"
+
+#: ../sheets/UML.sheet.in.h:16
+msgid "Use case"
+msgstr "用例"
+
+#: ../sheets/UML.sheet.in.h:17
+msgid "Lifeline"
+msgstr "生命线"
+
+#: ../sheets/UML.sheet.in.h:18
+msgid "Object"
+msgstr "对象"
+
+#: ../sheets/UML.sheet.in.h:19
+msgid "Message"
+msgstr "消息"
+
+#: ../sheets/UML.sheet.in.h:20
+msgid "Component"
+msgstr "组件"
+
+#: ../sheets/UML.sheet.in.h:25
+msgid "Node"
+msgstr "节点"
+
+#: ../sheets/UML.sheet.in.h:26
+msgid "Class stereotype icon"
+msgstr "类定性图标"
+
+#: ../sheets/UML.sheet.in.h:27
+msgid "Initial/End state"
+msgstr "初始/结束状态"
+
+#: ../sheets/UML.sheet.in.h:29
+msgid "Activity"
+msgstr "活动"
+
+#: ../sheets/UML.sheet.in.h:31
+msgid "Fork/Union"
+msgstr "Fork/联合"
+
+#~ msgid "There are %d similar messages."
+#~ msgstr "有 %d 条类似的消息。"
+
+#~ msgid "A KAOS operation"
+#~ msgstr "KAOS 操作"
+
+#~ msgid "Recovering autosaved diagrams"
+#~ msgstr "正在恢复自动保存的图表"
+
+#~ msgid ""
+#~ "Autosaved files exist.\n"
+#~ "Please select those you wish to recover."
+#~ msgstr ""
+#~ "发现自动保存的文件。\n"
+#~ "请选择希望恢复的文件。"
+
+#~ msgid "X position"
+#~ msgstr "X 位置"
+
+#~ msgid "X position of child widget"
+#~ msgstr "子部件的 X 位置"
+
+#~ msgid "Y position"
+#~ msgstr "Y 位置"
+
+#~ msgid "Y position of child widget"
+#~ msgstr "子部件的 Y 位置"
+
+#~ msgid ""
+#~ "You cannot group objects that belong to different groups or have "
+#~ "different parents"
+#~ msgstr "不能组合属于不同组或者拥有不同父对象的对象"
 
-#~ msgid "'%s' not found!\n"
-#~ msgstr "没有找到“%s”!\n"
+#~ msgid "/_Sort objects"
+#~ msgstr "/对象排序(_S)"
 
-#~ msgid "'%s' not found in '%s'!\n"
-#~ msgstr "“%s”不在目录“%s”中!\n"
+#~ msgid "/Sort objects/by _name"
+#~ msgstr "/对象排序(S)/按名称(_N)"
 
-#~ msgid "Could not initialize Bonobo!"
-#~ msgstr "无法初始化 Bonobo!"
+#~ msgid "/Sort objects/by _type"
+#~ msgstr "/对象排序(S)/按类型(_T)"
 
-#~ msgid "active"
-#~ msgstr "活动的"
+#~ msgid "/Sort objects/as _inserted"
+#~ msgstr "/对象排序(S)/按插入先后(_I)"
 
-#~ msgid "Sheets and Objects"
-#~ msgstr "工作表和对象"
+#~ msgid "/Sort objects/All by name"
+#~ msgstr "/对象排序(S)/全部按名称"
 
-#~ msgid "Edit"
-#~ msgstr "编辑"
+#~ msgid "/Sort objects/All by type"
+#~ msgstr "/对象排序(S)/全部按类型"
 
-#~ msgid "Revert"
-#~ msgstr "反转"
+#~ msgid "/Sort objects/All as inserted"
+#~ msgstr "/对象排序(S)/全部按插入先后"
 
-#~ msgid "New"
-#~ msgstr "新建"
+#~ msgid "/Sort objects/_Default"
+#~ msgstr "/对象排序(S)/默认(_D)"
 
-#~ msgid "Browse..."
-#~ msgstr "浏览..."
+#~ msgid "/Sort objects/Default/by _name"
+#~ msgstr "/对象排序(S)/默认(D)/按名称(_N)"
 
-#~ msgid "SVG Shape:"
-#~ msgstr "SVG 形状:"
+#~ msgid "/Sort objects/Default/by _type"
+#~ msgstr "/对象排序(S)/默认(D)/按类型(_T)"
 
-#~ msgid "description:"
-#~ msgstr "描述:"
+#~ msgid "/Sort objects/Default/as _inserted"
+#~ msgstr "/对象排序(S)/默认(D)/按插入先后(_I)"
 
-#~ msgid "Sheet name:"
-#~ msgstr "工作表名:"
+#~ msgid "/Sort _diagrams"
+#~ msgstr "/图表排序(_D)"
 
-#~ msgid "Edit Attributes"
-#~ msgstr "编辑属性"
+#~ msgid "/Sort _diagrams/by _name"
+#~ msgstr "/图表排序(_D)/根据名称(_N)"
 
-#~ msgid "DiaObject"
-#~ msgstr "DiaObject"
+#~ msgid "/Sort _diagrams/as _inserted"
+#~ msgstr "/图表排序(_D)/按插入先后(_I)"
 
-#~ msgid "Description:"
-#~ msgstr "描述:"
+#~ msgid "/Sort diagrams/_Default"
+#~ msgstr "/图表排序(D)/默认(_D)"
 
-#~ msgid "Sheet"
-#~ msgstr "工作表"
+#~ msgid "/Sort diagrams/Default/by _name"
+#~ msgstr "/图表排序(D)/默认(D)/根据名称(_N)"
 
-#~ msgid "DiaObject:"
-#~ msgstr "DiaObject:"
+#~ msgid "/Sort diagrams/Default/as _inserted"
+#~ msgstr "/图表排序(D)/默认(D)/按插入先后(_I)"
 
-#~ msgid "Sheet:"
-#~ msgstr "工作表:"
+#~ msgid "/_Locate"
+#~ msgstr "/定位(_L)"
 
-#~ msgid "%s<illegal characters>..."
-#~ msgstr "%s<非法字符>..."
+#~ msgid "/_Properties"
+#~ msgstr "/属性(_P)"
 
-#~ msgid "Show Comments"
-#~ msgstr "显示注释"
+#~ msgid "/_Hide this type"
+#~ msgstr "/隐藏此类型(_H)"
 
-#~ msgid "Printing with Gtk+(cairo) requires at least version 2.10."
-#~ msgstr "用 Gtk+(cairo) 打印需要 2.10 以上版本。"
+#~ msgid "Layer(s)"
+#~ msgstr "图层"


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