diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4983fb54c..4c3585288 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,33 +1,338 @@
 # Chinese (China) translation for cogl.
 # Copyright (C) 2011 cogl's COPYRIGHT HOLDER
 # This file is distributed under the same license as the cogl package.
-# Yinghua_Wang <wantinghard@gmail.com>, 2011.
+# Wylmer Wang <wantinghard@gmail.com>, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=cogl&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-09-16 23:16+0000\n"
-"PO-Revision-Date: 2011-09-17 23:22+0800\n"
+"POT-Creation-Date: 2011-11-17 13:20+0000\n"
+"PO-Revision-Date: 2011-11-19 17:20+0800\n"
 "Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
 "Language-Team: Chinese (China) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../cogl/cogl-debug.c:206
+#: ../cogl/cogl-debug.c:172
+msgid "Supported debug values:"
+msgstr "支持的调试值："
+
+#: ../cogl/cogl-debug.c:177
+msgid "Special debug values:"
+msgstr "特殊的调试值："
+
+#: ../cogl/cogl-debug.c:179 ../cogl/cogl-debug.c:181
+msgid "Enables all non-behavioural debug options"
+msgstr ""
+
+#: ../cogl/cogl-debug.c:225
 msgid "Cogl debugging flags to set"
 msgstr "要设置的 Cogl 调试选项"
 
-#: ../cogl/cogl-debug.c:208
+#: ../cogl/cogl-debug.c:227
 msgid "Cogl debugging flags to unset"
 msgstr "要清除的 Cogl 调试选项"
 
-#: ../cogl/cogl-debug.c:257
+#: ../cogl/cogl-debug.c:276
 msgid "Cogl Options"
 msgstr "Cogl 选项"
 
-#: ../cogl/cogl-debug.c:258
+#: ../cogl/cogl-debug.c:277
 msgid "Show Cogl options"
 msgstr "显示  Cogl 选项"
