diff --git a/po/zh_CN.po b/po/zh_CN.po
index e6bee9d..9f6827c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,9 +9,9 @@ msgstr ""
 "Project-Id-Version: zenity master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=zenity&component=general\n"
-"POT-Creation-Date: 2010-07-24 10:34+0000\n"
-"PO-Revision-Date: 2010-07-24 20:47+0800\n"
-"Last-Translator: Yinghua Wang <wantinghard@gmail.com>\n"
+"POT-Creation-Date: 2011-02-28 23:23+0000\n"
+"PO-Revision-Date: 2011-03-01 12:48+0000\n"
+"Last-Translator: ben <benbenhappy2008@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,22 +55,22 @@ msgstr "GNOME 简体中文翻译组"
 msgid "Display dialog boxes from shell scripts"
 msgstr "在 Shell 脚本中显示对话框"
 
-#: ../src/main.c:100
+#: ../src/main.c:105
 #, c-format
 msgid "You must specify a dialog type. See 'zenity --help' for details\n"
 msgstr "您必须指定对话框类型。请参看“zenity --help”获得更多细节\n"
 
-#: ../src/notification.c:138
+#: ../src/notification.c:95
 #, c-format
 msgid "could not parse command from stdin\n"
 msgstr "无法从 stdin 解析命令\n"
 
-#: ../src/notification.c:177
+#: ../src/notification.c:122
 #, c-format
 msgid "Could not parse message from stdin\n"
 msgstr "无法从 stdin 解析消息\n"
 
-#: ../src/notification.c:262 ../src/notification.c:279
+#: ../src/notification.c:198
 msgid "Zenity notification"
 msgstr "Zenity 通知"
 
@@ -107,553 +107,594 @@ msgid "You should use only one List dialog type.\n"
 msgstr "您应该只使用一种列表对话框类型。\n"
 
 #: ../src/zenity.ui.h:1
+msgid "<b>Forms dialog</b>"
+msgstr "<b>表单对话框</b>"
+
+#: ../src/zenity.ui.h:2
 msgid "Add a new entry"
 msgstr "添加新项"
 
-#: ../src/zenity.ui.h:2
+#: ../src/zenity.ui.h:3
 msgid "Adjust the scale value"
 msgstr "调整范围值"
 
-#: ../src/zenity.ui.h:3
+#: ../src/zenity.ui.h:4
 msgid "All updates are complete."
 msgstr "所有更新都已完成。"
 
-#: ../src/zenity.ui.h:4
+#: ../src/zenity.ui.h:5
 msgid "An error has occurred."
 msgstr "发生了错误。"
 
-#: ../src/zenity.ui.h:5
+#: ../src/zenity.ui.h:6
 msgid "Are you sure you want to proceed?"
 msgstr "您确定要继续吗？"
 
-#: ../src/zenity.ui.h:6
+#: ../src/zenity.ui.h:7
 msgid "C_alendar:"
 msgstr "日历(_A)："
 
-#: ../src/zenity.ui.h:7
+#: ../src/zenity.ui.h:8
 msgid "Calendar selection"
 msgstr "日历选择"
 
-#: ../src/zenity.ui.h:8
+#: ../src/zenity.ui.h:9
 msgid "Error"
 msgstr "错误"
 
-#: ../src/zenity.ui.h:9
+#: ../src/zenity.ui.h:10
 msgid "Information"
 msgstr "信息"
 
-#: ../src/zenity.ui.h:10
+#: ../src/zenity.ui.h:11
 msgid "Progress"
 msgstr "进度"
 
-#: ../src/zenity.ui.h:11
+#: ../src/zenity.ui.h:12
 msgid "Question"
 msgstr "问题"
 
-#: ../src/zenity.ui.h:12
+#: ../src/zenity.ui.h:13
 msgid "Running..."
 msgstr "正在运行..."
 
-#: ../src/zenity.ui.h:13
+#: ../src/zenity.ui.h:14
 msgid "Select a date from below."
 msgstr "从下面选择一个日期。"
 
-#: ../src/zenity.ui.h:14
+#: ../src/zenity.ui.h:15
 msgid "Select items from the list"
 msgstr "从列表中选择项目"
 
