? patch-520
? patch513
? images/dialogs/zh_CN/color-dialog.png
? images/dialogs/zh_CN/dialogs-brushes-list.png
? images/dialogs/zh_CN/dialogs-brushes.png
? images/dialogs/zh_CN/dialogs-buffers-grid.png
? images/dialogs/zh_CN/dialogs-buffers-menu.png
? images/dialogs/zh_CN/dialogs-buffers.png
? images/dialogs/zh_CN/dialogs-channel-menu.png
? images/dialogs/zh_CN/dialogs-channel-quickmask.png
? images/dialogs/zh_CN/dialogs-channel.png
? images/dialogs/zh_CN/dialogs-file-open.png
? images/dialogs/zh_CN/dialogs-fonts-grid.png
? images/dialogs/zh_CN/dialogs-fonts.png
? images/dialogs/zh_CN/dialogs-gradient-editor-blend.png
? images/dialogs/zh_CN/dialogs-gradient-editor-color.png
? images/dialogs/zh_CN/dialogs-gradient-editor-colorfrom.png
? images/dialogs/zh_CN/dialogs-gradient-editor-menu.png
? images/dialogs/zh_CN/dialogs-gradient-editor.png
? images/dialogs/zh_CN/dialogs-gradient.png
? images/dialogs/zh_CN/dialogs-histogram-basic.png
? images/dialogs/zh_CN/dialogs-histogram-log.png
? images/dialogs/zh_CN/dialogs-histogram-menu.png
? images/dialogs/zh_CN/dialogs-histogram-range.png
? images/dialogs/zh_CN/dialogs-histogram-rgb.png
? images/dialogs/zh_CN/dialogs-history.png
? images/dialogs/zh_CN/dialogs-image-canvas-size.png
? images/dialogs/zh_CN/dialogs-image-configure-grid.png
? images/dialogs/zh_CN/dialogs-image-merge-visible.png
? images/dialogs/zh_CN/dialogs-image-mode-indexed.png
? images/dialogs/zh_CN/dialogs-image-scale-image.png
? images/dialogs/zh_CN/dialogs-indexed-palette.png
? images/dialogs/zh_CN/dialogs-layer-addmask.png
? images/dialogs/zh_CN/dialogs-layer-keeptrans.png
? images/dialogs/zh_CN/dialogs-layer-modes.png
? images/dialogs/zh_CN/dialogs-layer-opacity.png
? images/dialogs/zh_CN/dialogs-layer.png
? images/dialogs/zh_CN/dialogs-menus-imagewindow-edit-stroke.png
? images/dialogs/zh_CN/dialogs-navigation.png
? images/dialogs/zh_CN/dialogs-new-image-advanced.png
? images/dialogs/zh_CN/dialogs-new-image-colorspace.png
? images/dialogs/zh_CN/dialogs-new-image-fill.png
? images/dialogs/zh_CN/dialogs-new-image-templates.png
? images/dialogs/zh_CN/dialogs-new-image.png
? images/dialogs/zh_CN/dialogs-new-layer.png
? images/dialogs/zh_CN/dialogs-palette-editor-menu.png
? images/dialogs/zh_CN/dialogs-palette-editor.png
? images/dialogs/zh_CN/dialogs-palette-import.png
? images/dialogs/zh_CN/dialogs-palettes-grid.png
? images/dialogs/zh_CN/dialogs-palettes-menu.png
? images/dialogs/zh_CN/dialogs-palettes.png
? images/dialogs/zh_CN/dialogs-paths-menu.png
? images/dialogs/zh_CN/dialogs-paths.png
? images/dialogs/zh_CN/dialogs-patterns-list.png
? images/dialogs/zh_CN/dialogs-patterns.png
? images/dialogs/zh_CN/dialogs-tools.png
? images/dialogs/zh_CN/dialogs-undo-history.png
? images/dialogs/zh_CN/dialogs-view-infowindow.png
? images/menus/zh_CN
? images/preferences/zh_CN
? images/using/zh_CN
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gimp-help-2/ChangeLog,v
retrieving revision 1.634
diff -u -r1.634 ChangeLog
--- ChangeLog	18 May 2005 22:22:48 -0000	1.634
+++ ChangeLog	19 May 2005 18:36:52 -0000
@@ -287,7 +287,7 @@
 	* src/menus/menus-tools.xml
 	* src/menus/menus-view.xml
 	* src/menus/view-infowindow.xml
-	* src/menus/view-zoom.xml: added patch contributed by Cai Quian
+	* src/menus/view-zoom.xml: added patch contributed by Cai Qian
 	
 2005-05-11  Jakub Friedl <jfriedl@suse.cz>
 
@@ -449,7 +449,7 @@
 	* src/using/fileformats.xml
 	* src/using/getting-unstuck.xml
 	* src/using/imagewindow.xml: added huge patch contributed by
-	Cai Quian
+	Cai Qian
 	
 2005-05-09  Sven Neumann  <sven@gimp.org>
 
@@ -5314,7 +5314,7 @@
 	* src/using/imagewindow.xml
 	* src/using/plugins.xml
 	* src/using/toolbox.xml: applied chinese contribution by Cai
-	Quian; fixed deprecated content for german content
+	Qian; fixed deprecated content for german content
 	
 2004-08-21  Bill Skaggs	<weskaggs@primate.ucdavis.edu>
 
@@ -5915,7 +5915,7 @@
 
 	* configure.in: added chinese traditional to LINGUAS
 
