From 155ecdb8a7cb028193007e5848e24dd3111eeba6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A5=9E=E5=B7=9E=E6=95=A3=E4=BA=BA?= <kappa8086@gmail.com>
Date: Mon, 14 Dec 2009 11:34:45 +0800
Subject: [PATCH] Updated Simplified Chinese translation.

---
 po-plug-ins/zh_CN.po | 249 +++++++++++++++++++++++++++----------------
 po/zh_CN.po          | 136 +++++++++++------------
 2 files changed, 230 insertions(+), 155 deletions(-)

diff --git a/po-plug-ins/zh_CN.po b/po-plug-ins/zh_CN.po
index 30b9f13f74..b3ab9b3f47 100644
--- a/po-plug-ins/zh_CN.po
+++ b/po-plug-ins/zh_CN.po
@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: gimp-plug-ins HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=gimp&component=general\n"
-"POT-Creation-Date: 2009-11-16 17:22+0000\n"
-"PO-Revision-Date: 2009-11-04 18:40+0800\n"
+"POT-Creation-Date: 2009-12-09 21:39+0000\n"
+"PO-Revision-Date: 2009-12-10 15:32+0800\n"
 "Last-Translator: 神州散人 <kappa8086@gmail.com>\n"
 "Language-Team: Chinese/Simplified <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -423,81 +423,91 @@ msgstr "寻找动画背景"
 msgid "Optimizing animation"
 msgstr "优化动画"
 
-#: ../plug-ins/common/animation-play.c:164
+#: ../plug-ins/common/animation-play.c:169
 msgid "Preview a GIMP layer-based animation"
 msgstr "预览一个基于 GIMP 图层的动画"
 
-#: ../plug-ins/common/animation-play.c:169
+#: ../plug-ins/common/animation-play.c:174
 msgid "_Playback..."
 msgstr "回放(_P)..."
 
-#: ../plug-ins/common/animation-play.c:448
+#: ../plug-ins/common/animation-play.c:453
 msgid "_Step"
 msgstr "单步(_S)"
 
-#: ../plug-ins/common/animation-play.c:448
+#: ../plug-ins/common/animation-play.c:453
 msgid "Step to next frame"
 msgstr "跳到下一帧"
 
-#: ../plug-ins/common/animation-play.c:452
+#: ../plug-ins/common/animation-play.c:457
 msgid "Rewind the animation"
 msgstr "快退动画"
 
-#: ../plug-ins/common/animation-play.c:470
+#: ../plug-ins/common/animation-play.c:475
 msgid "Faster"
 msgstr "加快"
 
-#: ../plug-ins/common/animation-play.c:470
+#: ../plug-ins/common/animation-play.c:475
 msgid "Increase the speed of the animation"
 msgstr "提高动画的速度"
 
-#: ../plug-ins/common/animation-play.c:475
+#: ../plug-ins/common/animation-play.c:480
 msgid "Slower"
 msgstr "减慢"
 
-#: ../plug-ins/common/animation-play.c:475
+#: ../plug-ins/common/animation-play.c:480
 msgid "Decrease the speed of the animation"
 msgstr "降低动画的速度"
 
-#: ../plug-ins/common/animation-play.c:480
+#: ../plug-ins/common/animation-play.c:485
 msgid "Reset speed"
 msgstr "重置速度"
 
-#: ../plug-ins/common/animation-play.c:480
+#: ../plug-ins/common/animation-play.c:485
 msgid "Reset the speed of the animation"
 msgstr "重置动画速度"
 
-#: ../plug-ins/common/animation-play.c:488
-#: ../plug-ins/common/animation-play.c:1447
+#: ../plug-ins/common/animation-play.c:493
+#: ../plug-ins/common/animation-play.c:1474
 msgid "Start playback"
 msgstr "开始回放"
 
-#: ../plug-ins/common/animation-play.c:492
+#: ../plug-ins/common/animation-play.c:497
 msgid "Detach"
 msgstr "分离"
 
-#: ../plug-ins/common/animation-play.c:493
+#: ../plug-ins/common/animation-play.c:498
 msgid "Detach the animation from the dialog window"
 msgstr "从对话窗口中分离动画"
 
-#: ../plug-ins/common/animation-play.c:585
+#: ../plug-ins/common/animation-play.c:590
 msgid "Animation Playback:"
 msgstr "动画回放："
 
-#: ../plug-ins/common/animation-play.c:664
+#. list is given in "fps" - frames per second
+#: ../plug-ins/common/animation-play.c:663
+#, c-format
+msgid "%d fps"
+msgstr "%d fps"
+
+#: ../plug-ins/common/animation-play.c:674
+msgid "Default framerate"
+msgstr "默认帧率"
+
+#: ../plug-ins/common/animation-play.c:695
 msgid "Playback speed"
 msgstr "回放速度"
 
-#: ../plug-ins/common/animation-play.c:804
+#: ../plug-ins/common/animation-play.c:831
 msgid "Tried to display an invalid layer."
 msgstr "已试图显示一个无效图层。"
 
-#: ../plug-ins/common/animation-play.c:1324
+#: ../plug-ins/common/animation-play.c:1351
 #, c-format
 msgid "Frame %d of %d"
 msgstr "帧 %d/%d"
 
-#: ../plug-ins/common/animation-play.c:1447
+#: ../plug-ins/common/animation-play.c:1474
 msgid "Stop playback"
 msgstr "停止回放"
 
@@ -597,8 +607,8 @@ msgstr "垂直(_V)"
 #: ../plug-ins/common/decompose.c:722 ../plug-ins/common/file-cel.c:361
 #: ../plug-ins/common/file-cel.c:364 ../plug-ins/common/file-dicom.c:556
 #: ../plug-ins/common/file-gif-load.c:927