-#: ../src/zenity.ui.h:15
+#: ../src/zenity.ui.h:16
 msgid "Select items from the list below."
 msgstr "从下面的列表中选择项目。"
 
-#: ../src/zenity.ui.h:16
+#: ../src/zenity.ui.h:17
 msgid "Text View"
 msgstr "文字视图"
 
-#: ../src/zenity.ui.h:17
+#: ../src/zenity.ui.h:18
 msgid "Warning"
 msgstr "警告"
 
-#: ../src/zenity.ui.h:18
+#: ../src/zenity.ui.h:19
 msgid "_Enter new text:"
 msgstr "输入新文字(_E)："
 
-#: ../src/option.c:131
+#: ../src/option.c:144
 msgid "Set the dialog title"
 msgstr "设置对话框标题"
 
-#: ../src/option.c:132
+#: ../src/option.c:145
 msgid "TITLE"
 msgstr "标题"
 
-#: ../src/option.c:140
+#: ../src/option.c:153
 msgid "Set the window icon"
 msgstr "设置窗口图标"
 
-#: ../src/option.c:141
+#: ../src/option.c:154
 msgid "ICONPATH"
 msgstr "图标路径"
 
-#: ../src/option.c:149
+#: ../src/option.c:162
 msgid "Set the width"
 msgstr "设置宽度"
 
-#: ../src/option.c:150
+#: ../src/option.c:163
 msgid "WIDTH"
 msgstr "宽度"
 
-#: ../src/option.c:158
+#: ../src/option.c:171
 msgid "Set the height"
 msgstr "设置高度"
 
-#: ../src/option.c:159
+#: ../src/option.c:172
 msgid "HEIGHT"
 msgstr "高度"
 
-#: ../src/option.c:167
+#: ../src/option.c:180
 msgid "Set dialog timeout in seconds"
 msgstr "设置对话框超时秒数"
 
 #. Timeout for closing the dialog
-#: ../src/option.c:169
+#: ../src/option.c:182
 msgid "TIMEOUT"
 msgstr "超时"
 
-#: ../src/option.c:183
+#: ../src/option.c:196
 msgid "Display calendar dialog"
 msgstr "显示日历对话框"
 
-#: ../src/option.c:192 ../src/option.c:252 ../src/option.c:295
-#: ../src/option.c:328 ../src/option.c:440 ../src/option.c:579
-#: ../src/option.c:651 ../src/option.c:735 ../src/option.c:768
+#: ../src/option.c:205 ../src/option.c:265 ../src/option.c:308
+#: ../src/option.c:341 ../src/option.c:453 ../src/option.c:595
+#: ../src/option.c:667 ../src/option.c:760 ../src/option.c:793
+#: ../src/option.c:898
 msgid "Set the dialog text"
 msgstr "设置对话框文字"
 
-#: ../src/option.c:193 ../src/option.c:253 ../src/option.c:262
-#: ../src/option.c:296 ../src/option.c:329 ../src/option.c:441
-#: ../src/option.c:547 ../src/option.c:580 ../src/option.c:652
-#: ../src/option.c:661 ../src/option.c:670 ../src/option.c:736
-#: ../src/option.c:769
+#: ../src/option.c:206 ../src/option.c:266 ../src/option.c:275
+#: ../src/option.c:309 ../src/option.c:342 ../src/option.c:454
+#: ../src/option.c:561 ../src/option.c:596 ../src/option.c:668
+#: ../src/option.c:677 ../src/option.c:686 ../src/option.c:737
+#: ../src/option.c:761 ../src/option.c:794 ../src/option.c:899
 msgid "TEXT"
 msgstr "文字"
 
-#: ../src/option.c:201
+#: ../src/option.c:214
 msgid "Set the calendar day"
 msgstr "设置日"
 
-#: ../src/option.c:202
+#: ../src/option.c:215
 msgid "DAY"
 msgstr "日"
 
-#: ../src/option.c:210
+#: ../src/option.c:223
 msgid "Set the calendar month"
 msgstr "设置月份"
 