-	* src/introduction.xml: added patch contributed by Cai Quian
+	* src/introduction.xml: added patch contributed by Cai Qian
 
 2004-08-11  Bill Skaggs	<weskaggs@primate.ucdavis.edu>
 
Index: NEWS
===================================================================
RCS file: /cvs/gnome/gimp-help-2/NEWS,v
retrieving revision 1.5
diff -u -r1.5 NEWS
--- NEWS	13 May 2005 17:34:39 -0000	1.5
+++ NEWS	19 May 2005 18:36:52 -0000
@@ -9,7 +9,7 @@
  * Makefile overhaul
  * new Hacking styleguide
 
-contributions from Sven Neumann, Cai Quian, Daniel Egger, Julien
+contributions from Sven Neumann, Cai Qian, Daniel Egger, Julien
 Hardelin, Jakub Friedl, Robert van Drunen, Karine Delvare, David
 Klementa, Xceals, Axel Wernicke, Roman Joost 
  
Index: src/dialogs/channel-dialog.xml
===================================================================
RCS file: /cvs/gnome/gimp-help-2/src/dialogs/channel-dialog.xml,v
retrieving revision 1.18
diff -u -r1.18 channel-dialog.xml
--- src/dialogs/channel-dialog.xml	13 May 2005 07:37:17 -0000	1.18
+++ src/dialogs/channel-dialog.xml	19 May 2005 18:37:56 -0000
@@ -310,7 +310,7 @@
     <inlinemediaobject>
       <imageobject> 
         <imagedata
-        fileref="../images/dialogs/dialogs-channels-example.png"
+        fileref="../images/dialogs/zh_CN/dialogs-channels-example.png"
         format="PNG" />
       </imageobject>
     </inlinemediaobject>
Index: src/filters/artistic/applycanvas.xml
===================================================================
RCS file: /cvs/gnome/gimp-help-2/src/filters/artistic/applycanvas.xml,v
retrieving revision 1.5
diff -u -r1.5 applycanvas.xml
--- src/filters/artistic/applycanvas.xml	9 Dec 2004 13:40:17 -0000	1.5
+++ src/filters/artistic/applycanvas.xml	19 May 2005 18:37:58 -0000
@@ -23,7 +23,7 @@
   </mediaobject>
   <mediaobject lang="zh_CN">
     <imageobject>
-      <imagedata fileref='../images/filters/filters-artistic-applycanvas.png' format="PNG"/>
+      <imagedata fileref='../images/filters/zh_CN/filters-artistic-applycanvas.png' format="PNG"/>
     </imageobject>
   </mediaobject>
 
Index: src/filters/artistic/cubism.xml
===================================================================
RCS file: /cvs/gnome/gimp-help-2/src/filters/artistic/cubism.xml,v
retrieving revision 1.5
diff -u -r1.5 cubism.xml
--- src/filters/artistic/cubism.xml	7 Dec 2004 22:43:04 -0000	1.5
+++ src/filters/artistic/cubism.xml	19 May 2005 18:38:01 -0000
@@ -25,7 +25,7 @@
 
   <mediaobject lang="zh_CN">
     <imageobject>
-      <imagedata fileref='../images/filters/filters-artistic-cubism.png' format="PNG"/>
+      <imagedata fileref='../images/filters/zh_CN/filters-artistic-cubism.png' format="PNG"/>
     </imageobject>
   </mediaobject>
 
Index: src/filters/artistic/oilify.xml
===================================================================
RCS file: /cvs/gnome/gimp-help-2/src/filters/artistic/oilify.xml,v
retrieving revision 1.7
diff -u -r1.7 oilify.xml
--- src/filters/artistic/oilify.xml	11 Dec 2004 15:26:53 -0000	1.7
+++ src/filters/artistic/oilify.xml	19 May 2005 18:38:01 -0000
@@ -11,7 +11,7 @@
     <primary lang="zh_CN">油画</primary>
   </indexterm>
 
-  <mediaobject lang="en;zh_CN">
+  <mediaobject lang="en">
     <imageobject>
       <imagedata fileref='../images/filters/filters-artistic-oilify.png' format="PNG"/>
     </imageobject>
@@ -23,6 +23,13 @@
     </imageobject>
   </mediaobject>
 
+  <mediaobject lang="zh_CN">
+    <imageobject>
+      <imagedata fileref='../images/filters/zh_CN/filters-artistic-oilify.png' format="PNG"/>
+    </imageobject>
+  </mediaobject>
+
+
   <simplesect>
     <title lang="en">Overview</title>
     <title lang="fr">Généralités</title>
Index: src/filters/blur/gauss.xml
===================================================================
RCS file: /cvs/gnome/gimp-help-2/src/filters/blur/gauss.xml,v
retrieving revision 1.5
diff -u -r1.5 gauss.xml
--- src/filters/blur/gauss.xml	4 May 2005 19:37:10 -0000	1.5
+++ src/filters/blur/gauss.xml	19 May 2005 18:38:06 -0000
@@ -28,7 +28,7 @@
     <tertiary lang="zh_CN">高斯</tertiary>
   </indexterm>
 
-  <mediaobject lang="en;cs;zh_CN">
+  <mediaobject lang="en;cs">
     <imageobject>
       <imagedata fileref='../images/filters/filters-blur-gaussIIR.png' format="PNG"/>
     </imageobject>
@@ -40,6 +40,13 @@
     </imageobject>
   </mediaobject>
 
+  <mediaobject lang="zh_CN">
+    <imageobject>
+      <imagedata fileref='../images/filters/zh_CN/filters-blur-gaussIIR.png' format="PNG"/>
+    </imageobject>
+  </mediaobject>
+
+
     <!-- changed in 12/2/2004 -->
 
   <simplesect>