-#: ../plug-ins/common/file-jp2-load.c:351 ../plug-ins/common/file-pcx.c:411
-#: ../plug-ins/common/file-pcx.c:417 ../plug-ins/common/file-pix.c:381
+#: ../plug-ins/common/file-jp2-load.c:351 ../plug-ins/common/file-pcx.c:418
+#: ../plug-ins/common/file-pcx.c:424 ../plug-ins/common/file-pix.c:381
 #: ../plug-ins/common/file-png.c:851 ../plug-ins/common/file-pnm.c:584
 #: ../plug-ins/common/file-raw.c:759 ../plug-ins/common/file-sunras.c:974
 #: ../plug-ins/common/file-tga.c:1063 ../plug-ins/common/file-tiff-load.c:998
@@ -608,7 +618,7 @@ msgstr "垂直(_V)"
 #: ../plug-ins/file-faxg3/faxg3.c:477 ../plug-ins/file-fits/fits.c:529
 #: ../plug-ins/file-jpeg/jpeg-load.c:248 ../plug-ins/file-jpeg/jpeg-load.c:760
 #: ../plug-ins/file-psd/psd-image-res-load.c:994
-#: ../plug-ins/file-psd/psd-load.c:1525 ../plug-ins/file-sgi/sgi.c:383
+#: ../plug-ins/file-psd/psd-load.c:1574 ../plug-ins/file-sgi/sgi.c:404
 #: ../plug-ins/gfig/gfig-dialog.c:1284
 #: ../plug-ins/gimpressionist/general.c:139 ../plug-ins/twain/twain.c:567
 #: ../plug-ins/win-snap/winsnap.c:1155
@@ -646,7 +656,7 @@ msgstr "选择性高斯模糊"
 #: ../plug-ins/common/edge-dog.c:266 ../plug-ins/common/edge-neon.c:227
 #: ../plug-ins/common/edge-sobel.c:211 ../plug-ins/common/photocopy.c:243
 #: ../plug-ins/common/pixelize.c:292 ../plug-ins/common/softglow.c:223
-#: ../plug-ins/file-sgi/sgi.c:535 ../plug-ins/file-xjt/xjt.c:1683
+#: ../plug-ins/file-sgi/sgi.c:555 ../plug-ins/file-xjt/xjt.c:1683
 #: ../plug-ins/gradient-flare/gradient-flare.c:965
 msgid "Cannot operate on indexed color images."
 msgstr "无法对索引颜色图像进行操作。"
@@ -1049,10 +1059,10 @@ msgstr "保存通道混合器设置"
 #: ../plug-ins/common/file-compressor.c:589
 #: ../plug-ins/common/file-compressor.c:676
 #: ../plug-ins/common/file-csource.c:405 ../plug-ins/common/file-dicom.c:800
-#: ../plug-ins/common/file-gbr.c:637 ../plug-ins/common/file-gif-save.c:761
+#: ../plug-ins/common/file-gbr.c:652 ../plug-ins/common/file-gif-save.c:761
 #: ../plug-ins/common/file-gih.c:1261 ../plug-ins/common/file-html-table.c:235
 #: ../plug-ins/common/file-mng.c:609 ../plug-ins/common/file-mng.c:943
-#: ../plug-ins/common/file-pat.c:461 ../plug-ins/common/file-pcx.c:665
+#: ../plug-ins/common/file-pat.c:475 ../plug-ins/common/file-pcx.c:672
 #: ../plug-ins/common/file-pix.c:523 ../plug-ins/common/file-png.c:1269
 #: ../plug-ins/common/file-pnm.c:976 ../plug-ins/common/file-ps.c:1213
 #: ../plug-ins/common/file-raw.c:587 ../plug-ins/common/file-raw.c:615
@@ -1450,9 +1460,8 @@ msgid "Use cyclic range"
 msgstr "使用循环范围"
 
 #: ../plug-ins/common/cml-explorer.c:1600
-#, fuzzy
 msgid "Mod. rate:"
-msgstr "变化率："
+msgstr "修改率："
 
 #: ../plug-ins/common/cml-explorer.c:1609
 msgid "Env. sensitivity:"
@@ -2523,7 +2532,7 @@ msgid ""
 "Pixels in the foreground color will appear black in all output images.  This "
 "can be used for things like crop marks that have to show up on all channels."
 msgstr ""
-"像素为前景色的将在所有输出图像中呈现黑色。这可被用于一些情形，比如剪裁会在所"
+"为前景色的像素将在所有输出图像中呈现黑色。这可被用于一些情形，比如剪裁会在所"
 "有频道中露出的标记。"
 
 #: ../plug-ins/common/deinterlace.c:90
@@ -3007,7 +3016,7 @@ msgstr "加载 KISS 色板"
 #: ../plug-ins/file-bmp/bmp-read.c:160 ../plug-ins/file-faxg3/faxg3.c:216
 #: ../plug-ins/file-fli/fli-gimp.c:501 ../plug-ins/file-ico/ico-load.c:645
 #: ../plug-ins/file-jpeg/jpeg-load.c:114 ../plug-ins/file-psd/psd-load.c:135
-#: ../plug-ins/file-sgi/sgi.c:330 ../plug-ins/file-xjt/xjt.c:3328
+#: ../plug-ins/file-sgi/sgi.c:329 ../plug-ins/file-xjt/xjt.c:3328
 #, c-format
 msgid "Opening '%s'"
 msgstr "打开“%s”"
@@ -3023,10 +3032,10 @@ msgstr "不支持的位深度(%d)！"
 
 #. init the progress meter
 #. And let's begin the progress
-#: ../plug-ins/common/file-cel.c:587 ../plug-ins/common/file-gbr.c:642
+#: ../plug-ins/common/file-cel.c:587 ../plug-ins/common/file-gbr.c:657
 #: ../plug-ins/common/file-gif-save.c:768 ../plug-ins/common/file-gih.c:1266