-#: ../src/option.c:211
+#: ../src/option.c:224
 msgid "MONTH"
 msgstr "月份"
 
-#: ../src/option.c:219
+#: ../src/option.c:232
 msgid "Set the calendar year"
 msgstr "设置年份"
 
-#: ../src/option.c:220
+#: ../src/option.c:233
 msgid "YEAR"
 msgstr "年份"
 
-#: ../src/option.c:228
+#: ../src/option.c:241 ../src/option.c:916
 msgid "Set the format for the returned date"
 msgstr "设置返回日期的格式"
 
-#: ../src/option.c:229
+#: ../src/option.c:242 ../src/option.c:917
 msgid "PATTERN"
 msgstr "模式"
 
-#: ../src/option.c:243
+#: ../src/option.c:256
 msgid "Display text entry dialog"
 msgstr "显示文本输入对话框"
 
-#: ../src/option.c:261
+#: ../src/option.c:274
 msgid "Set the entry text"
 msgstr "设置输入文字"
 
-#: ../src/option.c:270
+#: ../src/option.c:283
 msgid "Hide the entry text"
 msgstr "隐藏输入文字"
 
-#: ../src/option.c:286
+#: ../src/option.c:299
 msgid "Display error dialog"
 msgstr "显示错误对话框"
 
-#: ../src/option.c:304 ../src/option.c:337 ../src/option.c:678
-#: ../src/option.c:744
+#: ../src/option.c:317 ../src/option.c:350 ../src/option.c:694
+#: ../src/option.c:769
 msgid "Do not enable text wrapping"
 msgstr "不启用文本自动换行"
 
-#: ../src/option.c:319
+#: ../src/option.c:332
 msgid "Display info dialog"
 msgstr "显示信息对话框"
 
-#: ../src/option.c:352
+#: ../src/option.c:365
 msgid "Display file selection dialog"
 msgstr "显示文件选择对话框"
 
-#: ../src/option.c:361
+#: ../src/option.c:374
 msgid "Set the filename"
 msgstr "设置文件名"
 
-#: ../src/option.c:362 ../src/option.c:703
+#: ../src/option.c:375 ../src/option.c:719
 msgid "FILENAME"
 msgstr "文件名"
 
-#: ../src/option.c:370
+#: ../src/option.c:383
 msgid "Allow multiple files to be selected"
 msgstr "允许选中多个文件"
 
-#: ../src/option.c:379
+#: ../src/option.c:392
 msgid "Activate directory-only selection"
 msgstr "允许只选择文件夹"
 
-#: ../src/option.c:388
+#: ../src/option.c:401
 msgid "Activate save mode"
 msgstr "激活保存模式"
 
-#: ../src/option.c:397 ../src/option.c:476
+#: ../src/option.c:410 ../src/option.c:489 ../src/option.c:907
 msgid "Set output separator character"
 msgstr "设置输出分隔符"
 
-#: ../src/option.c:398 ../src/option.c:477
+#: ../src/option.c:411 ../src/option.c:490 ../src/option.c:908
 msgid "SEPARATOR"
 msgstr "分隔符"
 
-#: ../src/option.c:406
+#: ../src/option.c:419
 msgid "Confirm file selection if filename already exists"
 msgstr "若文件名已存在则确认是否覆盖文件"
 
-#: ../src/option.c:415
+#: ../src/option.c:428
 msgid "Sets a filename filter"
 msgstr "设置文件名过滤器"
 
 #. Help for file-filter argument (name and patterns for file selection)
-#: ../src/option.c:417
+#: ../src/option.c:430
 msgid "NAME | PATTERN1 PATTERN2 ..."
 msgstr "名称 | 模式1 模式2 ..."
 
-#: ../src/option.c:431
+#: ../src/option.c:444
 msgid "Display list dialog"
 msgstr "显示列表对话框"
 
-#: ../src/option.c:449
+#: ../src/option.c:462
 msgid "Set the column header"
 msgstr "设置列标题"
 
-#: ../src/option.c:450
+#: ../src/option.c:463
 msgid "COLUMN"
 msgstr "列"
 