Index: src/filters/color/ccanalyse.xml
===================================================================
RCS file: /cvs/gnome/gimp-help-2/src/filters/color/ccanalyse.xml,v
retrieving revision 1.7
diff -u -r1.7 ccanalyse.xml
--- src/filters/color/ccanalyse.xml	25 Jan 2005 14:57:09 -0000	1.7
+++ src/filters/color/ccanalyse.xml	19 May 2005 18:38:06 -0000
@@ -19,7 +19,7 @@
     <tertiary lang="zh_CN">分析</tertiary>
   </indexterm>
 
-  <mediaobject lang="en;zh_CN">
+  <mediaobject lang="en">
     <imageobject>
       <imagedata fileref='../images/filters/filters-color-ccanalysis.png' format="PNG"/>
     </imageobject>
@@ -30,6 +30,13 @@
       <imagedata fileref='../images/filters/fr/filters-color-ccanalysis.png' format="PNG"/>
     </imageobject>
   </mediaobject>
+
+  <mediaobject lang="zh_CN">
+    <imageobject>
+      <imagedata fileref='../images/filters/zh_CN/filters-color-ccanalysis.png' format="PNG"/>
+    </imageobject>
+  </mediaobject>
+
   
   <simplesect>
     <title lang="en">Overview</title>
Index: src/filters/color/channelmixer.xml
===================================================================
RCS file: /cvs/gnome/gimp-help-2/src/filters/color/channelmixer.xml,v
retrieving revision 1.8
diff -u -r1.8 channelmixer.xml
--- src/filters/color/channelmixer.xml	25 Jan 2005 14:57:09 -0000	1.8
+++ src/filters/color/channelmixer.xml	19 May 2005 18:38:08 -0000
@@ -19,7 +19,7 @@
     <tertiary lang="zh_CN">通道混合器</tertiary>
   </indexterm>
 
-  <mediaobject lang="en;zh_CN">
+  <mediaobject lang="en">
     <imageobject>
       <imagedata fileref='../images/filters/filters-color-channelmixer.png' format="PNG"/>
     </imageobject>
@@ -31,6 +31,13 @@
     </imageobject>
   </mediaobject>
 
+  <mediaobject lang="zh_CN">
+    <imageobject>
+      <imagedata fileref='../images/filters/zh_CN/filters-color-channelmixer.png' format="PNG"/>
+    </imageobject>
+  </mediaobject>
+
+
   <simplesect>
     <title lang="en">Overview</title>
     <title lang="fr">Généralités</title>
Index: src/filters/color/colorify.xml
===================================================================
RCS file: /cvs/gnome/gimp-help-2/src/filters/color/colorify.xml,v
retrieving revision 1.7
diff -u -r1.7 colorify.xml
--- src/filters/color/colorify.xml	25 Jan 2005 14:57:09 -0000	1.7
+++ src/filters/color/colorify.xml	19 May 2005 18:38:08 -0000
@@ -19,7 +19,7 @@
     <tertiary lang="zh_CN">单色化</tertiary>
   </indexterm>
 
-  <mediaobject lang="en;zh_CN">
+  <mediaobject lang="en">
     <imageobject>
       <imagedata fileref='../images/filters/filters-color-colorify.png' format="PNG"/>
     </imageobject>
@@ -31,6 +31,13 @@
     </imageobject>
   </mediaobject>
 
+  <mediaobject lang="zh_CN">
+    <imageobject>
+      <imagedata fileref='../images/filters/zh_CN/filters-color-colorify.png' format="PNG"/>
+    </imageobject>
+  </mediaobject>
+
+
   <simplesect>
     <title lang="en">Overview</title>
     <title lang="fr">Généralités</title>
Index: src/filters/color/colortoalpha.xml
===================================================================
RCS file: /cvs/gnome/gimp-help-2/src/filters/color/colortoalpha.xml,v
retrieving revision 1.9
diff -u -r1.9 colortoalpha.xml
--- src/filters/color/colortoalpha.xml	25 Jan 2005 14:57:09 -0000	1.9
+++ src/filters/color/colortoalpha.xml	19 May 2005 18:38:09 -0000
@@ -19,7 +19,7 @@
     <tertiary lang="zh_CN">Alpha</tertiary>
   </indexterm>
 
-  <mediaobject lang="en;zh_CN">
+  <mediaobject lang="en">
     <imageobject>
       <imagedata fileref='../images/filters/filters-color-colortoalpha.png' format="PNG"/>
     </imageobject>
@@ -31,6 +31,13 @@
     </imageobject>
   </mediaobject>
 
+  <mediaobject lang="zh_CN">
+    <imageobject>
+      <imagedata fileref='../images/filters/zh_CN/filters-color-colortoalpha.png' format="PNG"/>
+    </imageobject>
+  </mediaobject>
+
+
   <simplesect>
     <title lang="en">Overview</title>
     <title lang="fr">Généralités</title>
Index: src/filters/color/compose.xml
===================================================================
RCS file: /cvs/gnome/gimp-help-2/src/filters/color/compose.xml,v
retrieving revision 1.9
diff -u -r1.9 compose.xml
--- src/filters/color/compose.xml	22 Feb 2005 14:33:18 -0000	1.9
+++ src/filters/color/compose.xml	19 May 2005 18:38:10 -0000
@@ -19,7 +19,7 @@
     <tertiary lang="zh_CN">合成</tertiary>
   </indexterm>
 