-#: ../plug-ins/common/file-html-table.c:255 ../plug-ins/common/file-pat.c:466
-#: ../plug-ins/common/file-pcx.c:626 ../plug-ins/common/file-pix.c:528
+#: ../plug-ins/common/file-html-table.c:255 ../plug-ins/common/file-pat.c:480
+#: ../plug-ins/common/file-pcx.c:633 ../plug-ins/common/file-pix.c:528
 #: ../plug-ins/common/file-png.c:1276 ../plug-ins/common/file-pnm.c:981
 #: ../plug-ins/common/file-ps.c:1218 ../plug-ins/common/file-sunras.c:567
 #: ../plug-ins/common/file-tga.c:1174 ../plug-ins/common/file-tiff-save.c:693
@@ -3035,7 +3044,7 @@ msgstr "不支持的位深度(%d)！"
 #: ../plug-ins/file-bmp/bmp-write.c:306 ../plug-ins/file-fits/fits.c:480
 #: ../plug-ins/file-fli/fli-gimp.c:717 ../plug-ins/file-ico/ico-save.c:1001
 #: ../plug-ins/file-jpeg/jpeg-save.c:286 ../plug-ins/file-psd/psd-save.c:1642
-#: ../plug-ins/file-sgi/sgi.c:553 ../plug-ins/file-xjt/xjt.c:1692
+#: ../plug-ins/file-sgi/sgi.c:573 ../plug-ins/file-xjt/xjt.c:1692
 #, c-format
 msgid "Saving '%s'"
 msgstr "保存“%s”"
@@ -3128,7 +3137,7 @@ msgstr "医学数字成像和通信图像"
 msgid "'%s' is not a DICOM file."
 msgstr "“%s”不是 DICOM 文件。"
 
-#: ../plug-ins/common/file-dicom.c:768 ../plug-ins/common/file-pcx.c:658
+#: ../plug-ins/common/file-dicom.c:768 ../plug-ins/common/file-pcx.c:665
 #: ../plug-ins/common/file-pnm.c:966
 msgid "Cannot save images with alpha channel."
 msgstr "无法保存带有 Alpha 通道的图像。"
@@ -3143,41 +3152,46 @@ msgstr "无法对未知的图像类型操作。"
 msgid "GIMP brush"
 msgstr "GIMP 画笔"
 
-#: ../plug-ins/common/file-gbr.c:400 ../plug-ins/common/file-gbr.c:412
+#: ../plug-ins/common/file-gbr.c:391 ../plug-ins/common/file-pat.c:410
+#, c-format
+msgid "Invalid header data in '%s': width=%lu, height=%lu, bytes=%lu"
+msgstr "“%s”中无效的头数据：width=%lu, height=%lu, bytes=%lu"
+
+#: ../plug-ins/common/file-gbr.c:415 ../plug-ins/common/file-gbr.c:427
 msgid "Unsupported brush format"
 msgstr "不支持的画笔格式"
 
-#: ../plug-ins/common/file-gbr.c:424
+#: ../plug-ins/common/file-gbr.c:439
 #, c-format
 msgid "Error in GIMP brush file '%s'"
 msgstr "GIMP 画笔文件“%s”有错"
 
-#: ../plug-ins/common/file-gbr.c:432
+#: ../plug-ins/common/file-gbr.c:447
 #, c-format
 msgid "Invalid UTF-8 string in brush file '%s'."
 msgstr "画笔文件“%s”中存在无效的 UTF-8 字符串。"
 
-#: ../plug-ins/common/file-gbr.c:438 ../plug-ins/common/file-gih.c:491
+#: ../plug-ins/common/file-gbr.c:453 ../plug-ins/common/file-gih.c:491
 #: ../plug-ins/common/file-gih.c:1140
 #: ../plug-ins/gradient-flare/gradient-flare.c:3062
 msgid "Unnamed"
 msgstr "未命名"
 
-#: ../plug-ins/common/file-gbr.c:627
+#: ../plug-ins/common/file-gbr.c:642
 msgid "GIMP brushes are either GRAYSCALE or RGBA"
 msgstr "GIMP 画笔只能是灰度或 RGBA"
 
-#: ../plug-ins/common/file-gbr.c:744
+#: ../plug-ins/common/file-gbr.c:759
 msgid "Brush"
 msgstr "画笔"
 
 #. attach labels
-#: ../plug-ins/common/file-gbr.c:758 ../plug-ins/common/grid.c:790
+#: ../plug-ins/common/file-gbr.c:773 ../plug-ins/common/grid.c:790
 msgid "Spacing:"
 msgstr "间距："
 
-#: ../plug-ins/common/file-gbr.c:769 ../plug-ins/common/file-gih.c:891
-#: ../plug-ins/common/file-pat.c:542 ../plug-ins/gimpressionist/presets.c:666
+#: ../plug-ins/common/file-gbr.c:784 ../plug-ins/common/file-gih.c:891
+#: ../plug-ins/common/file-pat.c:557 ../plug-ins/gimpressionist/presets.c:666
 msgid "Description:"
 msgstr "描述："
 
@@ -3522,8 +3536,8 @@ msgid "The amount of cellspacing."
 msgstr "表格单元的间距。"
 
 #: ../plug-ins/common/file-jp2-load.c:96
-msgid "JPEG-2000 image"
-msgstr "JPEG-2000 图像"
+msgid "JPEG 2000 image"
+msgstr "JPEG 2000 图像"
 
 #: ../plug-ins/common/file-jp2-load.c:215
 #, c-format
@@ -3537,34 +3551,34 @@ msgstr "图像“%s”属于灰度图，但没有包含任何灰度分量。"
 
 #: ../plug-ins/common/file-jp2-load.c:264
 #, c-format
-msgid "The image '%s' is in RGB but is missing some of the components."
-msgstr "图像“%s”属于 RGB 图，但有些分量缺失。"
+msgid "The image '%s' is in RGB, but is missing some of the components."
+msgstr "图像“%s”为 RGB 格式，但有些分量缺失。"
 
 #: ../plug-ins/common/file-jp2-load.c:284
 #, c-format
 msgid ""