-#: ../src/option.c:458
+#: ../src/option.c:471
 msgid "Use check boxes for first column"
 msgstr "第一列使用复选框"
 
-#: ../src/option.c:467
+#: ../src/option.c:480
 msgid "Use radio buttons for first column"
 msgstr "第一列使用单选钮"
 
-#: ../src/option.c:485
+#: ../src/option.c:498
 msgid "Allow multiple rows to be selected"
 msgstr "允许选中多行"
 
-#: ../src/option.c:494 ../src/option.c:711
+#: ../src/option.c:507 ../src/option.c:727
 msgid "Allow changes to text"
 msgstr "允许更改文字"
 
-#: ../src/option.c:503
+#: ../src/option.c:516
 msgid ""
 "Print a specific column (Default is 1. 'ALL' can be used to print all "
 "columns)"
 msgstr "打印指定列(默认为 1。“全部”可用于打印全部列)"
 
 #. Column index number to print out on a list dialog
-#: ../src/option.c:505 ../src/option.c:514
+#: ../src/option.c:518 ../src/option.c:527
 msgid "NUMBER"
 msgstr "序号"
 
-#: ../src/option.c:513
+#: ../src/option.c:526
 msgid "Hide a specific column"
 msgstr "隐藏指定列"
 
-#: ../src/option.c:522
+#: ../src/option.c:535
 msgid "Hides the column headers"
 msgstr "隐藏列头"
 
-#: ../src/option.c:537
+#: ../src/option.c:551
 msgid "Display notification"
 msgstr "显示通知"
 
-#: ../src/option.c:546
+#: ../src/option.c:560
 msgid "Set the notification text"
 msgstr "设定通知文字"
 
-#: ../src/option.c:555
+#: ../src/option.c:569
 msgid "Listen for commands on stdin"
 msgstr "在 stdin 上监听命令"
 
-#: ../src/option.c:570
+#: ../src/option.c:586
 msgid "Display progress indication dialog"
 msgstr "显示进度指示对话框"
 
-#: ../src/option.c:588
+#: ../src/option.c:604
 msgid "Set initial percentage"
 msgstr "设定初始百分比"
 
-#: ../src/option.c:589
+#: ../src/option.c:605
 msgid "PERCENTAGE"
 msgstr "百分比"
 
-#: ../src/option.c:597
+#: ../src/option.c:613
 msgid "Pulsate progress bar"
 msgstr "跳动进度条"
 
-#: ../src/option.c:607
+#: ../src/option.c:623
 #, no-c-format
 msgid "Dismiss the dialog when 100% has been reached"
 msgstr "达到 100% 时关闭对话框"
 
-#: ../src/option.c:617
+#: ../src/option.c:633
 #, no-c-format
 msgid "Kill parent process if Cancel button is pressed"
 msgstr "若按下取消按钮则终止父进程"
 
-#: ../src/option.c:627
+#: ../src/option.c:643
 #, no-c-format
 msgid "Hide Cancel button"
 msgstr "隐藏取消按钮"
 
-#: ../src/option.c:642
+#: ../src/option.c:658
 msgid "Display question dialog"
 msgstr "显示问题对话框"
 
-#: ../src/option.c:660
+#: ../src/option.c:676
 msgid "Sets the label of the Ok button"
 msgstr "设定“确定”按钮标签"
 
-#: ../src/option.c:669
+#: ../src/option.c:685
 msgid "Sets the label of the Cancel button"
 msgstr "设定“取消”按钮标签"
 
-#: ../src/option.c:693
+#: ../src/option.c:709
 msgid "Display text information dialog"
 msgstr "显示文本信息对话框"
 
-#: ../src/option.c:702
+#: ../src/option.c:718
 msgid "Open file"
 msgstr "打开文件"
 
-#: ../src/option.c:726
+#: ../src/option.c:736
+msgid "Set the text font"
+msgstr "设置文本字体"
+
+#: ../src/option.c:751
 msgid "Display warning dialog"
 msgstr "显示警告对话框"
 
-#: ../src/option.c:759
+#: ../src/option.c:784
 msgid "Display scale dialog"
 msgstr "显示范围对话框"
 