-  <mediaobject lang="en;zh_CN">
+  <mediaobject lang="en">
     <imageobject>
       <imagedata fileref='../images/filters/filters-color-compose.png' format="PNG"/>
     </imageobject>
@@ -31,6 +31,13 @@
     </imageobject>
   </mediaobject>
 
+  <mediaobject lang="zh_CN">
+    <imageobject>
+      <imagedata fileref='../images/filters/zh_CN/filters-color-compose.png' format="PNG"/>
+    </imageobject>
+  </mediaobject>
+
+
   <simplesect>
     <title lang="en">Overview</title>
     <title lang="fr">Généralités</title>
Index: src/filters/color/hot.xml
===================================================================
RCS file: /cvs/gnome/gimp-help-2/src/filters/color/hot.xml,v
retrieving revision 1.8
diff -u -r1.8 hot.xml
--- src/filters/color/hot.xml	25 Jan 2005 14:57:09 -0000	1.8
+++ src/filters/color/hot.xml	19 May 2005 18:38:12 -0000
@@ -19,7 +19,7 @@
     <tertiary lang="zh_CN">坏点</tertiary>
   </indexterm>
 
-  <mediaobject lang="en;zh_CN">
+  <mediaobject lang="en">
     <imageobject>
       <imagedata fileref='../images/filters/filters-color-hot.png' format="PNG"/>
     </imageobject>
@@ -31,6 +31,13 @@
     </imageobject>
   </mediaobject>
 
+  <mediaobject lang="zh_CN">
+    <imageobject>
+      <imagedata fileref='../images/filters/zh_CN/filters-color-hot.png' format="PNG"/>
+    </imageobject>
+  </mediaobject>
+
+
   <simplesect>
     <title lang="en">Overview</title>
     <title lang="fr">Généralités</title>
Index: src/filters/color/smooth_palette.xml
===================================================================
RCS file: /cvs/gnome/gimp-help-2/src/filters/color/smooth_palette.xml,v
retrieving revision 1.7
diff -u -r1.7 smooth_palette.xml
--- src/filters/color/smooth_palette.xml	25 Jan 2005 14:57:09 -0000	1.7
+++ src/filters/color/smooth_palette.xml	19 May 2005 18:38:13 -0000
@@ -19,7 +19,7 @@
     <tertiary lang="zh_CN">色板</tertiary>
   </indexterm>
 
-  <mediaobject lang="en;zh_CN">
+  <mediaobject lang="en">
     <imageobject>
       <imagedata fileref='../images/filters/filters-color-smoothpalette.png' format="PNG"/>
     </imageobject>
@@ -30,6 +30,13 @@
       <imagedata fileref='../images/filters/fr/filters-color-smoothpalette.png' format="PNG"/>
     </imageobject>
   </mediaobject>
+
+  <mediaobject lang="zh_CN">
+    <imageobject>
+      <imagedata fileref='../images/filters/zh_CN/filters-color-smoothpalette.png' format="PNG"/>
+    </imageobject>
+  </mediaobject>
+
   
   <simplesect>
     <title lang="en">Overview</title>
Index: src/filters/combine/depthmerge.xml
===================================================================
RCS file: /cvs/gnome/gimp-help-2/src/filters/combine/depthmerge.xml,v
retrieving revision 1.8
diff -u -r1.8 depthmerge.xml
--- src/filters/combine/depthmerge.xml	4 May 2005 19:37:15 -0000	1.8
+++ src/filters/combine/depthmerge.xml	19 May 2005 18:38:15 -0000
@@ -13,7 +13,7 @@
     <primary lang="zh_CN">深度合并</primary>
   </indexterm>
 
-  <mediaobject lang="en;cs;zh_CN">
+  <mediaobject lang="en;cs">
     <imageobject>
       <imagedata fileref='../images/filters/filters-combine-depthmerge.png' format="PNG"/>
     </imageobject>
@@ -25,6 +25,13 @@
     </imageobject>
   </mediaobject>
 
+  <mediaobject lang="zh_CN">
+    <imageobject>
+      <imagedata fileref='../images/filters/zh_CN/filters-combine-depthmerge.png' format="PNG"/>
+    </imageobject>
+  </mediaobject>
+
+
   <para lang="en">
     Depth Merge is a Combine Filter that is useful to combine two different 
     pictures.
Index: src/filters/combine/film.xml
===================================================================
RCS file: /cvs/gnome/gimp-help-2/src/filters/combine/film.xml,v
retrieving revision 1.10
diff -u -r1.10 film.xml
--- src/filters/combine/film.xml	4 May 2005 19:37:15 -0000	1.10
+++ src/filters/combine/film.xml	19 May 2005 18:38:30 -0000
@@ -28,7 +28,7 @@
     <tertiary>胶卷</tertiary>
   </indexterm>
 
-  <mediaobject lang="en;cs;zh_CN">
+  <mediaobject lang="en;cs">
     <imageobject>
       <imagedata fileref='../images/filters/filters-combine-film.png' format="PNG"/>
     </imageobject>
@@ -40,6 +40,13 @@
     </imageobject>
   </mediaobject>
 
+  <mediaobject lang="zh_CN">
+    <imageobject>
+      <imagedata fileref='../images/filters/zh_CN/filters-combine-film.png' format="PNG"/>
+    </imageobject>
+  </mediaobject>
+
+
   <simplesect>
     <title lang="en">Overview</title>
     <title lang="cs">Přehled</title>