-"The image '%s' is in the CIEXYZ color space but there is no code in place to "
-"convert it to RGB."
+"The image '%s' is in the CIEXYZ color space, but there is no code in place "
+"to convert it to RGB."
 msgstr "图像“%s”属于 CIEXYZ 色彩空间，但没有适当的代码转换到 RGB。"
 
 #: ../plug-ins/common/file-jp2-load.c:291
 #, c-format
 msgid ""
-"The image '%s' is in the CIELAB color space but there is no code in place to "
-"convert it to RGB."
+"The image '%s' is in the CIELAB color space, but there is no code in place "
+"to convert it to RGB."
 msgstr "图像“%s”属于 CIELAB 色彩空间，但没有适当的代码转换到 RGB。"
 
 #: ../plug-ins/common/file-jp2-load.c:298
 #, c-format
 msgid ""
-"The image '%s' is in the YCbCr color space but there is no code in place to "
+"The image '%s' is in the YCbCr color space, but there is no code in place to "
 "convert it to RGB."
 msgstr "图像“%s”属于 YCbCr 色彩空间，但没有适当的代码转换到 RGB。"
 
 #: ../plug-ins/common/file-jp2-load.c:306
 #, c-format
-msgid "The image '%s' is in an unkown color space."
-msgstr "图像“%s”属于未知色彩空间。"
+msgid "The image '%s' is in an unknown color space."
+msgstr "图像“%s”所属的色彩空间未知。"
 
 #: ../plug-ins/common/file-jp2-load.c:320
 #, c-format
@@ -3574,9 +3588,9 @@ msgid ""
 msgstr "图像“%2$s”的图像分量 %1$d 和图像的尺寸不一致，目前不被 GIMP 支持。"
 
 #: ../plug-ins/common/file-jp2-load.c:331
-#, fuzzy, c-format
+#, c-format
 msgid "Image component %d of image '%s' does not have both a hstep and vstep."
-msgstr "图像“%s”的图像分量 %d 不同时拥有 hstep 和 vstep。"
+msgstr "图像“%2$s”的图像分量 %1$d 没有同时拥有 hstep 和 vstep。"
 
 #: ../plug-ins/common/file-jp2-load.c:340
 #, c-format
@@ -3700,7 +3714,7 @@ msgstr "GIMP 图案"
 msgid "Invalid UTF-8 string in pattern file '%s'."
 msgstr "图案文件“%s”中存在无效的 UTF-8 字符串。"
 
-#: ../plug-ins/common/file-pat.c:527
+#: ../plug-ins/common/file-pat.c:542
 msgid "Pattern"
 msgstr "图案"
 
@@ -3734,31 +3748,36 @@ msgstr "不支持或无效的图像高度：%d"
 msgid "Invalid number of bytes per line in PCX header"
 msgstr "PCX 文件头中的无效的每行字节数"
 
-#: ../plug-ins/common/file-pcx.c:452
+#: ../plug-ins/common/file-pcx.c:411
+#, c-format
+msgid "Image dimensions too large: width %d x height %d"
+msgstr "图像尺寸过大：宽 %d x 高 %d"
+
+#: ../plug-ins/common/file-pcx.c:459
 msgid "Unusual PCX flavour, giving up"
 msgstr "异常的 PCX 类型，放弃"
 
-#: ../plug-ins/common/file-pcx.c:675
+#: ../plug-ins/common/file-pcx.c:682
 #, c-format
 msgid "Invalid X offset: %d"
 msgstr "无效的 X 偏移量：%d"
 
-#: ../plug-ins/common/file-pcx.c:681
+#: ../plug-ins/common/file-pcx.c:688
 #, c-format
 msgid "Invalid Y offset: %d"
 msgstr "无效的 Y 偏移量：%d"
 
-#: ../plug-ins/common/file-pcx.c:687
+#: ../plug-ins/common/file-pcx.c:694
 #, c-format
 msgid "Right border out of bounds (must be < %d): %d"
 msgstr "右边框超出边界(须 < %d)：%d"
 
-#: ../plug-ins/common/file-pcx.c:694
+#: ../plug-ins/common/file-pcx.c:701
 #, c-format
 msgid "Bottom border out of bounds (must be < %d): %d"
 msgstr "下边框超出边界(须 < %d)：%d"
 
-#: ../plug-ins/common/file-pcx.c:751
+#: ../plug-ins/common/file-pcx.c:758
 #, c-format
 msgid "Writing to file '%s' failed: %s"
 msgstr "写入文件“%s”失败：%s"
@@ -4479,7 +4498,7 @@ msgid "TIFF Channel"
 msgstr "TIFF 通道"
 
 #: ../plug-ins/common/file-tiff-load.c:1025
-#: ../plug-ins/file-psd/psd-load.c:324
+#: ../plug-ins/file-psd/psd-load.c:333
 msgid ""
 "Warning:\n"
 "The image you are loading has 16 bits per channel. GIMP can only handle 8 "
@@ -5338,12 +5357,20 @@ msgstr "网格"
 
 #. attach labels
 #: ../plug-ins/common/grid.c:717
-msgid "Horizontal"
-msgstr "水平"
+msgid ""
+"Horizontal\n"
+"Lines"
+msgstr ""
+"水平\n"
+"线"
 
 #: ../plug-ins/common/grid.c:719
-msgid "Vertical"
-msgstr "垂直"
+msgid ""
+"Vertical\n"
+"Lines"
+msgstr ""
+"垂直\n"
+"线"
 
 #: ../plug-ins/common/grid.c:721
 msgid "Intersection"
@@ -6354,9 +6381,8 @@ msgid "R_andom hue:"
 msgstr "随机色调(_A)："
 
 #: ../plug-ins/common/nova.c:446
-#, fuzzy
 msgid "Center of Nova"