-#: ../src/option.c:777
+#: ../src/option.c:802
 msgid "Set initial value"
 msgstr "设置初始值"
 
-#: ../src/option.c:778 ../src/option.c:787 ../src/option.c:796
-#: ../src/option.c:805 ../src/option.c:871
+#: ../src/option.c:803 ../src/option.c:812 ../src/option.c:821
+#: ../src/option.c:830 ../src/option.c:965
 msgid "VALUE"
 msgstr "数值"
 
-#: ../src/option.c:786
+#: ../src/option.c:811
 msgid "Set minimum value"
 msgstr "设置最小值"
 
-#: ../src/option.c:795
+#: ../src/option.c:820
 msgid "Set maximum value"
 msgstr "设置最大值"
 
-#: ../src/option.c:804
+#: ../src/option.c:829
 msgid "Set step size"
 msgstr "设置步进大小"
 
-#: ../src/option.c:813
+#: ../src/option.c:838
 msgid "Print partial values"
 msgstr "打印部分值"
 
-#: ../src/option.c:822
+#: ../src/option.c:847
 msgid "Hide value"
 msgstr "隐藏值"
 
-#: ../src/option.c:837
+#: ../src/option.c:862
+msgid "Display forms dialog"
+msgstr "显示表单对话框"
+
+#: ../src/option.c:871
+msgid "Add a new Entry in forms dialog"
+msgstr "在表单对话框中添加新条目"
+
+#: ../src/option.c:872 ../src/option.c:881
+msgid "Field name"
+msgstr "域名称"
+
+#: ../src/option.c:880
+msgid "Add a new Password Entry in forms dialog"
+msgstr "在表单对话框中添加新密码条目"
+
+#: ../src/option.c:889
+msgid "Add a new Calendar in forms dialog"
+msgstr "在表单对话框中添加一个新日历"
+
+#: ../src/option.c:890
+msgid "Calendar field name"
+msgstr "日历域名称"
+
+#: ../src/option.c:931
 msgid "Display password dialog"
 msgstr "显示口令对话框"
 
-#: ../src/option.c:846
+#: ../src/option.c:940
 msgid "Display the username option"
 msgstr "显示用户名选项"
 
-#: ../src/option.c:861
+#: ../src/option.c:955
 msgid "Display color selection dialog"
 msgstr "显示颜色选择对话框"
 
-#: ../src/option.c:870
+#: ../src/option.c:964
 msgid "Set the color"
 msgstr "设定颜色"
 
-#: ../src/option.c:879
+#: ../src/option.c:973
 msgid "Show the palette"
 msgstr "显示调色板"
 
-#: ../src/option.c:894
+#: ../src/option.c:988
 msgid "About zenity"
 msgstr "关于 zenity"
 
-#: ../src/option.c:903
+#: ../src/option.c:997
 msgid "Print version"
 msgstr "打印版本"
 
-#: ../src/option.c:1643
+#: ../src/option.c:1813
 msgid "General options"
 msgstr "常规选项"
 
-#: ../src/option.c:1644
+#: ../src/option.c:1814
 msgid "Show general options"
 msgstr "显示常规选项"
 
-#: ../src/option.c:1654
+#: ../src/option.c:1824
 msgid "Calendar options"
 msgstr "日历选项"
 
-#: ../src/option.c:1655
+#: ../src/option.c:1825
 msgid "Show calendar options"
 msgstr "显示日历选项"
 
-#: ../src/option.c:1665
+#: ../src/option.c:1835
 msgid "Text entry options"
 msgstr "文字输入选项"
 
-#: ../src/option.c:1666
+#: ../src/option.c:1836
 msgid "Show text entry options"
 msgstr "显示文字输入选项"
 
-#: ../src/option.c:1676
+#: ../src/option.c:1846
 msgid "Error options"
 msgstr "错误选项"
 
-#: ../src/option.c:1677
+#: ../src/option.c:1847
 msgid "Show error options"
 msgstr "显示错误选项"
 
-#: ../src/option.c:1687
+#: ../src/option.c:1857
 msgid "Info options"
 msgstr "信息选项"
 