Index: src/filters/edge-detect/sobel.xml
===================================================================
RCS file: /cvs/gnome/gimp-help-2/src/filters/edge-detect/sobel.xml,v
retrieving revision 1.8
diff -u -r1.8 sobel.xml
--- src/filters/edge-detect/sobel.xml	14 Mar 2005 15:32:14 -0000	1.8
+++ src/filters/edge-detect/sobel.xml	19 May 2005 18:38:32 -0000
@@ -9,7 +9,7 @@
     <primary lang="fr">Sobel</primary>
   </indexterm>
 
-  <mediaobject lang="en;zh_CN">
+  <mediaobject lang="en">
     <imageobject>
       <imagedata fileref='../images/filters/filters-edgedetect-sobel.png' format="PNG"/>
     </imageobject>
@@ -20,6 +20,13 @@
     </imageobject>
   </mediaobject>
 
+  <mediaobject lang="zh_CN">
+    <imageobject>
+      <imagedata fileref='../images/filters/zh_CN/filters-edgedetect-sobel.png' format="PNG"/>
+    </imageobject>
+  </mediaobject>
+
+
   <simplesect>
     <title lang="en">Overview</title>
     <title lang="fr">Généralités</title>   
Index: src/filters/light_effects/flarefx.xml
===================================================================
RCS file: /cvs/gnome/gimp-help-2/src/filters/light_effects/flarefx.xml,v
retrieving revision 1.7
diff -u -r1.7 flarefx.xml
--- src/filters/light_effects/flarefx.xml	14 Apr 2005 07:24:18 -0000	1.7
+++ src/filters/light_effects/flarefx.xml	19 May 2005 18:38:33 -0000
@@ -12,7 +12,7 @@
     <primary lang="zh_CN">闪光</primary>
   </indexterm>
 
-  <mediaobject lang="en;zh_CN">
+  <mediaobject lang="en">
     <imageobject>
       <imagedata fileref='../images/filters/filters-light-flarefx.png' format="PNG"/>
     </imageobject>
@@ -27,6 +27,12 @@
       <imagedata fileref='../images/filters/fr/filters-light-flarefx.png' format="PNG"/>
     </imageobject>
   </mediaobject>
+  <mediaobject lang="zh_CN">
+    <imageobject>
+      <imagedata fileref='../images/filters/zh_CN/filters-light-flarefx.png' format="PNG"/>
+    </imageobject>
+  </mediaobject>
+
 
   <simplesect>
     <title lang="en">Overview</title>
Index: src/filters/light_effects/nova.xml
===================================================================
RCS file: /cvs/gnome/gimp-help-2/src/filters/light_effects/nova.xml,v
retrieving revision 1.6
diff -u -r1.6 nova.xml
--- src/filters/light_effects/nova.xml	14 Apr 2005 07:24:18 -0000	1.6
+++ src/filters/light_effects/nova.xml	19 May 2005 18:38:37 -0000
@@ -13,7 +13,7 @@
     <primary lang="zh_CN">超新星</primary>
   </indexterm>
 
-  <mediaobject lang="en;cs;zh_CN">
+  <mediaobject lang="en;cs">
     <imageobject>
       <imagedata fileref='../images/filters/filters-light-supernova.png' format="PNG"/>
     </imageobject>
@@ -23,6 +23,12 @@
       <imagedata fileref='../images/filters/fr/filters-light-supernova.png' format="PNG"/>
     </imageobject>
   </mediaobject>
+  <mediaobject lang="zh_CN">
+    <imageobject>
+      <imagedata fileref='../images/filters/zh_CN/filters-light-supernova.png' format="PNG"/>
+    </imageobject>
+  </mediaobject>
+
 
   <simplesect>
     <title lang="en">Overview</title>
Index: src/filters/light_effects/sparkle.xml
===================================================================
RCS file: /cvs/gnome/gimp-help-2/src/filters/light_effects/sparkle.xml,v
retrieving revision 1.7
diff -u -r1.7 sparkle.xml
--- src/filters/light_effects/sparkle.xml	14 Apr 2005 07:24:18 -0000	1.7
+++ src/filters/light_effects/sparkle.xml	19 May 2005 18:38:39 -0000
@@ -13,7 +13,7 @@
     <primary lang="zh_CN">火花</primary>
   </indexterm>
 
-  <mediaobject lang="en;cs;zh_CN">
+  <mediaobject lang="en;cs">
     <imageobject>
       <imagedata fileref='../images/filters/filters-light-sparkle.png' format="PNG"/>
     </imageobject>
@@ -23,6 +23,12 @@
       <imagedata fileref='../images/filters/fr/filters-light-sparkle.png' format="PNG"/>
     </imageobject>
   </mediaobject>
+  <mediaobject lang="zh_CN">
+    <imageobject>
+      <imagedata fileref='../images/filters/zh_CN/filters-light-sparkle.png' format="PNG"/>
+    </imageobject>
+  </mediaobject>
+
 
   <simplesect>
     <title lang="en">Overview</title>
Index: src/filters/render/flame.xml
===================================================================
RCS file: /cvs/gnome/gimp-help-2/src/filters/render/flame.xml,v
retrieving revision 1.9
diff -u -r1.9 flame.xml
--- src/filters/render/flame.xml	18 Nov 2004 11:42:50 -0000	1.9
+++ src/filters/render/flame.xml	19 May 2005 18:38:45 -0000
@@ -20,12 +20,16 @@
   </indexterm>
   
   <mediaobject>