-msgstr "新星的核心"
+msgstr "新星的中心"
 
 #: ../plug-ins/common/oilify.c:118 ../plug-ins/common/oilify.c:133
 msgid "Smear colors to simulate an oil painting"
@@ -8717,46 +8743,76 @@ msgstr "不支持的文件格式版本：%d"
 msgid "Too many channels in file: %d"
 msgstr "文件中的通道数太多：%d"
 
-#: ../plug-ins/file-psd/psd-load.c:313
+#: ../plug-ins/file-psd/psd-load.c:310
+#, c-format
+msgid "Unsupported or invalid image size: %dx%d"
+msgstr "不支持或无效的图像尺寸：%dx%d"
+
+#: ../plug-ins/file-psd/psd-load.c:322
 #, c-format
 msgid "Unsupported color mode: %s"
 msgstr "不支持的色彩模式：%s"
 
-#: ../plug-ins/file-psd/psd-load.c:340
+#: ../plug-ins/file-psd/psd-load.c:349
 #, c-format
 msgid "Unsupported bit depth: %d"
 msgstr "不支持的位深度：%d"
 
-#: ../plug-ins/file-psd/psd-load.c:374 ../plug-ins/file-psd/psd-load.c:384
-#: ../plug-ins/file-psd/psd-load.c:603 ../plug-ins/file-psd/psd-load.c:784
+#: ../plug-ins/file-psd/psd-load.c:383 ../plug-ins/file-psd/psd-load.c:393
+#: ../plug-ins/file-psd/psd-load.c:624 ../plug-ins/file-psd/psd-load.c:833
 #, c-format
 msgid "The file is corrupt!"
 msgstr "文件损坏！"
 
-#: ../plug-ins/file-psd/psd-load.c:544
+#: ../plug-ins/file-psd/psd-load.c:553
 #, c-format
 msgid "Too many channels in layer: %d"
 msgstr "图层中的通道数太多：%d"
 
-#: ../plug-ins/file-psd/psd-load.c:551
+#: ../plug-ins/file-psd/psd-load.c:561
 #, c-format
 msgid "Unsupported or invalid layer height: %d"
 msgstr "不支持的或无效的图层高度：%d"
 
-#: ../plug-ins/file-psd/psd-load.c:558
+#: ../plug-ins/file-psd/psd-load.c:569
 #, c-format
 msgid "Unsupported or invalid layer width: %d"
 msgstr "不支持的或无效的图层宽度：%d"
 
-#: ../plug-ins/file-psd/psd-load.c:1152 ../plug-ins/file-psd/psd-load.c:1501
+#: ../plug-ins/file-psd/psd-load.c:578
+#, c-format
+msgid "Unsupported or invalid layer size: %dx%d"
+msgstr "不支持的或无效的图层尺寸：%dx%d"
+
+#: ../plug-ins/file-psd/psd-load.c:762
+#, c-format
+msgid "Unsupported or invalid layer mask height: %d"
+msgstr "不支持的或无效的图层蒙板高度：%d"
+
+#: ../plug-ins/file-psd/psd-load.c:770
+#, c-format
+msgid "Unsupported or invalid layer mask width: %d"
+msgstr "不支持的或无效的图层蒙板宽度：%d"
+
+#: ../plug-ins/file-psd/psd-load.c:779
+#, c-format
+msgid "Unsupported or invalid layer mask size: %dx%d"
+msgstr "不支持的或无效的图层蒙板尺寸：%dx%d"
+
+#: ../plug-ins/file-psd/psd-load.c:1201 ../plug-ins/file-psd/psd-load.c:1550
 #, c-format
 msgid "Unsupported compression mode: %d"
 msgstr "不支持的压缩模式：%d"
 
-#: ../plug-ins/file-psd/psd-load.c:1594
+#: ../plug-ins/file-psd/psd-load.c:1643
 msgid "Extra"
 msgstr ""
 
+#: ../plug-ins/file-psd/psd-load.c:1818
+#, c-format
+msgid "Unsupported or invalid channel size"
+msgstr "不支持或无效的通道尺寸"
+
 #: ../plug-ins/file-psd/psd-save.c:227 ../plug-ins/file-psd/psd.c:113
 #: ../plug-ins/file-psd/psd.c:152
 msgid "Photoshop image"
@@ -8798,33 +8854,48 @@ msgstr "意料之外的文件尾"
 msgid "Silicon Graphics IRIS image"
 msgstr "Silicon Graphics IRIS 图像"
 
-#: ../plug-ins/file-sgi/sgi.c:325
+#: ../plug-ins/file-sgi/sgi.c:324
 #, c-format
 msgid "Could not open '%s' for reading."
 msgstr "无法打开“%s”并读取。"
 
-#: ../plug-ins/file-sgi/sgi.c:548
+#: ../plug-ins/file-sgi/sgi.c:340
+#, c-format
+msgid "Invalid width: %hu"
+msgstr "无效的宽度：%hu"
+
+#: ../plug-ins/file-sgi/sgi.c:347
+#, c-format
+msgid "Invalid height: %hu"
+msgstr "无效的高度：%hu"
+
+#: ../plug-ins/file-sgi/sgi.c:354
+#, c-format
+msgid "Invalid number of channels: %hu"
+msgstr "无效的通道数：%hu"
+
+#: ../plug-ins/file-sgi/sgi.c:568
 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr "无法打开“%s”并写入。"
 
-#: ../plug-ins/file-sgi/sgi.c:628
+#: ../plug-ins/file-sgi/sgi.c:648
 msgid "SGI"
 msgstr "SGI"
 
-#: ../plug-ins/file-sgi/sgi.c:630
+#: ../plug-ins/file-sgi/sgi.c:650
 msgid "Compression type"
 msgstr "压缩类型"
 
-#: ../plug-ins/file-sgi/sgi.c:634
+#: ../plug-ins/file-sgi/sgi.c:654
 msgid "No compression"
 msgstr "无压缩"
 