+
+#: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30
+#: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40
+#: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50
+#: ../cogl/cogl-debug-options.h:55 ../cogl/cogl-debug-options.h:61
+#: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71
+#: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163
+#: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184
+msgid "Cogl Tracing"
+msgstr "Cogl 跟踪"
+
+#: ../cogl/cogl-debug-options.h:27
+msgid "CoglObject references"
+msgstr "CoglObject 引用"
+
+#: ../cogl/cogl-debug-options.h:28
+msgid "Debug ref counting issues for CoglObjects"
+msgstr "调试 CoglObjects 的引用计数问题"
+
+#: ../cogl/cogl-debug-options.h:32
+msgid "Trace Texture Slicing"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:33
+msgid "debug the creation of texture slices"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:37
+msgid "Trace Atlas Textures"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:38
+msgid "Debug texture atlas management"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:42
+msgid "Trace Blend Strings"
+msgstr "跟踪混合字符串"
+
+#: ../cogl/cogl-debug-options.h:43
+msgid "Debug CoglBlendString parsing"
+msgstr "调试 CoglBlendString 解析"
+
+#: ../cogl/cogl-debug-options.h:47
+msgid "Trace Journal"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:48
+msgid "View all the geometry passing through the journal"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:52
+msgid "Trace Batching"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:53
+msgid "Show how geometry is being batched in the journal"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:57
+msgid "Trace matrices"
+msgstr "跟踪矩阵"
+
+#: ../cogl/cogl-debug-options.h:58
+msgid "Trace all matrix manipulation"
+msgstr "跟踪所有矩阵操作"
+
+#: ../cogl/cogl-debug-options.h:63
+#, fuzzy
+msgid "Trace Misc Drawing"
+msgstr "跟踪混杂绘制"
+
+#: ../cogl/cogl-debug-options.h:64
+#, fuzzy
+msgid "Trace some misc drawing operations"
+msgstr "跟踪一些混杂的绘制操作"
+
+#: ../cogl/cogl-debug-options.h:68
+msgid "Trace Pango Renderer"
+msgstr "跟踪 Pango 渲染器"
+
+#: ../cogl/cogl-debug-options.h:69
+msgid "Trace the Cogl Pango renderer"
+msgstr "跟踪 Cogl Pango 渲染器"
+
+#: ../cogl/cogl-debug-options.h:73
+msgid "Trace CoglTexturePixmap backend"
+msgstr "跟踪 CoglTexturePixmap 后端"
+
+#: ../cogl/cogl-debug-options.h:74
+msgid "Trace the Cogl texture pixmap backend"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:76 ../cogl/cogl-debug-options.h:81
+msgid "Visualize"
+msgstr "可视化"
+
+#: ../cogl/cogl-debug-options.h:78
+msgid "Outline rectangles"
+msgstr "突显矩形"
+
+#: ../cogl/cogl-debug-options.h:79
+#, fuzzy
+msgid "Add wire outlines for all rectangular geometry"
+msgstr "对所有矩形形状添加实线外框"
+
+#: ../cogl/cogl-debug-options.h:83
+msgid "Show wireframes"
+msgstr "显示线框"
+
+#: ../cogl/cogl-debug-options.h:84
+msgid "Add wire outlines for all geometry"
+msgstr "对所有形状添加线框"
+
+#: ../cogl/cogl-debug-options.h:86 ../cogl/cogl-debug-options.h:91
+#: ../cogl/cogl-debug-options.h:96 ../cogl/cogl-debug-options.h:101
+#: ../cogl/cogl-debug-options.h:111 ../cogl/cogl-debug-options.h:116
+#: ../cogl/cogl-debug-options.h:122 ../cogl/cogl-debug-options.h:127
+#: ../cogl/cogl-debug-options.h:132 ../cogl/cogl-debug-options.h:137
+#: ../cogl/cogl-debug-options.h:142 ../cogl/cogl-debug-options.h:147
+#: ../cogl/cogl-debug-options.h:153 ../cogl/cogl-debug-options.h:173
+#: ../cogl/cogl-debug-options.h:178
+msgid "Root Cause"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:88
+msgid "Disable Journal batching"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:89
+msgid "Disable batching of geometry in the Cogl Journal."
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:93
+msgid "Disable GL Vertex Buffers"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:94
+msgid "Disable use of OpenGL vertex buffer objects"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:98
+msgid "Disable GL Pixel Buffers"
+msgstr "禁用 GL 像素缓存"
+
+#: ../cogl/cogl-debug-options.h:99
+msgid "Disable use of OpenGL pixel buffer objects"
+msgstr "禁止使用 OpenGL 像素缓存对象"
+
+#: ../cogl/cogl-debug-options.h:103
+msgid "Disable software rect transform"
+msgstr "禁用软件矩形变换"
+
+#: ../cogl/cogl-debug-options.h:104
+msgid "Use the GPU to transform rectangular geometry"
+msgstr "使用 GPU 来变换矩形"
+
+#: ../cogl/cogl-debug-options.h:106
+msgid "Cogl Specialist"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:108
+msgid "Dump atlas images"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:109
+msgid "Dump texture atlas changes to an image file"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:113
+msgid "Disable texture atlasing"
+msgstr "禁用纹理平滑"
+
+#: ../cogl/cogl-debug-options.h:114
+msgid "Disable use of texture atlasing"
+msgstr "禁止使用纹理平滑"
+
+#: ../cogl/cogl-debug-options.h:118
+msgid "Disable sharing the texture atlas between text and images"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:119
+msgid ""
+"When this is set the glyph cache will always use a separate texture for its "
+"atlas. Otherwise it will try to share the atlas with images."
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:124
+msgid "Disable texturing"
+msgstr "禁用纹理"
+
+#: ../cogl/cogl-debug-options.h:125
+msgid "Disable texturing any primitives"
+msgstr "禁止用任何元素使用纹理"
+
+#: ../cogl/cogl-debug-options.h:129
+msgid "Disable arbfp"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:130
+msgid "Disable use of ARB fragment programs"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:134
+msgid "Disable fixed"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:135
+msgid "Disable use of the fixed function pipeline backend"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:139
+msgid "Disable GLSL"
+msgstr "禁用 GLSL"
+
+#: ../cogl/cogl-debug-options.h:140
+msgid "Disable use of GLSL"
+msgstr "禁止使用 GLSL"
+
+#: ../cogl/cogl-debug-options.h:144
+msgid "Disable blending"
+msgstr "禁用混合"
+
+#: ../cogl/cogl-debug-options.h:145
+msgid "Disable use of blending"
+msgstr "禁止使用混合"
+
+#: ../cogl/cogl-debug-options.h:149
+msgid "Disable non-power-of-two textures"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:150
+msgid ""
+"Makes Cogl think that the GL driver doesn't support NPOT textures so that it "
+"will create sliced textures or textures with waste instead."
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:155
+msgid "Disable software clipping"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:156
+msgid "Disables Cogl's attempts to clip some rectangles in software."
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:160
+msgid "Show source"
+msgstr "显示源代码"
+
+#: ../cogl/cogl-debug-options.h:161
+msgid "Show generated ARBfp/GLSL source code"
+msgstr "显示生成的 ARBfp/GLSL 源代码"
+
+#: ../cogl/cogl-debug-options.h:165
+msgid "Trace some OpenGL"
+msgstr "跟踪某些 OpenGL"
+
+#: ../cogl/cogl-debug-options.h:166
+msgid "Traces some select OpenGL calls"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:170
+msgid "Trace offscreen support"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:171
+msgid "Debug offscreen support"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:175
+msgid "Disable program caches"
+msgstr "禁用程序缓存"
+
+#: ../cogl/cogl-debug-options.h:176
+msgid "Disable fallback caches for arbfp and glsl programs"
+msgstr "禁用 arbfp 和 glsl 程序的后备缓存"
+
+#: ../cogl/cogl-debug-options.h:180
+msgid "Disable read pixel optimization"
+msgstr "禁用读取像素优化"
+
+#: ../cogl/cogl-debug-options.h:181
+msgid ""
+"Disable optimization for reading 1px for simple scenes of opaque rectangles"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:186
+msgid "Trace clipping"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:187
+msgid "Logs information about how Cogl is implementing clipping"
+msgstr ""