-    <imageobject lang="en;zh_CN">
+    <imageobject lang="en">
       <imagedata fileref='../images/filters/filters-render-flame.png' format='PNG'/>
     </imageobject>
     <imageobject lang="fr">
       <imagedata fileref='../images/filters/fr/filters-render-flame.png' format='PNG'/>
     </imageobject>
+    <imageobject lang="zh_CN">
+      <imagedata fileref='../images/filters/zh_CN/filters-render-flame.png' format='PNG'/>
+    </imageobject>
+
   </mediaobject>
 
   <simplesect>
@@ -147,12 +151,16 @@
         <listitem>
           <informalfigure>
             <mediaobject>
-              <imageobject lang="en;zh_CN">
+              <imageobject lang="en">
                 <imagedata fileref='../images/filters/filters-render-flame-edit.png' format='PNG'/> 
               </imageobject>
               <imageobject lang="fr">
                 <imagedata fileref='../images/filters/fr/filters-render-flame-edit.png' format='PNG'/> 
               </imageobject>
+              <imageobject lang="zh_CN">
+                <imagedata fileref='../images/filters/zh_CN/filters-render-flame-edit.png' format='PNG'/>
+              </imageobject>
+
 
 	      <caption>
 		<para lang='en'>
Index: src/filters/render/grid.xml
===================================================================
RCS file: /cvs/gnome/gimp-help-2/src/filters/render/grid.xml,v
retrieving revision 1.6
diff -u -r1.6 grid.xml
--- src/filters/render/grid.xml	18 Nov 2004 11:42:50 -0000	1.6
+++ src/filters/render/grid.xml	19 May 2005 18:38:48 -0000
@@ -20,7 +20,7 @@
   </indexterm>
   
   <mediaobject>
-    <imageobject lang="en;zh_CN">
+    <imageobject lang="en">
       <imagedata fileref='../images/filters/filters-render-grid.png' format='PNG'/>
     </imageobject>
     <imageobject lang="de">
@@ -29,6 +29,9 @@
     <imageobject lang="fr">
       <imagedata fileref='../images/filters/fr/filters-render-grid.png' format='PNG'/>
     </imageobject>
+    <imageobject lang="zh_CN">
+      <imagedata fileref='../images/filters/zh_CN/filters-render-grid.png' format='PNG'/>
+    </imageobject>
   </mediaobject>
 
   <simplesect>
Index: src/filters/render/ifscompose.xml
===================================================================
RCS file: /cvs/gnome/gimp-help-2/src/filters/render/ifscompose.xml,v
retrieving revision 1.12
diff -u -r1.12 ifscompose.xml
--- src/filters/render/ifscompose.xml	11 Dec 2004 20:10:03 -0000	1.12
+++ src/filters/render/ifscompose.xml	19 May 2005 18:38:55 -0000
@@ -19,7 +19,7 @@
     <tertiary lang="zh_CN">IFS 分形</tertiary>
   </indexterm>
 
-  <mediaobject lang="en;zh_CN">
+  <mediaobject lang="en">
     <imageobject>
       <imagedata fileref='../images/filters/filters-render-ifscompose.png' format='PNG'/>
     </imageobject>
@@ -29,6 +29,12 @@
       <imagedata fileref='../images/filters/fr/filters-render-ifscompose.png' format='PNG'/>
     </imageobject>
   </mediaobject>
+  <mediaobject lang="zh_CN">
+    <imageobject>
+      <imagedata fileref='../images/filters/zh_CN/filters-render-ifscompose.png' format='PNG'/>
+    </imageobject>
+  </mediaobject>
+
 
   <simplesect>
     <title lang="en">Overview</title>
Index: src/filters/render/jigsaw.xml
===================================================================
RCS file: /cvs/gnome/gimp-help-2/src/filters/render/jigsaw.xml,v
retrieving revision 1.11
diff -u -r1.11 jigsaw.xml
--- src/filters/render/jigsaw.xml	14 Apr 2005 07:24:19 -0000	1.11
+++ src/filters/render/jigsaw.xml	19 May 2005 18:38:57 -0000
@@ -24,7 +24,7 @@
     <tertiary lang="zh_CN">拼图</tertiary>
   </indexterm>
 
-  <mediaobject lang="en;cs;zh_CN">
+  <mediaobject lang="en;cs">
     <imageobject>
       <imagedata fileref='../images/filters/filters-render-jigsaw.png'
         format='PNG'/>
@@ -37,6 +37,14 @@
       format='PNG'/>
     </imageobject>
   </mediaobject>
+  <mediaobject lang="zh_CN">
+    <imageobject>
+      <imagedata
+      fileref='../images/filters/zh_CN/filters-render-jigsaw.png'
+      format='PNG'/>
+    </imageobject>
+  </mediaobject>
+
 
   <simplesect>
     <title lang="en">Overview</title>
Index: src/filters/render/maze.xml
===================================================================
RCS file: /cvs/gnome/gimp-help-2/src/filters/render/maze.xml,v
retrieving revision 1.8
diff -u -r1.8 maze.xml
--- src/filters/render/maze.xml	14 Apr 2005 07:24:20 -0000	1.8
+++ src/filters/render/maze.xml	19 May 2005 18:39:01 -0000
@@ -24,7 +24,7 @@
     <tertiary lang="zh_CN">迷宫</tertiary>
   </indexterm>
 
-  <mediaobject lang="en;cs;zh_CN">
+  <mediaobject lang="en;cs">
     <imageobject>
       <imagedata fileref='../images/filters/filters-render-maze.png' format='PNG'/>
     </imageobject>