-#: ../plug-ins/file-sgi/sgi.c:636
+#: ../plug-ins/file-sgi/sgi.c:656
 msgid "RLE compression"
 msgstr "RLE 压缩"
 
-#: ../plug-ins/file-sgi/sgi.c:638
+#: ../plug-ins/file-sgi/sgi.c:658
 msgid ""
 "Aggressive RLE\n"
 "(not supported by SGI)"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 061161d5f3..9e0a8a0152 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "Project-Id-Version: gimp HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=gimp&component=general\n"
-"POT-Creation-Date: 2009-11-07 20:18+0000\n"
-"PO-Revision-Date: 2009-11-04 12:01+0800\n"
+"POT-Creation-Date: 2009-12-10 18:34+0000\n"
+"PO-Revision-Date: 2009-12-08 14:20+0800\n"
 "Last-Translator: 神州散人 <kappa8086@gmail.com>\n"
 "Language-Team: Chinese/Simplified <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -949,7 +949,7 @@ msgstr "使用所有可见图层的混合颜色"
 #: ../app/dialogs/file-open-location-dialog.c:225
 #: ../app/display/gimpdisplayshell-dnd.c:579
 #: ../app/widgets/gimplayertreeview.c:765 ../app/widgets/gimptoolbox-dnd.c:163
-#: ../app/widgets/gimptoolbox.c:1002
+#: ../app/widgets/gimptoolbox.c:1076
 #, c-format
 msgid ""
 "Opening '%s' failed:\n"
@@ -3746,7 +3746,7 @@ msgstr "可见"
 msgid "Set Layer Boundary Size"
 msgstr "设置图层边界大小"
 
-#: ../app/actions/layers-commands.c:654 ../app/core/gimplayer.c:259
+#: ../app/actions/layers-commands.c:654 ../app/core/gimplayer.c:261
 msgid "Scale Layer"
 msgstr "缩放图层"
 
@@ -3762,7 +3762,7 @@ msgstr "图层蒙板到选区"
 msgid "Please select a channel first"
 msgstr "请先选择通道"
 
-#: ../app/actions/layers-commands.c:1090 ../app/core/gimplayer.c:1339
+#: ../app/actions/layers-commands.c:1090 ../app/core/gimplayer.c:1365
 #: ../app/dialogs/layer-add-mask-dialog.c:82
 msgid "Add Layer Mask"
 msgstr "添加图层蒙板"
@@ -6924,7 +6924,7 @@ msgid "Convert to RGB workspace"
 msgstr "转换为 RGB 工作空间"
 
 #: ../app/core/gimp-contexts.c:154 ../app/core/gimptooloptions.c:232
-#: ../app/gui/session.c:332 ../app/menus/menus.c:449
+#: ../app/gui/session.c:332 ../app/menus/menus.c:448
 #: ../app/widgets/gimpdevices.c:258
 #, c-format
 msgid "Deleting \"%s\" failed: %s"
@@ -7190,11 +7190,11 @@ msgstr "画笔穗数"
 msgid "Brush Hardness"
 msgstr "画笔硬度"
 
-#: ../app/core/gimpbrushgenerated.c:158 ../app/paint/gimppaintoptions.c:138
+#: ../app/core/gimpbrushgenerated.c:158 ../app/paint/gimppaintoptions.c:144
 msgid "Brush Aspect Ratio"
 msgstr "画笔宽高比"
 
-#: ../app/core/gimpbrushgenerated.c:165 ../app/paint/gimppaintoptions.c:142
+#: ../app/core/gimpbrushgenerated.c:165 ../app/paint/gimppaintoptions.c:148
 msgid "Brush Angle"
 msgstr "画笔角度"
 
@@ -7496,7 +7496,7 @@ msgctxt "command"
 msgid "Rotate"
 msgstr "旋转"
 
-#: ../app/core/gimpdrawable-transform.c:883 ../app/core/gimplayer.c:263
+#: ../app/core/gimpdrawable-transform.c:883 ../app/core/gimplayer.c:265
 msgid "Transform Layer"
 msgstr "变换图层"
 
@@ -7937,7 +7937,7 @@ msgstr "从项目删除寄生物"
 msgid "Anchor Floating Selection"
 msgstr "固定浮动选区"
 
-#: ../app/core/gimplayer-floating-sel.c:126 ../app/core/gimplayer.c:576
+#: ../app/core/gimplayer-floating-sel.c:126 ../app/core/gimplayer.c:578
 msgid ""
 "Cannot create a new layer from the floating selection because it belongs to "
 "a layer mask or channel."
@@ -7947,38 +7947,38 @@ msgstr "无法从浮动选区创建新图层，因为它属于一个图层蒙板
 msgid "Floating Selection to Layer"
 msgstr "浮动选区到图层"
 
-#: ../app/core/gimplayer.c:256
+#: ../app/core/gimplayer.c:258
 msgid "Layer"
 msgstr "图层"
 
-#: ../app/core/gimplayer.c:257
+#: ../app/core/gimplayer.c:259
 msgid "Rename Layer"
 msgstr "重命名图层"
 
-#: ../app/core/gimplayer.c:258 ../app/pdb/layer-cmds.c:441
+#: ../app/core/gimplayer.c:260 ../app/pdb/layer-cmds.c:441
 #: ../app/pdb/layer-cmds.c:479
 msgid "Move Layer"
 msgstr "移动图层"
 
-#: ../app/core/gimplayer.c:260
+#: ../app/core/gimplayer.c:262
 msgid "Resize Layer"
 msgstr "改变图层大小"
 
-#: ../app/core/gimplayer.c:261
+#: ../app/core/gimplayer.c:263
 msgid "Flip Layer"
 msgstr "翻转图层"
 
-#: ../app/core/gimplayer.c:262
+#: ../app/core/gimplayer.c:264
 msgid "Rotate Layer"
 msgstr "旋转图层"
 