-#: ../src/option.c:1688
+#: ../src/option.c:1858
 msgid "Show info options"
 msgstr "显示信息选项"
 
-#: ../src/option.c:1698
+#: ../src/option.c:1868
 msgid "File selection options"
 msgstr "文件选择选项"
 
-#: ../src/option.c:1699
+#: ../src/option.c:1869
 msgid "Show file selection options"
 msgstr "显示文件选择选项"
 
-#: ../src/option.c:1709
+#: ../src/option.c:1879
 msgid "List options"
 msgstr "列表选项"
 
-#: ../src/option.c:1710
+#: ../src/option.c:1880
 msgid "Show list options"
 msgstr "显示列表选项"
 
-#: ../src/option.c:1720
+#: ../src/option.c:1891
 msgid "Notification icon options"
 msgstr "通知图标选项"
 
-#: ../src/option.c:1721
+#: ../src/option.c:1892
 msgid "Show notification icon options"
 msgstr "显示通知图标选项"
 
-#: ../src/option.c:1731
+#: ../src/option.c:1903
 msgid "Progress options"
 msgstr "进度选项"
 
-#: ../src/option.c:1732
+#: ../src/option.c:1904
 msgid "Show progress options"
 msgstr "显示进度选项"
 
-#: ../src/option.c:1742
+#: ../src/option.c:1914
 msgid "Question options"
 msgstr "问题选项"
 
-#: ../src/option.c:1743
+#: ../src/option.c:1915
 msgid "Show question options"
 msgstr "显示问题选项"
 
-#: ../src/option.c:1753
+#: ../src/option.c:1925
 msgid "Warning options"
 msgstr "警告选项"
 
-#: ../src/option.c:1754
+#: ../src/option.c:1926
 msgid "Show warning options"
 msgstr "显示警告选项"
 
-#: ../src/option.c:1764
+#: ../src/option.c:1936
 msgid "Scale options"
 msgstr "范围选项"
 
-#: ../src/option.c:1765
+#: ../src/option.c:1937
 msgid "Show scale options"
 msgstr "显示范围选项"
 
-#: ../src/option.c:1775
+#: ../src/option.c:1947
 msgid "Text information options"
 msgstr "文本信息选项"
 
-#: ../src/option.c:1776
+#: ../src/option.c:1948
 msgid "Show text information options"
 msgstr "显示文本信息选项"
 
-#: ../src/option.c:1786
+#: ../src/option.c:1958
 msgid "Color selection options"
 msgstr "颜色选择选项"
 
-#: ../src/option.c:1787
+#: ../src/option.c:1959
 msgid "Show color selection options"
 msgstr "显示颜色选择选项"
 
-#: ../src/option.c:1797
+#: ../src/option.c:1969
 msgid "Password dialog options"
 msgstr "口令对话框选项。"
 
-#: ../src/option.c:1798
+#: ../src/option.c:1970
 msgid "Show password dialog options"
 msgstr "显示口令对话框选项"
 
-#: ../src/option.c:1808
+#: ../src/option.c:1980
+msgid "Forms dialog options"
+msgstr "表单对话框选项"
+
+#: ../src/option.c:1981
+msgid "Show forms dialog options"
+msgstr "显示表单对话框选项"
+
+#: ../src/option.c:1991
 msgid "Miscellaneous options"
 msgstr "杂类选项"
 
-#: ../src/option.c:1809
+#: ../src/option.c:1992
 msgid "Show miscellaneous options"
 msgstr "显示杂类选项"
 
-#: ../src/option.c:1834
+#: ../src/option.c:2017
 #, c-format
 msgid ""
 "This option is not available. Please see --help for all possible usages.\n"
 msgstr "此选项不可用。请参看 --help 了解所有能用的用法。\n"
 
-#: ../src/option.c:1838
+#: ../src/option.c:2021
 #, c-format
 msgid "--%s is not supported for this dialog\n"
 msgstr "此对话框不支持 --%s\n"
 
-#: ../src/option.c:1842
+#: ../src/option.c:2025
 #, c-format
 msgid "Two or more dialog options specified\n"
 msgstr "指定了两个或更多对话框选项\n"