@@ -34,6 +34,12 @@
       <imagedata fileref='../images/filters/fr/filters-render-maze.png' format='PNG'/>
     </imageobject>
   </mediaobject>
+  <mediaobject lang="zh_CN">
+    <imageobject>
+      <imagedata fileref='../images/filters/zh_CN/filters-render-maze.png' format='PNG'/>
+    </imageobject>
+  </mediaobject>
+
 
   <simplesect>
     <title lang="en">Overview</title>
Index: src/filters/render/plasma.xml
===================================================================
RCS file: /cvs/gnome/gimp-help-2/src/filters/render/plasma.xml,v
retrieving revision 1.11
diff -u -r1.11 plasma.xml
--- src/filters/render/plasma.xml	17 Apr 2005 23:41:17 -0000	1.11
+++ src/filters/render/plasma.xml	19 May 2005 18:39:05 -0000
@@ -23,12 +23,15 @@
   </indexterm>
 
   <mediaobject>
-    <imageobject lang="de;en;cs;zh_CN">
+    <imageobject lang="de;en;cs">
       <imagedata fileref='../images/filters/filters-render-plasma.png' format='PNG'/>
     </imageobject>
     <imageobject lang="fr">
       <imagedata fileref='../images/filters/fr/filters-render-plasma.png' format='PNG'/>
     </imageobject>
+    <imageobject lang="zh_CN">
+      <imagedata fileref='../images/filters/zh_CN/filters-render-plasma.png' format='PNG'/>
+    </imageobject>
   </mediaobject>
 
   <simplesect>
Index: src/filters/render/qbist.xml
===================================================================
RCS file: /cvs/gnome/gimp-help-2/src/filters/render/qbist.xml,v
retrieving revision 1.10
diff -u -r1.10 qbist.xml
--- src/filters/render/qbist.xml	14 Apr 2005 07:24:20 -0000	1.10
+++ src/filters/render/qbist.xml	19 May 2005 18:39:11 -0000
@@ -25,12 +25,16 @@
   </indexterm>
   
   <mediaobject>
-    <imageobject lang="de;en;cs;zh_CN">
+    <imageobject lang="de;en;cs">
       <imagedata fileref='../images/filters/filters-render-qbist.png' format='PNG'/>
     </imageobject>
     <imageobject lang="fr">
       <imagedata fileref='../images/filters/fr/filters-render-qbist.png' format='PNG'/>
     </imageobject>
+    <imageobject lang="zh_CN">
+      <imagedata fileref='../images/filters/zh_CN/filters-render-qbist.png' format='PNG'/>
+    </imageobject>
+
   </mediaobject>
 
   <simplesect>
Index: src/filters/render/sinus.xml
===================================================================
RCS file: /cvs/gnome/gimp-help-2/src/filters/render/sinus.xml,v
retrieving revision 1.10
diff -u -r1.10 sinus.xml
--- src/filters/render/sinus.xml	28 Jan 2005 19:56:49 -0000	1.10
+++ src/filters/render/sinus.xml	19 May 2005 18:39:24 -0000
@@ -20,13 +20,18 @@
   </indexterm>
   
   <mediaobject>
-    <imageobject lang="de;en;zh_CN">
+    <imageobject lang="de;en">
       <imagedata fileref='../images/filters/filters-render-sinus.png' format='PNG'/>
     </imageobject>
 
     <imageobject lang="fr">
       <imagedata fileref='../images/filters/fr/filters-render-sinus.png' format='PNG'/>
     </imageobject>
+
+    <imageobject lang="zh_CN">
+      <imagedata fileref='../images/filters/zh_CN/filters-render-sinus.png' format='PNG'/>
+    </imageobject>
+
   </mediaobject>
 
   <simplesect>
Index: src/filters/render/solid_noise.xml
===================================================================
RCS file: /cvs/gnome/gimp-help-2/src/filters/render/solid_noise.xml,v
retrieving revision 1.9
diff -u -r1.9 solid_noise.xml
--- src/filters/render/solid_noise.xml	18 Nov 2004 11:42:50 -0000	1.9
+++ src/filters/render/solid_noise.xml	19 May 2005 18:39:25 -0000
@@ -20,7 +20,7 @@
   </indexterm>
   
   <mediaobject>
-    <imageobject lang="en;zh_CN">
+    <imageobject lang="en">
       <imagedata fileref='../images/filters/filters-render-solidnoise.png' format='PNG'/>
     </imageobject>
     <imageobject lang="de">
@@ -29,6 +29,9 @@
     <imageobject lang="fr">
       <imagedata fileref='../images/filters/filters-render-solidnoise.png' format='PNG'/>
     </imageobject>
+    <imageobject lang="zh_CN">
+      <imagedata fileref='../images/filters/zh_CN/filters-render-solidnoise.png' format='PNG'/>
+    </imageobject>
   </mediaobject>
 
   <simplesect>
Index: src/glossary/c.xml
===================================================================
RCS file: /cvs/gnome/gimp-help-2/src/glossary/c.xml,v
retrieving revision 1.23
diff -u -r1.23 c.xml
--- src/glossary/c.xml	16 May 2005 11:57:49 -0000	1.23
+++ src/glossary/c.xml	19 May 2005 18:40:10 -0000
@@ -596,7 +596,7 @@
               <mediaobject>
                 <imageobject>
                   <imagedata
-                    fileref='../images/glossary/colorcircle-en.png' format='PNG'
+                    fileref='../images/glossary/colorcircle-cn.png' format='PNG'
                   />
                 </imageobject>
               </mediaobject>