-#: ../app/core/gimplayer.c:420 ../app/core/gimplayer.c:1398
+#: ../app/core/gimplayer.c:422 ../app/core/gimplayer.c:1424
 #: ../app/core/gimplayermask.c:234
 #, c-format
 msgid "%s mask"
 msgstr "%s蒙板"
 
-#: ../app/core/gimplayer.c:459
+#: ../app/core/gimplayer.c:461
 #, c-format
 msgid ""
 "Floating Selection\n"
@@ -7987,35 +7987,35 @@ msgstr ""
 "浮动选区\n"
 "(%s)"
 
-#: ../app/core/gimplayer.c:1322
+#: ../app/core/gimplayer.c:1348
 msgid "Unable to add a layer mask since the layer already has one."
 msgstr "无法添加图层蒙板，因为已有一个。"
 
-#: ../app/core/gimplayer.c:1333
+#: ../app/core/gimplayer.c:1359
 msgid "Cannot add layer mask of different dimensions than specified layer."
 msgstr "无法添加跟指定图层尺寸不同的图层蒙板。"
 
-#: ../app/core/gimplayer.c:1453
+#: ../app/core/gimplayer.c:1479
 msgid "Transfer Alpha to Mask"
 msgstr "转移 Alpha 到蒙板"
 
-#: ../app/core/gimplayer.c:1623 ../app/core/gimplayermask.c:260
+#: ../app/core/gimplayer.c:1649 ../app/core/gimplayermask.c:260
 msgid "Apply Layer Mask"
 msgstr "应用图层蒙板"
 
-#: ../app/core/gimplayer.c:1624
+#: ../app/core/gimplayer.c:1650
 msgid "Delete Layer Mask"
 msgstr "删除图层蒙板"
 
-#: ../app/core/gimplayer.c:1743
+#: ../app/core/gimplayer.c:1769
 msgid "Add Alpha Channel"
 msgstr "添加 Alpha 通道"
 
-#: ../app/core/gimplayer.c:1797
+#: ../app/core/gimplayer.c:1823
 msgid "Remove Alpha Channel"
 msgstr "删除 Alpha 通道"
 
-#: ../app/core/gimplayer.c:1817
+#: ../app/core/gimplayer.c:1843
 msgid "Layer to Image Size"
 msgstr "图层到图像大小"
 
@@ -8427,6 +8427,10 @@ msgstr "输入位置(URI)："
 msgid "Export Image"
 msgstr "导出图像"
 
+#: ../app/dialogs/file-save-dialog.c:106
+msgid "_Export"
+msgstr "导出(_E)"
+
 #: ../app/dialogs/file-save-dialog.c:468
 msgid ""
 "Saving remote files needs to determine the file format from the file "
@@ -9130,7 +9134,7 @@ msgstr "移动工具"
 msgid "Set layer or path as active"
 msgstr "将图层或路径设置为活动的"
 
-#: ../app/dialogs/preferences-dialog.c:1965 ../app/widgets/gimptoolbox.c:564
+#: ../app/dialogs/preferences-dialog.c:1965 ../app/widgets/gimptoolbox.c:657
 msgid "Toolbox"
 msgstr "工具箱"
 
@@ -9937,7 +9941,7 @@ msgid "Navigate the image display"
 msgstr "导航图像显示"
 
 #: ../app/display/gimpdisplayshell.c:711
-#: ../app/display/gimpdisplayshell.c:1154 ../app/widgets/gimptoolbox.c:241
+#: ../app/display/gimpdisplayshell.c:1154 ../app/widgets/gimptoolbox.c:279
 msgid "Drop image files here to open them"
 msgstr "拖动图像到此处以打开"
 
@@ -10078,7 +10082,7 @@ msgstr " (已覆盖)"
 msgid " (imported)"
 msgstr " (已导入)"
 
-#: ../app/display/gimpstatusbar.c:358
+#: ../app/display/gimpstatusbar.c:364
 #, c-format
 msgid "Cancel <i>%s</i>"
 msgstr "取消 <i>%s</i>"
@@ -10219,7 +10223,7 @@ msgstr "不足够的笔画点"
 msgid "Paint"
 msgstr "涂画"
 
-#: ../app/paint/gimppaintoptions.c:133
+#: ../app/paint/gimppaintoptions.c:139
 msgid "Brush Scale"
 msgstr "画笔缩放"
 
@@ -10939,7 +10943,7 @@ msgstr "分布目标的底部"
 msgid "Offset:"
 msgstr "位移："
 
-#: ../app/tools/gimpblendoptions.c:215 ../app/tools/gimppaintoptions-gui.c:293
+#: ../app/tools/gimpblendoptions.c:215 ../app/tools/gimppaintoptions-gui.c:308
 msgid "Gradient:"
 msgstr "渐变："
 
@@ -10947,7 +10951,8 @@ msgstr "渐变："
 msgid "Shape:"
 msgstr "形状："
 
-#: ../app/tools/gimpblendoptions.c:238 ../app/tools/gimppaintoptions-gui.c:317
+#: ../app/tools/gimpblendoptions.c:238 ../app/tools/gimppaintoptions-gui.c:236
+#: ../app/tools/gimppaintoptions-gui.c:332
 msgid "Repeat:"
 msgstr "重复："
 
@@ -11702,23 +11707,23 @@ msgstr "自由选择工具：选择手绘区域"
 msgid "_Free Select"
 msgstr "自由选择(_F)"
 
-#: ../app/tools/gimpfreeselecttool.c:1118
+#: ../app/tools/gimpfreeselecttool.c:1119
 msgid "Click to complete selection"
 msgstr "点击并拖动可创建新的选区"
 
-#: ../app/tools/gimpfreeselecttool.c:1122
+#: ../app/tools/gimpfreeselecttool.c:1123
 msgid "Click-Drag to move segment vertex"
 msgstr "点击并拖动可移动组件"
 