Index: src/glossary/j.xml
===================================================================
RCS file: /cvs/gnome/gimp-help-2/src/glossary/j.xml,v
retrieving revision 1.18
diff -u -r1.18 j.xml
--- src/glossary/j.xml	16 May 2005 11:57:49 -0000	1.18
+++ src/glossary/j.xml	19 May 2005 18:40:23 -0000
@@ -205,7 +205,7 @@
       <informalfigure pgwide="0">
         <mediaobject>
           <imageobject>
-            <imagedata fileref='../images/using/jpeg-save-dialog-en.png' format="PNG"/>
+            <imagedata fileref='../images/using/jpeg-save-dialog-cn.png' format="PNG"/>
           </imageobject>
           <caption>
             <para>JPEG 保存对话框</para>
Index: src/menus/edit-buffer-dialog.xml
===================================================================
RCS file: /cvs/gnome/gimp-help-2/src/menus/edit-buffer-dialog.xml,v
retrieving revision 1.10
diff -u -r1.10 edit-buffer-dialog.xml
--- src/menus/edit-buffer-dialog.xml	8 May 2005 19:49:37 -0000	1.10
+++ src/menus/edit-buffer-dialog.xml	19 May 2005 18:40:27 -0000
@@ -48,6 +48,20 @@
     </mediaobject>
   </informalfigure>
 
+  <informalfigure lang='zh_CN'>
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref='../images/menus/zh_CN/menus-edit-buffer.png'
+        format="PNG"/>
+      </imageobject>
+      <caption>
+        <para>
+          编辑/缓冲区
+        </para>
+      </caption>
+    </mediaobject>
+  </informalfigure>
+
   <para lang='en'>
     The commands in this submenu operate on <emphasis>named
     buffers</emphasis>.  You can use the <link
Index: src/menus/image-flatten.xml
===================================================================
RCS file: /cvs/gnome/gimp-help-2/src/menus/image-flatten.xml,v
retrieving revision 1.3
diff -u -r1.3 image-flatten.xml
--- src/menus/image-flatten.xml	6 Dec 2004 22:09:58 -0000	1.3
+++ src/menus/image-flatten.xml	19 May 2005 18:41:09 -0000
@@ -31,6 +31,22 @@
     </mediaobject>
   </informalfigure>
 
+  <informalfigure lang='zh_CN'>
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="../images/menus/zh_CN/menus-image-flatten.png"
+        format="PNG" />
+      </imageobject>
+    <caption>
+      <para>
+        平整图像菜单
+        item.
+      </para>
+    </caption>
+    </mediaobject>
+  </informalfigure>
+
+
   <para lang='en'>
     This command can be accessed from an image menubar as 
     <menuchoice>
Index: src/menus/image-transform.xml
===================================================================
RCS file: /cvs/gnome/gimp-help-2/src/menus/image-transform.xml,v
retrieving revision 1.9
diff -u -r1.9 image-transform.xml
--- src/menus/image-transform.xml	11 Dec 2004 20:08:59 -0000	1.9
+++ src/menus/image-transform.xml	19 May 2005 18:41:33 -0000
@@ -39,6 +39,21 @@
     </mediaobject>
   </informalfigure>
 
+  <informalfigure lang='zh_CN'>
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref='../images/menus/zh_CN/menus-image-transform.png'
+        format="PNG"/>
+      </imageobject>
+      <caption>
+        <para>
+          图像/变换
+        </para>
+      </caption>
+    </mediaobject>
+  </informalfigure>
+
+
   <para lang='en'>
     This command can be accessed from an image menubar as 
     <menuchoice>
@@ -61,7 +76,8 @@
   </para>
 
   <para lang="zh_CN">
-    该命令可以在<guimenuitem>图像&gt;图像/变换</guimenuitem>找到。
+    该命令在<menuchoice><guimenu>图像</guimenu><guimenuitem>变换</guimenuitem>
+    </menuchoice>。
   </para>     
   <para lang="zh_CN">
     这个菜单项包括翻转、旋转、剪裁。
Index: src/menus/view-zoom.xml
===================================================================
RCS file: /cvs/gnome/gimp-help-2/src/menus/view-zoom.xml,v
retrieving revision 1.10
diff -u -r1.10 view-zoom.xml
--- src/menus/view-zoom.xml	13 May 2005 16:57:40 -0000	1.10
+++ src/menus/view-zoom.xml	19 May 2005 18:42:34 -0000
@@ -21,21 +21,33 @@
 
   <informalfigure lang="cs;en;zh_CN">
     <mediaobject>
+<<<<<<< view-zoom.xml
+      <imageobject lang="en">
+=======
       <imageobject lang="en">
         <imagedata
           fileref='../images/menus/menus-view-zoom.png'
           format="PNG"/>
        </imageobject>
       <imageobject lang="cs">
+>>>>>>> 1.10
         <imagedata
           fileref='../images/menus/menus-view-zoom.png'
           format="PNG"/>
        </imageobject>
+<<<<<<< view-zoom.xml
+      <imageobject lang="zh_CN">
+        <imagedata
+          fileref='../images/menus/zh_CN/menus-view-zoom.png'
+          format="PNG"/>
+       </imageobject>
+=======
        <imageobject lang="zh_CN">
         <imagedata
           fileref='../images/menus/zh_CN/menus-view-zoom.png'
           format="PNG"/>
        </imageobject>
+>>>>>>> 1.10
        <caption>
          <para lang='cs'>
            Podnabídka Přiblížení nabídky Zobrazení