-#: ../app/tools/gimpfreeselecttool.c:1127
+#: ../app/tools/gimpfreeselecttool.c:1128
 msgid "Return commits, Escape cancels, Backspace removes last segment"
 msgstr "回车键以确认，Esc 键以取消，回退键以移除最后片段"
 
-#: ../app/tools/gimpfreeselecttool.c:1131
+#: ../app/tools/gimpfreeselecttool.c:1132
 msgid "Click-Drag adds a free segment, Click adds a polygonal segment"
 msgstr "点击并拖动以添加自由选区，点击以添加多边形选区"
 
-#: ../app/tools/gimpfreeselecttool.c:1585
+#: ../app/tools/gimpfreeselecttool.c:1586
 msgctxt "command"
 msgid "Free Select"
 msgstr "自由选择"
@@ -12195,24 +12200,29 @@ msgstr "增值"
 msgid "Hard edge"
 msgstr "硬质边界"
 
-#: ../app/tools/gimppaintoptions-gui.c:210
+#: ../app/tools/gimppaintoptions-gui.c:212
 msgid "Fade out"
 msgstr "淡出"
 
-#: ../app/tools/gimppaintoptions-gui.c:219
-#: ../app/tools/gimppaintoptions-gui.c:302
+#: ../app/tools/gimppaintoptions-gui.c:221
+#: ../app/tools/gimppaintoptions-gui.c:317
 msgid "Length:"
 msgstr "长度："
 
-#: ../app/tools/gimppaintoptions-gui.c:246
+#: ../app/tools/gimppaintoptions-gui.c:241
+#: ../app/widgets/gimpviewablebox.c:223
+msgid "Reverse"
+msgstr "反向"
+
+#: ../app/tools/gimppaintoptions-gui.c:261
 msgid "Apply Jitter"
 msgstr "应用抖动"
 
-#: ../app/tools/gimppaintoptions-gui.c:251
+#: ../app/tools/gimppaintoptions-gui.c:266
 msgid "Amount:"
 msgstr "计数："
 
-#: ../app/tools/gimppaintoptions-gui.c:276
+#: ../app/tools/gimppaintoptions-gui.c:291
 msgid "Use color from gradient"
 msgstr "使用渐变中的颜色"
 
@@ -13521,14 +13531,10 @@ msgstr "已存在一个叫“%s”的文件。"
 msgid "Do you want to replace it with the image you are saving?"
 msgstr "您真的要将它替换为您正在保存的图像吗？"
 
-#: ../app/widgets/gimpdockable.c:196
+#: ../app/widgets/gimpdockable.c:212
 msgid "Configure this tab"
 msgstr "配置此页签"
 
-#: ../app/widgets/gimpdockseparator.c:42
-msgid "You can drop dockable dialogs here"
-msgstr "您可以将可停靠的对话框放在这里"
-
 #: ../app/widgets/gimpdrawabletreeview.c:123
 msgid "Lock pixels"
 msgstr "锁定像素"
@@ -13938,15 +13944,6 @@ msgstr "锁定 Alpha 通道"
 msgid "Empty Layer"
 msgstr "空白图层"
 
-#: ../app/widgets/gimpmenudock.c:159
-msgid "Auto"
-msgstr "自动"
-
-#: ../app/widgets/gimpmenudock.c:170
-msgid ""
-"When enabled the dialog automatically follows the image you are working on."
-msgstr "如果启用，对话框将自动跟随您工作的图像。"
-
 #: ../app/widgets/gimpmessagebox.c:444
 #, c-format
 msgid "Message repeated %d times."
@@ -14294,10 +14291,6 @@ msgstr "打开图案选择对话框"
 msgid "Open the gradient selection dialog"
 msgstr "打开渐变选择对话框"
 
-#: ../app/widgets/gimpviewablebox.c:223
-msgid "Reverse"
-msgstr "反向"
-
 #: ../app/widgets/gimpviewablebox.c:305
 msgid "Open the palette selection dialog"
 msgstr "打开色板选择对话框"
@@ -14306,27 +14299,27 @@ msgstr "打开色板选择对话框"
 msgid "Open the font selection dialog"
 msgstr "打开字体选择对话框"
 
-#: ../app/widgets/gimpwidgets-utils.c:660
+#: ../app/widgets/gimpwidgets-utils.c:657
 #, c-format
 msgid "%s (try %s)"
 msgstr "%s (尝试 %s)"
 
-#: ../app/widgets/gimpwidgets-utils.c:660
+#: ../app/widgets/gimpwidgets-utils.c:657
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../app/widgets/gimpwidgets-utils.c:664
+#: ../app/widgets/gimpwidgets-utils.c:661
 #, c-format
 msgid "%s (try %s, %s)"
 msgstr "%s (尝试 %s, %s)"
 
-#: ../app/widgets/gimpwidgets-utils.c:668
+#: ../app/widgets/gimpwidgets-utils.c:665
 #, c-format
 msgid "%s (try %s, %s, %s)"
 msgstr "%s (尝试 %s, %s, %s)"
 
-#: ../app/widgets/gimpwidgets-utils.c:936
+#: ../app/widgets/gimpwidgets-utils.c:933
 #, c-format
 msgid "Invalid UTF-8 data in file '%s'."
 msgstr "“%s”文件中含有无效的 UTF-8 数据。"
@@ -14571,3 +14564,14 @@ msgstr "确定工具箱可见！"
 #, c-format
 msgid "Couldn't start '%s': %s"
 msgstr "无法启动“%s”：%s"
+
+#~ msgid "You can drop dockable dialogs here"
+#~ msgstr "您可以将可停靠的对话框放在这里"
+
+#~ msgid "Auto"
+#~ msgstr "自动"
+
+#~ msgid ""
+#~ "When enabled the dialog automatically follows the image you are working "
+#~ "on."
+#~ msgstr "如果启用，对话框将自动跟随您工作的图像。"