Fix "on qt the seek slider is as wide as the interface, not in FS controler" bug

[vlc] / po / zh_CN.po

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 31154f7922c984536b02b7492fb5085afe5906dd..690746d0f44c96592b0e4f116ebd1c3c2786287c 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.8.4-test1-svn\n"
 "Report-Msgid-Bugs-To: vlc-devel@videolan.org\n"
-"POT-Creation-Date: 2008-07-01 20:22+0300\n"
+"POT-Creation-Date: 2008-07-13 23:18+0100\n"
 "PO-Revision-Date: 2006-11-26 18:47+0700\n"
 "Last-Translator: Wei Mingzhi <whistler@openoffice.org>\n"
 "Language-Team: Simplified Chinese\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: include/vlc_common.h:913
+#: include/vlc_common.h:891
 msgid ""
 "This program comes with NO WARRANTY, to the extent permitted by law.\n"
 "You may redistribute it under the terms of the GNU General Public License;\n"
@@ -39,7 +39,7 @@ msgid "Select \"Advanced Options\" to see all options."
 msgstr "选择 \"高级选项\" 查看所有选项。"
 
 #: include/vlc_config_cat.h:36 include/vlc_config_cat.h:127
-#: modules/gui/macosx/playlistinfo.m:73 modules/gui/wince/playlist.cpp:675
+#: modules/gui/macosx/playlistinfo.m:75 modules/gui/wince/playlist.cpp:675
 #: modules/visualization/visual/visual.c:116
 msgid "General"
 msgstr "一般"
@@ -79,10 +79,10 @@ msgstr "控制界面设置"
 msgid "Hotkeys settings"
 msgstr "热键设置"
 
-#: include/vlc_config_cat.h:54 src/input/es_out.c:2045
-#: src/libvlc-module.c:1424 modules/gui/beos/InterfaceWindow.cpp:284
-#: modules/gui/macosx/intf.m:708 modules/gui/macosx/output.m:170
-#: modules/gui/macosx/playlistinfo.m:107 modules/gui/macosx/simple_prefs.m:171
+#: include/vlc_config_cat.h:54 src/input/es_out.c:2054
+#: src/libvlc-module.c:1429 modules/gui/beos/InterfaceWindow.cpp:284
+#: modules/gui/macosx/intf.m:625 modules/gui/macosx/output.m:170
+#: modules/gui/macosx/playlistinfo.m:109 modules/gui/macosx/simple_prefs.m:171
 #: modules/gui/macosx/wizard.m:378
 #: modules/gui/qt4/components/info_panels.cpp:519
 #: modules/gui/qt4/components/simple_preferences.cpp:76
@@ -99,7 +99,7 @@ msgid "General audio settings"
 msgstr "一般音频设置"
 
 #: include/vlc_config_cat.h:60 include/vlc_config_cat.h:85
-#: src/video_output/video_output.c:417
+#: src/video_output/video_output.c:420
 msgid "Filters"
 msgstr "过滤器"
 
@@ -108,7 +108,7 @@ msgid "Audio filters are used to postprocess the audio stream."
 msgstr "音频过滤器可以用于对音频流进行善后处理。"
 
 #: include/vlc_config_cat.h:64 src/audio_output/input.c:92
-#: modules/gui/macosx/intf.m:718 modules/gui/macosx/intf.m:719
+#: modules/gui/macosx/intf.m:635 modules/gui/macosx/intf.m:636
 msgid "Visualizations"
 msgstr "视觉效果"
 
@@ -124,7 +124,7 @@ msgstr "输出模块"
 msgid "These are general settings for audio output modules."
 msgstr "音频输出模块的一般设置"
 
-#: include/vlc_config_cat.h:71 src/libvlc-module.c:1806
+#: include/vlc_config_cat.h:71 src/libvlc-module.c:1833
 #: modules/gui/qt4/ui/sout.ui:758 modules/stream_out/transcode.c:231
 msgid "Miscellaneous"
 msgstr "杂项"
@@ -133,9 +133,9 @@ msgstr "杂项"
 msgid "Miscellaneous audio settings and modules."
 msgstr "模块及音频杂项设置"
 
-#: include/vlc_config_cat.h:75 src/input/es_out.c:2073
-#: src/libvlc-module.c:1472 modules/gui/macosx/intf.m:721
-#: modules/gui/macosx/output.m:160 modules/gui/macosx/playlistinfo.m:96
+#: include/vlc_config_cat.h:75 src/input/es_out.c:2082
+#: src/libvlc-module.c:1479 modules/gui/macosx/intf.m:638
+#: modules/gui/macosx/output.m:160 modules/gui/macosx/playlistinfo.m:98
 #: modules/gui/macosx/simple_prefs.m:175 modules/gui/macosx/wizard.m:379
 #: modules/gui/qt4/components/info_panels.cpp:520
 #: modules/gui/qt4/components/simple_preferences.cpp:77
@@ -242,8 +242,7 @@ msgstr "设置音频+视频、杂项编码及译码器"
 msgid "General input settings. Use with care."
 msgstr "一般输入设置，请注意。"
 
-#: include/vlc_config_cat.h:131 src/libvlc-module.c:1732
-#: modules/gui/qt4/dialogs/sout.cpp:44
+#: include/vlc_config_cat.h:131 src/libvlc-module.c:1759
 msgid "Stream output"
 msgstr "串流输出"
 
@@ -341,11 +340,11 @@ msgstr "VOD"
 msgid "VLC's implementation of Video On Demand"
 msgstr "VLC 的 Video On Demand 实现"
 
-#: include/vlc_config_cat.h:182 src/libvlc-module.c:1873
+#: include/vlc_config_cat.h:182 src/libvlc-module.c:1901
 #: src/playlist/engine.c:110 modules/demux/playlist/playlist.c:66
 #: modules/demux/playlist/playlist.c:67
 #: modules/gui/beos/InterfaceWindow.cpp:233
-#: modules/gui/beos/InterfaceWindow.cpp:327 modules/gui/macosx/intf.m:652
+#: modules/gui/beos/InterfaceWindow.cpp:327 modules/gui/macosx/intf.m:569
 #: modules/gui/pda/pda_interface.c:1262
 #: modules/gui/qt4/dialogs/playlist.cpp:48
 #: modules/gui/qt4/main_interface.cpp:127
@@ -364,7 +363,7 @@ msgstr ""
 msgid "General playlist behaviour"
 msgstr "一般播放列表行为"
 
-#: include/vlc_config_cat.h:188 modules/gui/macosx/playlist.m:438
+#: include/vlc_config_cat.h:188 modules/gui/macosx/playlist.m:437
 msgid "Services discovery"
 msgstr "服务探索"
 
@@ -374,8 +373,7 @@ msgid ""
 "playlist."
 msgstr "自动将项目添加到播放列表的服务探索模块及设备。"
 
-#: include/vlc_config_cat.h:193 src/libvlc-module.c:1691
-#: modules/gui/macosx/prefs.m:129
+#: include/vlc_config_cat.h:193 src/libvlc-module.c:1718
 msgid "Advanced"
 msgstr "高级"
 
@@ -459,10 +457,11 @@ msgid "There is no help available for these modules."
 msgstr "这些模块尚无可用的帮助文件"
 
 #: include/vlc_interface.h:134
+#, fuzzy
 msgid ""
 "\n"
 "Warning: if you can't access the GUI anymore, open a command-line window, go "
-"to the directory where you installed VLC and run \"vlc -I wx\"\n"
+"to the directory where you installed VLC and run \"vlc -I qt\"\n"
 msgstr ""
 "\n"
 "警告: 如果您不能访问 GUI，打开一个命令行窗口，进入 VLC 的安装目录，并且运行  "
@@ -487,7 +486,7 @@ msgstr "打开目录(&I)..."
 msgid "Select one or more files to open"
 msgstr "选择文件以保存到"
 
-#: include/vlc_intf_strings.h:37 modules/gui/macosx/intf.m:752
+#: include/vlc_intf_strings.h:37 modules/gui/macosx/intf.m:669
 #, fuzzy
 msgid "Media Information..."
 msgstr "元信息"
@@ -497,22 +496,22 @@ msgstr "元信息"
 msgid "Codec Information..."
 msgstr "信息"
 
-#: include/vlc_intf_strings.h:39 modules/gui/macosx/intf.m:753
+#: include/vlc_intf_strings.h:39 modules/gui/macosx/intf.m:670
 #, fuzzy
 msgid "Messages..."
 msgstr "讯息(&M)"
 
 #: include/vlc_intf_strings.h:40
 #, fuzzy
-msgid "Extended settings..."
+msgid "Extended Settings..."
 msgstr "编码器设置"
 
 #: include/vlc_intf_strings.h:41
 #, fuzzy
-msgid "Go to specific time..."
+msgid "Go to Specific Time..."
 msgstr "Logo位置"
 
-#: include/vlc_intf_strings.h:42 modules/gui/macosx/intf.m:750
+#: include/vlc_intf_strings.h:42 modules/gui/macosx/intf.m:667
 #, fuzzy
 msgid "Bookmarks..."
 msgstr "书签"
@@ -528,14 +527,14 @@ msgstr "关于..."
 
 #: include/vlc_intf_strings.h:48 modules/control/rc.c:75
 #: modules/gui/macosx/embeddedwindow.m:51
-#: modules/gui/macosx/embeddedwindow.m:137 modules/gui/macosx/intf.m:645
-#: modules/gui/macosx/intf.m:689 modules/gui/macosx/intf.m:768
-#: modules/gui/macosx/intf.m:775 modules/gui/macosx/intf.m:1693
-#: modules/gui/macosx/intf.m:1694 modules/gui/macosx/intf.m:1695
-#: modules/gui/macosx/intf.m:1696 modules/gui/macosx/playlist.m:430
+#: modules/gui/macosx/embeddedwindow.m:141 modules/gui/macosx/intf.m:562
+#: modules/gui/macosx/intf.m:606 modules/gui/macosx/intf.m:685
+#: modules/gui/macosx/intf.m:692 modules/gui/macosx/intf.m:1608
+#: modules/gui/macosx/intf.m:1609 modules/gui/macosx/intf.m:1610
+#: modules/gui/macosx/intf.m:1611 modules/gui/macosx/playlist.m:429
 #: modules/gui/pda/pda_interface.c:260 modules/gui/pda/pda_interface.c:261
 #: modules/gui/qt4/components/interface_widgets.cpp:590
-#: modules/gui/qt4/components/interface_widgets.cpp:803
+#: modules/gui/qt4/components/interface_widgets.cpp:813
 #: modules/gui/qt4/menus.cpp:652 modules/gui/qt4/menus.cpp:656
 #: modules/gui/qt4/menus.cpp:659
 msgid "Play"
@@ -543,10 +542,10 @@ msgstr "播放"
 
 #: include/vlc_intf_strings.h:49
 #, fuzzy
-msgid "Fetch information"
+msgid "Fetch Information"
 msgstr "元信息"
 
-#: include/vlc_intf_strings.h:50 modules/gui/macosx/playlist.m:431
+#: include/vlc_intf_strings.h:50 modules/gui/macosx/playlist.m:430
 #: modules/gui/pda/pda_interface.c:1252
 #: modules/gui/qt4/dialogs/bookmarks.cpp:45
 #: modules/gui/qt4/ui/podcast_configuration.ui:59
@@ -554,7 +553,7 @@ msgstr "元信息"
 msgid "Delete"
 msgstr "删除"
 
-#: include/vlc_intf_strings.h:51
+#: include/vlc_intf_strings.h:51 modules/gui/macosx/playlist.m:433
 #, fuzzy
 msgid "Information..."
 msgstr "信息"
@@ -565,7 +564,7 @@ msgid "Sort"
 msgstr "排序(&S)"
 
 #: include/vlc_intf_strings.h:53
-msgid "Add node"
+msgid "Add Node"
 msgstr "添加节点"
 
 #: include/vlc_intf_strings.h:54
@@ -583,7 +582,7 @@ msgstr "保存文件..."
 msgid "Open Folder..."
 msgstr "打开文件..."
 
-#: include/vlc_intf_strings.h:60 src/libvlc-module.c:1114
+#: include/vlc_intf_strings.h:60 src/libvlc-module.c:1119
 msgid "Repeat all"
 msgstr "重复播放全部"
 
@@ -596,8 +595,8 @@ msgstr "重复一次"
 msgid "No repeat"
 msgstr ""
 
-#: include/vlc_intf_strings.h:64 src/libvlc-module.c:1315
-#: modules/gui/macosx/controls.m:919 modules/gui/macosx/intf.m:695
+#: include/vlc_intf_strings.h:64 src/libvlc-module.c:1320
+#: modules/gui/macosx/controls.m:919 modules/gui/macosx/intf.m:612
 msgid "Random"
 msgstr "随机"
 
@@ -633,12 +632,12 @@ msgstr "增加目录(&D)..."
 
 #: include/vlc_intf_strings.h:74
 #, fuzzy
-msgid "Save playlist to file..."
+msgid "Save Playlist to File..."
 msgstr "储存播放列表..."
 
 #: include/vlc_intf_strings.h:75
 #, fuzzy
-msgid "Load playlist file..."
+msgid "Load Playlist File..."
 msgstr "储存播放列表..."
 
 #: include/vlc_intf_strings.h:77
@@ -647,12 +646,12 @@ msgstr "搜索"
 
 #: include/vlc_intf_strings.h:78
 #, fuzzy
-msgid "Search filter"
+msgid "Search Filter"
 msgstr "搜索播放列表"
 
 #: include/vlc_intf_strings.h:80
 #, fuzzy
-msgid "Additional sources"
+msgid "Additional Sources"
 msgstr "附加调试"
 
 #: include/vlc_intf_strings.h:84
@@ -754,21 +753,21 @@ msgid ""
 "b> VLC media player.</p></body></html>"
 msgstr ""
 
-#: src/audio_output/filters.c:155 src/audio_output/filters.c:202
-#: src/audio_output/filters.c:225
+#: src/audio_output/filters.c:159 src/audio_output/filters.c:206
+#: src/audio_output/filters.c:229
 #, fuzzy
 msgid "Audio filtering failed"
 msgstr "音频滤波器"
 
-#: src/audio_output/filters.c:156 src/audio_output/filters.c:203
-#: src/audio_output/filters.c:226
+#: src/audio_output/filters.c:160 src/audio_output/filters.c:207
+#: src/audio_output/filters.c:230
 #, c-format
 msgid "The maximum number of filters (%d) was reached."
 msgstr ""
 
 #: src/audio_output/input.c:94 src/audio_output/input.c:140
-#: src/input/es_out.c:453 src/libvlc-module.c:560
-#: src/video_output/video_output.c:394 modules/video_filter/postproc.c:222
+#: src/input/es_out.c:458 src/libvlc-module.c:560
+#: src/video_output/video_output.c:397 modules/video_filter/postproc.c:222
 msgid "Disable"
 msgstr "关闭"
 
@@ -804,8 +803,8 @@ msgid "Replay gain"
 msgstr "全域增益"
 
 #: src/audio_output/output.c:102 src/audio_output/output.c:129
-#: modules/access/vcdx/info.c:121 modules/gui/macosx/intf.m:714
-#: modules/gui/macosx/intf.m:715
+#: modules/access/vcdx/info.c:121 modules/gui/macosx/intf.m:631
+#: modules/gui/macosx/intf.m:632
 msgid "Audio Channels"
 msgstr "音频"
 
@@ -859,15 +858,15 @@ msgstr "键"
 msgid "boolean"
 msgstr "布尔值"
 
-#: src/config/file.c:593 src/libvlc.c:1531
+#: src/config/file.c:593 src/libvlc.c:1601
 msgid "integer"
 msgstr "整型"
 
-#: src/config/file.c:602 src/libvlc.c:1558
+#: src/config/file.c:602 src/libvlc.c:1630
 msgid "float"
 msgstr "浮点型"
 
-#: src/config/file.c:625 src/libvlc.c:1512
+#: src/config/file.c:625 src/libvlc.c:1580
 msgid "string"
 msgstr "字符串型"
 
@@ -891,42 +890,37 @@ msgstr "%s: 选项 `--%s' 不允许任何参数\n"
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: 选项 `%c%s' 不允许任何参数\n"
 
-#: src/extras/getopt.c:681 src/extras/getopt.c:854
+#: src/extras/getopt.c:681 src/extras/getopt.c:857
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: 选项 `%s' 需要一个参数\n"
 
-#: src/extras/getopt.c:710
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: 不能识别的选项 `--%s'\n"
-
-#: src/extras/getopt.c:714
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: src/extras/getopt.c:710 src/extras/getopt.c:716
+#, fuzzy, c-format
+msgid "%s: unrecognized option `%s%s'\n"
 msgstr "%s: 不能识别的选项 `%c%s'\n"
 
-#: src/extras/getopt.c:740
+#: src/extras/getopt.c:743
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: 不合法的选项 -- %c\n"
 
-#: src/extras/getopt.c:743
+#: src/extras/getopt.c:746
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: 不合法的选项 -- %c\n"
 
-#: src/extras/getopt.c:773 src/extras/getopt.c:903
+#: src/extras/getopt.c:776 src/extras/getopt.c:906
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: 选项需要一个参数 -- %c\n"
 
-#: src/extras/getopt.c:820
+#: src/extras/getopt.c:823
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: 选项 `-W %s' 是有歧义的\n"
 
-#: src/extras/getopt.c:838
+#: src/extras/getopt.c:841
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: 选项 `-W %s' 不允许一个参数\n"
@@ -965,135 +959,135 @@ msgstr ""
 msgid "VLC could not open the decoder module."
 msgstr ""
 
-#: src/input/es_out.c:475 src/input/es_out.c:477 src/input/es_out.c:483
-#: src/input/es_out.c:484 modules/access/cdda/info.c:907
+#: src/input/es_out.c:480 src/input/es_out.c:482 src/input/es_out.c:488
+#: src/input/es_out.c:489 modules/access/cdda/info.c:907
 #: modules/access/cdda/info.c:938
 #, c-format
 msgid "Track %i"
 msgstr "音轨 %i"
 
-#: src/input/es_out.c:666
+#: src/input/es_out.c:675
 #, c-format
 msgid "%s [%s %d]"
 msgstr ""
 
-#: src/input/es_out.c:666 src/input/es_out.c:668 src/input/var.c:156
-#: src/libvlc-module.c:593 modules/gui/macosx/intf.m:701
-#: modules/gui/macosx/intf.m:702
+#: src/input/es_out.c:675 src/input/es_out.c:677 src/input/var.c:158
+#: src/libvlc-module.c:593 modules/gui/macosx/intf.m:618
+#: modules/gui/macosx/intf.m:619
 msgid "Program"
 msgstr "程序"
 
-#: src/input/es_out.c:1452 modules/demux/ty.c:771
+#: src/input/es_out.c:1461 modules/demux/ty.c:771
 msgid "Closed captions 1"
 msgstr ""
 
-#: src/input/es_out.c:1453 modules/demux/ty.c:772
+#: src/input/es_out.c:1462 modules/demux/ty.c:772
 msgid "Closed captions 2"
 msgstr ""
 
-#: src/input/es_out.c:1454 modules/demux/ty.c:773
+#: src/input/es_out.c:1463 modules/demux/ty.c:773
 msgid "Closed captions 3"
 msgstr ""
 
-#: src/input/es_out.c:1455 modules/demux/ty.c:774
+#: src/input/es_out.c:1464 modules/demux/ty.c:774
 msgid "Closed captions 4"
 msgstr ""
 
-#: src/input/es_out.c:2032 modules/codec/faad.c:386
+#: src/input/es_out.c:2041 modules/codec/faad.c:386
 #, c-format
 msgid "Stream %d"
 msgstr "串流 %d"
 
-#: src/input/es_out.c:2034 modules/gui/macosx/wizard.m:383
+#: src/input/es_out.c:2043 modules/gui/macosx/wizard.m:383
 #: modules/gui/qt4/ui/sout.ui:562 modules/gui/qt4/ui/sout.ui:641
 msgid "Codec"
 msgstr "编码器"
 
-#: src/input/es_out.c:2037 src/input/meta.c:63 src/libvlc-module.c:173
+#: src/input/es_out.c:2046 src/input/meta.c:63 src/libvlc-module.c:173
 #: modules/gui/beos/InterfaceWindow.cpp:280
 #: modules/gui/macosx/simple_prefs.m:260
 #: modules/gui/qt4/ui/sprefs_interface.ui:25
 msgid "Language"
 msgstr "语言"
 
-#: src/input/es_out.c:2045 src/input/es_out.c:2073 src/input/es_out.c:2100
+#: src/input/es_out.c:2054 src/input/es_out.c:2082 src/input/es_out.c:2109
 #: modules/gui/macosx/output.m:153 modules/gui/qt4/ui/sprefs_audio.ui:186
 msgid "Type"
 msgstr "类型"
 
-#: src/input/es_out.c:2048 modules/codec/faad.c:391
+#: src/input/es_out.c:2057 modules/codec/faad.c:391
 #: modules/gui/macosx/output.m:176 modules/gui/qt4/ui/sout.ui:690
 msgid "Channels"
 msgstr "频道"
 
-#: src/input/es_out.c:2053 modules/codec/faad.c:393
+#: src/input/es_out.c:2062 modules/codec/faad.c:393
 msgid "Sample rate"
 msgstr "采样率"
 
-#: src/input/es_out.c:2054
+#: src/input/es_out.c:2063
 #, fuzzy, c-format
 msgid "%u Hz"
 msgstr "%d Hz"
 
-#: src/input/es_out.c:2060
+#: src/input/es_out.c:2069
 msgid "Bits per sample"
 msgstr "比特每采样"
 
-#: src/input/es_out.c:2065 modules/access_output/shout.c:91
-#: modules/access/pvr.c:97 modules/gui/qt4/components/open_panels.cpp:837
+#: src/input/es_out.c:2074 modules/access_output/shout.c:91
+#: modules/access/pvr.c:97 modules/gui/qt4/components/open_panels.cpp:838
 msgid "Bitrate"
 msgstr "位率"
 
-#: src/input/es_out.c:2066
+#: src/input/es_out.c:2075
 #, fuzzy, c-format
 msgid "%u kb/s"
 msgstr "%d kb/s"
 
-#: src/input/es_out.c:2077
+#: src/input/es_out.c:2086
 msgid "Resolution"
 msgstr "分辨率"
 
-#: src/input/es_out.c:2083
+#: src/input/es_out.c:2092
 msgid "Display resolution"
 msgstr "显示分辨率"
 
-#: src/input/es_out.c:2093 modules/access/screen/screen.c:43
+#: src/input/es_out.c:2102 modules/access/screen/screen.c:43
 msgid "Frame rate"
 msgstr "帧率"
 
-#: src/input/es_out.c:2100
+#: src/input/es_out.c:2109
 msgid "Subtitle"
 msgstr "字幕"
 
-#: src/input/input.c:2200
+#: src/input/input.c:2211
 msgid "Your input can't be opened"
 msgstr ""
 
-#: src/input/input.c:2201
+#: src/input/input.c:2212
 #, c-format
 msgid "VLC is unable to open the MRL '%s'. Check the log for details."
 msgstr ""
 
-#: src/input/input.c:2299
+#: src/input/input.c:2310
 msgid "VLC can't recognize the input's format"
 msgstr ""
 
-#: src/input/input.c:2300
+#: src/input/input.c:2311
 #, c-format
 msgid "The format of '%s' cannot be detected. Have a look the log for details."
 msgstr ""
 
-#: src/input/meta.c:52 src/input/var.c:166
-#: modules/gui/beos/MediaControlView.cpp:1237 modules/gui/macosx/intf.m:703
-#: modules/gui/macosx/intf.m:704 modules/gui/macosx/open.m:179
-#: modules/gui/macosx/playlistinfo.m:69 modules/gui/macosx/wizard.m:348
+#: src/input/meta.c:52 src/input/var.c:168
+#: modules/gui/beos/MediaControlView.cpp:1237 modules/gui/macosx/intf.m:620
+#: modules/gui/macosx/intf.m:621 modules/gui/macosx/open.m:179
+#: modules/gui/macosx/playlistinfo.m:71 modules/gui/macosx/wizard.m:348
 #: modules/gui/qt4/components/open_panels.cpp:298
 #: modules/gui/qt4/ui/open_disk.ui:206 modules/mux/asf.c:52
 msgid "Title"
 msgstr "标题"
 
-#: src/input/meta.c:53 modules/gui/macosx/playlistinfo.m:70
-#: modules/gui/macosx/playlist.m:1078
+#: src/input/meta.c:53 modules/gui/macosx/playlistinfo.m:72
+#: modules/gui/macosx/playlist.m:1087
 msgid "Artist"
 msgstr "艺术家"
 
@@ -1158,69 +1152,69 @@ msgstr "网址"
 msgid "Track ID"
 msgstr "轨道"
 
-#: src/input/var.c:147
+#: src/input/var.c:149
 msgid "Bookmark"
 msgstr "书签"
 
-#: src/input/var.c:161 src/libvlc-module.c:599
+#: src/input/var.c:163 src/libvlc-module.c:599
 msgid "Programs"
 msgstr "程序"
 
-#: src/input/var.c:171 modules/gui/beos/MediaControlView.cpp:1238
-#: modules/gui/macosx/intf.m:705 modules/gui/macosx/intf.m:706
+#: src/input/var.c:173 modules/gui/beos/MediaControlView.cpp:1238
+#: modules/gui/macosx/intf.m:622 modules/gui/macosx/intf.m:623
 #: modules/gui/macosx/open.m:180 modules/gui/qt4/ui/open_disk.ui:177
 msgid "Chapter"
 msgstr "章节"
 
-#: src/input/var.c:176 modules/access/vcdx/info.c:305
+#: src/input/var.c:178 modules/access/vcdx/info.c:305
 #: modules/access/vcdx/info.c:306 modules/gui/beos/InterfaceWindow.cpp:295
 msgid "Navigation"
 msgstr "导航"
 
-#: src/input/var.c:192 modules/gui/macosx/intf.m:729
-#: modules/gui/macosx/intf.m:730
+#: src/input/var.c:194 modules/gui/macosx/intf.m:646
+#: modules/gui/macosx/intf.m:647
 msgid "Video Track"
 msgstr "视频轨"
 
-#: src/input/var.c:197 modules/gui/macosx/intf.m:712
-#: modules/gui/macosx/intf.m:713
+#: src/input/var.c:199 modules/gui/macosx/intf.m:629
+#: modules/gui/macosx/intf.m:630
 msgid "Audio Track"
 msgstr "音频轨"
 
-#: src/input/var.c:202 modules/gui/macosx/intf.m:737
-#: modules/gui/macosx/intf.m:738
+#: src/input/var.c:204 modules/gui/macosx/intf.m:654
+#: modules/gui/macosx/intf.m:655
 msgid "Subtitles Track"
 msgstr "字幕轨"
 
-#: src/input/var.c:269
+#: src/input/var.c:271
 msgid "Next title"
 msgstr "下一个标题"
 
-#: src/input/var.c:274
+#: src/input/var.c:276
 msgid "Previous title"
 msgstr "上一个标题"
 
-#: src/input/var.c:297
+#: src/input/var.c:299
 #, c-format
 msgid "Title %i"
 msgstr "标题 %i"
 
-#: src/input/var.c:320 src/input/var.c:380
+#: src/input/var.c:322 src/input/var.c:382
 #, c-format
 msgid "Chapter %i"
 msgstr "章节 %i"
 
-#: src/input/var.c:359 modules/gui/beos/InterfaceWindow.cpp:292
-#: modules/gui/qt4/components/interface_widgets.cpp:734
+#: src/input/var.c:361 modules/gui/beos/InterfaceWindow.cpp:292
+#: modules/gui/qt4/components/interface_widgets.cpp:744
 msgid "Next chapter"
 msgstr "下一个章节"
 
-#: src/input/var.c:364 modules/gui/beos/InterfaceWindow.cpp:291
-#: modules/gui/qt4/components/interface_widgets.cpp:733
+#: src/input/var.c:366 modules/gui/beos/InterfaceWindow.cpp:291
+#: modules/gui/qt4/components/interface_widgets.cpp:743
 msgid "Previous chapter"
 msgstr "上一个章节"
 
-#: src/input/vlm.c:519 src/input/vlm.c:849
+#: src/input/vlm.c:517 src/input/vlm.c:847
 #, c-format
 msgid "Media: %s"
 msgstr "媒体: %s"
@@ -1230,91 +1224,109 @@ msgstr "媒体: %s"
 #: modules/gui/macosx/bookmarks.m:104 modules/gui/macosx/controls.m:58
 #: modules/gui/macosx/interaction.m:128 modules/gui/macosx/interaction.m:132
 #: modules/gui/macosx/interaction.m:135 modules/gui/macosx/open.m:168
-#: modules/gui/macosx/prefs.m:127 modules/gui/macosx/prefs.m:149
+#: modules/gui/macosx/prefs.m:126 modules/gui/macosx/prefs.m:147
 #: modules/gui/macosx/simple_prefs.m:231 modules/gui/macosx/simple_prefs.m:295
 #: modules/gui/macosx/simple_prefs.m:606 modules/gui/macosx/wizard.m:320
-#: modules/gui/qt4/components/open_panels.cpp:1128
-#: modules/gui/qt4/components/preferences_widgets.cpp:1284
-#: modules/gui/qt4/dialogs/podcast_configuration.cpp:38
+#: modules/gui/qt4/components/open_panels.cpp:1129
+#: modules/gui/qt4/components/preferences_widgets.cpp:1285
 msgid "Cancel"
 msgstr "取消"
 
-#: src/interface/interaction.c:279
-#: modules/gui/qt4/components/open_panels.cpp:1127
-#: modules/gui/qt4/main_interface.cpp:525
-msgid "Ok"
-msgstr ""
+#: src/interface/interaction.c:279 modules/gui/beos/InterfaceWindow.cpp:406
+#: modules/gui/macosx/bookmarks.m:103 modules/gui/macosx/bookmarks.m:217
+#: modules/gui/macosx/bookmarks.m:225 modules/gui/macosx/bookmarks.m:270
+#: modules/gui/macosx/bookmarks.m:278 modules/gui/macosx/controls.m:59
+#: modules/gui/macosx/extended.m:518 modules/gui/macosx/interaction.m:133
+#: modules/gui/macosx/interaction.m:134 modules/gui/macosx/interaction.m:174
+#: modules/gui/macosx/open.m:167 modules/gui/macosx/open.m:299
+#: modules/gui/macosx/output.m:138 modules/gui/macosx/playlistinfo.m:424
+#: modules/gui/macosx/simple_prefs.m:232 modules/gui/macosx/update.m:65
+#: modules/gui/macosx/wizard.m:599 modules/gui/macosx/wizard.m:663
+#: modules/gui/macosx/wizard.m:1055 modules/gui/macosx/wizard.m:1140
+#: modules/gui/macosx/wizard.m:1147 modules/gui/macosx/wizard.m:1674
+#: modules/gui/macosx/wizard.m:1682 modules/gui/macosx/wizard.m:1863
+#: modules/gui/macosx/wizard.m:1874 modules/gui/macosx/wizard.m:1887
+#: modules/gui/qt4/components/open_panels.cpp:1128
+#: modules/gui/qt4/components/preferences_widgets.cpp:1284
+#: modules/gui/qt4/dialogs/podcast_configuration.cpp:37
+#: modules/gui/qt4/main_interface.cpp:524
+msgid "OK"
+msgstr "确定"
 
-#: src/interface/interface.c:186 modules/gui/macosx/intf.m:663
-#: modules/gui/macosx/intf.m:664
+#: src/interface/interface.c:200 modules/gui/macosx/intf.m:580
+#: modules/gui/macosx/intf.m:581
 msgid "Add Interface"
 msgstr "新增界面"
 
-#: src/interface/interface.c:192
+#: src/interface/interface.c:206
 msgid "Telnet Interface"
 msgstr "Telnet 界面"
 
-#: src/interface/interface.c:195
+#: src/interface/interface.c:209
 msgid "Web Interface"
 msgstr "Web 界面"
 
-#: src/interface/interface.c:198
+#: src/interface/interface.c:212
 msgid "Debug logging"
 msgstr "调试记录"
 
-#: src/interface/interface.c:201
+#: src/interface/interface.c:215
 msgid "Mouse Gestures"
 msgstr "鼠标手势"
 
-#: src/libvlc.c:260 src/libvlc.c:399 src/modules/cache.c:192
-#: src/modules/cache.c:507
+#: src/libvlc.c:295 src/libvlc.c:434 src/modules/cache.c:206
+#: src/modules/cache.c:525
 msgid "C"
 msgstr "zh_CN"
 
-#: src/libvlc.c:1122
+#: src/libvlc.c:1168
 msgid ""
 "Running vlc with the default interface. Use 'cvlc' to use vlc without "
 "interface."
 msgstr ""
 
-#: src/libvlc.c:1571
+#: src/libvlc.c:1313
+msgid "To get exhaustive help, use '-H'."
+msgstr ""
+
+#: src/libvlc.c:1645
 msgid " (default enabled)"
 msgstr " (默认打开)"
 
-#: src/libvlc.c:1572
+#: src/libvlc.c:1646
 msgid " (default disabled)"
 msgstr " (默认关闭)"
 
-#: src/libvlc.c:1731 src/libvlc.c:1734
+#: src/libvlc.c:1805 src/libvlc.c:1808
 #, fuzzy
 msgid "Note:"
 msgstr "无"
 
-#: src/libvlc.c:1732 src/libvlc.c:1735
+#: src/libvlc.c:1806 src/libvlc.c:1809
 msgid "add --advanced to your command line to see advanced options."
 msgstr ""
 
-#: src/libvlc.c:1839
+#: src/libvlc.c:1913
 #, c-format
 msgid "VLC version %s\n"
 msgstr "VLC 版本 %s\n"
 
-#: src/libvlc.c:1840
+#: src/libvlc.c:1914
 #, c-format
 msgid "Compiled by %s@%s.%s\n"
 msgstr "由 %s 在 %s.%s 编译\n"
 
-#: src/libvlc.c:1842
+#: src/libvlc.c:1916
 #, c-format
 msgid "Compiler: %s\n"
 msgstr "编译器: %s\n"
 
-#: src/libvlc.c:1844
+#: src/libvlc.c:1918
 #, fuzzy, c-format
 msgid "Based upon Git commit [%s]\n"
 msgstr "基于 svn 修改集[%s]\n"
 
-#: src/libvlc.c:1880
+#: src/libvlc.c:1954
 msgid ""
 "\n"
 "Dumped content to vlc-help.txt file.\n"
@@ -1322,7 +1334,7 @@ msgstr ""
 "\n"
 "将内容写到 vlc-help.txt 文件.\n"
 
-#: src/libvlc.c:1900
+#: src/libvlc.c:1974
 msgid ""
 "\n"
 "Press the RETURN key to continue...\n"
@@ -1330,24 +1342,24 @@ msgstr ""
 "\n"
 "按回车键继续...\n"
 
-#: src/libvlc.h:201 src/libvlc-module.c:1318 src/libvlc-module.c:1319
-#: src/libvlc-module.c:2356 src/video_output/vout_intf.c:272
+#: src/libvlc.h:202 src/libvlc-module.c:1323 src/libvlc-module.c:1324
+#: src/libvlc-module.c:2384 src/video_output/vout_intf.c:272
 msgid "Zoom"
 msgstr "缩放"
 
-#: src/libvlc.h:202 src/libvlc-module.c:1244 src/video_output/vout_intf.c:167
+#: src/libvlc.h:203 src/libvlc-module.c:1249 src/video_output/vout_intf.c:167
 msgid "1:4 Quarter"
 msgstr "1:4 四分之一"
 
-#: src/libvlc.h:203 src/libvlc-module.c:1245 src/video_output/vout_intf.c:168
+#: src/libvlc.h:204 src/libvlc-module.c:1250 src/video_output/vout_intf.c:168
 msgid "1:2 Half"
 msgstr "1:2 一半"
 
-#: src/libvlc.h:204 src/libvlc-module.c:1246 src/video_output/vout_intf.c:169
+#: src/libvlc.h:205 src/libvlc-module.c:1251 src/video_output/vout_intf.c:169
 msgid "1:1 Original"
 msgstr "1:1 原始"
 
-#: src/libvlc.h:205 src/libvlc-module.c:1247 src/video_output/vout_intf.c:170
+#: src/libvlc.h:206 src/libvlc-module.c:1252 src/video_output/vout_intf.c:170
 msgid "2:1 Double"
 msgstr "2:1 双倍"
 
@@ -1804,7 +1816,7 @@ msgstr ""
 
 #: src/libvlc-module.c:315 modules/access/dshow/dshow.cpp:81
 #: modules/access/dshow/dshow.cpp:83 modules/codec/avcodec/avcodec.c:71
-#: modules/gui/qt4/components/interface_widgets.cpp:255
+#: modules/gui/qt4/components/interface_widgets.cpp:256
 #: modules/video_output/opengl.c:126 modules/video_output/opengl.c:182
 msgid "None"
 msgstr "无"
@@ -1812,7 +1824,7 @@ msgstr "无"
 #: src/libvlc-module.c:315 modules/access/cdda/info.c:392
 #: modules/access/vcdx/access.c:477 modules/access/vcdx/info.c:289
 #: modules/access/vcdx/info.c:290
-#: modules/gui/qt4/components/open_panels.cpp:322
+#: modules/gui/qt4/components/open_panels.cpp:324
 msgid "Track"
 msgstr "轨道"
 
@@ -2243,6 +2255,7 @@ msgid ""
 msgstr ""
 
 #: src/libvlc-module.c:517 modules/gui/macosx/simple_prefs.m:284
+#: modules/gui/qt4/ui/sprefs_video.ui:101
 msgid "Skip frames"
 msgstr "跳过帧"
 
@@ -2315,7 +2328,7 @@ msgstr ""
 #: modules/access/dshow/dshow.cpp:83 modules/access/dshow/dshow.cpp:86
 #: modules/access/dshow/dshow.cpp:92 modules/access/v4l2/v4l2.c:246
 #: modules/audio_output/alsa.c:105 modules/gui/fbosd.c:173
-#: modules/gui/macosx/prefs_widgets.m:1277 modules/gui/macosx/sfilters.m:119
+#: modules/gui/macosx/prefs_widgets.m:1280
 #: modules/gui/macosx/simple_prefs.m:342 modules/gui/macosx/simple_prefs.m:428
 #: modules/gui/macosx/simple_prefs.m:674 modules/gui/macosx/vout.m:203
 #: modules/gui/qt4/components/preferences_widgets.cpp:556
@@ -2549,7 +2562,7 @@ msgstr "启用子画面"
 msgid "You can completely disable the sub-picture processing."
 msgstr "您可以完全禁用子画面处理。"
 
-#: src/libvlc-module.c:686 src/libvlc-module.c:1571 src/text/iso-639_def.h:143
+#: src/libvlc-module.c:686 src/libvlc-module.c:1585 src/text/iso-639_def.h:143
 #: modules/gui/macosx/simple_prefs.m:273
 #: modules/gui/qt4/ui/sprefs_subtitles.ui:22
 #: modules/stream_out/transcode.c:227
@@ -2677,7 +2690,7 @@ msgstr "默认的音乐 CD 设备，如果你不指定，程序将会自动扫
 msgid "This is the default Audio CD device to use."
 msgstr "默认的音乐 CD 设备"
 
-#: src/libvlc-module.c:755 modules/gui/qt4/ui/open_net.ui:114
+#: src/libvlc-module.c:755
 msgid "Force IPv6"
 msgstr "强制使用 IPv6"
 
@@ -3121,88 +3134,92 @@ msgid "This option minimizes the number of threads needed to run VLC."
 msgstr "此选项将 VLC 运行所需线程数减至最少。"
 
 #: src/libvlc-module.c:998
-msgid ""
-"(Experimental) Use the StreamImmediate method and minimize the caching done "
-"at the access level."
+msgid "(Experimental) Don't do caching at the access level."
 msgstr ""
 
-#: src/libvlc-module.c:1001
+#: src/libvlc-module.c:1000 src/libvlc-module.c:1006
 msgid ""
 "This option is useful if you want to lower the latency when reading a stream"
 msgstr ""
 
-#: src/libvlc-module.c:1004
+#: src/libvlc-module.c:1003
+msgid ""
+"(Experimental) Auto adjust the caching done to minimize latency when reading "
+"live stream."
+msgstr ""
+
+#: src/libvlc-module.c:1009
 msgid "Modules search path"
 msgstr "模块搜寻路径"
 
-#: src/libvlc-module.c:1006
+#: src/libvlc-module.c:1011
 #, fuzzy
 msgid ""
 "Additional path for VLC to look for its modules. You can add several paths "
 "by concatenating them using "
 msgstr "这个选项允许你指定其它的 VLC 模块搜寻路径"
 
-#: src/libvlc-module.c:1009
+#: src/libvlc-module.c:1014
 msgid "VLM configuration file"
 msgstr "VLM设置档"
 
-#: src/libvlc-module.c:1011
+#: src/libvlc-module.c:1016
 msgid "Read a VLM configuration file as soon as VLM is started."
 msgstr "当 VLM 启动时，读取一个 VLM 配置文件。"
 
-#: src/libvlc-module.c:1013
+#: src/libvlc-module.c:1018
 msgid "Use a plugins cache"
 msgstr "使用外挂缓存"
 
-#: src/libvlc-module.c:1015
+#: src/libvlc-module.c:1020
 msgid "Use a plugins cache which will greatly improve the startup time of VLC."
 msgstr "这个选项允许你使用插件缓存, 这将会大大提高 VLC 的开始时间"
 
-#: src/libvlc-module.c:1017
+#: src/libvlc-module.c:1022
 msgid "Collect statistics"
 msgstr "收集统计信息"
 
-#: src/libvlc-module.c:1019
+#: src/libvlc-module.c:1024
 msgid "Collect miscellaneous statistics."
 msgstr "收集杂项统计。"
 
-#: src/libvlc-module.c:1021
+#: src/libvlc-module.c:1026
 msgid "Run as daemon process"
 msgstr "使用常驻程序执行"
 
-#: src/libvlc-module.c:1023
+#: src/libvlc-module.c:1028
 msgid "Runs VLC as a background daemon process."
 msgstr "使用背景常驻程序执行VLC"
 
-#: src/libvlc-module.c:1025
+#: src/libvlc-module.c:1030
 msgid "Write process id to file"
 msgstr ""
 
-#: src/libvlc-module.c:1027
+#: src/libvlc-module.c:1032
 msgid "Writes process id into specified file."
 msgstr ""
 
-#: src/libvlc-module.c:1029
+#: src/libvlc-module.c:1034
 msgid "Log to file"
 msgstr "记录到文件"
 
-#: src/libvlc-module.c:1031
+#: src/libvlc-module.c:1036
 msgid "Log all VLC messages to a text file."
 msgstr "记录所有的 VLC 信息到一个文本文件。"
 
-#: src/libvlc-module.c:1033
+#: src/libvlc-module.c:1038
 msgid "Log to syslog"
 msgstr "记录到 syslog"
 
-#: src/libvlc-module.c:1035
+#: src/libvlc-module.c:1040
 msgid "Log all VLC messages to syslog (UNIX systems)."
 msgstr "记录所有的 VLC 信息到 sysloc (UNIX 系统)。"
 
-#: src/libvlc-module.c:1037
+#: src/libvlc-module.c:1042
 msgid "Allow only one running instance"
 msgstr "只允许一个实例运行"
 
-#: src/libvlc-module.c:1039
+#: src/libvlc-module.c:1044
 msgid ""
 "Allowing only one running instance of VLC can sometimes be useful, for "
 "example if you associated VLC with some media types and you don't want a new "
@@ -3211,7 +3228,7 @@ msgid ""
 "running instance or enqueue it."
 msgstr ""
 
-#: src/libvlc-module.c:1047
+#: src/libvlc-module.c:1052
 msgid ""
 "Allowing only one running instance of VLC can sometimes be useful, for "
 "example if you associated VLC with some media types and you don't want a new "
@@ -3221,27 +3238,27 @@ msgid ""
 "active and the running instance of VLC to use D-Bus control interface."
 msgstr ""
 
-#: src/libvlc-module.c:1055
+#: src/libvlc-module.c:1060
 msgid "VLC is started from file association"
 msgstr "VLC 从文件关联启动"
 
-#: src/libvlc-module.c:1057
+#: src/libvlc-module.c:1062
 msgid "Tell VLC that it is being launched due to a file association in the OS"
 msgstr "告知 VLC 它正从操作系统中的文件关联启动"
 
-#: src/libvlc-module.c:1060
+#: src/libvlc-module.c:1065
 msgid "One instance when started from file"
 msgstr "当从文件开始时只允许一个实例"
 
-#: src/libvlc-module.c:1062
+#: src/libvlc-module.c:1067
 msgid "Allow only one running instance when started from file."
 msgstr "当从文件开始时, 只允许一个实例运行。"
 
-#: src/libvlc-module.c:1064
+#: src/libvlc-module.c:1069
 msgid "Increase the priority of the process"
 msgstr "提高程序优先权"
 
-#: src/libvlc-module.c:1066
+#: src/libvlc-module.c:1071
 msgid ""
 "Increasing the priority of the process will very likely improve your playing "
 "experience as it allows VLC not to be disturbed by other applications that "
@@ -3251,199 +3268,199 @@ msgid ""
 "machine."
 msgstr ""
 
-#: src/libvlc-module.c:1074
+#: src/libvlc-module.c:1079
 msgid "Enqueue items to playlist when in one instance mode"
 msgstr ""
 
-#: src/libvlc-module.c:1076
+#: src/libvlc-module.c:1081
 msgid ""
 "When using the one instance only option, enqueue items to playlist and keep "
 "playing current item."
 msgstr ""
 
-#: src/libvlc-module.c:1085
+#: src/libvlc-module.c:1090
 msgid ""
 "These options define the behavior of the playlist. Some of them can be "
 "overridden in the playlist dialog box."
 msgstr ""
 
-#: src/libvlc-module.c:1088
+#: src/libvlc-module.c:1093
 msgid "Automatically preparse files"
 msgstr "自动预解释文件"
 
-#: src/libvlc-module.c:1090
+#: src/libvlc-module.c:1095
 msgid ""
 "Automatically preparse files added to the playlist (to retrieve some "
 "metadata)."
 msgstr ""
 
-#: src/libvlc-module.c:1093
+#: src/libvlc-module.c:1098
 msgid "Album art policy"
 msgstr ""
 
-#: src/libvlc-module.c:1095
+#: src/libvlc-module.c:1100
 msgid "Choose how album art will be downloaded."
 msgstr ""
 
-#: src/libvlc-module.c:1101
+#: src/libvlc-module.c:1106
 msgid "Manual download only"
 msgstr ""
 
-#: src/libvlc-module.c:1102
+#: src/libvlc-module.c:1107
 msgid "When track starts playing"
 msgstr ""
 
-#: src/libvlc-module.c:1103
+#: src/libvlc-module.c:1108
 msgid "As soon as track is added"
 msgstr ""
 
-#: src/libvlc-module.c:1105
+#: src/libvlc-module.c:1110
 msgid "Services discovery modules"
 msgstr "服务探索模块"
 
-#: src/libvlc-module.c:1107
+#: src/libvlc-module.c:1112
 msgid ""
 "Specifies the services discovery modules to load, separated by semi-colons. "
 "Typical values are sap, hal, ..."
 msgstr "指定加载服务发现模块，逗号分隔。通常为“sap, hal, ...”"
 
-#: src/libvlc-module.c:1110
+#: src/libvlc-module.c:1115
 msgid "Play files randomly forever"
 msgstr "永远随机播放文件"
 
-#: src/libvlc-module.c:1112
+#: src/libvlc-module.c:1117
 msgid "VLC will randomly play files in the playlist until interrupted."
 msgstr "选择后，VLC 会随机地播放列表中的文件，直到中断"
 
-#: src/libvlc-module.c:1116
+#: src/libvlc-module.c:1121
 msgid "VLC will keep playing the playlist indefinitely."
 msgstr "启动后，VLC 会一遍又一遍地的播放目前的播放列表。"
 
-#: src/libvlc-module.c:1118
+#: src/libvlc-module.c:1123
 msgid "Repeat current item"
 msgstr "重复播放目前项目"
 
-#: src/libvlc-module.c:1120
+#: src/libvlc-module.c:1125
 msgid "VLC will keep playing the current playlist item."
 msgstr "启动后，VLC 会一遍又一遍地的播放目前的播放列表项目。"
 
-#: src/libvlc-module.c:1122
+#: src/libvlc-module.c:1127
 msgid "Play and stop"
 msgstr "播放和停止"
 
-#: src/libvlc-module.c:1124
+#: src/libvlc-module.c:1129
 msgid "Stop the playlist after each played playlist item."
 msgstr "每次播放完条目后停止播放列表中的项目"
 
-#: src/libvlc-module.c:1126
+#: src/libvlc-module.c:1131
 #, fuzzy
 msgid "Play and exit"
 msgstr "播放和停止"
 
-#: src/libvlc-module.c:1128
+#: src/libvlc-module.c:1133
 #, fuzzy
 msgid "Exit if there are no more items in the playlist."
 msgstr "播放列表中没有项目"
 
-#: src/libvlc-module.c:1130
+#: src/libvlc-module.c:1135
 #, fuzzy
 msgid "Use media library"
 msgstr "VLC多媒体播放程序"
 
-#: src/libvlc-module.c:1132
+#: src/libvlc-module.c:1137
 msgid ""
 "The media library is automatically saved and reloaded each time you start "
 "VLC."
 msgstr ""
 
-#: src/libvlc-module.c:1135
+#: src/libvlc-module.c:1140
 #, fuzzy
 msgid "Display playlist tree"
 msgstr "下一个播放列表项目"
 
-#: src/libvlc-module.c:1137
+#: src/libvlc-module.c:1142
 msgid ""
 "The playlist can use a tree to categorize some items, like the contents of a "
 "directory."
 msgstr ""
 
-#: src/libvlc-module.c:1146
+#: src/libvlc-module.c:1151
 msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
 msgstr "这些设置是 VLC 的全局键盘绑定，即“热键”"
 
-#: src/libvlc-module.c:1149 src/video_output/vout_intf.c:413
-#: modules/gui/beos/VideoOutput.cpp:1058 modules/gui/macosx/controls.m:456
-#: modules/gui/macosx/controls.m:509 modules/gui/macosx/controls.m:961
-#: modules/gui/macosx/controls.m:991 modules/gui/macosx/embeddedwindow.m:50
-#: modules/gui/macosx/intf.m:649 modules/gui/macosx/intf.m:726
-#: modules/gui/macosx/intf.m:782 modules/gui/macosx/simple_prefs.m:281
+#: src/libvlc-module.c:1154 src/video_output/vout_intf.c:413
+#: modules/gui/beos/VideoOutput.cpp:1058 modules/gui/macosx/controls.m:458
+#: modules/gui/macosx/controls.m:512 modules/gui/macosx/controls.m:961
+#: modules/gui/macosx/controls.m:992 modules/gui/macosx/embeddedwindow.m:50
+#: modules/gui/macosx/intf.m:566 modules/gui/macosx/intf.m:643
+#: modules/gui/macosx/intf.m:699 modules/gui/macosx/simple_prefs.m:281
 #: modules/gui/qt4/components/interface_widgets.cpp:606
 #: modules/gui/qt4/ui/sprefs_video.ui:61
 msgid "Fullscreen"
 msgstr "全屏幕"
 
-#: src/libvlc-module.c:1150
+#: src/libvlc-module.c:1155
 msgid "Select the hotkey to use to swap fullscreen state."
 msgstr "选择热键以切换全屏幕状态"
 
-#: src/libvlc-module.c:1151
+#: src/libvlc-module.c:1156
 #, fuzzy
 msgid "Leave fullscreen"
 msgstr "放大到全屏幕"
 
-#: src/libvlc-module.c:1152
+#: src/libvlc-module.c:1157
 #, fuzzy
 msgid "Select the hotkey to use to leave fullscreen state."
 msgstr "选择热键以切换全屏幕状态"
 
-#: src/libvlc-module.c:1153
+#: src/libvlc-module.c:1158
 msgid "Play/Pause"
 msgstr "播放/暂停"
 
-#: src/libvlc-module.c:1154
+#: src/libvlc-module.c:1159
 msgid "Select the hotkey to use to swap paused state."
 msgstr "选择热键以切换暂停状态"
 
-#: src/libvlc-module.c:1155
+#: src/libvlc-module.c:1160
 msgid "Pause only"
 msgstr "仅暂停"
 
-#: src/libvlc-module.c:1156
+#: src/libvlc-module.c:1161
 msgid "Select the hotkey to use to pause."
 msgstr "选择热键以暂停"
 
-#: src/libvlc-module.c:1157
+#: src/libvlc-module.c:1162
 msgid "Play only"
 msgstr "仅播放"
 
-#: src/libvlc-module.c:1158
+#: src/libvlc-module.c:1163
 msgid "Select the hotkey to use to play."
 msgstr "选择热键以播放"
 
-#: src/libvlc-module.c:1159 modules/control/hotkeys.c:691
-#: modules/gui/macosx/controls.m:893 modules/gui/macosx/intf.m:691
+#: src/libvlc-module.c:1164 modules/control/hotkeys.c:691
+#: modules/gui/macosx/controls.m:891 modules/gui/macosx/intf.m:608
 #: modules/gui/qt4/components/interface_widgets.cpp:440
 msgid "Faster"
 msgstr "加快"
 
-#: src/libvlc-module.c:1160
+#: src/libvlc-module.c:1165
 msgid "Select the hotkey to use for fast forward playback."
 msgstr "选择热键以快速回放"
 
-#: src/libvlc-module.c:1161 modules/control/hotkeys.c:697
-#: modules/gui/macosx/controls.m:894 modules/gui/macosx/intf.m:692
+#: src/libvlc-module.c:1166 modules/control/hotkeys.c:697
+#: modules/gui/macosx/controls.m:892 modules/gui/macosx/intf.m:609
 #: modules/gui/qt4/components/interface_widgets.cpp:433
 msgid "Slower"
 msgstr "放慢"
 
-#: src/libvlc-module.c:1162
+#: src/libvlc-module.c:1167
 msgid "Select the hotkey to use for slow motion playback."
 msgstr "选择热键以慢速回放"
 
-#: src/libvlc-module.c:1163 modules/control/hotkeys.c:674
-#: modules/gui/macosx/about.m:190 modules/gui/macosx/controls.m:914
-#: modules/gui/macosx/intf.m:648 modules/gui/macosx/intf.m:694
-#: modules/gui/macosx/intf.m:770 modules/gui/macosx/intf.m:778
+#: src/libvlc-module.c:1168 modules/control/hotkeys.c:674
+#: modules/gui/macosx/about.m:190 modules/gui/macosx/controls.m:912
+#: modules/gui/macosx/intf.m:565 modules/gui/macosx/intf.m:611
+#: modules/gui/macosx/intf.m:687 modules/gui/macosx/intf.m:695
 #: modules/gui/macosx/wizard.m:309 modules/gui/macosx/wizard.m:321
 #: modules/gui/macosx/wizard.m:1619
 #: modules/gui/qt4/components/interface_widgets.cpp:593
@@ -3452,27 +3469,27 @@ msgstr "选择热键以慢速回放"
 msgid "Next"
 msgstr "下一项"
 
-#: src/libvlc-module.c:1164
+#: src/libvlc-module.c:1169
 msgid "Select the hotkey to use to skip to the next item in the playlist."
 msgstr "选择热键以播放列表中的下一个项目"
 
-#: src/libvlc-module.c:1165 modules/control/hotkeys.c:680
-#: modules/gui/macosx/about.m:191 modules/gui/macosx/controls.m:913
-#: modules/gui/macosx/intf.m:643 modules/gui/macosx/intf.m:693
-#: modules/gui/macosx/intf.m:771 modules/gui/macosx/intf.m:777
+#: src/libvlc-module.c:1170 modules/control/hotkeys.c:680
+#: modules/gui/macosx/about.m:191 modules/gui/macosx/controls.m:911
+#: modules/gui/macosx/intf.m:560 modules/gui/macosx/intf.m:610
+#: modules/gui/macosx/intf.m:688 modules/gui/macosx/intf.m:694
 #: modules/gui/qt4/components/interface_widgets.cpp:592
 #: modules/gui/qt4/menus.cpp:664 modules/misc/notify/notify.c:303
 msgid "Previous"
 msgstr "上一项"
 
-#: src/libvlc-module.c:1166
+#: src/libvlc-module.c:1171
 msgid "Select the hotkey to use to skip to the previous item in the playlist."
 msgstr "选择热键以播放列表中的上一个项目"
 
-#: src/libvlc-module.c:1167 modules/control/rc.c:77
-#: modules/gui/macosx/controls.m:905 modules/gui/macosx/intf.m:646
-#: modules/gui/macosx/intf.m:690 modules/gui/macosx/intf.m:769
-#: modules/gui/macosx/intf.m:776 modules/gui/pda/pda_interface.c:272
+#: src/libvlc-module.c:1172 modules/control/rc.c:77
+#: modules/gui/macosx/controls.m:903 modules/gui/macosx/intf.m:563
+#: modules/gui/macosx/intf.m:607 modules/gui/macosx/intf.m:686
+#: modules/gui/macosx/intf.m:693 modules/gui/pda/pda_interface.c:272
 #: modules/gui/pda/pda_interface.c:273
 #: modules/gui/qt4/components/interface_widgets.cpp:594
 #: modules/gui/qt4/menus.cpp:662 modules/gui/qt4/ui/streampanel.ui:101
@@ -3480,631 +3497,627 @@ msgstr "选择热键以播放列表中的上一个项目"
 msgid "Stop"
 msgstr "停止"
 
-#: src/libvlc-module.c:1168
+#: src/libvlc-module.c:1173
 msgid "Select the hotkey to stop playback."
 msgstr "选择热键以停止回放"
 
-#: src/libvlc-module.c:1169 modules/gui/fbosd.c:129 modules/gui/fbosd.c:197
+#: src/libvlc-module.c:1174 modules/gui/fbosd.c:129 modules/gui/fbosd.c:197
 #: modules/gui/macosx/bookmarks.m:98 modules/gui/macosx/bookmarks.m:107
-#: modules/gui/macosx/embeddedwindow.m:52 modules/gui/macosx/intf.m:651
+#: modules/gui/macosx/embeddedwindow.m:52 modules/gui/macosx/intf.m:568
 #: modules/gui/qt4/ui/video_effects.ui:731 modules/video_filter/marq.c:153
 #: modules/video_filter/rss.c:197
 msgid "Position"
 msgstr "位置"
 
-#: src/libvlc-module.c:1170
+#: src/libvlc-module.c:1175
 msgid "Select the hotkey to display the position."
 msgstr "选择热键以显示位置"
 
-#: src/libvlc-module.c:1172
+#: src/libvlc-module.c:1177
 msgid "Very short backwards jump"
 msgstr "向后跳一很小的段"
 
-#: src/libvlc-module.c:1174
+#: src/libvlc-module.c:1179
 msgid "Select the hotkey to make a very short backwards jump."
 msgstr "选择向后跳一很小的段的热键"
 
-#: src/libvlc-module.c:1175
+#: src/libvlc-module.c:1180
 msgid "Short backwards jump"
 msgstr "向后跳一小段"
 
-#: src/libvlc-module.c:1177
+#: src/libvlc-module.c:1182
 msgid "Select the hotkey to make a short backwards jump."
 msgstr "选择向后跳一小段的热键"
 
-#: src/libvlc-module.c:1178
+#: src/libvlc-module.c:1183
 msgid "Medium backwards jump"
 msgstr "向后跳一中段"
 
-#: src/libvlc-module.c:1180
+#: src/libvlc-module.c:1185
 msgid "Select the hotkey to make a medium backwards jump."
 msgstr "选择向后跳一中段的热键"
 
-#: src/libvlc-module.c:1181
+#: src/libvlc-module.c:1186
 msgid "Long backwards jump"
 msgstr "向后跳一大段"
 
-#: src/libvlc-module.c:1183
+#: src/libvlc-module.c:1188
 msgid "Select the hotkey to make a long backwards jump."
 msgstr "选择向后跳一大段的热键"
 
-#: src/libvlc-module.c:1185
+#: src/libvlc-module.c:1190
 msgid "Very short forward jump"
 msgstr "向前跳一很小的段"
 
-#: src/libvlc-module.c:1187
+#: src/libvlc-module.c:1192
 msgid "Select the hotkey to make a very short forward jump."
 msgstr "选择向前跳一很小的段的热键"
 
-#: src/libvlc-module.c:1188
+#: src/libvlc-module.c:1193
 msgid "Short forward jump"
 msgstr "向前跳一小段"
 
-#: src/libvlc-module.c:1190
+#: src/libvlc-module.c:1195
 msgid "Select the hotkey to make a short forward jump."
 msgstr "选择向前跳一小段的热键"
 
-#: src/libvlc-module.c:1191
+#: src/libvlc-module.c:1196
 msgid "Medium forward jump"
 msgstr "向前跳一中段"
 
-#: src/libvlc-module.c:1193
+#: src/libvlc-module.c:1198
 msgid "Select the hotkey to make a medium forward jump."
 msgstr "选择向前跳一中段的热键"
 
-#: src/libvlc-module.c:1194
+#: src/libvlc-module.c:1199
 msgid "Long forward jump"
 msgstr "向前跳一大段"
 
-#: src/libvlc-module.c:1196
+#: src/libvlc-module.c:1201
 msgid "Select the hotkey to make a long forward jump."
 msgstr "选择向前跳一大段的热键"
 
-#: src/libvlc-module.c:1198
+#: src/libvlc-module.c:1203
 msgid "Very short jump length"
 msgstr "跳一很小的段的长度"
 
-#: src/libvlc-module.c:1199
+#: src/libvlc-module.c:1204
 msgid "Very short jump length, in seconds."
 msgstr "跳一很小的段的长度，以秒为单位。"
 
-#: src/libvlc-module.c:1200
+#: src/libvlc-module.c:1205
 msgid "Short jump length"
 msgstr "跳一小段的长度"
 
-#: src/libvlc-module.c:1201
+#: src/libvlc-module.c:1206
 msgid "Short jump length, in seconds."
 msgstr "跳一小段的长度，以秒为单位。"
 
-#: src/libvlc-module.c:1202
+#: src/libvlc-module.c:1207
 msgid "Medium jump length"
 msgstr "跳一中段的长度"
 
-#: src/libvlc-module.c:1203
+#: src/libvlc-module.c:1208
 msgid "Medium jump length, in seconds."
 msgstr "跳一中段的长度，以秒为单位。"
 
-#: src/libvlc-module.c:1204
+#: src/libvlc-module.c:1209
 msgid "Long jump length"
 msgstr "长跳长度"
 
-#: src/libvlc-module.c:1205
+#: src/libvlc-module.c:1210
 msgid "Long jump length, in seconds."
 msgstr "跳一大段的长度，以秒为单位。"
 
-#: src/libvlc-module.c:1207 modules/control/hotkeys.c:189
-#: modules/gui/beos/InterfaceWindow.cpp:278 modules/gui/macosx/intf.m:814
+#: src/libvlc-module.c:1212 modules/control/hotkeys.c:189
+#: modules/gui/beos/InterfaceWindow.cpp:278 modules/gui/macosx/intf.m:725
 #: modules/gui/qt4/menus.cpp:698
 msgid "Quit"
 msgstr "离开"
 
-#: src/libvlc-module.c:1208
+#: src/libvlc-module.c:1213
 msgid "Select the hotkey to quit the application."
 msgstr "选择热键以离开应用程序"
 
-#: src/libvlc-module.c:1209
+#: src/libvlc-module.c:1214
 msgid "Navigate up"
 msgstr "向上导览"
 
-#: src/libvlc-module.c:1210
+#: src/libvlc-module.c:1215
 msgid "Select the key to move the selector up in DVD menus."
 msgstr "选择按键以向上移动DVD选单中的选择器"
 
-#: src/libvlc-module.c:1211
+#: src/libvlc-module.c:1216
 msgid "Navigate down"
 msgstr "向下导览"
 
-#: src/libvlc-module.c:1212
+#: src/libvlc-module.c:1217
 msgid "Select the key to move the selector down in DVD menus."
 msgstr "选择按键以向下移动DVD选单中的选择器"
 
-#: src/libvlc-module.c:1213
+#: src/libvlc-module.c:1218
 msgid "Navigate left"
 msgstr "向左导览"
 
-#: src/libvlc-module.c:1214
+#: src/libvlc-module.c:1219
 msgid "Select the key to move the selector left in DVD menus."
 msgstr "选择按键以向左移动DVD选单中的选择器"
 
-#: src/libvlc-module.c:1215
+#: src/libvlc-module.c:1220
 msgid "Navigate right"
 msgstr "向右导览"
 
-#: src/libvlc-module.c:1216
+#: src/libvlc-module.c:1221
 msgid "Select the key to move the selector right in DVD menus."
 msgstr "选择按键以向右移动DVD选单中的选择器"
 
-#: src/libvlc-module.c:1217
+#: src/libvlc-module.c:1222
 msgid "Activate"
 msgstr "启动"
 
-#: src/libvlc-module.c:1218
+#: src/libvlc-module.c:1223
 msgid "Select the key to activate selected item in DVD menus."
 msgstr "选择热键以启动所选择的DVD选单项目"
 
-#: src/libvlc-module.c:1219
+#: src/libvlc-module.c:1224
 msgid "Go to the DVD menu"
 msgstr "转到DVD选单"
 
-#: src/libvlc-module.c:1220
+#: src/libvlc-module.c:1225
 msgid "Select the key to take you to the DVD menu"
 msgstr "选择转到 DVD 选单的按键"
 
-#: src/libvlc-module.c:1221
+#: src/libvlc-module.c:1226
 msgid "Select previous DVD title"
 msgstr "选择上一个DVD章节"
 
-#: src/libvlc-module.c:1222
+#: src/libvlc-module.c:1227
 msgid "Select the key to choose the previous title from the DVD"
 msgstr "选择播放列表中的上一个项目的热键"
 
-#: src/libvlc-module.c:1223
+#: src/libvlc-module.c:1228
 msgid "Select next DVD title"
 msgstr "选择下一个DVD章节"
 
-#: src/libvlc-module.c:1224
+#: src/libvlc-module.c:1229
 msgid "Select the key to choose the next title from the DVD"
 msgstr "选择下一个 DVD 标题的按键"
 
-#: src/libvlc-module.c:1225
+#: src/libvlc-module.c:1230
 msgid "Select prev DVD chapter"
 msgstr "选择上一个 DVD 章节"
 
-#: src/libvlc-module.c:1226
+#: src/libvlc-module.c:1231
 msgid "Select the key to choose the previous chapter from the DVD"
 msgstr "选择 DVD 中的上一个章节的热键"
 
-#: src/libvlc-module.c:1227
+#: src/libvlc-module.c:1232
 msgid "Select next DVD chapter"
 msgstr "选择下一个 DVD 章节"
 
-#: src/libvlc-module.c:1228
+#: src/libvlc-module.c:1233
 msgid "Select the key to choose the next chapter from the DVD"
 msgstr "选择 DVD 中的下一个章节的热键"
 
-#: src/libvlc-module.c:1229
+#: src/libvlc-module.c:1234
 msgid "Volume up"
 msgstr "增加音量"
 
-#: src/libvlc-module.c:1230
+#: src/libvlc-module.c:1235
 msgid "Select the key to increase audio volume."
 msgstr "选择按键以增加音量"
 
-#: src/libvlc-module.c:1231
+#: src/libvlc-module.c:1236
 msgid "Volume down"
 msgstr "减低音量"
 
-#: src/libvlc-module.c:1232
+#: src/libvlc-module.c:1237
 msgid "Select the key to decrease audio volume."
 msgstr "选择按键以减低音量"
 
-#: src/libvlc-module.c:1233 modules/access/v4l2/v4l2.c:195
-#: modules/gui/macosx/controls.m:951 modules/gui/macosx/intf.m:711
-#: modules/gui/macosx/intf.m:772 modules/gui/macosx/intf.m:781
+#: src/libvlc-module.c:1238 modules/access/v4l2/v4l2.c:195
+#: modules/gui/macosx/controls.m:951 modules/gui/macosx/intf.m:628
+#: modules/gui/macosx/intf.m:689 modules/gui/macosx/intf.m:698
 #: modules/gui/qt4/components/interface_widgets.cpp:633
 msgid "Mute"
 msgstr "静音"
 
-#: src/libvlc-module.c:1234
+#: src/libvlc-module.c:1239
 msgid "Select the key to mute audio."
 msgstr "选择暂停的热键。"
 
-#: src/libvlc-module.c:1235
+#: src/libvlc-module.c:1240
 msgid "Subtitle delay up"
 msgstr "增加字幕延迟"
 
-#: src/libvlc-module.c:1236
+#: src/libvlc-module.c:1241
 msgid "Select the key to increase the subtitle delay."
 msgstr "选择按键以增加字幕延迟"
 
-#: src/libvlc-module.c:1237
+#: src/libvlc-module.c:1242
 msgid "Subtitle delay down"
 msgstr "减少字幕延迟"
 
-#: src/libvlc-module.c:1238
+#: src/libvlc-module.c:1243
 msgid "Select the key to decrease the subtitle delay."
 msgstr "选择按键以减少字幕延迟"
 
-#: src/libvlc-module.c:1239
+#: src/libvlc-module.c:1244
 msgid "Audio delay up"
 msgstr "增加音频延迟"
 
-#: src/libvlc-module.c:1240
+#: src/libvlc-module.c:1245
 msgid "Select the key to increase the audio delay."
 msgstr "选择按键以增加音频延迟"
 
-#: src/libvlc-module.c:1241
+#: src/libvlc-module.c:1246
 msgid "Audio delay down"
 msgstr "减少音频延迟"
 
-#: src/libvlc-module.c:1242
+#: src/libvlc-module.c:1247
 msgid "Select the key to decrease the audio delay."
 msgstr "选择按键以减少音频延迟"
 
-#: src/libvlc-module.c:1249
+#: src/libvlc-module.c:1254
 msgid "Play playlist bookmark 1"
 msgstr "播放播放列表书签 1"
 
-#: src/libvlc-module.c:1250
+#: src/libvlc-module.c:1255
 msgid "Play playlist bookmark 2"
 msgstr "播放播放列表书签 2"
 
-#: src/libvlc-module.c:1251
+#: src/libvlc-module.c:1256
 msgid "Play playlist bookmark 3"
 msgstr "播放播放列表书签 3"
 
-#: src/libvlc-module.c:1252
+#: src/libvlc-module.c:1257
 msgid "Play playlist bookmark 4"
 msgstr "播放播放列表书签 4"
 
-#: src/libvlc-module.c:1253
+#: src/libvlc-module.c:1258
 msgid "Play playlist bookmark 5"
 msgstr "播放播放列表书签 5"
 
-#: src/libvlc-module.c:1254
+#: src/libvlc-module.c:1259
 msgid "Play playlist bookmark 6"
 msgstr "播放播放列表书签 6"
 
-#: src/libvlc-module.c:1255
+#: src/libvlc-module.c:1260
 msgid "Play playlist bookmark 7"
 msgstr "播放播放列表书签 7"
 
-#: src/libvlc-module.c:1256
+#: src/libvlc-module.c:1261
 msgid "Play playlist bookmark 8"
 msgstr "播放播放列表书签 8"
 
-#: src/libvlc-module.c:1257
+#: src/libvlc-module.c:1262
 msgid "Play playlist bookmark 9"
 msgstr "播放播放列表书签 9"
 
-#: src/libvlc-module.c:1258
+#: src/libvlc-module.c:1263
 msgid "Play playlist bookmark 10"
 msgstr "播放播放列表书签 10"
 
-#: src/libvlc-module.c:1259
+#: src/libvlc-module.c:1264
 msgid "Select the key to play this bookmark."
 msgstr "选择按键以播放该书签"
 
-#: src/libvlc-module.c:1260
+#: src/libvlc-module.c:1265
 msgid "Set playlist bookmark 1"
 msgstr "设置播放列表书签 1"
 
-#: src/libvlc-module.c:1261
+#: src/libvlc-module.c:1266
 msgid "Set playlist bookmark 2"
 msgstr "设置播放列表书签 2"
 
-#: src/libvlc-module.c:1262
+#: src/libvlc-module.c:1267
 msgid "Set playlist bookmark 3"
 msgstr "设置播放列表书签 3"
 
-#: src/libvlc-module.c:1263
+#: src/libvlc-module.c:1268
 msgid "Set playlist bookmark 4"
 msgstr "设置播放列表书签 4"
 
-#: src/libvlc-module.c:1264
+#: src/libvlc-module.c:1269
 msgid "Set playlist bookmark 5"
 msgstr "设置播放列表书签 5"
 
-#: src/libvlc-module.c:1265
+#: src/libvlc-module.c:1270
 msgid "Set playlist bookmark 6"
 msgstr "设置播放列表书签 6"
 
-#: src/libvlc-module.c:1266
+#: src/libvlc-module.c:1271
 msgid "Set playlist bookmark 7"
 msgstr "设置播放列表书签 7"
 
-#: src/libvlc-module.c:1267
+#: src/libvlc-module.c:1272
 msgid "Set playlist bookmark 8"
 msgstr "设置播放列表书签 8"
 
-#: src/libvlc-module.c:1268
+#: src/libvlc-module.c:1273
 msgid "Set playlist bookmark 9"
 msgstr "设置播放列表书签 9"
 
-#: src/libvlc-module.c:1269
+#: src/libvlc-module.c:1274
 msgid "Set playlist bookmark 10"
 msgstr "设置播放列表书签 10"
 
-#: src/libvlc-module.c:1270
+#: src/libvlc-module.c:1275
 msgid "Select the key to set this playlist bookmark."
 msgstr "选择按键以设置该播放列表书签"
 
-#: src/libvlc-module.c:1272 modules/control/hotkeys.c:84
+#: src/libvlc-module.c:1277 modules/control/hotkeys.c:84
 msgid "Playlist bookmark 1"
 msgstr "播放列表书签 1"
 
-#: src/libvlc-module.c:1273 modules/control/hotkeys.c:85
+#: src/libvlc-module.c:1278 modules/control/hotkeys.c:85
 msgid "Playlist bookmark 2"
 msgstr "播放列表书签 2"
 
-#: src/libvlc-module.c:1274 modules/control/hotkeys.c:86
+#: src/libvlc-module.c:1279 modules/control/hotkeys.c:86
 msgid "Playlist bookmark 3"
 msgstr "播放列表书签 3"
 
-#: src/libvlc-module.c:1275 modules/control/hotkeys.c:87
+#: src/libvlc-module.c:1280 modules/control/hotkeys.c:87
 msgid "Playlist bookmark 4"
 msgstr "播放列表书签 4"
 
-#: src/libvlc-module.c:1276 modules/control/hotkeys.c:88
+#: src/libvlc-module.c:1281 modules/control/hotkeys.c:88
 msgid "Playlist bookmark 5"
 msgstr "播放列表书签 5"
 
-#: src/libvlc-module.c:1277 modules/control/hotkeys.c:89
+#: src/libvlc-module.c:1282 modules/control/hotkeys.c:89
 msgid "Playlist bookmark 6"
 msgstr "播放列表书签 6"
 
-#: src/libvlc-module.c:1278 modules/control/hotkeys.c:90
+#: src/libvlc-module.c:1283 modules/control/hotkeys.c:90
 msgid "Playlist bookmark 7"
 msgstr "播放列表书签 7"
 
-#: src/libvlc-module.c:1279 modules/control/hotkeys.c:91
+#: src/libvlc-module.c:1284 modules/control/hotkeys.c:91
 msgid "Playlist bookmark 8"
 msgstr "播放列表书签 8"
 
-#: src/libvlc-module.c:1280 modules/control/hotkeys.c:92
+#: src/libvlc-module.c:1285 modules/control/hotkeys.c:92
 msgid "Playlist bookmark 9"
 msgstr "播放列表书签 9"
 
-#: src/libvlc-module.c:1281 modules/control/hotkeys.c:93
+#: src/libvlc-module.c:1286 modules/control/hotkeys.c:93
 msgid "Playlist bookmark 10"
 msgstr "播放列表书签 10"
 
-#: src/libvlc-module.c:1283
+#: src/libvlc-module.c:1288
 msgid "This allows you to define playlist bookmarks."
 msgstr "这个选项允许你定义播放列表书签"
 
-#: src/libvlc-module.c:1285
+#: src/libvlc-module.c:1290
 msgid "Go back in browsing history"
 msgstr "在浏览历史中后退"
 
-#: src/libvlc-module.c:1286
+#: src/libvlc-module.c:1291
 msgid ""
 "Select the key to go back (to the previous media item) in the browsing "
 "history."
 msgstr "选择在浏览历史中后退 (到上一个媒体项目) 的按键。"
 
-#: src/libvlc-module.c:1287
+#: src/libvlc-module.c:1292
 msgid "Go forward in browsing history"
 msgstr "在浏览历史中前进"
 
-#: src/libvlc-module.c:1288
+#: src/libvlc-module.c:1293
 msgid ""
 "Select the key to go forward (to the next media item) in the browsing "
 "history."
 msgstr "选择在浏览历史中前进 (到下一个媒体项目) 的按键。"
 
-#: src/libvlc-module.c:1290
+#: src/libvlc-module.c:1295
 msgid "Cycle audio track"
 msgstr "循环音轨"
 
-#: src/libvlc-module.c:1291
+#: src/libvlc-module.c:1296
 msgid "Cycle through the available audio tracks(languages)."
 msgstr "循环可用音轨 (语言)"
 
-#: src/libvlc-module.c:1292
+#: src/libvlc-module.c:1297
 msgid "Cycle subtitle track"
 msgstr "循环字幕轨"
 
-#: src/libvlc-module.c:1293
+#: src/libvlc-module.c:1298
 msgid "Cycle through the available subtitle tracks."
 msgstr "循环可用字幕轨"
 
-#: src/libvlc-module.c:1294
+#: src/libvlc-module.c:1299
 msgid "Cycle source aspect ratio"
 msgstr "循环源纵横比"
 
-#: src/libvlc-module.c:1295
+#: src/libvlc-module.c:1300
 msgid "Cycle through a predefined list of source aspect ratios."
 msgstr "循环一个源纵横比的预定义的列表。"
 
-#: src/libvlc-module.c:1296
+#: src/libvlc-module.c:1301
 msgid "Cycle video crop"
 msgstr "循环视频修整"
 
-#: src/libvlc-module.c:1297
+#: src/libvlc-module.c:1302
 msgid "Cycle through a predefined list of crop formats."
 msgstr "循环一个修整格式的预定义的列表。"
 
-#: src/libvlc-module.c:1298
+#: src/libvlc-module.c:1303
 msgid "Cycle deinterlace modes"
 msgstr "循环解除交错模块"
 
-#: src/libvlc-module.c:1299
+#: src/libvlc-module.c:1304
 msgid "Cycle through deinterlace modes."
 msgstr "循环解除交错模块。"
 
-#: src/libvlc-module.c:1300
+#: src/libvlc-module.c:1305
 msgid "Show interface"
 msgstr "显示界面"
 
-#: src/libvlc-module.c:1301
+#: src/libvlc-module.c:1306
 msgid "Raise the interface above all other windows."
 msgstr "将界面提升到其它所有窗口上面。"
 
-#: src/libvlc-module.c:1302
+#: src/libvlc-module.c:1307
 msgid "Hide interface"
 msgstr "隐藏接口"
 
-#: src/libvlc-module.c:1303
+#: src/libvlc-module.c:1308
 msgid "Lower the interface below all other windows."
 msgstr "将界面下降到其它所有窗口下面。"
 
-#: src/libvlc-module.c:1304
+#: src/libvlc-module.c:1309
 msgid "Take video snapshot"
 msgstr "获取视频快照"
 
-#: src/libvlc-module.c:1305
+#: src/libvlc-module.c:1310
 msgid "Takes a video snapshot and writes it to disk."
 msgstr "获取视频快照并写入磁盘"
 
-#: src/libvlc-module.c:1307 modules/access_filter/record.c:56
+#: src/libvlc-module.c:1312 modules/access_filter/record.c:56
 #: modules/access_filter/record.c:57 modules/gui/macosx/simple_prefs.m:251
 #: modules/gui/qt4/components/interface_widgets.cpp:326
 #: modules/gui/qt4/ui/sprefs_input.ui:194
 msgid "Record"
 msgstr "录制"
 
-#: src/libvlc-module.c:1308
+#: src/libvlc-module.c:1313
 msgid "Record access filter start/stop."
 msgstr "记录存取过滤器开始/停止"
 
-#: src/libvlc-module.c:1309 modules/access_filter/dump.c:54
+#: src/libvlc-module.c:1314 modules/access_filter/dump.c:54
 #: modules/access_filter/dump.c:55 modules/gui/macosx/simple_prefs.m:245
 #: modules/gui/qt4/ui/sprefs_input.ui:201
 msgid "Dump"
 msgstr "倾倒"
 
-#: src/libvlc-module.c:1310
+#: src/libvlc-module.c:1315
 msgid "Media dump access filter trigger."
 msgstr "媒体倾倒访问过滤器触发。"
 
-#: src/libvlc-module.c:1312
+#: src/libvlc-module.c:1317
 msgid "Normal/Repeat/Loop"
 msgstr ""
 
-#: src/libvlc-module.c:1313
+#: src/libvlc-module.c:1318
 msgid "Toggle Normal/Repeat/Loop playlist modes"
 msgstr ""
 
-#: src/libvlc-module.c:1316
+#: src/libvlc-module.c:1321
 msgid "Toggle random playlist playback"
 msgstr ""
 
-#: src/libvlc-module.c:1321 src/libvlc-module.c:1322
+#: src/libvlc-module.c:1326 src/libvlc-module.c:1327
 msgid "Un-Zoom"
 msgstr "反缩放"
 
-#: src/libvlc-module.c:1324 src/libvlc-module.c:1325
+#: src/libvlc-module.c:1329 src/libvlc-module.c:1330
 msgid "Crop one pixel from the top of the video"
 msgstr "在视频顶部修剪一个像素"
 
-#: src/libvlc-module.c:1326 src/libvlc-module.c:1327
+#: src/libvlc-module.c:1331 src/libvlc-module.c:1332
 msgid "Uncrop one pixel from the top of the video"
 msgstr "不在视频顶部修剪一个像素"
 
-#: src/libvlc-module.c:1329 src/libvlc-module.c:1330
+#: src/libvlc-module.c:1334 src/libvlc-module.c:1335
 msgid "Crop one pixel from the left of the video"
 msgstr "在视频左侧修剪一个像素"
 
-#: src/libvlc-module.c:1331 src/libvlc-module.c:1332
+#: src/libvlc-module.c:1336 src/libvlc-module.c:1337
 msgid "Uncrop one pixel from the left of the video"
 msgstr "不在视频左侧修剪一个像素"
 
-#: src/libvlc-module.c:1334 src/libvlc-module.c:1335
+#: src/libvlc-module.c:1339 src/libvlc-module.c:1340
 msgid "Crop one pixel from the bottom of the video"
 msgstr "在视频底部修剪一个像素"
 
-#: src/libvlc-module.c:1336 src/libvlc-module.c:1337
+#: src/libvlc-module.c:1341 src/libvlc-module.c:1342
 msgid "Uncrop one pixel from the bottom of the video"
 msgstr "不在视频底部修剪一个像素"
 
-#: src/libvlc-module.c:1339 src/libvlc-module.c:1340
+#: src/libvlc-module.c:1344 src/libvlc-module.c:1345
 msgid "Crop one pixel from the right of the video"
 msgstr "从视频右侧修剪一个像素"
 
-#: src/libvlc-module.c:1341 src/libvlc-module.c:1342
+#: src/libvlc-module.c:1346 src/libvlc-module.c:1347
 msgid "Uncrop one pixel from the right of the video"
 msgstr "不在视频右部修剪一个像素"
 
-#: src/libvlc-module.c:1344
+#: src/libvlc-module.c:1349
 #, fuzzy
 msgid "Toggle wallpaper mode in video output"
 msgstr "QT Embedded 视频输出"
 
-#: src/libvlc-module.c:1346
+#: src/libvlc-module.c:1351
 msgid ""
 "Toggle wallpaper mode in video output. Only works with the directx video "
 "output for the time being."
 msgstr ""
 
-#: src/libvlc-module.c:1349
+#: src/libvlc-module.c:1354 src/libvlc-module.c:1355
 msgid "Display OSD menu on top of video output"
 msgstr ""
 
-#: src/libvlc-module.c:1350
-msgid "Display OSDmenu on top of video output"
-msgstr ""
-
-#: src/libvlc-module.c:1351
+#: src/libvlc-module.c:1356
 msgid "Do not display OSD menu on video output"
 msgstr ""
 
-#: src/libvlc-module.c:1352
-msgid "Do not display OSDmenu on top of video output"
+#: src/libvlc-module.c:1357
+msgid "Do not display OSD menu on top of video output"
 msgstr ""
 
-#: src/libvlc-module.c:1353
+#: src/libvlc-module.c:1358
 msgid "Highlight widget on the right"
 msgstr ""
 
-#: src/libvlc-module.c:1355
+#: src/libvlc-module.c:1360
 msgid "Move OSD menu highlight to the widget on the right"
 msgstr ""
 
-#: src/libvlc-module.c:1356
+#: src/libvlc-module.c:1361
 msgid "Highlight widget on the left"
 msgstr ""
 
-#: src/libvlc-module.c:1358
+#: src/libvlc-module.c:1363
 msgid "Move OSD menu highlight to the widget on the left"
 msgstr ""
 
-#: src/libvlc-module.c:1359
+#: src/libvlc-module.c:1364
 msgid "Highlight widget on top"
 msgstr ""
 
-#: src/libvlc-module.c:1361
+#: src/libvlc-module.c:1366
 msgid "Move OSD menu highlight to the widget on top"
 msgstr ""
 
-#: src/libvlc-module.c:1362
+#: src/libvlc-module.c:1367
 msgid "Highlight widget below"
 msgstr ""
 
-#: src/libvlc-module.c:1364
+#: src/libvlc-module.c:1369
 msgid "Move OSD menu highlight to the widget below"
 msgstr ""
 
-#: src/libvlc-module.c:1365
+#: src/libvlc-module.c:1370
 #, fuzzy
 msgid "Select current widget"
 msgstr "重复播放目前项目"
 
-#: src/libvlc-module.c:1367
+#: src/libvlc-module.c:1372
 msgid "Selecting current widget performs the associated action."
 msgstr ""
 
-#: src/libvlc-module.c:1369
+#: src/libvlc-module.c:1374
 #, fuzzy
 msgid "Cycle through audio devices"
 msgstr "循环解除交错模块。"
 
-#: src/libvlc-module.c:1370
+#: src/libvlc-module.c:1375
 #, fuzzy
 msgid "Cycle through available audio devices"
 msgstr "循环可用音轨 (语言)"
 
-#: src/libvlc-module.c:1372
+#: src/libvlc-module.c:1377
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options] [stream] ...\n"
@@ -4170,196 +4183,201 @@ msgstr ""
 "  vlc:pause:<seconds> 特殊选项：使播放列表暂停指定时间\n"
 "  vlc:quit 特殊选项：退出 VLC\n"
 
-#: src/libvlc-module.c:1511 src/video_output/vout_intf.c:419
-#: modules/gui/macosx/controls.m:494 modules/gui/macosx/controls.m:960
-#: modules/gui/macosx/intf.m:728 modules/gui/macosx/intf.m:783
+#: src/libvlc-module.c:1519 src/video_output/vout_intf.c:419
+#: modules/gui/macosx/controls.m:496 modules/gui/macosx/controls.m:960
+#: modules/gui/macosx/intf.m:645 modules/gui/macosx/intf.m:700
 #: modules/gui/qt4/menus.cpp:508 modules/video_output/snapshot.c:81
 msgid "Snapshot"
 msgstr "快照"
 
-#: src/libvlc-module.c:1529
+#: src/libvlc-module.c:1537
 msgid "Window properties"
 msgstr "窗口属性"
 
-#: src/libvlc-module.c:1572
+#: src/libvlc-module.c:1586
 msgid "Subpictures"
 msgstr "子画面"
 
-#: src/libvlc-module.c:1579 modules/codec/subtitles/subsdec.c:117
+#: src/libvlc-module.c:1594 modules/codec/subtitles/subsdec.c:117
 #: modules/demux/subtitle.c:74 modules/gui/beos/InterfaceWindow.cpp:281
 #: modules/gui/qt4/ui/sout.ui:717 modules/gui/qt4/ui/sout.ui:723
 msgid "Subtitles"
 msgstr "字幕"
 
-#: src/libvlc-module.c:1596 modules/stream_out/transcode.c:122
+#: src/libvlc-module.c:1611 modules/stream_out/transcode.c:122
 msgid "Overlays"
 msgstr "覆盖"
 
-#: src/libvlc-module.c:1604
+#: src/libvlc-module.c:1619
 msgid "Track settings"
 msgstr "轨道设置"
 
-#: src/libvlc-module.c:1626
+#: src/libvlc-module.c:1649
 msgid "Playback control"
 msgstr "回放控制"
 
-#: src/libvlc-module.c:1643
+#: src/libvlc-module.c:1670
 msgid "Default devices"
 msgstr "默认设备"
 
-#: src/libvlc-module.c:1652
+#: src/libvlc-module.c:1679
 msgid "Network settings"
 msgstr "网络设置"
 
-#: src/libvlc-module.c:1664
+#: src/libvlc-module.c:1691
 msgid "Socks proxy"
 msgstr "Socks 代理"
 
-#: src/libvlc-module.c:1673
+#: src/libvlc-module.c:1700
 msgid "Metadata"
 msgstr "元信息"
 
-#: src/libvlc-module.c:1703
+#: src/libvlc-module.c:1730
 msgid "Decoders"
 msgstr "译码器"
 
-#: src/libvlc-module.c:1710 modules/access/v4l2/v4l2.c:92
-#: modules/gui/macosx/playlistinfo.m:90
+#: src/libvlc-module.c:1737 modules/access/v4l2/v4l2.c:92
+#: modules/gui/macosx/playlistinfo.m:92
 #: modules/gui/qt4/components/info_panels.cpp:521
 msgid "Input"
 msgstr "输入"
 
-#: src/libvlc-module.c:1750
+#: src/libvlc-module.c:1777
 msgid "VLM"
 msgstr "VLM"
 
-#: src/libvlc-module.c:1783
+#: src/libvlc-module.c:1810
 msgid "CPU"
 msgstr "CPU"
 
-#: src/libvlc-module.c:1805
+#: src/libvlc-module.c:1832
 msgid "Special modules"
 msgstr "特殊模块"
 
-#: src/libvlc-module.c:1811
+#: src/libvlc-module.c:1838
 msgid "Plugins"
 msgstr "插件"
 
-#: src/libvlc-module.c:1820
+#: src/libvlc-module.c:1847
 msgid "Performance options"
 msgstr "性能选项"
 
-#: src/libvlc-module.c:1969
+#: src/libvlc-module.c:1997
 msgid "Hot keys"
 msgstr "热键"
 
-#: src/libvlc-module.c:2366
+#: src/libvlc-module.c:2394
 msgid "Jump sizes"
 msgstr "跳转长度"
 
-#: src/libvlc-module.c:2443
+#: src/libvlc-module.c:2471
 #, fuzzy
 msgid "print help for VLC (can be combined with --advanced and --help-verbose)"
 msgstr "打印 VLC 帮助信息 (可以和 --advanced 一起使用)"
 
-#: src/libvlc-module.c:2446
+#: src/libvlc-module.c:2474
+msgid "Exhaustive help for VLC and its modules"
+msgstr ""
+
+#: src/libvlc-module.c:2476
 #, fuzzy
 msgid ""
 "print help for VLC and all its modules (can be combined with --advanced and "
 "--help-verbose)"
 msgstr "显示 VLC 及所有的模块的帮助信息 (可以和 --advanced 一起使用)"
 
-#: src/libvlc-module.c:2449
+#: src/libvlc-module.c:2479
 msgid "ask for extra verbosity when displaying help"
 msgstr ""
 
-#: src/libvlc-module.c:2451
+#: src/libvlc-module.c:2481
 msgid "print a list of available modules"
 msgstr "打印一个可用模块的列表"
 
-#: src/libvlc-module.c:2453
+#: src/libvlc-module.c:2483
 #, fuzzy
 msgid "print a list of available modules with extra detail"
 msgstr "打印一个可用模块的列表"
 
-#: src/libvlc-module.c:2455
+#: src/libvlc-module.c:2485
 #, fuzzy
 msgid ""
 "print help on a specific module (can be combined with --advanced and --help-"
 "verbose)"
 msgstr "显示 VLC 及所有的模块的帮助信息 (可以和 --advanced 一起使用)"
 
-#: src/libvlc-module.c:2458
+#: src/libvlc-module.c:2488
 msgid "no configuration option will be loaded nor saved to config file"
 msgstr ""
 
-#: src/libvlc-module.c:2460
+#: src/libvlc-module.c:2490
 msgid "save the current command line options in the config"
 msgstr "在配置中保存当前的命令行选项"
 
-#: src/libvlc-module.c:2462
+#: src/libvlc-module.c:2492
 msgid "reset the current config to the default values"
 msgstr "将当前设置复位为默认值"
 
-#: src/libvlc-module.c:2464
+#: src/libvlc-module.c:2494
 msgid "use alternate config file"
 msgstr "使用替代的组态档"
 
-#: src/libvlc-module.c:2466
+#: src/libvlc-module.c:2496
 msgid "resets the current plugins cache"
 msgstr "重置目前外挂缓存"
 
-#: src/libvlc-module.c:2468
+#: src/libvlc-module.c:2498
 msgid "print version information"
 msgstr "打印版本信息"
 
-#: src/libvlc-module.c:2522
+#: src/libvlc-module.c:2555
 msgid "main program"
 msgstr "主程序"
 
-#: src/misc/update.c:1579
-msgid "File can not be verified"
-msgstr ""
+#: src/misc/update.c:1582
+#, fuzzy
+msgid "File could not be verified"
+msgstr "隐藏接口"
 
-#: src/misc/update.c:1580
+#: src/misc/update.c:1583
 #, c-format
 msgid ""
-"It was not possible to download a cryptographic signature for downloaded "
-"file \"%s\", and so VLC deleted it."
+"It was not possible to download a cryptographic signature for the downloaded "
+"file \"%s\". Thus, it was deleted."
 msgstr ""
 
-#: src/misc/update.c:1591 src/misc/update.c:1603
+#: src/misc/update.c:1594 src/misc/update.c:1606
 #, fuzzy
 msgid "Invalid signature"
 msgstr "无效的选择"
 
-#: src/misc/update.c:1592 src/misc/update.c:1604
+#: src/misc/update.c:1595 src/misc/update.c:1607
 #, c-format
 msgid ""
-"The cryptographic signature for downloaded file \"%s\" was invalid and "
-"couldn't be used to securely verify it, and so VLC deleted it."
+"The cryptographic signature for the downloaded file \"%s\" was invalid and "
+"could not be used to securely verify it. Thus, the file was deleted."
 msgstr ""
 
-#: src/misc/update.c:1616
+#: src/misc/update.c:1619
 #, fuzzy
 msgid "File not verifiable"
 msgstr "隐藏接口"
 
-#: src/misc/update.c:1617
+#: src/misc/update.c:1620
 #, c-format
 msgid ""
-"It was not possible to securely verify downloaded file \"%s\", and so VLC "
-"deleted it."
+"It was not possible to securely verify the downloaded file \"%s\". Thus, it "
+"was VLC deleted."
 msgstr ""
 
-#: src/misc/update.c:1628 src/misc/update.c:1640
+#: src/misc/update.c:1631 src/misc/update.c:1643
 #, fuzzy
 msgid "File corrupted"
 msgstr "文件 dumpper"
 
-#: src/misc/update.c:1629 src/misc/update.c:1641
+#: src/misc/update.c:1632 src/misc/update.c:1644
 #, c-format
-msgid "Downloaded file \"%s\" was corrupted, and so VLC deleted it."
+msgid "Downloaded file \"%s\" was corrupted. Thus, it was deleted."
 msgstr ""
 
 #: src/playlist/tree.c:65 modules/access/bda/bda.c:62
@@ -4927,40 +4945,40 @@ msgstr "壮文"
 msgid "Zulu"
 msgstr "祖鲁文"
 
-#: src/video_output/video_output.c:392 modules/gui/macosx/intf.m:739
-#: modules/gui/macosx/intf.m:740 modules/video_filter/deinterlace.c:127
+#: src/video_output/video_output.c:395 modules/gui/macosx/intf.m:656
+#: modules/gui/macosx/intf.m:657 modules/video_filter/deinterlace.c:127
 msgid "Deinterlace"
 msgstr "解除交错"
 
-#: src/video_output/video_output.c:396 modules/video_filter/deinterlace.c:123
+#: src/video_output/video_output.c:399 modules/video_filter/deinterlace.c:123
 msgid "Discard"
 msgstr "丢弃"
 
-#: src/video_output/video_output.c:398 modules/video_filter/deinterlace.c:123
+#: src/video_output/video_output.c:401 modules/video_filter/deinterlace.c:123
 msgid "Blend"
 msgstr "混合"
 
-#: src/video_output/video_output.c:400 modules/video_filter/deinterlace.c:123
+#: src/video_output/video_output.c:403 modules/video_filter/deinterlace.c:123
 msgid "Mean"
 msgstr ""
 
-#: src/video_output/video_output.c:402 modules/video_filter/deinterlace.c:123
+#: src/video_output/video_output.c:405 modules/video_filter/deinterlace.c:123
 msgid "Bob"
 msgstr ""
 
-#: src/video_output/video_output.c:404 modules/video_filter/deinterlace.c:123
+#: src/video_output/video_output.c:407 modules/video_filter/deinterlace.c:123
 msgid "Linear"
 msgstr "线性"
 
-#: src/video_output/vout_intf.c:305 modules/gui/macosx/intf.m:733
-#: modules/gui/macosx/intf.m:734 modules/gui/qt4/ui/video_effects.ui:329
+#: src/video_output/vout_intf.c:305 modules/gui/macosx/intf.m:650
+#: modules/gui/macosx/intf.m:651 modules/gui/qt4/ui/video_effects.ui:329
 #: modules/video_filter/crop.c:105 modules/video_filter/croppadd.c:83
 #: modules/video_output/x11/xvmc.c:133
 msgid "Crop"
 msgstr "修整"
 
-#: src/video_output/vout_intf.c:369 modules/gui/macosx/intf.m:731
-#: modules/gui/macosx/intf.m:732
+#: src/video_output/vout_intf.c:369 modules/gui/macosx/intf.m:648
+#: modules/gui/macosx/intf.m:649
 msgid "Aspect-ratio"
 msgstr "纵横比"
 
@@ -4985,7 +5003,7 @@ msgid ""
 msgstr "DVB 串流的缓存值。这个值是以毫秒为单位的。"
 
 #: modules/access/bda/bda.c:45 modules/access/dvb/access.c:83
-#: modules/gui/qt4/components/open_panels.cpp:864
+#: modules/gui/qt4/components/open_panels.cpp:865
 msgid "Adapter card to tune"
 msgstr "要调整的适配卡"
 
@@ -5000,8 +5018,8 @@ msgid "Device number to use on adapter"
 msgstr "适配卡设备号"
 
 #: modules/access/bda/bda.c:52 modules/access/dvb/access.c:89
-#: modules/gui/qt4/components/open_panels.cpp:623
-#: modules/gui/qt4/components/open_panels.cpp:886
+#: modules/gui/qt4/components/open_panels.cpp:624
+#: modules/gui/qt4/components/open_panels.cpp:887
 msgid "Transponder/multiplex frequency"
 msgstr ""
 
@@ -5611,7 +5629,7 @@ msgid "Disc"
 msgstr "光盘"
 
 #: modules/access/cdda/info.c:330 modules/access/cdda/info.c:395
-#: modules/gui/macosx/playlist.m:127
+#: modules/gui/macosx/playlist.m:128
 #: modules/gui/qt4/components/playlist/sorting.h:48
 msgid "Duration"
 msgstr "长度"
@@ -5704,8 +5722,8 @@ msgid ""
 msgstr "DirectShow 串流的缓存值。这个值是以毫秒为单位的。"
 
 #: modules/access/dshow/dshow.cpp:102 modules/access/v4l.c:81
-#: modules/gui/qt4/components/open_panels.cpp:674
-#: modules/gui/qt4/components/open_panels.cpp:709
+#: modules/gui/qt4/components/open_panels.cpp:675
+#: modules/gui/qt4/components/open_panels.cpp:710
 msgid "Video device name"
 msgstr "视频装置名称"
 
@@ -5717,8 +5735,8 @@ msgid ""
 msgstr "默认的音频设备，如果你不指定，则没有设备将会被使用。"
 
 #: modules/access/dshow/dshow.cpp:107 modules/access/v4l2/v4l2.c:169
-#: modules/access/v4l.c:85 modules/gui/qt4/components/open_panels.cpp:680
-#: modules/gui/qt4/components/open_panels.cpp:715
+#: modules/access/v4l.c:85 modules/gui/qt4/components/open_panels.cpp:681
+#: modules/gui/qt4/components/open_panels.cpp:716
 msgid "Audio device name"
 msgstr "音频装置名称"
 
@@ -5730,7 +5748,7 @@ msgid ""
 msgstr "默认的音频设备，如果你不指定，则没有设备将会被使用。"
 
 #: modules/access/dshow/dshow.cpp:112
-#: modules/gui/qt4/components/open_panels.cpp:588
+#: modules/gui/qt4/components/open_panels.cpp:589
 msgid "Video size"
 msgstr "视频大小"
 
@@ -5862,7 +5880,7 @@ msgstr "输出频道数量"
 
 #: modules/access/dshow/dshow.cpp:165
 msgid ""
-"Select audio input format with the given number of audio channesl (if non 0)"
+"Select audio input format with the given number of audio channels (if non 0)"
 msgstr ""
 
 #: modules/access/dshow/dshow.cpp:167 modules/stream_out/transcode.c:103
@@ -5956,7 +5974,7 @@ msgid ""
 msgstr ""
 
 #: modules/access/dvb/access.c:173 modules/access_output/http.c:74
-#: modules/control/http/http.c:56
+#: modules/control/http/http.c:55
 msgid "Certificate file"
 msgstr "证书文件"
 
@@ -5965,7 +5983,7 @@ msgid "HTTP interface x509 PEM certificate file (enables SSL)"
 msgstr ""
 
 #: modules/access/dvb/access.c:177 modules/access_output/http.c:77
-#: modules/control/http/http.c:59
+#: modules/control/http/http.c:58
 msgid "Private key file"
 msgstr "私钥文件"
 
@@ -5974,7 +5992,7 @@ msgid "HTTP interface x509 PEM private key file"
 msgstr ""
 
 #: modules/access/dvb/access.c:180 modules/access_output/http.c:81
-#: modules/control/http/http.c:61
+#: modules/control/http/http.c:60
 msgid "Root CA file"
 msgstr "根 CA 文件"
 
@@ -5983,7 +6001,7 @@ msgid "HTTP interface x509 PEM trusted root CA certificates file"
 msgstr ""
 
 #: modules/access/dvb/access.c:184 modules/access_output/http.c:86
-#: modules/control/http/http.c:64
+#: modules/control/http/http.c:63
 msgid "CRL file"
 msgstr "CRL 文件"
 
@@ -6229,7 +6247,7 @@ msgid ""
 msgstr ""
 
 #: modules/access_filter/bandwidth.c:45
-#: modules/gui/qt4/components/open_panels.cpp:642
+#: modules/gui/qt4/components/open_panels.cpp:643
 #, fuzzy
 msgid "Bandwidth"
 msgstr "边界宽度"
@@ -6388,6 +6406,7 @@ msgid "GnomeVFS input"
 msgstr "GnomeVFS 输入"
 
 #: modules/access/http.c:64 modules/access/mms/mms.c:63
+#: modules/gui/qt4/ui/sprefs_input.ui:81
 msgid "HTTP proxy"
 msgstr "HTTP 代理"
 
@@ -6816,8 +6835,8 @@ msgid "PVR radio device"
 msgstr "PVR 收音机模式"
 
 #: modules/access/pvr.c:71 modules/access/v4l.c:100
-#: modules/gui/qt4/components/open_panels.cpp:722
-#: modules/gui/qt4/components/open_panels.cpp:821
+#: modules/gui/qt4/components/open_panels.cpp:723
+#: modules/gui/qt4/components/open_panels.cpp:822
 msgid "Norm"
 msgstr "规范"
 
@@ -6846,8 +6865,8 @@ msgid "Height of the stream to capture (-1 for autodetection)."
 msgstr ""
 
 #: modules/access/pvr.c:83 modules/access/v4l2/v4l2.c:230
-#: modules/access/v4l.c:93 modules/gui/qt4/components/open_panels.cpp:729
-#: modules/gui/qt4/components/open_panels.cpp:828
+#: modules/access/v4l.c:93 modules/gui/qt4/components/open_panels.cpp:730
+#: modules/gui/qt4/components/open_panels.cpp:829
 msgid "Frequency"
 msgstr "频率"
 
@@ -6909,7 +6928,7 @@ msgid "Bitmask that will get used by the audio part of the card."
 msgstr ""
 
 #: modules/access/pvr.c:110 modules/access/v4l2/v4l2.c:189
-#: modules/access/vcdx/info.c:100 modules/gui/macosx/intf.m:650
+#: modules/access/vcdx/info.c:100 modules/gui/macosx/intf.m:567
 msgid "Volume"
 msgstr "音量"
 
@@ -7051,30 +7070,21 @@ msgstr "马赛克左上角的 X 坐标。"
 msgid "Left coordinate of the subscreen top left corner."
 msgstr "马赛克左上角的 X 坐标。"
 
-#: modules/access/screen/screen.c:63
+#: modules/access/screen/screen.c:63 modules/access/screen/screen.c:65
 msgid "Subscreen width"
 msgstr ""
 
-#: modules/access/screen/screen.c:65
-msgid "Subscreen width."
-msgstr ""
-
-#: modules/access/screen/screen.c:67
+#: modules/access/screen/screen.c:67 modules/access/screen/screen.c:69
 #, fuzzy
 msgid "Subscreen height"
 msgstr "边界高度"
 
-#: modules/access/screen/screen.c:69
-#, fuzzy
-msgid "Subscreen height."
-msgstr "边界高度"
-
 #: modules/access/screen/screen.c:71
 msgid "Follow the mouse"
 msgstr ""
 
 #: modules/access/screen/screen.c:73
-msgid "Follow the mouse when capturing a subscreen"
+msgid "Follow the mouse when capturing a subscreen."
 msgstr ""
 
 #: modules/access/screen/screen.c:86
@@ -7140,7 +7150,7 @@ msgid "UDP input"
 msgstr "UDP/RTP 输入"
 
 #: modules/access/v4l2/v4l2.c:79 modules/gui/macosx/open.m:178
-#: modules/gui/qt4/components/open_panels.cpp:808
+#: modules/gui/qt4/components/open_panels.cpp:809
 msgid "Device name"
 msgstr "装置名称"
 
@@ -7152,7 +7162,7 @@ msgid ""
 msgstr "默认的视频设备，如果你不指定，则没有设备将会被使用。"
 
 #: modules/access/v4l2/v4l2.c:83
-#: modules/gui/qt4/components/open_panels.cpp:687
+#: modules/gui/qt4/components/open_panels.cpp:688
 #: modules/stream_out/standard.c:100
 msgid "Standard"
 msgstr "标准"
@@ -7212,7 +7222,7 @@ msgstr ""
 
 #: modules/access/v4l2/v4l2.c:114 modules/access/v4l.c:112
 #: modules/gui/macosx/extended.m:97 modules/gui/qt4/ui/video_effects.ui:197
-#: modules/video_filter/atmo/atmo.cpp:193
+#: modules/video_filter/atmo/atmo.cpp:196
 msgid "Brightness"
 msgstr "亮度"
 
@@ -7567,7 +7577,7 @@ msgstr ""
 msgid "Video4Linux2 Compressed A/V"
 msgstr "Video4Linux输入"
 
-#: modules/access/v4l2/v4l2.c:3142
+#: modules/access/v4l2/v4l2.c:3135
 #, fuzzy
 msgid "Reset controls to default"
 msgstr "摇控界面"
@@ -7717,7 +7727,7 @@ msgstr ""
 #: modules/access/vcdx/access.c:286 modules/access/vcdx/access.c:369
 #: modules/access/vcdx/access.c:695 modules/access/vcdx/info.c:293
 #: modules/access/vcdx/info.c:294
-#: modules/gui/qt4/components/open_panels.cpp:310
+#: modules/gui/qt4/components/open_panels.cpp:311
 msgid "Entry"
 msgstr "项"
 
@@ -7727,7 +7737,7 @@ msgstr "段"
 
 #: modules/access/vcdx/access.c:433 modules/access/vcdx/access.c:714
 #: modules/access/vcdx/info.c:297 modules/access/vcdx/info.c:298
-#: modules/demux/mkv.cpp:5439
+#: modules/demux/mkv.cpp:5437
 msgid "Segment"
 msgstr "段"
 
@@ -7968,12 +7978,12 @@ msgstr "左"
 msgid "Audio filter for stereo to mono conversion"
 msgstr "PCM 格式转换的音频过滤器"
 
-#: modules/audio_filter/channel_mixer/simple.c:52
+#: modules/audio_filter/channel_mixer/simple.c:44
 #, fuzzy
 msgid "Audio filter for simple channel mixing"
 msgstr "PCM 格式转换的音频过滤器"
 
-#: modules/audio_filter/channel_mixer/simple.c:59
+#: modules/audio_filter/channel_mixer/simple.c:51
 #, fuzzy
 msgid "audio filter for simple channel mixing"
 msgstr "PCM 格式转换的音频过滤器"
@@ -8283,6 +8293,40 @@ msgstr "PCM 格式转换的音频过滤器"
 msgid "Audio filter for ugly resampling"
 msgstr "PCM 格式转换的音频过滤器"
 
+#: modules/audio_filter/scaletempo.c:47
+msgid "Scale audio tempo in sync with playback rate"
+msgstr ""
+
+#: modules/audio_filter/scaletempo.c:48
+#, fuzzy
+msgid "Scaletempo"
+msgstr "尺寸"
+
+#: modules/audio_filter/scaletempo.c:54
+msgid "Stride Length"
+msgstr ""
+
+#: modules/audio_filter/scaletempo.c:54
+msgid "Length in milliseconds to output each stride"
+msgstr ""
+
+#: modules/audio_filter/scaletempo.c:56
+msgid "Overlap Length"
+msgstr ""
+
+#: modules/audio_filter/scaletempo.c:56
+msgid "Percentage of stride to overlap"
+msgstr ""
+
+#: modules/audio_filter/scaletempo.c:58
+#, fuzzy
+msgid "Search Length"
+msgstr "搜索"
+
+#: modules/audio_filter/scaletempo.c:58
+msgid "Length in milliseconds to search for best overlap position"
+msgstr ""
+
 #: modules/audio_filter/spatializer/spatializer.cpp:49
 #: modules/audio_filter/spatializer/spatializer.cpp:50
 #, fuzzy
@@ -8318,8 +8362,8 @@ msgstr "ALSA装置名称"
 #: modules/audio_output/auhal.c:968 modules/audio_output/directx.c:421
 #: modules/audio_output/oss.c:134 modules/audio_output/portaudio.c:393
 #: modules/audio_output/sdl.c:179 modules/audio_output/sdl.c:197
-#: modules/audio_output/waveout.c:462 modules/gui/macosx/intf.m:716
-#: modules/gui/macosx/intf.m:717
+#: modules/audio_output/waveout.c:462 modules/gui/macosx/intf.m:633
+#: modules/gui/macosx/intf.m:634
 msgid "Audio Device"
 msgstr "音频装置"
 
@@ -8359,7 +8403,7 @@ msgstr "视频输入色彩."
 msgid "The audio device \"%s\" is already in use."
 msgstr ""
 
-#: modules/audio_output/alsa.c:958
+#: modules/audio_output/alsa.c:961
 msgid "Unknown soundcard"
 msgstr "未知的声卡"
 
@@ -8536,16 +8580,16 @@ msgstr ""
 msgid "PORTAUDIO audio output"
 msgstr "PORTAUDIO音频输出"
 
-#: modules/audio_output/pulse.c:61 modules/gui/macosx/intf.m:640
-#: modules/gui/macosx/intf.m:1609 modules/gui/pda/pda_interface.c:210
+#: modules/audio_output/pulse.c:61 modules/gui/macosx/intf.m:557
+#: modules/gui/macosx/intf.m:1524 modules/gui/pda/pda_interface.c:210
 #: modules/gui/pda/pda_interface.c:1353 modules/gui/qt4/main_interface.cpp:368
 #: modules/gui/qt4/main_interface.cpp:372
-#: modules/gui/qt4/main_interface.cpp:943
-#: modules/gui/qt4/main_interface.cpp:945
-#: modules/gui/qt4/main_interface.cpp:1009
-#: modules/gui/qt4/main_interface.cpp:1024
-#: modules/gui/qt4/main_interface.cpp:1031
-#: modules/gui/qt4/main_interface.cpp:1048
+#: modules/gui/qt4/main_interface.cpp:935
+#: modules/gui/qt4/main_interface.cpp:937
+#: modules/gui/qt4/main_interface.cpp:1001
+#: modules/gui/qt4/main_interface.cpp:1016
+#: modules/gui/qt4/main_interface.cpp:1023
+#: modules/gui/qt4/main_interface.cpp:1040
 msgid "VLC media player"
 msgstr "VLC多媒体播放程序"
 
@@ -8623,7 +8667,7 @@ msgstr "双线性"
 msgid "Non-key"
 msgstr "无"
 
-#: modules/codec/avcodec/avcodec.c:71 modules/gui/macosx/prefs.m:131
+#: modules/codec/avcodec/avcodec.c:71 modules/gui/macosx/prefs.m:129
 #: modules/gui/macosx/simple_prefs.m:294
 #: modules/gui/qt4/dialogs/preferences.cpp:67
 msgid "All"
@@ -9067,12 +9111,12 @@ msgstr "Cinepak视频译码器"
 msgid "CMML annotations decoder"
 msgstr "ADPCM音频译码器"
 
-#: modules/codec/csri.c:67
+#: modules/codec/csri.c:57
 #, fuzzy
 msgid "Subtitles (advanced)"
 msgstr "字幕编码器"
 
-#: modules/codec/csri.c:68
+#: modules/codec/csri.c:58
 msgid "Wrapper for subtitle renderers using CSRI/asa"
 msgstr ""
 
@@ -9370,6 +9414,11 @@ msgstr "RealAudio 函式库译码器"
 msgid "RealVideo library decoder"
 msgstr "RealAudio 函式库译码器"
 
+#: modules/codec/schroedinger.c:84
+#, fuzzy
+msgid "Schroedinger video decoder"
+msgstr "Theora视频译码器"
+
 #: modules/codec/sdl_image.c:60
 #, fuzzy
 msgid "SDL Image decoder"
@@ -10228,7 +10277,7 @@ msgstr "安静模式"
 msgid "Quiet mode."
 msgstr "安静模式。"
 
-#: modules/codec/x264.c:363 modules/gui/macosx/playlistinfo.m:75
+#: modules/codec/x264.c:363 modules/gui/macosx/playlistinfo.m:77
 #: modules/gui/qt4/ui/streampanel.ui:28
 #, fuzzy
 msgid "Statistics"
@@ -10478,67 +10527,67 @@ msgstr "增加音频延迟"
 msgid "Volume %d%%"
 msgstr "音量: %d%%"
 
-#: modules/control/http/http.c:40
+#: modules/control/http/http.c:39
 msgid "Host address"
 msgstr "主机地址"
 
-#: modules/control/http/http.c:42
+#: modules/control/http/http.c:41
 msgid ""
 "Address and port the HTTP interface will listen on. It defaults to all "
 "network interfaces (0.0.0.0). If you want the HTTP interface to be available "
 "only on the local machine, enter 127.0.0.1"
 msgstr ""
 
-#: modules/control/http/http.c:46 modules/control/http/http.c:47
+#: modules/control/http/http.c:45 modules/control/http/http.c:46
 msgid "Source directory"
 msgstr "源目录"
 
-#: modules/control/http/http.c:48
+#: modules/control/http/http.c:47
 msgid "Handlers"
 msgstr ""
 
-#: modules/control/http/http.c:50
+#: modules/control/http/http.c:49
 msgid ""
 "List of handler extensions and executable paths (for instance: php=/usr/bin/"
 "php,pl=/usr/bin/perl)."
 msgstr ""
 
-#: modules/control/http/http.c:52
+#: modules/control/http/http.c:51
 msgid "Export album art as /art."
 msgstr ""
 
-#: modules/control/http/http.c:54
+#: modules/control/http/http.c:53
 msgid ""
 "Allow exporting album art for current playlist items at the /art and /art?"
 "id=<id> URLs."
 msgstr ""
 
-#: modules/control/http/http.c:57
+#: modules/control/http/http.c:56
 msgid "HTTP interface x509 PEM certificate file (enables SSL)."
 msgstr ""
 
-#: modules/control/http/http.c:60
+#: modules/control/http/http.c:59
 msgid "HTTP interface x509 PEM private key file."
 msgstr ""
 
-#: modules/control/http/http.c:62
+#: modules/control/http/http.c:61
 msgid "HTTP interface x509 PEM trusted root CA certificates file."
 msgstr ""
 
-#: modules/control/http/http.c:65
+#: modules/control/http/http.c:64
 msgid "HTTP interace Certificates Revocation List file."
 msgstr ""
 
-#: modules/control/http/http.c:68
+#: modules/control/http/http.c:67
 msgid "HTTP"
 msgstr "HTTP"
 
-#: modules/control/http/http.c:69
+#: modules/control/http/http.c:68
 #, fuzzy
 msgid "HTTP remote control interface"
 msgstr "VLM 遥控界面"
 
-#: modules/control/http/http.c:79
+#: modules/control/http/http.c:78
 msgid "HTTP SSL"
 msgstr "HTTP SSL"
 
@@ -10676,11 +10725,11 @@ msgstr "打开"
 msgid "Buffer"
 msgstr "VBV 缓冲区"
 
-#: modules/control/rc.c:76 modules/gui/macosx/embeddedwindow.m:131
-#: modules/gui/macosx/intf.m:1683 modules/gui/macosx/intf.m:1684
-#: modules/gui/macosx/intf.m:1685 modules/gui/macosx/intf.m:1686
+#: modules/control/rc.c:76 modules/gui/macosx/embeddedwindow.m:135
+#: modules/gui/macosx/intf.m:1598 modules/gui/macosx/intf.m:1599
+#: modules/gui/macosx/intf.m:1600 modules/gui/macosx/intf.m:1601
 #: modules/gui/pda/pda_interface.c:248 modules/gui/pda/pda_interface.c:249
-#: modules/gui/qt4/components/interface_widgets.cpp:798
+#: modules/gui/qt4/components/interface_widgets.cpp:808
 #: modules/gui/qt4/menus.cpp:649 modules/misc/notify/xosd.c:235
 msgid "Pause"
 msgstr "暂停"
@@ -11111,82 +11160,82 @@ msgstr "播放列表是空的"
 msgid "Unknown command!"
 msgstr "未知的声卡"
 
-#: modules/control/rc.c:2002 modules/gui/ncurses.c:2035
+#: modules/control/rc.c:2002 modules/gui/ncurses.c:2037
 #, fuzzy
 msgid "+-[Incoming]"
 msgstr "编码"
 
-#: modules/control/rc.c:2003 modules/gui/ncurses.c:2038
+#: modules/control/rc.c:2003 modules/gui/ncurses.c:2040
 #, c-format
 msgid "| input bytes read : %8.0f kB"
 msgstr ""
 
-#: modules/control/rc.c:2005 modules/gui/ncurses.c:2041
+#: modules/control/rc.c:2005 modules/gui/ncurses.c:2043
 #, c-format
 msgid "| input bitrate    :   %6.0f kb/s"
 msgstr ""
 
-#: modules/control/rc.c:2007 modules/gui/ncurses.c:2043
+#: modules/control/rc.c:2007 modules/gui/ncurses.c:2045
 #, c-format
 msgid "| demux bytes read : %8.0f kB"
 msgstr ""
 
-#: modules/control/rc.c:2009 modules/gui/ncurses.c:2046
+#: modules/control/rc.c:2009 modules/gui/ncurses.c:2048
 #, c-format
 msgid "| demux bitrate    :   %6.0f kb/s"
 msgstr ""
 
-#: modules/control/rc.c:2013 modules/gui/ncurses.c:2054
+#: modules/control/rc.c:2013 modules/gui/ncurses.c:2056
 #, fuzzy
 msgid "+-[Video Decoding]"
 msgstr "视频修整"
 
-#: modules/control/rc.c:2014 modules/gui/ncurses.c:2057
+#: modules/control/rc.c:2014 modules/gui/ncurses.c:2059
 #, c-format
 msgid "| video decoded    :    %5i"
 msgstr ""
 
-#: modules/control/rc.c:2016 modules/gui/ncurses.c:2060
+#: modules/control/rc.c:2016 modules/gui/ncurses.c:2062
 #, c-format
 msgid "| frames displayed :    %5i"
 msgstr ""
 
-#: modules/control/rc.c:2018 modules/gui/ncurses.c:2063
+#: modules/control/rc.c:2018 modules/gui/ncurses.c:2065
 #, c-format
 msgid "| frames lost      :    %5i"
 msgstr ""
 
-#: modules/control/rc.c:2022 modules/gui/ncurses.c:2071
+#: modules/control/rc.c:2022 modules/gui/ncurses.c:2073
 #, fuzzy
 msgid "+-[Audio Decoding]"
 msgstr "音频编码器"
 
-#: modules/control/rc.c:2023 modules/gui/ncurses.c:2074
+#: modules/control/rc.c:2023 modules/gui/ncurses.c:2076
 #, c-format
 msgid "| audio decoded    :    %5i"
 msgstr ""
 
-#: modules/control/rc.c:2025 modules/gui/ncurses.c:2077
+#: modules/control/rc.c:2025 modules/gui/ncurses.c:2079
 #, c-format
 msgid "| buffers played   :    %5i"
 msgstr ""
 
-#: modules/control/rc.c:2027 modules/gui/ncurses.c:2080
+#: modules/control/rc.c:2027 modules/gui/ncurses.c:2082
 #, c-format
 msgid "| buffers lost     :    %5i"
 msgstr ""
 
-#: modules/control/rc.c:2031 modules/gui/ncurses.c:2086
+#: modules/control/rc.c:2031 modules/gui/ncurses.c:2088
 #, fuzzy
 msgid "+-[Streaming]"
 msgstr "串流"
 
-#: modules/control/rc.c:2032 modules/gui/ncurses.c:2089
+#: modules/control/rc.c:2032 modules/gui/ncurses.c:2091
 #, c-format
 msgid "| packets sent     :    %5i"
 msgstr ""
 
-#: modules/control/rc.c:2033 modules/gui/ncurses.c:2091
+#: modules/control/rc.c:2033 modules/gui/ncurses.c:2093
 #, c-format
 msgid "| bytes sent       : %8.0f kB"
 msgstr ""
@@ -11227,7 +11276,7 @@ msgstr ""
 
 #: modules/control/telnet.c:83 modules/gui/macosx/open.m:189
 #: modules/gui/macosx/open.m:191 modules/gui/macosx/output.m:147
-#: modules/gui/qt4/ui/open_net.ui:72 modules/gui/qt4/ui/sout.ui:303
+#: modules/gui/qt4/ui/open_net.ui:75 modules/gui/qt4/ui/sout.ui:303
 #: modules/stream_out/rtp.c:108
 msgid "Port"
 msgstr "端口"
@@ -11468,19 +11517,19 @@ msgstr "HTTP 隧道端口"
 msgid "Port to use for tunneling the RTSP/RTP over HTTP."
 msgstr ""
 
-#: modules/demux/live555.cpp:593
+#: modules/demux/live555.cpp:591
 #, fuzzy
 msgid "RTSP authentication"
 msgstr "RTP 多播"
 
-#: modules/demux/live555.cpp:594
+#: modules/demux/live555.cpp:592
 #, fuzzy
 msgid "Please enter a valid login name and a password."
 msgstr "请输入节点编号"
 
 #: modules/demux/mjpeg.c:47 modules/demux/mpeg/h264.c:43
 #: modules/demux/mpeg/m4v.c:43 modules/demux/rawvid.c:44
-#: modules/demux/vc1.c:43 modules/gui/macosx/playlistinfo.m:100
+#: modules/demux/vc1.c:43 modules/gui/macosx/playlistinfo.m:102
 msgid "Frames per Second"
 msgstr "每秒帧数"
 
@@ -11543,19 +11592,19 @@ msgstr ""
 msgid "Read and discard unknown EBML elements (not good for broken files)."
 msgstr ""
 
-#: modules/demux/mkv.cpp:3371
+#: modules/demux/mkv.cpp:3369
 msgid "---  DVD Menu"
 msgstr "---  DVD 选单"
 
-#: modules/demux/mkv.cpp:3377
+#: modules/demux/mkv.cpp:3375
 msgid "First Played"
 msgstr "首次播放"
 
-#: modules/demux/mkv.cpp:3379
+#: modules/demux/mkv.cpp:3377
 msgid "Video Manager"
 msgstr "视频管理器"
 
-#: modules/demux/mkv.cpp:3385
+#: modules/demux/mkv.cpp:3383
 msgid "----- Title"
 msgstr "----- 标题"
 
@@ -11861,6 +11910,7 @@ msgid "Force chroma. This is a four character string."
 msgstr ""
 
 #: modules/demux/rawvid.c:59 modules/stream_out/switcher.c:92
+#: modules/video_filter/canvas.c:53
 msgid "Aspect ratio"
 msgstr "纵横比"
 
@@ -12007,177 +12057,177 @@ msgid ""
 "autodetection, this should always work)."
 msgstr ""
 
-#: modules/demux/ts.c:101
+#: modules/demux/ts.c:110
 #, fuzzy
 msgid "Extra PMT"
 msgstr "提取"
 
-#: modules/demux/ts.c:103
+#: modules/demux/ts.c:112
 msgid "Allows a user to specify an extra pmt (pmt_pid=pid:stream_type[,...])."
 msgstr ""
 
-#: modules/demux/ts.c:105
+#: modules/demux/ts.c:114
 msgid "Set id of ES to PID"
 msgstr "为 PID 设置 ES 的标识。"
 
-#: modules/demux/ts.c:106
+#: modules/demux/ts.c:115
 msgid ""
 "Set the internal ID of each elementary stream handled by VLC to the same "
 "value as the PID in the TS stream, instead of 1, 2, 3, etc. Useful to do "
 "'#duplicate{..., select=\"es=<pid>\"}'."
 msgstr ""
 
-#: modules/demux/ts.c:111
+#: modules/demux/ts.c:120
 #, fuzzy
 msgid "Fast udp streaming"
 msgstr "暂停串流"
 
-#: modules/demux/ts.c:113
+#: modules/demux/ts.c:122
 msgid "Sends TS to specific ip:port by udp (you must know what you are doing)."
 msgstr ""
 
-#: modules/demux/ts.c:115
+#: modules/demux/ts.c:124
 msgid "MTU for out mode"
 msgstr "输出模式的 MTU"
 
-#: modules/demux/ts.c:116
+#: modules/demux/ts.c:125
 msgid "MTU for out mode."
 msgstr "输出模式的 MTU。"
 
-#: modules/demux/ts.c:118
+#: modules/demux/ts.c:127
 msgid "CSA ck"
 msgstr "CSA ck"
 
-#: modules/demux/ts.c:119
+#: modules/demux/ts.c:128
 msgid "Control word for the CSA encryption algorithm"
 msgstr ""
 
-#: modules/demux/ts.c:121 modules/mux/mpeg/ts.c:170
+#: modules/demux/ts.c:130 modules/mux/mpeg/ts.c:170
 #, fuzzy
 msgid "Second CSA Key"
 msgstr "CSA 密钥"
 
-#: modules/demux/ts.c:122 modules/mux/mpeg/ts.c:171
+#: modules/demux/ts.c:131 modules/mux/mpeg/ts.c:171
 #, fuzzy
 msgid ""
 "The even CSA encryption key. This must be a 16 char string (8 hexadecimal "
 "bytes)."
 msgstr "定义 CSA 加密密钥。这个必须是一个 16 字符的字符串 (8 个十六进制字节)。"
 
-#: modules/demux/ts.c:125
+#: modules/demux/ts.c:134
 msgid "Silent mode"
 msgstr "静音模式"
 
-#: modules/demux/ts.c:126
+#: modules/demux/ts.c:135
 msgid "Do not complain on encrypted PES."
 msgstr ""
 
-#: modules/demux/ts.c:128
+#: modules/demux/ts.c:137
 #, fuzzy
 msgid "CAPMT System ID"
 msgstr "系统 Id"
 
-#: modules/demux/ts.c:129
+#: modules/demux/ts.c:138
 msgid "Only forward descriptors from this SysID to the CAM."
 msgstr ""
 
-#: modules/demux/ts.c:131
+#: modules/demux/ts.c:140
 #, fuzzy
 msgid "Packet size in bytes to decrypt"
 msgstr "要加密的包的 大小"
 
-#: modules/demux/ts.c:132
+#: modules/demux/ts.c:141
 msgid ""
 "Specify the size of the TS packet to decrypt. The decryption routines "
 "subtract the TS-header from the value before decrypting. "
 msgstr ""
 
-#: modules/demux/ts.c:136
+#: modules/demux/ts.c:145
 #, fuzzy
 msgid "Filename of dump"
 msgstr "文件名称"
 
-#: modules/demux/ts.c:137
+#: modules/demux/ts.c:146
 msgid "Specify a filename where to dump the TS in."
 msgstr ""
 
-#: modules/demux/ts.c:139
+#: modules/demux/ts.c:148
 msgid "Append"
 msgstr "添加"
 
-#: modules/demux/ts.c:141
+#: modules/demux/ts.c:150
 #, fuzzy
 msgid ""
 "If the file exists and this option is selected, the existing file will not "
 "be overwritten."
 msgstr "如果文件已经存在，它将不会被覆盖。"
 
-#: modules/demux/ts.c:144
+#: modules/demux/ts.c:153
 #, fuzzy
 msgid "Dump buffer size"
 msgstr "跳转长度"
 
-#: modules/demux/ts.c:146
+#: modules/demux/ts.c:155
 msgid ""
 "Tweak the buffer size for reading and writing an integer number of packets."
 "Specify the size of the buffer here and not the number of packets."
 msgstr ""
 
-#: modules/demux/ts.c:150
+#: modules/demux/ts.c:159
 msgid "MPEG Transport Stream demuxer"
 msgstr "MPEG 转码串流分离器"
 
-#: modules/demux/ts.c:3349
+#: modules/demux/ts.c:3418
 #, fuzzy
 msgid "Teletext subtitles"
 msgstr "字体字幕译码器"
 
-#: modules/demux/ts.c:3359
+#: modules/demux/ts.c:3428
 #, fuzzy
 msgid "Teletext hearing impaired subtitles"
 msgstr "字体字幕译码器"
 
-#: modules/demux/ts.c:3454
+#: modules/demux/ts.c:3523
 #, fuzzy
 msgid "subtitles"
 msgstr "字幕"
 
-#: modules/demux/ts.c:3458
+#: modules/demux/ts.c:3527
 #, fuzzy
 msgid "4:3 subtitles"
 msgstr "SVCD字幕"
 
-#: modules/demux/ts.c:3462
+#: modules/demux/ts.c:3531
 #, fuzzy
 msgid "16:9 subtitles"
 msgstr "SVCD字幕"
 
-#: modules/demux/ts.c:3466
+#: modules/demux/ts.c:3535
 #, fuzzy
 msgid "2.21:1 subtitles"
 msgstr "SVCD字幕"
 
-#: modules/demux/ts.c:3470 modules/demux/ts.c:3651 modules/demux/ts.c:3692
+#: modules/demux/ts.c:3539 modules/demux/ts.c:3720 modules/demux/ts.c:3761
 msgid "hearing impaired"
 msgstr ""
 
-#: modules/demux/ts.c:3474
+#: modules/demux/ts.c:3543
 msgid "4:3 hearing impaired"
 msgstr ""
 
-#: modules/demux/ts.c:3478
+#: modules/demux/ts.c:3547
 msgid "16:9 hearing impaired"
 msgstr ""
 
-#: modules/demux/ts.c:3482
+#: modules/demux/ts.c:3551
 msgid "2.21:1 hearing impaired"
 msgstr ""
 
-#: modules/demux/ts.c:3647 modules/demux/ts.c:3688
+#: modules/demux/ts.c:3716 modules/demux/ts.c:3757
 msgid "clean effects"
 msgstr "清除效果"
 
-#: modules/demux/ts.c:3655 modules/demux/ts.c:3696
+#: modules/demux/ts.c:3724 modules/demux/ts.c:3765
 msgid "visual impaired commentary"
 msgstr ""
 
@@ -12239,14 +12289,14 @@ msgid "Open"
 msgstr "打开"
 
 #: modules/gui/beos/InterfaceWindow.cpp:227
-#: modules/gui/beos/InterfaceWindow.cpp:332 modules/gui/macosx/prefs.m:125
+#: modules/gui/beos/InterfaceWindow.cpp:332 modules/gui/macosx/prefs.m:124
 #: modules/gui/macosx/simple_prefs.m:298
 #: modules/gui/qt4/dialogs/preferences.cpp:50
 msgid "Preferences"
 msgstr "设置"
 
 #: modules/gui/beos/InterfaceWindow.cpp:239
-#: modules/gui/beos/InterfaceWindow.cpp:330 modules/gui/macosx/intf.m:655
+#: modules/gui/beos/InterfaceWindow.cpp:330 modules/gui/macosx/intf.m:572
 #: modules/gui/qt4/dialogs/messages.cpp:48
 #: modules/gui/qt4/dialogs/messages.cpp:66
 msgid "Messages"
@@ -12271,7 +12321,7 @@ msgstr "打开字幕"
 #: modules/gui/beos/InterfaceWindow.cpp:274
 #: modules/gui/pda/pda_interface.c:298 modules/gui/pda/pda_interface.c:299
 #: modules/gui/pda/pda_interface.c:1360 modules/gui/qt4/dialogs/help.cpp:90
-#: modules/gui/qt4/dialogs/help.cpp:165
+#: modules/gui/qt4/dialogs/help.cpp:166
 msgid "About"
 msgstr "关于"
 
@@ -12295,28 +12345,10 @@ msgstr "前往章节"
 msgid "Speed"
 msgstr "速度"
 
-#: modules/gui/beos/InterfaceWindow.cpp:325 modules/gui/macosx/intf.m:744
+#: modules/gui/beos/InterfaceWindow.cpp:325 modules/gui/macosx/intf.m:661
 msgid "Window"
 msgstr "窗口"
 
-#: modules/gui/beos/InterfaceWindow.cpp:406 modules/gui/macosx/bookmarks.m:103
-#: modules/gui/macosx/bookmarks.m:226 modules/gui/macosx/bookmarks.m:234
-#: modules/gui/macosx/bookmarks.m:282 modules/gui/macosx/bookmarks.m:292
-#: modules/gui/macosx/controls.m:59 modules/gui/macosx/extended.m:518
-#: modules/gui/macosx/interaction.m:133 modules/gui/macosx/interaction.m:134
-#: modules/gui/macosx/interaction.m:174 modules/gui/macosx/open.m:167
-#: modules/gui/macosx/open.m:299 modules/gui/macosx/output.m:138
-#: modules/gui/macosx/simple_prefs.m:232 modules/gui/macosx/update.m:65
-#: modules/gui/macosx/wizard.m:599 modules/gui/macosx/wizard.m:663
-#: modules/gui/macosx/wizard.m:1055 modules/gui/macosx/wizard.m:1140
-#: modules/gui/macosx/wizard.m:1147 modules/gui/macosx/wizard.m:1674
-#: modules/gui/macosx/wizard.m:1682 modules/gui/macosx/wizard.m:1863
-#: modules/gui/macosx/wizard.m:1874 modules/gui/macosx/wizard.m:1887
-#: modules/gui/qt4/components/preferences_widgets.cpp:1283
-#: modules/gui/qt4/dialogs/podcast_configuration.cpp:37
-msgid "OK"
-msgstr "确定"
-
 #: modules/gui/beos/InterfaceWindow.cpp:414
 msgid "VLC media player: Open Media Files"
 msgstr "VLC media player:打开多媒体文件"
@@ -12334,17 +12366,16 @@ msgid "playlist"
 msgstr "播放列表"
 
 #: modules/gui/beos/PlayListWindow.cpp:99
-#: modules/gui/qt4/dialogs/extended.cpp:85 modules/gui/qt4/dialogs/vlm.cpp:139
 msgid "Close"
 msgstr "关闭"
 
 #: modules/gui/beos/PlayListWindow.cpp:104 modules/gui/macosx/bookmarks.m:92
-#: modules/gui/macosx/intf.m:681
+#: modules/gui/macosx/intf.m:598
 msgid "Edit"
 msgstr "编辑"
 
-#: modules/gui/beos/PlayListWindow.cpp:106 modules/gui/macosx/intf.m:686
-#: modules/gui/macosx/playlist.m:433
+#: modules/gui/beos/PlayListWindow.cpp:106 modules/gui/macosx/intf.m:603
+#: modules/gui/macosx/playlist.m:432
 msgid "Select All"
 msgstr "全选"
 
@@ -12385,7 +12416,7 @@ msgid "Path"
 msgstr "路径"
 
 #: modules/gui/beos/PlayListWindow.cpp:150 modules/gui/macosx/bookmarks.m:105
-#: modules/gui/macosx/playlist.m:125
+#: modules/gui/macosx/playlist.m:126
 msgid "Name"
 msgstr "名称"
 
@@ -12394,7 +12425,7 @@ msgid "Apply"
 msgstr "应用"
 
 #: modules/gui/beos/PreferencesWindow.cpp:257 modules/gui/macosx/output.m:526
-#: modules/gui/macosx/playlist.m:643 modules/gui/macosx/prefs.m:126
+#: modules/gui/macosx/playlist.m:661 modules/gui/macosx/prefs.m:125
 #: modules/gui/macosx/simple_prefs.m:297 modules/gui/qt4/ui/vlm.ui:209
 msgid "Save"
 msgstr "储存"
@@ -12573,105 +12604,99 @@ msgid ""
 "All rendered images and text will be displayed on the overlay framebuffer."
 msgstr ""
 
-#: modules/gui/fbosd.c:173 modules/gui/macosx/sfilters.m:120
-#: modules/misc/freetype.c:153 modules/misc/win32text.c:87
-#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:70
+#: modules/gui/fbosd.c:173 modules/misc/freetype.c:153
+#: modules/misc/win32text.c:87 modules/video_filter/marq.c:61
+#: modules/video_filter/rss.c:70
 msgid "Black"
 msgstr "黑色"
 
-#: modules/gui/fbosd.c:174 modules/gui/macosx/sfilters.m:121
-#: modules/misc/freetype.c:153 modules/misc/win32text.c:87
-#: modules/video_filter/marq.c:61 modules/video_filter/rss.c:71
+#: modules/gui/fbosd.c:174 modules/misc/freetype.c:153
+#: modules/misc/win32text.c:87 modules/video_filter/marq.c:61
+#: modules/video_filter/rss.c:71
 msgid "Gray"
 msgstr "灰色"
 
-#: modules/gui/fbosd.c:174 modules/gui/macosx/sfilters.m:122
-#: modules/misc/freetype.c:153 modules/misc/win32text.c:87
-#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:71
+#: modules/gui/fbosd.c:174 modules/misc/freetype.c:153
+#: modules/misc/win32text.c:87 modules/video_filter/marq.c:62
+#: modules/video_filter/rss.c:71
 msgid "Silver"
 msgstr "银色"
 
-#: modules/gui/fbosd.c:174 modules/gui/macosx/sfilters.m:123
-#: modules/misc/freetype.c:153 modules/misc/win32text.c:87
-#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:71
+#: modules/gui/fbosd.c:174 modules/misc/freetype.c:153
+#: modules/misc/win32text.c:87 modules/video_filter/marq.c:62
+#: modules/video_filter/rss.c:71
 msgid "White"
 msgstr "白色"
 
-#: modules/gui/fbosd.c:174 modules/gui/macosx/sfilters.m:124
-#: modules/misc/freetype.c:153 modules/misc/win32text.c:87
-#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:71
+#: modules/gui/fbosd.c:174 modules/misc/freetype.c:153
+#: modules/misc/win32text.c:87 modules/video_filter/marq.c:62
+#: modules/video_filter/rss.c:71
 msgid "Maroon"
 msgstr "栗色"
 
-#: modules/gui/fbosd.c:174 modules/gui/macosx/sfilters.m:125
-#: modules/misc/freetype.c:154 modules/misc/win32text.c:88
-#: modules/video_filter/colorthres.c:63 modules/video_filter/marq.c:62
-#: modules/video_filter/rss.c:71
+#: modules/gui/fbosd.c:174 modules/misc/freetype.c:154
+#: modules/misc/win32text.c:88 modules/video_filter/colorthres.c:63
+#: modules/video_filter/marq.c:62 modules/video_filter/rss.c:71
 msgid "Red"
 msgstr "红色"
 
-#: modules/gui/fbosd.c:175 modules/gui/macosx/sfilters.m:126
-#: modules/misc/freetype.c:154 modules/misc/win32text.c:88
-#: modules/video_filter/colorthres.c:63 modules/video_filter/marq.c:63
-#: modules/video_filter/rss.c:72
+#: modules/gui/fbosd.c:175 modules/misc/freetype.c:154
+#: modules/misc/win32text.c:88 modules/video_filter/colorthres.c:63
+#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:72
 msgid "Fuchsia"
 msgstr "紫红色"
 
-#: modules/gui/fbosd.c:175 modules/gui/macosx/sfilters.m:127
-#: modules/misc/freetype.c:154 modules/misc/win32text.c:88
-#: modules/video_filter/colorthres.c:63 modules/video_filter/marq.c:63
-#: modules/video_filter/rss.c:72
+#: modules/gui/fbosd.c:175 modules/misc/freetype.c:154
+#: modules/misc/win32text.c:88 modules/video_filter/colorthres.c:63
+#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:72
 msgid "Yellow"
 msgstr "黄色"
 
-#: modules/gui/fbosd.c:175 modules/gui/macosx/sfilters.m:128
-#: modules/misc/freetype.c:154 modules/misc/win32text.c:88
-#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:72
+#: modules/gui/fbosd.c:175 modules/misc/freetype.c:154
+#: modules/misc/win32text.c:88 modules/video_filter/marq.c:63
+#: modules/video_filter/rss.c:72
 msgid "Olive"
 msgstr "橄榄色"
 
-#: modules/gui/fbosd.c:175 modules/gui/macosx/sfilters.m:129
-#: modules/misc/freetype.c:154 modules/misc/win32text.c:88
-#: modules/video_filter/marq.c:63 modules/video_filter/rss.c:72
+#: modules/gui/fbosd.c:175 modules/misc/freetype.c:154
+#: modules/misc/win32text.c:88 modules/video_filter/marq.c:63
+#: modules/video_filter/rss.c:72
 msgid "Green"
 msgstr "绿色"
 
-#: modules/gui/fbosd.c:176 modules/gui/macosx/sfilters.m:130
-#: modules/misc/freetype.c:154 modules/misc/win32text.c:88
-#: modules/video_filter/marq.c:64 modules/video_filter/rss.c:73
+#: modules/gui/fbosd.c:176 modules/misc/freetype.c:154
+#: modules/misc/win32text.c:88 modules/video_filter/marq.c:64
+#: modules/video_filter/rss.c:73
 msgid "Teal"
 msgstr "蓝绿色"
 
-#: modules/gui/fbosd.c:176 modules/gui/macosx/sfilters.m:131
-#: modules/misc/freetype.c:155 modules/misc/win32text.c:89
-#: modules/video_filter/colorthres.c:63 modules/video_filter/marq.c:64
-#: modules/video_filter/rss.c:73
+#: modules/gui/fbosd.c:176 modules/misc/freetype.c:155
+#: modules/misc/win32text.c:89 modules/video_filter/colorthres.c:63
+#: modules/video_filter/marq.c:64 modules/video_filter/rss.c:73
 msgid "Lime"
 msgstr "柠檬色"
 
-#: modules/gui/fbosd.c:176 modules/gui/macosx/sfilters.m:132
-#: modules/misc/freetype.c:155 modules/misc/win32text.c:89
-#: modules/video_filter/marq.c:64 modules/video_filter/rss.c:73
+#: modules/gui/fbosd.c:176 modules/misc/freetype.c:155
+#: modules/misc/win32text.c:89 modules/video_filter/marq.c:64
+#: modules/video_filter/rss.c:73
 msgid "Purple"
 msgstr "紫色"
 
-#: modules/gui/fbosd.c:176 modules/gui/macosx/sfilters.m:133
-#: modules/misc/freetype.c:155 modules/misc/win32text.c:89
-#: modules/video_filter/marq.c:64 modules/video_filter/rss.c:73
+#: modules/gui/fbosd.c:176 modules/misc/freetype.c:155
+#: modules/misc/win32text.c:89 modules/video_filter/marq.c:64
+#: modules/video_filter/rss.c:73
 msgid "Navy"
 msgstr "藏青色"
 
-#: modules/gui/fbosd.c:176 modules/gui/macosx/sfilters.m:134
-#: modules/misc/freetype.c:155 modules/misc/win32text.c:89
-#: modules/video_filter/colorthres.c:63 modules/video_filter/marq.c:64
-#: modules/video_filter/rss.c:73
+#: modules/gui/fbosd.c:176 modules/misc/freetype.c:155
+#: modules/misc/win32text.c:89 modules/video_filter/colorthres.c:63
+#: modules/video_filter/marq.c:64 modules/video_filter/rss.c:73
 msgid "Blue"
 msgstr "蓝色"
 
-#: modules/gui/fbosd.c:177 modules/gui/macosx/sfilters.m:135
-#: modules/misc/freetype.c:155 modules/misc/win32text.c:89
-#: modules/video_filter/colorthres.c:63 modules/video_filter/marq.c:65
-#: modules/video_filter/rss.c:74
+#: modules/gui/fbosd.c:177 modules/misc/freetype.c:155
+#: modules/misc/win32text.c:89 modules/video_filter/colorthres.c:63
+#: modules/video_filter/marq.c:65 modules/video_filter/rss.c:74
 msgid "Aqua"
 msgstr "浅绿色"
 
@@ -12692,7 +12717,7 @@ msgstr "命令"
 msgid "GNU/Linux osd/overlay framebuffer interface"
 msgstr "GNU/Linux 控制台 framebuffer 视频输出"
 
-#: modules/gui/macosx/about.m:86 modules/gui/macosx/intf.m:659
+#: modules/gui/macosx/about.m:86 modules/gui/macosx/intf.m:576
 msgid "About VLC media player"
 msgstr "关于VLC多媒体播放程序"
 
@@ -12711,7 +12736,7 @@ msgid "VLC was brought to you by:"
 msgstr ""
 
 #: modules/gui/macosx/about.m:113 modules/gui/macosx/about.m:176
-#: modules/gui/macosx/intf.m:761 modules/gui/qt4/dialogs/help.cpp:168
+#: modules/gui/macosx/intf.m:678 modules/gui/qt4/dialogs/help.cpp:169
 msgid "License"
 msgstr "授权"
 
@@ -12734,7 +12759,7 @@ msgstr "书签"
 msgid "Add"
 msgstr "增加"
 
-#: modules/gui/macosx/bookmarks.m:91 modules/gui/macosx/intf.m:685
+#: modules/gui/macosx/bookmarks.m:91 modules/gui/macosx/intf.m:602
 #: modules/gui/macosx/simple_prefs.m:233
 #: modules/gui/qt4/components/playlist/standardpanel.cpp:163
 #: modules/gui/qt4/components/preferences_widgets.cpp:1126
@@ -12748,47 +12773,46 @@ msgid "Extract"
 msgstr "提取"
 
 #: modules/gui/macosx/bookmarks.m:100 modules/gui/macosx/bookmarks.m:106
-#: modules/gui/macosx/sfilters.m:71 modules/gui/pda/pda.c:278
-#: modules/gui/qt4/dialogs/bookmarks.cpp:59
+#: modules/gui/pda/pda.c:278 modules/gui/qt4/dialogs/bookmarks.cpp:59
 msgid "Time"
 msgstr "时间"
 
-#: modules/gui/macosx/bookmarks.m:133 modules/gui/macosx/playlist.m:639
+#: modules/gui/macosx/bookmarks.m:131 modules/gui/macosx/playlist.m:657
 msgid "Untitled"
 msgstr "无标题"
 
-#: modules/gui/macosx/bookmarks.m:226
+#: modules/gui/macosx/bookmarks.m:217
 msgid "No input"
 msgstr "没有输入"
 
-#: modules/gui/macosx/bookmarks.m:227
+#: modules/gui/macosx/bookmarks.m:218
 msgid ""
 "No input found. A stream must be playing or paused for bookmarks to work."
 msgstr "没有找到输入。要使书签有效，必须有一个串流正在被播放或处于暂停状态。"
 
-#: modules/gui/macosx/bookmarks.m:234
+#: modules/gui/macosx/bookmarks.m:225
 msgid "Input has changed"
 msgstr "输入已改变"
 
-#: modules/gui/macosx/bookmarks.m:235
+#: modules/gui/macosx/bookmarks.m:226
 msgid ""
 "Input has changed, unable to save bookmark. Suspending playback with \"Pause"
 "\" while editing bookmarks to ensure to keep the same input."
 msgstr ""
 
-#: modules/gui/macosx/bookmarks.m:282 modules/gui/macosx/wizard.m:1055
+#: modules/gui/macosx/bookmarks.m:270 modules/gui/macosx/wizard.m:1055
 msgid "Invalid selection"
 msgstr "无效的选择"
 
-#: modules/gui/macosx/bookmarks.m:284
+#: modules/gui/macosx/bookmarks.m:272
 msgid "Two bookmarks have to be selected."
 msgstr "必须选择两个书签"
 
-#: modules/gui/macosx/bookmarks.m:292
+#: modules/gui/macosx/bookmarks.m:278
 msgid "No input found"
 msgstr "没有输入"
 
-#: modules/gui/macosx/bookmarks.m:294
+#: modules/gui/macosx/bookmarks.m:280
 #, fuzzy
 msgid "The stream must be playing or paused for bookmarks to work."
 msgstr "要使书签有效，串流必须正在播放或处于暂停状态"
@@ -12807,69 +12831,69 @@ msgstr "秒"
 msgid "Jump to time"
 msgstr "停止时间"
 
-#: modules/gui/macosx/controls.m:218
+#: modules/gui/macosx/controls.m:220
 msgid "Random On"
 msgstr "开启随机播放"
 
-#: modules/gui/macosx/controls.m:223
+#: modules/gui/macosx/controls.m:225
 #, fuzzy
 msgid "Random Off"
 msgstr "关闭随机播放"
 
-#: modules/gui/macosx/controls.m:280 modules/gui/macosx/controls.m:340
-#: modules/gui/macosx/controls.m:926 modules/gui/macosx/intf.m:696
+#: modules/gui/macosx/controls.m:282 modules/gui/macosx/controls.m:342
+#: modules/gui/macosx/controls.m:926 modules/gui/macosx/intf.m:613
 msgid "Repeat One"
 msgstr "重复一次"
 
-#: modules/gui/macosx/controls.m:296 modules/gui/macosx/controls.m:369
-#: modules/gui/macosx/controls.m:933 modules/gui/macosx/intf.m:697
+#: modules/gui/macosx/controls.m:298 modules/gui/macosx/controls.m:371
+#: modules/gui/macosx/controls.m:933 modules/gui/macosx/intf.m:614
 msgid "Repeat All"
 msgstr "重复播放全部"
 
-#: modules/gui/macosx/controls.m:312 modules/gui/macosx/controls.m:345
-#: modules/gui/macosx/controls.m:374
+#: modules/gui/macosx/controls.m:314 modules/gui/macosx/controls.m:347
+#: modules/gui/macosx/controls.m:376
 msgid "Repeat Off"
 msgstr "关闭重复播放"
 
-#: modules/gui/macosx/controls.m:480 modules/gui/macosx/controls.m:956
-#: modules/gui/macosx/intf.m:722
+#: modules/gui/macosx/controls.m:482 modules/gui/macosx/controls.m:956
+#: modules/gui/macosx/intf.m:639
 msgid "Half Size"
 msgstr "一半大小"
 
-#: modules/gui/macosx/controls.m:482 modules/gui/macosx/controls.m:957
-#: modules/gui/macosx/intf.m:723
+#: modules/gui/macosx/controls.m:484 modules/gui/macosx/controls.m:957
+#: modules/gui/macosx/intf.m:640
 msgid "Normal Size"
 msgstr "正常值"
 
-#: modules/gui/macosx/controls.m:484 modules/gui/macosx/controls.m:958
-#: modules/gui/macosx/intf.m:724
+#: modules/gui/macosx/controls.m:486 modules/gui/macosx/controls.m:958
+#: modules/gui/macosx/intf.m:641
 msgid "Double Size"
 msgstr "双倍大小"
 
-#: modules/gui/macosx/controls.m:486 modules/gui/macosx/controls.m:962
-#: modules/gui/macosx/controls.m:973 modules/gui/macosx/intf.m:727
+#: modules/gui/macosx/controls.m:488 modules/gui/macosx/controls.m:962
+#: modules/gui/macosx/controls.m:973 modules/gui/macosx/intf.m:644
 msgid "Float on Top"
 msgstr "悬浮在最顶端"
 
-#: modules/gui/macosx/controls.m:488 modules/gui/macosx/controls.m:959
-#: modules/gui/macosx/intf.m:725
+#: modules/gui/macosx/controls.m:490 modules/gui/macosx/controls.m:959
+#: modules/gui/macosx/intf.m:642
 msgid "Fit to Screen"
 msgstr "缩放至屏幕"
 
-#: modules/gui/macosx/controls.m:940 modules/gui/macosx/intf.m:698
+#: modules/gui/macosx/controls.m:940 modules/gui/macosx/intf.m:615
 msgid "Step Forward"
 msgstr "向前"
 
-#: modules/gui/macosx/controls.m:941 modules/gui/macosx/intf.m:699
+#: modules/gui/macosx/controls.m:941 modules/gui/macosx/intf.m:616
 msgid "Step Backward"
 msgstr "向后"
 
-#: modules/gui/macosx/embeddedwindow.m:48 modules/gui/macosx/intf.m:644
+#: modules/gui/macosx/embeddedwindow.m:48 modules/gui/macosx/intf.m:561
 #: modules/gui/pda/pda_interface.c:236 modules/gui/pda/pda_interface.c:237
 msgid "Rewind"
 msgstr "回卷"
 
-#: modules/gui/macosx/embeddedwindow.m:49 modules/gui/macosx/intf.m:647
+#: modules/gui/macosx/embeddedwindow.m:49 modules/gui/macosx/intf.m:564
 msgid "Fast Forward"
 msgstr "快速向前"
 
@@ -12998,7 +13022,6 @@ msgid "Restore Defaults"
 msgstr "恢复默认值"
 
 #: modules/gui/macosx/extended.m:102 modules/gui/macosx/macosx.m:60
-#: modules/gui/macosx/sfilters.m:78 modules/gui/macosx/sfilters.m:89
 msgid "Opaqueness"
 msgstr "不透明度"
 
@@ -13030,7 +13053,7 @@ msgid ""
 "can be set in the Preferences, Video / Filters section."
 msgstr ""
 
-#: modules/gui/macosx/fspanel.m:385
+#: modules/gui/macosx/fspanel.m:389
 #, fuzzy
 msgid "(no item is being played)"
 msgstr "%i个项目在播放列表中"
@@ -13064,217 +13087,217 @@ msgstr " 清除 "
 msgid "Show Details"
 msgstr "显示全部"
 
-#: modules/gui/macosx/intf.m:639
+#: modules/gui/macosx/intf.m:556
 msgid "VLC - Controller"
 msgstr "VLC - 控制器"
 
-#: modules/gui/macosx/intf.m:656
+#: modules/gui/macosx/intf.m:573
 #, fuzzy
 msgid "Open CrashLog..."
 msgstr "开启崩溃纪录"
 
-#: modules/gui/macosx/intf.m:661
+#: modules/gui/macosx/intf.m:578
 msgid "Check for Update..."
 msgstr "检查更新..."
 
-#: modules/gui/macosx/intf.m:662 modules/gui/qt4/menus.cpp:415
+#: modules/gui/macosx/intf.m:579 modules/gui/qt4/menus.cpp:415
 msgid "Preferences..."
 msgstr "偏好设置..."
 
-#: modules/gui/macosx/intf.m:665
+#: modules/gui/macosx/intf.m:582
 msgid "Services"
 msgstr "服务"
 
-#: modules/gui/macosx/intf.m:666
+#: modules/gui/macosx/intf.m:583
 msgid "Hide VLC"
 msgstr "隐藏VLC"
 
-#: modules/gui/macosx/intf.m:667
+#: modules/gui/macosx/intf.m:584
 msgid "Hide Others"
 msgstr "隐藏其它"
 
-#: modules/gui/macosx/intf.m:668
+#: modules/gui/macosx/intf.m:585
 msgid "Show All"
 msgstr "显示全部"
 
-#: modules/gui/macosx/intf.m:669
+#: modules/gui/macosx/intf.m:586
 msgid "Quit VLC"
 msgstr "退出VLC"
 
-#: modules/gui/macosx/intf.m:671
+#: modules/gui/macosx/intf.m:588
 msgid "1:File"
 msgstr "1:文件"
 
-#: modules/gui/macosx/intf.m:672
+#: modules/gui/macosx/intf.m:589
 msgid "Open File..."
 msgstr "打开文件..."
 
-#: modules/gui/macosx/intf.m:673
+#: modules/gui/macosx/intf.m:590
 msgid "Quick Open File..."
 msgstr "快速打开文件..."
 
-#: modules/gui/macosx/intf.m:674
+#: modules/gui/macosx/intf.m:591
 msgid "Open Disc..."
 msgstr "打开光盘..."
 
-#: modules/gui/macosx/intf.m:675
+#: modules/gui/macosx/intf.m:592
 msgid "Open Network..."
 msgstr "打开网络..."
 
-#: modules/gui/macosx/intf.m:676
+#: modules/gui/macosx/intf.m:593
 #, fuzzy
 msgid "Open Capture Device..."
 msgstr "打开获取装置(&C)"
 
-#: modules/gui/macosx/intf.m:677
+#: modules/gui/macosx/intf.m:594
 msgid "Open Recent"
 msgstr "打开最近的文件"
 
-#: modules/gui/macosx/intf.m:678 modules/gui/macosx/intf.m:2260
+#: modules/gui/macosx/intf.m:595 modules/gui/macosx/intf.m:2176
 msgid "Clear Menu"
 msgstr "清除菜单"
 
-#: modules/gui/macosx/intf.m:679
+#: modules/gui/macosx/intf.m:596
 msgid "Streaming/Exporting Wizard..."
 msgstr "串流/导出向导"
 
-#: modules/gui/macosx/intf.m:682
+#: modules/gui/macosx/intf.m:599
 msgid "Cut"
 msgstr "剪切"
 
-#: modules/gui/macosx/intf.m:683
+#: modules/gui/macosx/intf.m:600
 msgid "Copy"
 msgstr "复制"
 
-#: modules/gui/macosx/intf.m:684
+#: modules/gui/macosx/intf.m:601
 msgid "Paste"
 msgstr "粘贴"
 
-#: modules/gui/macosx/intf.m:688
+#: modules/gui/macosx/intf.m:605
 msgid "Playback"
 msgstr "回放"
 
-#: modules/gui/macosx/intf.m:709 modules/gui/macosx/intf.m:779
+#: modules/gui/macosx/intf.m:626 modules/gui/macosx/intf.m:696
 msgid "Volume Up"
 msgstr "增加音量"
 
-#: modules/gui/macosx/intf.m:710 modules/gui/macosx/intf.m:780
+#: modules/gui/macosx/intf.m:627 modules/gui/macosx/intf.m:697
 msgid "Volume Down"
 msgstr "减低音量"
 
-#: modules/gui/macosx/intf.m:735 modules/gui/macosx/intf.m:736
-#: modules/gui/macosx/vout.m:197
+#: modules/gui/macosx/intf.m:652 modules/gui/macosx/intf.m:653
+#: modules/gui/macosx/simple_prefs.m:278 modules/gui/macosx/vout.m:197
 #, fuzzy
 msgid "Fullscreen Video Device"
 msgstr "全屏幕视频输出"
 
-#: modules/gui/macosx/intf.m:741 modules/gui/macosx/intf.m:742
+#: modules/gui/macosx/intf.m:658 modules/gui/macosx/intf.m:659
 #: modules/video_filter/postproc.c:186
 msgid "Post processing"
 msgstr "后处理"
 
-#: modules/gui/macosx/intf.m:745
+#: modules/gui/macosx/intf.m:662
 msgid "Minimize Window"
 msgstr "最小化窗口"
 
-#: modules/gui/macosx/intf.m:746
+#: modules/gui/macosx/intf.m:663
 msgid "Close Window"
 msgstr "关闭窗口"
 
-#: modules/gui/macosx/intf.m:747
+#: modules/gui/macosx/intf.m:664
 #, fuzzy
 msgid "Controller..."
 msgstr "控制器"
 
-#: modules/gui/macosx/intf.m:748
+#: modules/gui/macosx/intf.m:665
 #, fuzzy
 msgid "Equalizer..."
 msgstr "均衡器"
 
-#: modules/gui/macosx/intf.m:749
+#: modules/gui/macosx/intf.m:666
 #, fuzzy
 msgid "Extended Controls..."
 msgstr "扩展控制"
 
-#: modules/gui/macosx/intf.m:751 modules/gui/qt4/menus.cpp:352
+#: modules/gui/macosx/intf.m:668 modules/gui/qt4/menus.cpp:352
 #, fuzzy
 msgid "Playlist..."
 msgstr "播放列表"
 
-#: modules/gui/macosx/intf.m:754
+#: modules/gui/macosx/intf.m:671
 msgid "Errors and Warnings..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:756
+#: modules/gui/macosx/intf.m:673
 msgid "Bring All to Front"
 msgstr "全部提到最前面"
 
-#: modules/gui/macosx/intf.m:758 modules/gui/qt4/dialogs/help.cpp:58
+#: modules/gui/macosx/intf.m:675 modules/gui/qt4/dialogs/help.cpp:58
 #: modules/gui/qt4/menus.cpp:694
 msgid "Help"
 msgstr "帮助"
 
-#: modules/gui/macosx/intf.m:759
+#: modules/gui/macosx/intf.m:676
 #, fuzzy
 msgid "VLC media player Help..."
 msgstr "VLC多媒体播放程序"
 
-#: modules/gui/macosx/intf.m:760
+#: modules/gui/macosx/intf.m:677
 #, fuzzy
 msgid "ReadMe / FAQ..."
 msgstr "读我..."
 
-#: modules/gui/macosx/intf.m:762
+#: modules/gui/macosx/intf.m:679
 #, fuzzy
 msgid "Online Documentation..."
 msgstr "在线文件"
 
-#: modules/gui/macosx/intf.m:763
+#: modules/gui/macosx/intf.m:680
 #, fuzzy
 msgid "VideoLAN Website..."
 msgstr "VideoLAN 网站"
 
-#: modules/gui/macosx/intf.m:764
+#: modules/gui/macosx/intf.m:681
 #, fuzzy
 msgid "Make a donation..."
 msgstr "捐助 VideoLAN"
 
-#: modules/gui/macosx/intf.m:765
+#: modules/gui/macosx/intf.m:682
 #, fuzzy
 msgid "Online Forum..."
 msgstr "在线论坛"
 
-#: modules/gui/macosx/intf.m:813
+#: modules/gui/macosx/intf.m:724
 msgid "Your version of Mac OS X is not supported"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:817
+#: modules/gui/macosx/intf.m:728
 msgid "VLC media player requires Mac OS X 10.4 or higher."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:1430
+#: modules/gui/macosx/intf.m:1365
 #, c-format
 msgid "Volume: %d%%"
 msgstr "音量: %d%%"
 
-#: modules/gui/macosx/intf.m:2023
+#: modules/gui/macosx/intf.m:1939
 msgid "Update check failed"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:2023
+#: modules/gui/macosx/intf.m:1939
 msgid "Checking for updates was not enabled in this build."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:2089
+#: modules/gui/macosx/intf.m:2005
 msgid "No CrashLog found"
 msgstr "没有发现当机纪录"
 
-#: modules/gui/macosx/intf.m:2089 modules/gui/macosx/prefs.m:150
+#: modules/gui/macosx/intf.m:2005 modules/gui/macosx/prefs.m:148
 #: modules/gui/macosx/simple_prefs.m:607
 msgid "Continue"
 msgstr "继续"
 
-#: modules/gui/macosx/intf.m:2089
+#: modules/gui/macosx/intf.m:2005
 msgid "Couldn't find any trace of a previous crash."
 msgstr "无法找到一个以前的崩溃跟踪信息。"
 
@@ -13398,7 +13421,7 @@ msgstr "章节编码器"
 
 #: modules/gui/macosx/open.m:175 modules/gui/macosx/open.m:181
 #: modules/gui/macosx/open.m:287 modules/gui/macosx/output.m:145
-#: modules/gui/macosx/prefs_widgets.m:1169 modules/gui/macosx/sfilters.m:74
+#: modules/gui/macosx/prefs_widgets.m:1174
 #: modules/gui/macosx/simple_prefs.m:266 modules/gui/macosx/simple_prefs.m:286
 #: modules/gui/qt4/components/preferences_widgets.cpp:257
 #: modules/gui/qt4/components/simple_preferences.cpp:236
@@ -13417,7 +13440,7 @@ msgstr "浏览..."
 msgid "Treat as a pipe rather than as a file"
 msgstr "以管道而不是文件的形式处理"
 
-#: modules/gui/macosx/open.m:182
+#: modules/gui/macosx/open.m:182 modules/gui/qt4/ui/open_disk.ui:108
 #, fuzzy
 msgid "No DVD menus"
 msgstr "使用DVD选单"
@@ -13431,7 +13454,7 @@ msgid "DVD"
 msgstr "DVD"
 
 #: modules/gui/macosx/open.m:190 modules/gui/macosx/output.m:146
-#: modules/gui/qt4/ui/open_net.ui:62 modules/gui/qt4/ui/sout.ui:104
+#: modules/gui/qt4/ui/open_net.ui:65 modules/gui/qt4/ui/sout.ui:104
 #: modules/gui/qt4/ui/sout.ui:169 modules/gui/qt4/ui/sout.ui:231
 #: modules/gui/qt4/ui/sout.ui:293 modules/gui/qt4/ui/sout.ui:348
 msgid "Address"
@@ -13449,7 +13472,7 @@ msgstr "UDP/RTP 多播"
 msgid "HTTP/FTP/MMS/RTSP"
 msgstr "HTTP/FTP/MMS/RTSP"
 
-#: modules/gui/macosx/open.m:197 modules/gui/qt4/ui/open_net.ui:107
+#: modules/gui/macosx/open.m:197 modules/gui/qt4/ui/open_net.ui:110
 #: modules/services_discovery/sap.c:116
 msgid "Allow timeshifting"
 msgstr ""
@@ -13648,195 +13671,206 @@ msgstr "SDP URL"
 msgid "Save File"
 msgstr "储存文件"
 
-#: modules/gui/macosx/playlistinfo.m:67
+#: modules/gui/macosx/playlistinfo.m:69
+#: modules/gui/qt4/dialogs/mediainfo.cpp:55
 #, fuzzy
 msgid "Media Information"
 msgstr "元信息"
 
-#: modules/gui/macosx/playlistinfo.m:68
+#: modules/gui/macosx/playlistinfo.m:70
 #, fuzzy
 msgid "Location"
 msgstr "拉丁文"
 
-#: modules/gui/macosx/playlistinfo.m:71
+#: modules/gui/macosx/playlistinfo.m:73
 #, fuzzy
 msgid "Save Metadata"
 msgstr "元信息"
 
-#: modules/gui/macosx/playlistinfo.m:74
+#: modules/gui/macosx/playlistinfo.m:76
 #, fuzzy
 msgid "Codec Details"
 msgstr "显示全部"
 
-#: modules/gui/macosx/playlistinfo.m:91
+#: modules/gui/macosx/playlistinfo.m:93
 #: modules/gui/qt4/components/info_panels.cpp:524
 msgid "Read at media"
 msgstr "在媒体中读取"
 
-#: modules/gui/macosx/playlistinfo.m:92
+#: modules/gui/macosx/playlistinfo.m:94
 #: modules/gui/qt4/components/info_panels.cpp:526
 msgid "Input bitrate"
 msgstr "输入比特率"
 
-#: modules/gui/macosx/playlistinfo.m:93
+#: modules/gui/macosx/playlistinfo.m:95
 #: modules/gui/qt4/components/info_panels.cpp:528
 msgid "Demuxed"
 msgstr "已分离的"
 
-#: modules/gui/macosx/playlistinfo.m:94
+#: modules/gui/macosx/playlistinfo.m:96
 #: modules/gui/qt4/components/info_panels.cpp:529
 msgid "Stream bitrate"
 msgstr "串流比特率"
 
-#: modules/gui/macosx/playlistinfo.m:97 modules/gui/macosx/playlistinfo.m:108
+#: modules/gui/macosx/playlistinfo.m:99 modules/gui/macosx/playlistinfo.m:110
 #: modules/gui/qt4/components/info_panels.cpp:532
 #: modules/gui/qt4/components/info_panels.cpp:546
 msgid "Decoded blocks"
 msgstr "已解码的帧"
 
-#: modules/gui/macosx/playlistinfo.m:98
+#: modules/gui/macosx/playlistinfo.m:100
 #: modules/gui/qt4/components/info_panels.cpp:534
 msgid "Displayed frames"
 msgstr "已显示的帧"
 
-#: modules/gui/macosx/playlistinfo.m:99
+#: modules/gui/macosx/playlistinfo.m:101
 #: modules/gui/qt4/components/info_panels.cpp:536
 msgid "Lost frames"
 msgstr "丢失帧"
 
-#: modules/gui/macosx/playlistinfo.m:102 modules/gui/macosx/wizard.m:361
+#: modules/gui/macosx/playlistinfo.m:104 modules/gui/macosx/wizard.m:361
 #: modules/gui/qt4/components/info_panels.cpp:522
 #: modules/video_filter/deinterlace.c:142
 msgid "Streaming"
 msgstr "串流"
 
-#: modules/gui/macosx/playlistinfo.m:103
+#: modules/gui/macosx/playlistinfo.m:105
 #: modules/gui/qt4/components/info_panels.cpp:540
 msgid "Sent packets"
 msgstr "已发送的包"
 
-#: modules/gui/macosx/playlistinfo.m:104
+#: modules/gui/macosx/playlistinfo.m:106
 #: modules/gui/qt4/components/info_panels.cpp:541
 msgid "Sent bytes"
 msgstr "已发送的字节"
 
-#: modules/gui/macosx/playlistinfo.m:105
+#: modules/gui/macosx/playlistinfo.m:107
 msgid "Send rate"
 msgstr "发送率"
 
-#: modules/gui/macosx/playlistinfo.m:109
+#: modules/gui/macosx/playlistinfo.m:111
 #: modules/gui/qt4/components/info_panels.cpp:548
 msgid "Played buffers"
 msgstr "已播放的缓冲区"
 
-#: modules/gui/macosx/playlistinfo.m:110
+#: modules/gui/macosx/playlistinfo.m:112
 #: modules/gui/qt4/components/info_panels.cpp:550
 msgid "Lost buffers"
 msgstr "丢失的缓冲区"
 
-#: modules/gui/macosx/playlistinfo.m:395 modules/gui/macosx/playlist.m:434
+#: modules/gui/macosx/playlistinfo.m:422
+msgid "Error while saving meta"
+msgstr ""
+
+#: modules/gui/macosx/playlistinfo.m:423
+msgid "Impossible to save the meta data."
+msgstr ""
+
+#: modules/gui/macosx/playlistinfo.m:441
 msgid "Information"
 msgstr "信息"
 
-#: modules/gui/macosx/playlist.m:126 modules/gui/macosx/wizard.m:350
+#: modules/gui/macosx/playlist.m:127 modules/gui/macosx/wizard.m:350
 #: modules/gui/wince/playlist.cpp:675 modules/mux/asf.c:54
 msgid "Author"
 msgstr "作者"
 
-#: modules/gui/macosx/playlist.m:429
+#: modules/gui/macosx/playlist.m:428
 msgid "Save Playlist..."
 msgstr "储存播放列表..."
 
-#: modules/gui/macosx/playlist.m:432
+#: modules/gui/macosx/playlist.m:431
 msgid "Expand Node"
 msgstr "展开结点"
 
-#: modules/gui/macosx/playlist.m:435
-msgid "Get Stream Information"
-msgstr "获取串流信息"
+#: modules/gui/macosx/playlist.m:434
+#, fuzzy
+msgid "Fetch Meta Data"
+msgstr "标题数据"
 
-#: modules/gui/macosx/playlist.m:436
+#: modules/gui/macosx/playlist.m:435
 msgid "Sort Node by Name"
 msgstr "依名称排序节点"
 
-#: modules/gui/macosx/playlist.m:437
+#: modules/gui/macosx/playlist.m:436
 msgid "Sort Node by Author"
 msgstr "依制作人排序节点"
 
-#: modules/gui/macosx/playlist.m:439 modules/gui/macosx/playlist.m:477
-#: modules/gui/macosx/playlist.m:1362
+#: modules/gui/macosx/playlist.m:438 modules/gui/macosx/playlist.m:476
+#: modules/gui/macosx/playlist.m:1374
 msgid "No items in the playlist"
 msgstr "播放列表中没有项目"
 
-#: modules/gui/macosx/playlist.m:441
+#: modules/gui/macosx/playlist.m:440
 msgid "Search in Playlist"
 msgstr "搜索播放列表"
 
-#: modules/gui/macosx/playlist.m:442
+#: modules/gui/macosx/playlist.m:441
 msgid "Add Folder to Playlist"
 msgstr "增加文件夹至播放列表"
 
-#: modules/gui/macosx/playlist.m:444
+#: modules/gui/macosx/playlist.m:443
 msgid "File Format:"
 msgstr "文件格式:"
 
-#: modules/gui/macosx/playlist.m:445
+#: modules/gui/macosx/playlist.m:444
 msgid "Extended M3U"
 msgstr "扩展 M3U"
 
-#: modules/gui/macosx/playlist.m:446
+#: modules/gui/macosx/playlist.m:445
 msgid "XML Shareable Playlist Format (XSPF)"
 msgstr "XML 可共享播放列表格式 (XSPF)"
 
-#: modules/gui/macosx/playlist.m:471 modules/gui/macosx/playlist.m:1355
+#: modules/gui/macosx/playlist.m:470 modules/gui/macosx/playlist.m:1367
+#: modules/gui/macosx/wizard.m:1354
 #, c-format
-msgid "%i items in the playlist"
-msgstr "播放列表中有 %i 个项目"
+msgid "%i items"
+msgstr "%i 项"
 
-#: modules/gui/macosx/playlist.m:479 modules/gui/macosx/playlist.m:1366
-msgid "1 item in the playlist"
-msgstr "播放列表中有 1 个项目"
+#: modules/gui/macosx/playlist.m:478 modules/gui/macosx/playlist.m:1378
+#, fuzzy
+msgid "1 item"
+msgstr "%i 项"
 
-#: modules/gui/macosx/playlist.m:642
+#: modules/gui/macosx/playlist.m:660
 msgid "Save Playlist"
 msgstr "储存播放列表"
 
-#: modules/gui/macosx/playlist.m:1078 modules/gui/ncurses.c:1804
+#: modules/gui/macosx/playlist.m:1087 modules/gui/ncurses.c:1806
 msgid "Meta-information"
 msgstr "元信息"
 
-#: modules/gui/macosx/playlist.m:1323
+#: modules/gui/macosx/playlist.m:1335
 #, fuzzy
 msgid "New Node"
 msgstr "新节点"
 
-#: modules/gui/macosx/playlist.m:1324
+#: modules/gui/macosx/playlist.m:1336
 #, fuzzy
 msgid "Please enter a name for the new node."
 msgstr "请输入节点编号"
 
-#: modules/gui/macosx/playlist.m:1332
+#: modules/gui/macosx/playlist.m:1344
 msgid "Empty Folder"
 msgstr "空文件夹"
 
-#: modules/gui/macosx/prefs.m:128
+#: modules/gui/macosx/prefs.m:127
 msgid "Reset All"
 msgstr "全部重置"
 
-#: modules/gui/macosx/prefs.m:130 modules/gui/macosx/simple_prefs.m:293
-#: modules/gui/qt4/dialogs/preferences.cpp:65
+#: modules/gui/macosx/prefs.m:128 modules/gui/macosx/simple_prefs.m:293
 #: modules/gui/qt4/ui/video_effects.ui:17
 #, fuzzy
 msgid "Basic"
 msgstr "返回"
 
-#: modules/gui/macosx/prefs.m:149 modules/gui/macosx/simple_prefs.m:296
+#: modules/gui/macosx/prefs.m:147 modules/gui/macosx/simple_prefs.m:296
 #: modules/gui/macosx/simple_prefs.m:606
 #: modules/gui/qt4/dialogs/preferences.cpp:345
 msgid "Reset Preferences"
 msgstr "重设偏好设置"
 
-#: modules/gui/macosx/prefs.m:152 modules/gui/macosx/simple_prefs.m:609
+#: modules/gui/macosx/prefs.m:150 modules/gui/macosx/simple_prefs.m:609
 msgid ""
 "Beware this will reset the VLC media player preferences.\n"
 "Are you sure you want to continue?"
@@ -13844,101 +13878,20 @@ msgstr ""
 "注意: 这将复位您的 VLC media player 设置。\n"
 "是否确定要继续?"
 
-#: modules/gui/macosx/prefs.m:744
-msgid "Some options are hidden. Check \"Advanced\" to display them."
-msgstr "除了这些选项之外, 还有一些已被隐藏的选项。单击 \"高级\" 可以看到它们。"
-
-#: modules/gui/macosx/prefs_widgets.m:1207
+#: modules/gui/macosx/prefs_widgets.m:1209
 msgid "Select a directory"
 msgstr "选择一个目录"
 
-#: modules/gui/macosx/prefs_widgets.m:1207
+#: modules/gui/macosx/prefs_widgets.m:1209
 msgid "Select a file"
 msgstr "选择文件"
 
-#: modules/gui/macosx/prefs_widgets.m:1208
-#: modules/gui/qt4/dialogs/open.cpp:102
+#: modules/gui/macosx/prefs_widgets.m:1210
 msgid "Select"
 msgstr "选择"
 
-#: modules/gui/macosx/sfilters.m:69
-msgid "Subpicture Filters"
-msgstr "子画面过滤器"
-
-#: modules/gui/macosx/sfilters.m:70 modules/gui/qt4/ui/video_effects.ui:836
-#: modules/gui/qt4/ui/video_effects.ui:897
-msgid "Logo"
-msgstr "Logo"
-
-#: modules/gui/macosx/sfilters.m:72 modules/video_filter/marq.c:146
-msgid "Marquee"
-msgstr "字幕"
-
-#: modules/gui/macosx/sfilters.m:73
-msgid "Save settings"
-msgstr "保存设置"
-
-#: modules/gui/macosx/sfilters.m:75 modules/gui/macosx/sfilters.m:79
-#: modules/gui/macosx/sfilters.m:86
-msgid "Enabled"
-msgstr "启用"
-
-#: modules/gui/macosx/sfilters.m:76
-#, fuzzy
-msgid "Image:"
-msgstr "图像"
-
-#: modules/gui/macosx/sfilters.m:77 modules/gui/macosx/sfilters.m:84
-#: modules/gui/macosx/sfilters.m:92
-#, fuzzy
-msgid "Position:"
-msgstr "位置"
-
-#: modules/gui/macosx/sfilters.m:80
-#, fuzzy
-msgid "Timestamp:"
-msgstr "时间戳"
-
-#: modules/gui/macosx/sfilters.m:81 modules/gui/macosx/sfilters.m:93
-#: modules/gui/pda/pda_interface.c:609 modules/gui/qt4/ui/open_file.ui:90
-msgid "Size:"
-msgstr "大小:"
-
-#: modules/gui/macosx/sfilters.m:82 modules/gui/macosx/sfilters.m:87
-#, fuzzy
-msgid "Color:"
-msgstr "色彩"
-
-#: modules/gui/macosx/sfilters.m:83
-#, fuzzy
-msgid "Opaqueness:"
-msgstr "打开:"
-
-#: modules/gui/macosx/sfilters.m:85 modules/gui/macosx/sfilters.m:94
-msgid "(in pixels)"
-msgstr "(像素)"
-
-#: modules/gui/macosx/sfilters.m:88
-#, fuzzy
-msgid "Marquee:"
-msgstr "字幕"
-
-#: modules/gui/macosx/sfilters.m:90
-#, fuzzy
-msgid "Timeout:"
-msgstr "超时"
-
-#: modules/gui/macosx/sfilters.m:91
-msgid "ms"
-msgstr "ms"
-
-#: modules/gui/macosx/sfilters.m:201 modules/gui/macosx/sfilters.m:231
-#, fuzzy
-msgid "Not Available"
-msgstr "尚无可用的帮助文件"
-
 #: modules/gui/macosx/simple_prefs.m:167
-#: modules/gui/qt4/components/simple_preferences.cpp:451
+#: modules/gui/qt4/components/simple_preferences.cpp:450
 #, fuzzy
 msgid "Interface Settings"
 msgstr "一般界面设置"
@@ -13962,12 +13915,13 @@ msgid "Subtitles & OSD"
 msgstr "字幕/OSD"
 
 #: modules/gui/macosx/simple_prefs.m:179
-#: modules/gui/qt4/components/simple_preferences.cpp:510
+#: modules/gui/qt4/components/simple_preferences.cpp:508
 #, fuzzy
 msgid "Subtitles & OSD Settings"
 msgstr "字幕分离器设置"
 
 #: modules/gui/macosx/simple_prefs.m:183
+#: modules/gui/qt4/components/simple_preferences.cpp:80
 #, fuzzy
 msgid "Input & Codecs"
 msgstr "输入 / 编码器"
@@ -14076,7 +14030,7 @@ msgid ""
 "access module."
 msgstr ""
 
-#: modules/gui/macosx/simple_prefs.m:246 modules/gui/qt4/ui/sprefs_input.ui:81
+#: modules/gui/macosx/simple_prefs.m:246
 #, fuzzy
 msgid "HTTP Proxy"
 msgstr "HTTP 代理"
@@ -14092,7 +14046,6 @@ msgid "Codecs / Muxers"
 msgstr ""
 
 #: modules/gui/macosx/simple_prefs.m:250
-#: modules/gui/qt4/ui/sprefs_input.ui:125
 #, fuzzy
 msgid "Post-Processing Quality"
 msgstr "后处理质量"
@@ -14124,7 +14077,6 @@ msgid "Privacy / Network Interaction"
 msgstr "界面互动"
 
 #: modules/gui/macosx/simple_prefs.m:264
-#: modules/gui/qt4/ui/sprefs_subtitles.ui:79
 #, fuzzy
 msgid "Default Encoding"
 msgstr "解码"
@@ -14172,11 +14124,6 @@ msgstr "启动"
 msgid "Black screens in Fullscreen mode"
 msgstr "全屏中黑屏"
 
-#: modules/gui/macosx/simple_prefs.m:278
-#, fuzzy
-msgid "Display device"
-msgstr "显示"
-
 #: modules/gui/macosx/simple_prefs.m:279 modules/gui/qt4/ui/sprefs_video.ui:36
 #: modules/stream_out/display.c:54 modules/video_filter/deinterlace.c:132
 msgid "Display"
@@ -14792,11 +14739,6 @@ msgstr ""
 msgid "Finish"
 msgstr "完成"
 
-#: modules/gui/macosx/wizard.m:1354
-#, c-format
-msgid "%i items"
-msgstr "%i 项"
-
 #: modules/gui/macosx/wizard.m:1362 modules/gui/macosx/wizard.m:1391
 #: modules/gui/macosx/wizard.m:1421
 msgid "yes"
@@ -14890,343 +14832,343 @@ msgstr ""
 msgid "Ncurses interface"
 msgstr "Ncurses界面"
 
-#: modules/gui/ncurses.c:1538
+#: modules/gui/ncurses.c:1540
 #, fuzzy
 msgid "[Repeat] "
 msgstr "重复播放全部"
 
-#: modules/gui/ncurses.c:1539
+#: modules/gui/ncurses.c:1541
 #, fuzzy
 msgid "[Random] "
 msgstr "随机"
 
-#: modules/gui/ncurses.c:1540
+#: modules/gui/ncurses.c:1542
 #, fuzzy
 msgid "[Loop]"
 msgstr "循环"
 
-#: modules/gui/ncurses.c:1552
+#: modules/gui/ncurses.c:1554
 #, c-format
 msgid " Source   : %s"
 msgstr ""
 
-#: modules/gui/ncurses.c:1559
+#: modules/gui/ncurses.c:1561
 #, c-format
 msgid " State    : Playing %s"
 msgstr ""
 
-#: modules/gui/ncurses.c:1563
+#: modules/gui/ncurses.c:1565
 #, c-format
 msgid " State    : Stopped %s"
 msgstr ""
 
-#: modules/gui/ncurses.c:1567
+#: modules/gui/ncurses.c:1569
 #, c-format
 msgid " State    : Opening/Connecting %s"
 msgstr ""
 
-#: modules/gui/ncurses.c:1571
+#: modules/gui/ncurses.c:1573
 #, c-format
 msgid " State    : Buffering %s"
 msgstr ""
 
-#: modules/gui/ncurses.c:1575
+#: modules/gui/ncurses.c:1577
 #, c-format
 msgid " State    : Paused %s"
 msgstr ""
 
-#: modules/gui/ncurses.c:1589
+#: modules/gui/ncurses.c:1591
 #, c-format
 msgid " Position : %s/%s (%.2f%%)"
 msgstr ""
 
-#: modules/gui/ncurses.c:1593
+#: modules/gui/ncurses.c:1595
 #, fuzzy, c-format
 msgid " Volume   : %i%%"
 msgstr "音量: %d%%"
 
-#: modules/gui/ncurses.c:1601
+#: modules/gui/ncurses.c:1603
 #, fuzzy, c-format
 msgid " Title    : %d/%d"
 msgstr "标题 %d (%d)"
 
-#: modules/gui/ncurses.c:1612
+#: modules/gui/ncurses.c:1614
 #, fuzzy, c-format
 msgid " Chapter  : %d/%d"
 msgstr "章节 %d"
 
-#: modules/gui/ncurses.c:1624
+#: modules/gui/ncurses.c:1626
 #, c-format
 msgid " Source: <no current item> %s"
 msgstr ""
 
-#: modules/gui/ncurses.c:1626
+#: modules/gui/ncurses.c:1628
 msgid " [ h for help ]"
 msgstr ""
 
-#: modules/gui/ncurses.c:1648
+#: modules/gui/ncurses.c:1650
 #, fuzzy
 msgid " Help "
 msgstr "帮助"
 
-#: modules/gui/ncurses.c:1652
+#: modules/gui/ncurses.c:1654
 #, fuzzy
 msgid "[Display]"
 msgstr "显示"
 
-#: modules/gui/ncurses.c:1655
+#: modules/gui/ncurses.c:1657
 msgid "     h,H         Show/Hide help box"
 msgstr ""
 
-#: modules/gui/ncurses.c:1656
+#: modules/gui/ncurses.c:1658
 msgid "     i           Show/Hide info box"
 msgstr ""
 
-#: modules/gui/ncurses.c:1657
+#: modules/gui/ncurses.c:1659
 msgid "     m           Show/Hide metadata box"
 msgstr ""
 
-#: modules/gui/ncurses.c:1658
+#: modules/gui/ncurses.c:1660
 msgid "     L           Show/Hide messages box"
 msgstr ""
 
-#: modules/gui/ncurses.c:1659
+#: modules/gui/ncurses.c:1661
 msgid "     P           Show/Hide playlist box"
 msgstr ""
 
-#: modules/gui/ncurses.c:1660
+#: modules/gui/ncurses.c:1662
 msgid "     B           Show/Hide filebrowser"
 msgstr ""
 
-#: modules/gui/ncurses.c:1661
+#: modules/gui/ncurses.c:1663
 msgid "     x           Show/Hide objects box"
 msgstr ""
 
-#: modules/gui/ncurses.c:1662
+#: modules/gui/ncurses.c:1664
 msgid "     S           Show/Hide statistics box"
 msgstr ""
 
-#: modules/gui/ncurses.c:1663
+#: modules/gui/ncurses.c:1665
 msgid "     c           Switch color on/off"
 msgstr ""
 
-#: modules/gui/ncurses.c:1664
+#: modules/gui/ncurses.c:1666
 msgid "     Esc         Close Add/Search entry"
 msgstr ""
 
-#: modules/gui/ncurses.c:1669
+#: modules/gui/ncurses.c:1671
 #, fuzzy
 msgid "[Global]"
 msgstr "全域增益"
 
-#: modules/gui/ncurses.c:1672
+#: modules/gui/ncurses.c:1674
 msgid "     q, Q, Esc   Quit"
 msgstr ""
 
-#: modules/gui/ncurses.c:1673
+#: modules/gui/ncurses.c:1675
 msgid "     s           Stop"
 msgstr ""
 
-#: modules/gui/ncurses.c:1674
+#: modules/gui/ncurses.c:1676
 msgid "     <space>     Pause/Play"
 msgstr ""
 
-#: modules/gui/ncurses.c:1675
+#: modules/gui/ncurses.c:1677
 msgid "     f           Toggle Fullscreen"
 msgstr ""
 
-#: modules/gui/ncurses.c:1676
+#: modules/gui/ncurses.c:1678
 #, fuzzy
 msgid "     n, p        Next/Previous playlist item"
 msgstr "前一个播放列表项目"
 
-#: modules/gui/ncurses.c:1677
+#: modules/gui/ncurses.c:1679
 msgid "     [, ]        Next/Previous title"
 msgstr ""
 
-#: modules/gui/ncurses.c:1678
+#: modules/gui/ncurses.c:1680
 msgid "     <, >        Next/Previous chapter"
 msgstr ""
 
-#: modules/gui/ncurses.c:1679
+#: modules/gui/ncurses.c:1681
 #, c-format
 msgid "     <right>     Seek +1%%"
 msgstr ""
 
-#: modules/gui/ncurses.c:1680
+#: modules/gui/ncurses.c:1682
 #, c-format
 msgid "     <left>      Seek -1%%"
 msgstr ""
 
-#: modules/gui/ncurses.c:1681
+#: modules/gui/ncurses.c:1683
 msgid "     a           Volume Up"
 msgstr ""
 
-#: modules/gui/ncurses.c:1682
+#: modules/gui/ncurses.c:1684
 msgid "     z           Volume Down"
 msgstr ""
 
-#: modules/gui/ncurses.c:1687
+#: modules/gui/ncurses.c:1689
 #, fuzzy
 msgid "[Playlist]"
 msgstr "播放列表"
 
-#: modules/gui/ncurses.c:1690
+#: modules/gui/ncurses.c:1692
 msgid "     r           Toggle Random playing"
 msgstr ""
 
-#: modules/gui/ncurses.c:1691
+#: modules/gui/ncurses.c:1693
 msgid "     l           Toggle Loop Playlist"
 msgstr ""
 
-#: modules/gui/ncurses.c:1692
+#: modules/gui/ncurses.c:1694
 msgid "     R           Toggle Repeat item"
 msgstr ""
 
-#: modules/gui/ncurses.c:1693
+#: modules/gui/ncurses.c:1695
 msgid "     o           Order Playlist by title"
 msgstr ""
 
-#: modules/gui/ncurses.c:1694
+#: modules/gui/ncurses.c:1696
 msgid "     O           Reverse order Playlist by title"
 msgstr ""
 
-#: modules/gui/ncurses.c:1695
+#: modules/gui/ncurses.c:1697
 msgid "     g           Go to the current playing item"
 msgstr ""
 
-#: modules/gui/ncurses.c:1696
+#: modules/gui/ncurses.c:1698
 msgid "     /           Look for an item"
 msgstr ""
 
-#: modules/gui/ncurses.c:1697
+#: modules/gui/ncurses.c:1699
 msgid "     A           Add an entry"
 msgstr ""
 
-#: modules/gui/ncurses.c:1698
+#: modules/gui/ncurses.c:1700
 msgid "     D, <del>    Delete an entry"
 msgstr ""
 
-#: modules/gui/ncurses.c:1699
+#: modules/gui/ncurses.c:1701
 msgid "     <backspace> Delete an entry"
 msgstr ""
 
-#: modules/gui/ncurses.c:1700
+#: modules/gui/ncurses.c:1702
 msgid "     e           Eject (if stopped)"
 msgstr ""
 
-#: modules/gui/ncurses.c:1705
+#: modules/gui/ncurses.c:1707
 #, fuzzy
 msgid "[Filebrowser]"
 msgstr "过滤器"
 
-#: modules/gui/ncurses.c:1708
+#: modules/gui/ncurses.c:1710
 msgid "     <enter>     Add the selected file to the playlist"
 msgstr ""
 
-#: modules/gui/ncurses.c:1709
+#: modules/gui/ncurses.c:1711
 msgid "     <space>     Add the selected directory to the playlist"
 msgstr ""
 
-#: modules/gui/ncurses.c:1710
+#: modules/gui/ncurses.c:1712
 msgid "     .           Show/Hide hidden files"
 msgstr ""
 
-#: modules/gui/ncurses.c:1715
+#: modules/gui/ncurses.c:1717
 msgid "[Boxes]"
 msgstr ""
 
-#: modules/gui/ncurses.c:1718
+#: modules/gui/ncurses.c:1720
 msgid "     <up>,<down>     Navigate through the box line by line"
 msgstr ""
 
-#: modules/gui/ncurses.c:1719
+#: modules/gui/ncurses.c:1721
 msgid "     <pgup>,<pgdown> Navigate through the box page by page"
 msgstr ""
 
-#: modules/gui/ncurses.c:1724
+#: modules/gui/ncurses.c:1726
 #, fuzzy
 msgid "[Player]"
 msgstr "播放"
 
-#: modules/gui/ncurses.c:1727
+#: modules/gui/ncurses.c:1729
 #, c-format
 msgid "     <up>,<down>     Seek +/-5%%"
 msgstr ""
 
-#: modules/gui/ncurses.c:1732
+#: modules/gui/ncurses.c:1734
 #, fuzzy
 msgid "[Miscellaneous]"
 msgstr "杂项"
 
-#: modules/gui/ncurses.c:1735
+#: modules/gui/ncurses.c:1737
 msgid "     Ctrl-l          Refresh the screen"
 msgstr ""
 
-#: modules/gui/ncurses.c:1756
+#: modules/gui/ncurses.c:1758
 #, fuzzy
 msgid " Information "
 msgstr "信息"
 
-#: modules/gui/ncurses.c:1768
+#: modules/gui/ncurses.c:1770
 #, c-format
 msgid "  [%s]"
 msgstr ""
 
-#: modules/gui/ncurses.c:1775
+#: modules/gui/ncurses.c:1777
 #, c-format
 msgid "      %s: %s"
 msgstr ""
 
-#: modules/gui/ncurses.c:1782 modules/gui/ncurses.c:1870
+#: modules/gui/ncurses.c:1784 modules/gui/ncurses.c:1872
 #, fuzzy
 msgid "No item currently playing"
 msgstr "播放列表中没有项目"
 
-#: modules/gui/ncurses.c:1893
+#: modules/gui/ncurses.c:1895
 #, fuzzy
 msgid " Logs "
 msgstr "Logo"
 
-#: modules/gui/ncurses.c:1936
+#: modules/gui/ncurses.c:1938
 #, fuzzy
 msgid " Browse "
 msgstr "浏览..."
 
-#: modules/gui/ncurses.c:1991
+#: modules/gui/ncurses.c:1993
 msgid " Objects "
 msgstr ""
 
-#: modules/gui/ncurses.c:2005
+#: modules/gui/ncurses.c:2007
 #, fuzzy
 msgid " Stats "
 msgstr "设置(&S)"
 
-#: modules/gui/ncurses.c:2094
+#: modules/gui/ncurses.c:2096
 #, c-format
 msgid "\\ sending bitrate  :   %6.0f kb/s"
 msgstr ""
 
-#: modules/gui/ncurses.c:2127
+#: modules/gui/ncurses.c:2129
 msgid " Playlist (All, one level) "
 msgstr ""
 
-#: modules/gui/ncurses.c:2130
+#: modules/gui/ncurses.c:2132
 #, fuzzy
 msgid " Playlist (By category) "
 msgstr "按类别"
 
-#: modules/gui/ncurses.c:2133
+#: modules/gui/ncurses.c:2135
 #, fuzzy
 msgid " Playlist (Manually added) "
 msgstr "手动增加"
 
-#: modules/gui/ncurses.c:2221 modules/gui/ncurses.c:2225
+#: modules/gui/ncurses.c:2223 modules/gui/ncurses.c:2227
 #, c-format
 msgid "Find: %s"
 msgstr ""
 
-#: modules/gui/ncurses.c:2234
+#: modules/gui/ncurses.c:2236
 #, fuzzy, c-format
 msgid "Open: %s"
 msgstr "打开:"
@@ -15361,6 +15303,10 @@ msgstr "频道:"
 msgid "Norm:"
 msgstr "规范:"
 
+#: modules/gui/pda/pda_interface.c:609 modules/gui/qt4/ui/open_file.ui:90
+msgid "Size:"
+msgstr "大小:"
+
 #: modules/gui/pda/pda_interface.c:618
 msgid "Frequency:"
 msgstr "频率:"
@@ -15614,7 +15560,7 @@ msgstr "SLP 通告:"
 msgid "Announce Channel:"
 msgstr "通告频道:"
 
-#: modules/gui/pda/pda_interface.c:1247 modules/gui/qt4/dialogs/help.cpp:205
+#: modules/gui/pda/pda_interface.c:1247 modules/gui/qt4/dialogs/help.cpp:206
 #: modules/gui/qt4/ui/video_effects.ui:996
 msgid "Update"
 msgstr "更新"
@@ -15736,9 +15682,9 @@ msgstr ""
 msgid "Sent bitrate"
 msgstr "发送率"
 
-#: modules/gui/qt4/components/interface_widgets.cpp:253
+#: modules/gui/qt4/components/interface_widgets.cpp:254
 #, fuzzy
-msgid "Current visualization:"
+msgid "Current visualization"
 msgstr "音频视觉效果"
 
 #: modules/gui/qt4/components/interface_widgets.cpp:310
@@ -15748,7 +15694,7 @@ msgstr "到 "
 
 #: modules/gui/qt4/components/interface_widgets.cpp:319
 #, fuzzy
-msgid "Frame by Frame"
+msgid "Frame by frame"
 msgstr "帧率"
 
 #: modules/gui/qt4/components/interface_widgets.cpp:332
@@ -15766,7 +15712,7 @@ msgid "Teletext on"
 msgstr "字体字幕译码器"
 
 #: modules/gui/qt4/components/interface_widgets.cpp:536
-#: modules/gui/qt4/components/interface_widgets.cpp:693
+#: modules/gui/qt4/components/interface_widgets.cpp:703
 #, fuzzy
 msgid "Teletext"
 msgstr "字体字幕译码器"
@@ -15778,15 +15724,15 @@ msgstr "保存播放列表"
 
 #: modules/gui/qt4/components/interface_widgets.cpp:619
 #, fuzzy
-msgid "Extended Settings"
+msgid "Extended settings"
 msgstr "编码器设置"
 
-#: modules/gui/qt4/components/interface_widgets.cpp:699
+#: modules/gui/qt4/components/interface_widgets.cpp:709
 #, fuzzy
 msgid "Transparent"
 msgstr "透明"
 
-#: modules/gui/qt4/components/interface_widgets.cpp:1225
+#: modules/gui/qt4/components/interface_widgets.cpp:1235
 msgid "Revert to normal play speed"
 msgstr ""
 
@@ -15809,64 +15755,64 @@ msgstr "过滤器"
 msgid "Open subtitles file"
 msgstr "打开字幕文件"
 
-#: modules/gui/qt4/components/open_panels.cpp:389
+#: modules/gui/qt4/components/open_panels.cpp:392
 #, fuzzy
 msgid "Open a device or a VIDEO_TS directory"
 msgstr "开启VIDEO_TS目录"
 
-#: modules/gui/qt4/components/open_panels.cpp:609
-#: modules/gui/qt4/components/open_panels.cpp:865
+#: modules/gui/qt4/components/open_panels.cpp:610
+#: modules/gui/qt4/components/open_panels.cpp:866
 #, fuzzy
 msgid "DVB Type:"
 msgstr "光盘类型"
 
-#: modules/gui/qt4/components/open_panels.cpp:633
-#: modules/gui/qt4/components/open_panels.cpp:895
+#: modules/gui/qt4/components/open_panels.cpp:634
+#: modules/gui/qt4/components/open_panels.cpp:896
 msgid "Transponder symbol rate"
 msgstr ""
 
-#: modules/gui/qt4/components/open_panels.cpp:755
+#: modules/gui/qt4/components/open_panels.cpp:756
 #, fuzzy
 msgid "Channels:"
 msgstr "频道"
 
-#: modules/gui/qt4/components/open_panels.cpp:768
+#: modules/gui/qt4/components/open_panels.cpp:769
 #, fuzzy
 msgid "Selected ports:"
 msgstr "画面输入"
 
-#: modules/gui/qt4/components/open_panels.cpp:771
+#: modules/gui/qt4/components/open_panels.cpp:772
 msgid ".*"
 msgstr ""
 
-#: modules/gui/qt4/components/open_panels.cpp:776
+#: modules/gui/qt4/components/open_panels.cpp:777
 #, fuzzy
 msgid "Input caching:"
 msgstr "输入已改变"
 
-#: modules/gui/qt4/components/open_panels.cpp:786
+#: modules/gui/qt4/components/open_panels.cpp:787
 #, fuzzy
 msgid "Use VLC pace"
 msgstr "使用SAP缓存"
 
-#: modules/gui/qt4/components/open_panels.cpp:790
+#: modules/gui/qt4/components/open_panels.cpp:791
 #, fuzzy
 msgid "Auto connnection"
 msgstr "自动重新连接"
 
-#: modules/gui/qt4/components/open_panels.cpp:814
+#: modules/gui/qt4/components/open_panels.cpp:815
 #, fuzzy
 msgid "Radio device name"
 msgstr "音频装置名称"
 
-#: modules/gui/qt4/components/open_panels.cpp:1100
-#: modules/gui/qt4/ui/open_capture.ui:77
-msgid "Advanced options..."
-msgstr "高级选项..."
+#: modules/gui/qt4/components/open_panels.cpp:1101
+#, fuzzy
+msgid "Advanced Options"
+msgstr "高级选项"
 
 #: modules/gui/qt4/components/playlist/playlist.cpp:75
 #, fuzzy
-msgid "Double click to get media informations"
+msgid "Double click to get media information"
 msgstr "选择你的视频编码器，点击以显示更多信息"
 
 #: modules/gui/qt4/components/playlist/standardpanel.cpp:144
@@ -15892,35 +15838,30 @@ msgstr ""
 msgid "Set"
 msgstr "选择"
 
-#: modules/gui/qt4/components/preferences_widgets.cpp:1238
+#: modules/gui/qt4/components/preferences_widgets.cpp:1239
 #, fuzzy
 msgid "Unset"
 msgstr "用户"
 
-#: modules/gui/qt4/components/preferences_widgets.cpp:1276
+#: modules/gui/qt4/components/preferences_widgets.cpp:1277
 #, fuzzy
 msgid "Hotkey for "
 msgstr "热键"
 
-#: modules/gui/qt4/components/preferences_widgets.cpp:1279
+#: modules/gui/qt4/components/preferences_widgets.cpp:1280
 msgid "Press the new keys for "
 msgstr ""
 
-#: modules/gui/qt4/components/preferences_widgets.cpp:1304
+#: modules/gui/qt4/components/preferences_widgets.cpp:1305
 msgid "Warning: the key is already assigned to \""
 msgstr ""
 
-#: modules/gui/qt4/components/preferences_widgets.cpp:1324
-#: modules/gui/qt4/components/preferences_widgets.cpp:1332
+#: modules/gui/qt4/components/preferences_widgets.cpp:1325
+#: modules/gui/qt4/components/preferences_widgets.cpp:1333
 #, fuzzy
 msgid "Key: "
 msgstr "密钥"
 
-#: modules/gui/qt4/components/simple_preferences.cpp:80
-#, fuzzy
-msgid "Input and Codecs"
-msgstr "输入 / 编码器"
-
 #: modules/gui/qt4/components/simple_preferences.cpp:220
 #, fuzzy
 msgid "Device:"
@@ -15931,50 +15872,53 @@ msgstr "设备"
 msgid "Input & Codecs Settings"
 msgstr "输入 / 编码器"
 
-#: modules/gui/qt4/components/simple_preferences.cpp:356
+#: modules/gui/qt4/components/simple_preferences.cpp:355
 msgid ""
-"If this property is blank, then you have\n"
-"values for DVD, VCD, and CDDA.\n"
-"You can define a unique one or set that inthe advanced preferences"
+"If this property is blank, different values\n"
+"for DVD, VCD, and CDDA are set.\n"
+"You can define a unique one or configure them \n"
+"individually in the advanced preferences."
 msgstr ""
 
-#: modules/gui/qt4/components/simple_preferences.cpp:535
+#: modules/gui/qt4/components/simple_preferences.cpp:533
 #, fuzzy
 msgid "Configure Hotkeys"
 msgstr "配置"
 
-#: modules/gui/qt4/components/simple_preferences.cpp:744
+#: modules/gui/qt4/components/simple_preferences.cpp:742
 #: modules/gui/qt4/dialogs_provider.hpp:54
 #, fuzzy
 msgid "Audio Files"
 msgstr "音频滤波器"
 
-#: modules/gui/qt4/components/simple_preferences.cpp:745
+#: modules/gui/qt4/components/simple_preferences.cpp:743
 #: modules/gui/qt4/dialogs_provider.hpp:49
 #, fuzzy
 msgid "Video Files"
 msgstr "视频过滤器"
 
-#: modules/gui/qt4/components/simple_preferences.cpp:746
+#: modules/gui/qt4/components/simple_preferences.cpp:744
 #: modules/gui/qt4/dialogs_provider.hpp:59
 #, fuzzy
 msgid "Playlist Files"
 msgstr "播放列表视图"
 
-#: modules/gui/qt4/components/simple_preferences.cpp:793
+#: modules/gui/qt4/components/simple_preferences.cpp:791
 #, fuzzy
 msgid "&Apply"
 msgstr "应用"
 
-#: modules/gui/qt4/components/simple_preferences.cpp:794
+#: modules/gui/qt4/components/simple_preferences.cpp:792
 #: modules/gui/qt4/dialogs/gototime.cpp:52 modules/gui/qt4/dialogs/open.cpp:99
+#: modules/gui/qt4/dialogs/podcast_configuration.cpp:38
 #: modules/gui/qt4/dialogs/preferences.cpp:80
-#: modules/gui/qt4/dialogs/sout.cpp:130
+#: modules/gui/qt4/dialogs/sout.cpp:185
 msgid "&Cancel"
 msgstr "取消(&C)"
 
 #: modules/gui/qt4/dialogs/bookmarks.cpp:40
-msgid "Edit bookmark"
+#, fuzzy
+msgid "Edit Bookmarks"
 msgstr "编辑书签"
 
 #: modules/gui/qt4/dialogs/bookmarks.cpp:58
@@ -15985,10 +15929,12 @@ msgstr "字节"
 msgid "Errors"
 msgstr "错误"
 
-#: modules/gui/qt4/dialogs/errors.cpp:50 modules/gui/qt4/dialogs/help.cpp:65
-#: modules/gui/qt4/dialogs/help.cpp:97 modules/gui/qt4/dialogs/help.cpp:209
+#: modules/gui/qt4/dialogs/errors.cpp:50
+#: modules/gui/qt4/dialogs/extended.cpp:85 modules/gui/qt4/dialogs/help.cpp:65
+#: modules/gui/qt4/dialogs/help.cpp:97 modules/gui/qt4/dialogs/help.cpp:210
+#: modules/gui/qt4/dialogs/interaction.cpp:194
 #: modules/gui/qt4/dialogs/mediainfo.cpp:77
-#: modules/gui/qt4/dialogs/messages.cpp:82
+#: modules/gui/qt4/dialogs/messages.cpp:82 modules/gui/qt4/dialogs/vlm.cpp:139
 msgid "&Close"
 msgstr "关闭(&C)"
 
@@ -16030,7 +15976,7 @@ msgstr "音频编码器"
 
 #: modules/gui/qt4/dialogs/extended.cpp:75
 #, fuzzy
-msgid "Synchronisation"
+msgid "Synchronization"
 msgstr "时钟同步"
 
 #: modules/gui/qt4/dialogs/extended.cpp:80
@@ -16039,9 +15985,8 @@ msgid "v4l2 controls"
 msgstr "控制"
 
 #: modules/gui/qt4/dialogs/gototime.cpp:46
-#: modules/gui/qt4/dialogs/gototime.cpp:62
 #, fuzzy
-msgid "Go to time"
+msgid "Go to Time"
 msgstr "前往标题"
 
 #: modules/gui/qt4/dialogs/gototime.cpp:51
@@ -16049,6 +15994,11 @@ msgstr "前往标题"
 msgid "&Go"
 msgstr "否(&N)"
 
+#: modules/gui/qt4/dialogs/gototime.cpp:62
+#, fuzzy
+msgid "Go to time"
+msgstr "前往标题"
+
 #: modules/gui/qt4/dialogs/help.cpp:102
 #, fuzzy
 msgid "VLC media player "
@@ -16058,73 +16008,74 @@ msgstr "VLC多媒体播放程序"
 msgid ""
 "VLC media player is a free media player, encoder and streamer that can read "
 "from files, CDs, DVDs, network streams, capture cards and even more!\n"
-"Also, VLC works on essentially every popular platform.\n"
+"VLC uses its internal codecs and works on essentially every popular "
+"platform.\n"
 "\n"
 msgstr ""
 
-#: modules/gui/qt4/dialogs/help.cpp:121
+#: modules/gui/qt4/dialogs/help.cpp:122
 #, fuzzy
 msgid ""
 "This version of VLC was compiled by:\n"
 " "
 msgstr "此版本的 VLC 不是最新的。"
 
-#: modules/gui/qt4/dialogs/help.cpp:125 modules/gui/wince/interface.cpp:508
+#: modules/gui/qt4/dialogs/help.cpp:126 modules/gui/wince/interface.cpp:508
 msgid "Based on Git commit: "
 msgstr ""
 
-#: modules/gui/qt4/dialogs/help.cpp:126
+#: modules/gui/qt4/dialogs/help.cpp:127
 msgid ""
 "You are using the Qt4 Interface.\n"
 "\n"
 msgstr ""
 
-#: modules/gui/qt4/dialogs/help.cpp:127
+#: modules/gui/qt4/dialogs/help.cpp:128
 #, fuzzy
 msgid "Copyright (C) "
 msgstr "版权"
 
-#: modules/gui/qt4/dialogs/help.cpp:148
+#: modules/gui/qt4/dialogs/help.cpp:149
 msgid ""
-"We would like to thank the whole community, the testers, our users and the "
-"following people (and the missing ones...) for their collaboration to "
-"provide the best software."
+"We would like to thank the whole VLC community, the testers, our users and "
+"the following people (and the missing ones...) for their collaboration to "
+"create the best free software."
 msgstr ""
 
-#: modules/gui/qt4/dialogs/help.cpp:166
+#: modules/gui/qt4/dialogs/help.cpp:167
 msgid "Authors"
 msgstr "作者"
 
-#: modules/gui/qt4/dialogs/help.cpp:167
+#: modules/gui/qt4/dialogs/help.cpp:168
 #, fuzzy
 msgid "Thanks"
 msgstr "轨道"
 
-#: modules/gui/qt4/dialogs/help.cpp:210
+#: modules/gui/qt4/dialogs/help.cpp:211
 #, fuzzy
 msgid "&Update List"
 msgstr "更新"
 
-#: modules/gui/qt4/dialogs/help.cpp:216
+#: modules/gui/qt4/dialogs/help.cpp:217
 #, fuzzy
 msgid "Checking for an update..."
 msgstr "正在检查更新..."
 
-#: modules/gui/qt4/dialogs/help.cpp:259
+#: modules/gui/qt4/dialogs/help.cpp:260
 #, fuzzy
-msgid "Select a directory ..."
+msgid "Select a directory..."
 msgstr "选择一个目录"
 
-#: modules/gui/qt4/dialogs/help.cpp:293
+#: modules/gui/qt4/dialogs/help.cpp:294
 #, fuzzy
 msgid "There is a new version of VLC :\n"
 msgstr "此版本的 VLC 不是最新的。"
 
-#: modules/gui/qt4/dialogs/help.cpp:300
+#: modules/gui/qt4/dialogs/help.cpp:301
 msgid "You have the latest version of VLC"
 msgstr ""
 
-#: modules/gui/qt4/dialogs/help.cpp:304
+#: modules/gui/qt4/dialogs/help.cpp:305
 msgid "An error occurred while checking for updates"
 msgstr ""
 
@@ -16132,16 +16083,6 @@ msgstr ""
 msgid "Login"
 msgstr "登录"
 
-#: modules/gui/qt4/dialogs/interaction.cpp:194
-#, fuzzy
-msgid "close"
-msgstr "关闭"
-
-#: modules/gui/qt4/dialogs/mediainfo.cpp:55
-#, fuzzy
-msgid "Media information"
-msgstr "元信息"
-
 #: modules/gui/qt4/dialogs/mediainfo.cpp:61
 #, fuzzy
 msgid "&General"
@@ -16169,7 +16110,7 @@ msgstr "元信息"
 
 #: modules/gui/qt4/dialogs/mediainfo.cpp:81
 #, fuzzy
-msgid "Location :"
+msgid "Location:"
 msgstr "拉丁文"
 
 #: modules/gui/qt4/dialogs/messages.cpp:78
@@ -16194,8 +16135,8 @@ msgstr "更新"
 
 #: modules/gui/qt4/dialogs/messages.cpp:247
 #, fuzzy
-msgid "Choose a filename to save the logs under..."
-msgstr "你必须选择文件以另存"
+msgid "Select a name for the logs file"
+msgstr "选择文件以保存到"
 
 #: modules/gui/qt4/dialogs/messages.cpp:249
 msgid "Texts / Logs (*.log *.txt);; All (*.*) "
@@ -16226,6 +16167,11 @@ msgstr "网络"
 msgid "Capture &Device"
 msgstr "打开获取装置(&C)"
 
+#: modules/gui/qt4/dialogs/open.cpp:102
+#, fuzzy
+msgid "&Select"
+msgstr "选择"
+
 #: modules/gui/qt4/dialogs/open.cpp:106 modules/gui/qt4/dialogs/open.cpp:186
 msgid "&Enqueue"
 msgstr ""
@@ -16236,7 +16182,7 @@ msgid "&Play"
 msgstr "播放"
 
 #: modules/gui/qt4/dialogs/open.cpp:110 modules/gui/qt4/dialogs/open.cpp:180
-#: modules/gui/qt4/dialogs/sout.cpp:129
+#: modules/gui/qt4/dialogs/sout.cpp:184
 #, fuzzy
 msgid "&Stream"
 msgstr "串流"
@@ -16251,6 +16197,11 @@ msgstr "色彩反向"
 msgid "&Convert / Save"
 msgstr "色彩反向"
 
+#: modules/gui/qt4/dialogs/preferences.cpp:65
+#, fuzzy
+msgid "Simple"
+msgstr "波纹"
+
 #: modules/gui/qt4/dialogs/preferences.cpp:79
 msgid "&Save"
 msgstr "保存(&S)"
@@ -16311,18 +16262,23 @@ msgstr "字幕文件"
 msgid "All Files"
 msgstr "文件"
 
-#: modules/gui/qt4/dialogs/sout.cpp:97
+#: modules/gui/qt4/dialogs/sout.cpp:99 modules/gui/qt4/ui/sout.ui:20
+#, fuzzy
+msgid "Stream Output"
+msgstr "串流输出"
+
+#: modules/gui/qt4/dialogs/sout.cpp:152
 msgid ""
 "Stream output string.\n"
 " This is automatically generated when you change the above settings,\n"
 " but you can update it manually."
 msgstr ""
 
-#: modules/gui/qt4/dialogs/sout.cpp:145
+#: modules/gui/qt4/dialogs/sout.cpp:200
 msgid "Save file"
 msgstr "储存文件"
 
-#: modules/gui/qt4/dialogs/sout.cpp:146
+#: modules/gui/qt4/dialogs/sout.cpp:201
 msgid "Containers (*.ps *.ts *.mpg *.ogg *.asf *.mp4 *.mov *.wav *.raw *.flv)"
 msgstr ""
 
@@ -16370,12 +16326,12 @@ msgstr ""
 
 #: modules/gui/qt4/dialogs/vlm.cpp:336
 #, fuzzy
-msgid "Choose a VLM configuration file to open..."
+msgid "Open a VLM Configuration File"
 msgstr "VLM设置档"
 
 #: modules/gui/qt4/main_interface.cpp:470
 #, fuzzy
-msgid "Privacy and Network policies"
+msgid "Privacy and Network Policies"
 msgstr "界面互动"
 
 #: modules/gui/qt4/main_interface.cpp:474
@@ -16388,19 +16344,18 @@ msgid ""
 "<p>The <i>VideoLAN Team</i> doesn't like when an application goes online "
 "without authorization.</p>\n"
 " <p><i>VLC media player</i> can request limited information on the Internet, "
-"especially to get CD covers and songs metadata or to know if updates are "
-"available.</p>\n"
+"especially to get CD covers or to know if updates are available.</p>\n"
 "<p><i>VLC media player</i> <b>DOES NOT</b> send or collect <b>ANY</b> "
 "information, even anonymously, about your usage.</p>\n"
 "<p>Therefore please check the following options, the default being almost no "
 "access on the web.</p>\n"
 msgstr ""
 
-#: modules/gui/qt4/main_interface.cpp:1010
+#: modules/gui/qt4/main_interface.cpp:1002
 msgid "Control menu for the player"
 msgstr ""
 
-#: modules/gui/qt4/main_interface.cpp:1059
+#: modules/gui/qt4/main_interface.cpp:1051
 msgid "Paused"
 msgstr "暂停"
 
@@ -16475,7 +16430,7 @@ msgstr "保存播放列表"
 
 #: modules/gui/qt4/menus.cpp:331
 #, fuzzy
-msgid "Undock from interface"
+msgid "Undock from Interface"
 msgstr "控制界面"
 
 #: modules/gui/qt4/menus.cpp:332
@@ -16510,7 +16465,7 @@ msgstr "Telnet 界面"
 
 #: modules/gui/qt4/menus.cpp:385
 #, fuzzy
-msgid "Advanced controls"
+msgid "Advanced Controls"
 msgstr "高级选项"
 
 #: modules/gui/qt4/menus.cpp:391
@@ -16618,8 +16573,7 @@ msgid "Help..."
 msgstr "帮助"
 
 #: modules/gui/qt4/menus.cpp:615
-#, fuzzy
-msgid "Check for updates..."
+msgid "Check for Updates..."
 msgstr "检查更新..."
 
 #: modules/gui/qt4/menus.cpp:674
@@ -16649,7 +16603,7 @@ msgstr "开启"
 
 #: modules/gui/qt4/qt4.cpp:66
 #, fuzzy
-msgid "Show advanced prefs over simple ones"
+msgid "Show advanced preferences over simple ones"
 msgstr "显示高级选项"
 
 #: modules/gui/qt4/qt4.cpp:67
@@ -16665,7 +16619,7 @@ msgstr "托盘图标"
 #: modules/gui/qt4/qt4.cpp:72
 msgid ""
 "Show an icon in the systray allowing you to control VLC media player for "
-"basic actions"
+"basic actions."
 msgstr ""
 
 #: modules/gui/qt4/qt4.cpp:76
@@ -16673,65 +16627,63 @@ msgid "Start VLC with only a systray icon"
 msgstr ""
 
 #: modules/gui/qt4/qt4.cpp:77
-msgid ""
-"When you launch VLC with that option, VLC will start with just an icon "
-"inyour taskbar"
+msgid "VLC will start with just an icon in your taskbar"
 msgstr ""
 
-#: modules/gui/qt4/qt4.cpp:81
+#: modules/gui/qt4/qt4.cpp:80
 msgid "Show playing item name in window title"
 msgstr ""
 
-#: modules/gui/qt4/qt4.cpp:82
-msgid "Show the name of the song or video in the controler window title"
+#: modules/gui/qt4/qt4.cpp:81
+msgid "Show the name of the song or video in the controler window title."
 msgstr ""
 
-#: modules/gui/qt4/qt4.cpp:85
+#: modules/gui/qt4/qt4.cpp:84
 msgid "Path to use in openfile dialog"
 msgstr ""
 
-#: modules/gui/qt4/qt4.cpp:87
+#: modules/gui/qt4/qt4.cpp:86
 msgid "Show notification popup on track change"
 msgstr ""
 
-#: modules/gui/qt4/qt4.cpp:89
+#: modules/gui/qt4/qt4.cpp:88
 msgid ""
 "Show a notification popup with the artist and track name when the current "
 "playlist item changes, when VLC is minimized or hidden."
 msgstr ""
 
-#: modules/gui/qt4/qt4.cpp:92
+#: modules/gui/qt4/qt4.cpp:91
 msgid "Advanced options"
 msgstr "高级选项"
 
-#: modules/gui/qt4/qt4.cpp:93
+#: modules/gui/qt4/qt4.cpp:92
 #, fuzzy
-msgid "Show all the advanced options in the dialogs"
+msgid "Show all the advanced options in the dialogs."
 msgstr "显示高级选项"
 
-#: modules/gui/qt4/qt4.cpp:96
+#: modules/gui/qt4/qt4.cpp:95
 msgid "Windows opacity between 0.1 and 1."
 msgstr ""
 
-#: modules/gui/qt4/qt4.cpp:97
+#: modules/gui/qt4/qt4.cpp:96
 msgid ""
 "Sets the windows opacity between 0.1 and 1 for main interface, playlist and "
 "extended panel. This option only works with Windows and X11 with composite "
 "extensions."
 msgstr ""
 
-#: modules/gui/qt4/qt4.cpp:102
+#: modules/gui/qt4/qt4.cpp:101
 msgid "Show unimportant error and warnings dialogs"
 msgstr ""
 
-#: modules/gui/qt4/qt4.cpp:104
+#: modules/gui/qt4/qt4.cpp:103
 msgid "Activate the updates availability notification"
 msgstr ""
 
-#: modules/gui/qt4/qt4.cpp:105
+#: modules/gui/qt4/qt4.cpp:104
 msgid ""
 "Activate the automatic notification of new versions of the software. It runs "
-"once a week."
+"once every two weeks."
 msgstr ""
 
 #: modules/gui/qt4/qt4.cpp:107
@@ -16763,15 +16715,15 @@ msgstr ""
 
 #: modules/gui/qt4/qt4.cpp:121
 #, fuzzy
-msgid "Define the colours of the volume slider "
+msgid "Define the colors of the volume slider "
 msgstr "反转图像颜色"
 
 #: modules/gui/qt4/qt4.cpp:122
 msgid ""
-"Define the colours of the volume slider\n"
-" By specifying the 12 numbers separated by a ';'\n"
-" Default is '255;255;255;20;226;20;255;176;15;235;30;20'\n"
-" An alternative can be '30;30;50;40;40;100;50;50;160;150;150;255' "
+"Define the colors of the volume slider\n"
+"By specifying the 12 numbers separated by a ';'\n"
+"Default is '255;255;255;20;226;20;255;176;15;235;30;20'\n"
+"An alternative can be '30;30;50;40;40;100;50;50;160;150;150;255' "
 msgstr ""
 
 #: modules/gui/qt4/qt4.cpp:127
@@ -16786,7 +16738,7 @@ msgstr ""
 msgid ""
 "Start VLC with:\n"
 " - normal mode\n"
-" - a zone always present to show informationas lyrics, album arts...\n"
+" - a zone always present to show information as lyrics, album arts...\n"
 " - minimal mode with limited controls"
 msgstr ""
 
@@ -16814,7 +16766,7 @@ msgstr "预解释"
 
 #: modules/gui/qt4/ui/open_capture.ui:17
 #, fuzzy
-msgid "Capture Mode"
+msgid "Capture mode"
 msgstr "章节编码器"
 
 #: modules/gui/qt4/ui/open_capture.ui:30
@@ -16827,7 +16779,7 @@ msgstr "选择目录以保存到"
 msgid "Card Selection"
 msgstr "选择(&S)"
 
-#: modules/gui/qt4/ui/open_capture.ui:51 modules/gui/qt4/ui/open_net.ui:98
+#: modules/gui/qt4/ui/open_capture.ui:51 modules/gui/qt4/ui/open_net.ui:101
 msgid "Options"
 msgstr "选项"
 
@@ -16835,20 +16787,19 @@ msgstr "选项"
 msgid "Access advanced options to tweak the device"
 msgstr ""
 
+#: modules/gui/qt4/ui/open_capture.ui:77
+msgid "Advanced options..."
+msgstr "高级选项..."
+
 #: modules/gui/qt4/ui/open_disk.ui:20
 #, fuzzy
-msgid "Disc selection"
+msgid "Disc Selection"
 msgstr "无效的选择"
 
 #: modules/gui/qt4/ui/open_disk.ui:105
 msgid "Disable DVD Menus (for compatibility)"
 msgstr ""
 
-#: modules/gui/qt4/ui/open_disk.ui:108
-#, fuzzy
-msgid "No DVD Menus"
-msgstr "使用DVD选单"
-
 #: modules/gui/qt4/ui/open_disk.ui:122
 #, fuzzy
 msgid "Disc device"
@@ -16861,7 +16812,7 @@ msgstr "开启VIDEO_TS目录"
 
 #: modules/gui/qt4/ui/open_disk.ui:171
 #, fuzzy
-msgid "Starting position"
+msgid "Starting Position"
 msgstr "子图像位置"
 
 #: modules/gui/qt4/ui/open_disk.ui:238
@@ -16914,7 +16865,7 @@ msgstr "协议"
 msgid "Select the port used"
 msgstr "选择文件"
 
-#: modules/gui/qt4/ui/open_net.ui:82
+#: modules/gui/qt4/ui/open_net.ui:85
 msgid "Enter the URL of the network stream here, with or without the protocol."
 msgstr ""
 
@@ -16971,11 +16922,6 @@ msgstr ""
 msgid "Podcast URLs list"
 msgstr "Podcast URLs 列表"
 
-#: modules/gui/qt4/ui/sout.ui:20
-#, fuzzy
-msgid "Stream Output"
-msgstr "串流输出"
-
 #: modules/gui/qt4/ui/sout.ui:32
 msgid "Outputs"
 msgstr "输出"
@@ -17072,12 +17018,12 @@ msgstr "装置"
 
 #: modules/gui/qt4/ui/sprefs_input.ui:26
 #, fuzzy
-msgid "Disk Device"
-msgstr "设备"
+msgid "Default disc device"
+msgstr "默认设备"
 
 #: modules/gui/qt4/ui/sprefs_input.ui:55
 #, fuzzy
-msgid "Server Default Port"
+msgid "Server default port"
 msgstr "恢复默认值"
 
 #: modules/gui/qt4/ui/sprefs_input.ui:103
@@ -17085,6 +17031,11 @@ msgstr "恢复默认值"
 msgid "Default caching level"
 msgstr "默认 DVD 角度。"
 
+#: modules/gui/qt4/ui/sprefs_input.ui:125
+#, fuzzy
+msgid "Post-Processing quality"
+msgstr "后处理质量"
+
 #: modules/gui/qt4/ui/sprefs_input.ui:151
 msgid "Repair AVI files"
 msgstr ""
@@ -17094,8 +17045,9 @@ msgid "Use system codecs if available (better quality)"
 msgstr ""
 
 #: modules/gui/qt4/ui/sprefs_interface.ui:35
-msgid "Native or Skins"
-msgstr ""
+#, fuzzy
+msgid "Interface Type"
+msgstr "界面"
 
 #: modules/gui/qt4/ui/sprefs_interface.ui:41
 #, fuzzy
@@ -17109,7 +17061,7 @@ msgstr "使用最小界面, 没有工具栏, 很少菜单"
 
 #: modules/gui/qt4/ui/sprefs_interface.ui:73
 #, fuzzy
-msgid "Display Mode"
+msgid "Display mode"
 msgstr "显示"
 
 #: modules/gui/qt4/ui/sprefs_interface.ui:90
@@ -17124,7 +17076,7 @@ msgstr "皮肤"
 
 #: modules/gui/qt4/ui/sprefs_interface.ui:158
 #, fuzzy
-msgid "Skin File"
+msgid "Skin file"
 msgstr "环绕等级"
 
 #: modules/gui/qt4/ui/sprefs_interface.ui:181
@@ -17165,7 +17117,7 @@ msgstr ""
 
 #: modules/gui/qt4/ui/sprefs_subtitles.ui:50
 #, fuzzy
-msgid "Subtitles languages"
+msgid "Subtitles Language"
 msgstr "字幕语言"
 
 #: modules/gui/qt4/ui/sprefs_subtitles.ui:56
@@ -17173,6 +17125,11 @@ msgstr "字幕语言"
 msgid "Preferred subtitles language"
 msgstr "音频语言"
 
+#: modules/gui/qt4/ui/sprefs_subtitles.ui:79
+#, fuzzy
+msgid "Default encoding"
+msgstr "解码"
+
 #: modules/gui/qt4/ui/sprefs_subtitles.ui:114
 #, fuzzy
 msgid "Font color"
@@ -17187,11 +17144,6 @@ msgstr "输出"
 msgid "Accelerated video output"
 msgstr "重叠视频输出"
 
-#: modules/gui/qt4/ui/sprefs_video.ui:101
-#, fuzzy
-msgid "Skip Frames"
-msgstr "跳过帧"
-
 #: modules/gui/qt4/ui/sprefs_video.ui:114
 #, fuzzy
 msgid "DirectX"
@@ -17199,12 +17151,12 @@ msgstr "目录"
 
 #: modules/gui/qt4/ui/sprefs_video.ui:129
 #, fuzzy
-msgid "Display Device"
+msgid "Display device"
 msgstr "显示"
 
 #: modules/gui/qt4/ui/sprefs_video.ui:139
 #, fuzzy
-msgid "Enable Wallpaper Mode"
+msgid "Enable wallpaper mode"
 msgstr "打开壁纸模式"
 
 #: modules/gui/qt4/ui/streampanel.ui:48
@@ -17414,6 +17366,11 @@ msgstr "复制"
 msgid "Number of clones"
 msgstr "复制数量"
 
+#: modules/gui/qt4/ui/video_effects.ui:836
+#: modules/gui/qt4/ui/video_effects.ui:897
+msgid "Logo"
+msgstr "Logo"
+
 #: modules/gui/qt4/ui/video_effects.ui:842
 #, fuzzy
 msgid "Add logo"
@@ -18035,11 +17992,11 @@ msgid ""
 "Visit http://www.last.fm/join/ to get an account."
 msgstr ""
 
-#: modules/misc/audioscrobbler.c:809
+#: modules/misc/audioscrobbler.c:810
 msgid "last.fm: Authentication failed"
 msgstr ""
 
-#: modules/misc/audioscrobbler.c:810
+#: modules/misc/audioscrobbler.c:811
 msgid ""
 "last.fm username or password is incorrect. Please verify your settings and "
 "relaunch VLC."
@@ -18542,11 +18499,11 @@ msgstr "字体渲染"
 msgid "Quartz font renderer"
 msgstr "Freetype2 字体渲染器"
 
-#: modules/misc/rtsp.c:54
+#: modules/misc/rtsp.c:62
 msgid "RTSP host address"
 msgstr "RTSP 主机地址"
 
-#: modules/misc/rtsp.c:56
+#: modules/misc/rtsp.c:64
 msgid ""
 "This defines the address, port and path the RTSP VOD server will listen on.\n"
 "Syntax is address:port/path. The default is to listen on all interfaces "
@@ -18554,25 +18511,25 @@ msgid ""
 "To listen only on the local interface, use \"localhost\" as address."
 msgstr ""
 
-#: modules/misc/rtsp.c:61
+#: modules/misc/rtsp.c:69
 msgid "Maximum number of connections"
 msgstr "最大连接数目"
 
-#: modules/misc/rtsp.c:62
+#: modules/misc/rtsp.c:70
 msgid ""
 "This limits the maximum number of clients that can connect to the RTSP VOD. "
 "0 means no limit."
 msgstr ""
 
-#: modules/misc/rtsp.c:65
+#: modules/misc/rtsp.c:73
 msgid "MUX for RAW RTSP transport"
 msgstr ""
 
-#: modules/misc/rtsp.c:67
+#: modules/misc/rtsp.c:75
 msgid "Sets the timeout option in the RTSP session string"
 msgstr ""
 
-#: modules/misc/rtsp.c:69
+#: modules/misc/rtsp.c:77
 msgid ""
 "Defines what timeout option to add to the RTSP session ID string. Setting it "
 "to a negative number removes the timeout option entirely. This is needed by "
@@ -18580,11 +18537,11 @@ msgid ""
 "The default is 5."
 msgstr ""
 
-#: modules/misc/rtsp.c:75
+#: modules/misc/rtsp.c:83
 msgid "RTSP VoD"
 msgstr "RTSP VoD"
 
-#: modules/misc/rtsp.c:76
+#: modules/misc/rtsp.c:84
 msgid "RTSP VoD server"
 msgstr "RTSP VoD 服务器"
 
@@ -19085,7 +19042,7 @@ msgstr "尝试解析通告"
 #: modules/services_discovery/sap.c:104
 msgid ""
 "This enables actual parsing of the announces by the SAP module. Otherwise, "
-"all announcements are parsed by the \"livedotcom\" (RTP/RTSP) module."
+"all announcements are parsed by the \"live555\" (RTP/RTSP) module."
 msgstr ""
 
 #: modules/services_discovery/sap.c:107
@@ -19123,15 +19080,15 @@ msgstr "SAP 通告"
 msgid "SDP Descriptions parser"
 msgstr "描述文件"
 
-#: modules/services_discovery/sap.c:888 modules/services_discovery/sap.c:892
+#: modules/services_discovery/sap.c:901 modules/services_discovery/sap.c:905
 msgid "Session"
 msgstr "部分"
 
-#: modules/services_discovery/sap.c:888
+#: modules/services_discovery/sap.c:901
 msgid "Tool"
 msgstr "工具"
 
-#: modules/services_discovery/sap.c:892
+#: modules/services_discovery/sap.c:905
 msgid "User"
 msgstr "用户"
 
@@ -19980,7 +19937,7 @@ msgid "Transparency mask"
 msgstr "透明"
 
 #: modules/video_filter/alphamask.c:44
-msgid "Alpha blending transparency mask. Use's a png alpha channel."
+msgid "Alpha blending transparency mask. Uses a png alpha channel."
 msgstr ""
 
 #: modules/video_filter/alphamask.c:63
@@ -19995,433 +19952,436 @@ msgstr "修整视频过滤器"
 
 #: modules/video_filter/atmo/atmo.cpp:120
 msgid ""
-"This module allows to control an so called AtmoLight device which is "
-"connected to your computer.\n"
-"AtmoLight is the homebrew version of that what Philips calls AmbiLight.\n"
-"If you need further informations feel free to visit us at\n"
+"This module allows to control an so called AtmoLight device connected to "
+"your computer.\n"
+"AtmoLight is the homegrown version of what Philips calls AmbiLight.\n"
+"If you need further information feel free to visit us at\n"
 "\n"
 "http://www.vdr-wiki.de/wiki/index.php/Atmo-plugin\n"
-"http://www.vdr-wiki.de/wiki/index.php/AtmoWin\n"
+" http://www.vdr-wiki.de/wiki/index.php/AtmoWin\n"
 "\n"
-"there you will find detailed descriptions how to build it for your self and "
-"where you can get the required parts and so on.\n"
-" There you can also see pictures and some movies showing such a device in "
-"live action..."
+"You can find there detailed descriptions on how to build it for yourself and "
+"where to get the required parts.\n"
+"You can also have a look at pictures and some movies showing such a device "
+"in live action."
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:133
+#: modules/video_filter/atmo/atmo.cpp:134
 #, fuzzy
 msgid "Save Debug Frames"
 msgstr "帧率"
 
-#: modules/video_filter/atmo/atmo.cpp:134
-msgid "Writes every 128th miniframe to a folder."
+#: modules/video_filter/atmo/atmo.cpp:135
+msgid "Write every 128th miniframe to a folder."
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:135
+#: modules/video_filter/atmo/atmo.cpp:136
 msgid "Debug Frame Folder"
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:136
-msgid "defines the path where the debugframes should be saved"
+#: modules/video_filter/atmo/atmo.cpp:137
+msgid "The path where the debugframes should be saved"
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:140
+#: modules/video_filter/atmo/atmo.cpp:141
 #, fuzzy
 msgid "Extracted Image Width"
 msgstr "图像宽度"
-
-#: modules/video_filter/atmo/atmo.cpp:141
-msgid ""
-"defines the width of the mini image for further processing (64 is default)"
+
+#: modules/video_filter/atmo/atmo.cpp:142
+msgid "The width of the mini image for further processing (64 is default)"
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:144
+#: modules/video_filter/atmo/atmo.cpp:145
 #, fuzzy
 msgid "Extracted Image Height"
 msgstr "图像高度"
 
-#: modules/video_filter/atmo/atmo.cpp:145
-msgid ""
-"defines the height of the mini image for further processing (48 is default)"
+#: modules/video_filter/atmo/atmo.cpp:146
+msgid "The height of the mini image for further processing (48 is default)"
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:148
+#: modules/video_filter/atmo/atmo.cpp:149
 #, fuzzy
-msgid "use Pause Color"
-msgstr "仅暂停"
+msgid "Color when paused"
+msgstr "现在下载"
 
-#: modules/video_filter/atmo/atmo.cpp:149
+#: modules/video_filter/atmo/atmo.cpp:150
 msgid ""
-"use the color defined below if the user paused the video.(have light to get "
+"Set the color to show if the user pauses the video. (Have light to get "
 "another beer?)"
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:151
+#: modules/video_filter/atmo/atmo.cpp:153
 #, fuzzy
 msgid "Pause-Red"
 msgstr "暂停"
 
-#: modules/video_filter/atmo/atmo.cpp:152
-msgid "the red component of pause color"
-msgstr ""
+#: modules/video_filter/atmo/atmo.cpp:154
+#, fuzzy
+msgid "Red component of the pause color"
+msgstr "修整视频过滤器"
 
-#: modules/video_filter/atmo/atmo.cpp:153
+#: modules/video_filter/atmo/atmo.cpp:155
 #, fuzzy
 msgid "Pause-Green"
 msgstr "绿色"
 
-#: modules/video_filter/atmo/atmo.cpp:154
-msgid "the green component of pause color"
+#: modules/video_filter/atmo/atmo.cpp:156
+msgid "Green component of the pause color"
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:155
+#: modules/video_filter/atmo/atmo.cpp:157
 #, fuzzy
 msgid "Pause-Blue"
 msgstr "暂停"
 
-#: modules/video_filter/atmo/atmo.cpp:156
-msgid "the blue component of pause color"
+#: modules/video_filter/atmo/atmo.cpp:158
+msgid "Blue component of the pause color"
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:157
+#: modules/video_filter/atmo/atmo.cpp:159
 msgid "Pause-Fadesteps"
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:158
+#: modules/video_filter/atmo/atmo.cpp:160
 msgid ""
 "Number of steps to change current color to pause color (each step takes 40ms)"
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:161
+#: modules/video_filter/atmo/atmo.cpp:163
 #, fuzzy
 msgid "End-Red"
 msgstr "红色"
 
-#: modules/video_filter/atmo/atmo.cpp:162
-msgid "the red component of the shutdown color"
+#: modules/video_filter/atmo/atmo.cpp:164
+msgid "Red component of the shutdown color"
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:163
+#: modules/video_filter/atmo/atmo.cpp:165
 #, fuzzy
 msgid "End-Green"
 msgstr "绿色"
 
-#: modules/video_filter/atmo/atmo.cpp:164
-msgid "the green component of the shutdown color"
+#: modules/video_filter/atmo/atmo.cpp:166
+msgid "Green component of the shutdown color"
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:165
+#: modules/video_filter/atmo/atmo.cpp:167
 #, fuzzy
 msgid "End-Blue"
 msgstr "蓝色"
 
-#: modules/video_filter/atmo/atmo.cpp:166
-msgid "the blue component of the shutdown color"
+#: modules/video_filter/atmo/atmo.cpp:168
+msgid "Blue component of the shutdown color"
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:167
+#: modules/video_filter/atmo/atmo.cpp:169
 msgid "End-Fadesteps"
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:168
+#: modules/video_filter/atmo/atmo.cpp:170
 msgid ""
 "Number of steps to change current color to end color for dimming up the "
 "light in cinema style... (each step takes 40ms)"
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:172
+#: modules/video_filter/atmo/atmo.cpp:174
 msgid "Use Software White adjust"
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:173
+#: modules/video_filter/atmo/atmo.cpp:175
 msgid ""
-"Should the buildin driver do a white adjust or you LED stripes? recommend."
+"Should the buildin driver do a white adjust or your LED stripes? recommend."
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:175
+#: modules/video_filter/atmo/atmo.cpp:177
 #, fuzzy
 msgid "White Red"
 msgstr "白色"
 
-#: modules/video_filter/atmo/atmo.cpp:176
+#: modules/video_filter/atmo/atmo.cpp:178
 msgid "Red value of a pure white on your LED stripes."
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:178
+#: modules/video_filter/atmo/atmo.cpp:180
 #, fuzzy
 msgid "White Green"
 msgstr "白色"
 
-#: modules/video_filter/atmo/atmo.cpp:179
+#: modules/video_filter/atmo/atmo.cpp:181
 msgid "Green value of a pure white on your LED stripes."
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:181
+#: modules/video_filter/atmo/atmo.cpp:183
 #, fuzzy
 msgid "White Blue"
 msgstr "白色"
 
-#: modules/video_filter/atmo/atmo.cpp:182
+#: modules/video_filter/atmo/atmo.cpp:184
 msgid "Blue value of a pure white on your LED stripes."
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:185
+#: modules/video_filter/atmo/atmo.cpp:187
 msgid "Serial Port/Device"
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:186
+#: modules/video_filter/atmo/atmo.cpp:188
 msgid ""
-"Name of the serial port where the AtmoLight controller is attached to\n"
-" on Windows usually something like COM1 or COM2 on Linux /dev/ttyS01 f.e."
+"Name of the serial port where the AtmoLight controller is attached to.\n"
+"On Windows usually something like COM1 or COM2. On Linux /dev/ttyS01 f.e."
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:190
+#: modules/video_filter/atmo/atmo.cpp:193
 msgid "Edge Weightning"
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:191
+#: modules/video_filter/atmo/atmo.cpp:194
 msgid ""
-"increasing this value will result in color more depending on the border of "
-"the frame"
+"Increasing this value will result in color more depending on the border of "
+"the frame."
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:194
-msgid "overall Brightness of you LED stripes"
+#: modules/video_filter/atmo/atmo.cpp:197
+msgid "Overall brightness of your LED stripes"
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:195
+#: modules/video_filter/atmo/atmo.cpp:198
 #, fuzzy
 msgid "Darkness Limit"
 msgstr "边界遮掩"
 
-#: modules/video_filter/atmo/atmo.cpp:196
+#: modules/video_filter/atmo/atmo.cpp:199
 msgid ""
-"pixels with a saturation lower than this will be ignored should be greater "
-"than one for letterboxed videos"
+"Pixels with a saturation lower than this will be ignored. Should be greater "
+"than one for letterboxed videos."
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:199
+#: modules/video_filter/atmo/atmo.cpp:202
 msgid "Hue windowing"
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:200
-#: modules/video_filter/atmo/atmo.cpp:202
+#: modules/video_filter/atmo/atmo.cpp:203
+#: modules/video_filter/atmo/atmo.cpp:205
 #, fuzzy
-msgid "used for statistics"
+msgid "Used for statistics."
 msgstr "收集统计信息"
 
-#: modules/video_filter/atmo/atmo.cpp:201
+#: modules/video_filter/atmo/atmo.cpp:204
 msgid "Sat windowing"
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:204
+#: modules/video_filter/atmo/atmo.cpp:207
 #, fuzzy
 msgid "Filter length (ms)"
 msgstr "过滤器"
 
-#: modules/video_filter/atmo/atmo.cpp:205
-msgid "Time it takes until a color is complete changed, removes flickering"
+#: modules/video_filter/atmo/atmo.cpp:208
+msgid ""
+"Time it takes until a color is completely changed. This prevents flickering."
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:207
+#: modules/video_filter/atmo/atmo.cpp:210
 #, fuzzy
 msgid "Filter threshold"
 msgstr "阈值"
 
-#: modules/video_filter/atmo/atmo.cpp:208
-msgid "How much a color must changed, for an imediate color change"
+#: modules/video_filter/atmo/atmo.cpp:211
+msgid "How much a color has to be changed for an immediate color change."
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:210
-msgid "Filter Smoothness %"
+#: modules/video_filter/atmo/atmo.cpp:213
+msgid "Filter Smoothness (in %)"
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:211
+#: modules/video_filter/atmo/atmo.cpp:214
 msgid "Filter Smoothness"
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:213
+#: modules/video_filter/atmo/atmo.cpp:217
 #, fuzzy
-msgid "Filtermode"
+msgid "Filter mode"
 msgstr "过滤器"
 
-#: modules/video_filter/atmo/atmo.cpp:214
+#: modules/video_filter/atmo/atmo.cpp:218
 msgid "kind of filtering which should be use to calcuate the color output"
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:222
+#: modules/video_filter/atmo/atmo.cpp:226
 #, fuzzy
 msgid "No Filtering"
 msgstr "过滤器"
 
-#: modules/video_filter/atmo/atmo.cpp:223
+#: modules/video_filter/atmo/atmo.cpp:227
 #, fuzzy
 msgid "Combined"
 msgstr "编译者 "
 
-#: modules/video_filter/atmo/atmo.cpp:224
+#: modules/video_filter/atmo/atmo.cpp:228
 #, fuzzy
 msgid "Percent"
 msgstr "预解释"
 
-#: modules/video_filter/atmo/atmo.cpp:227
+#: modules/video_filter/atmo/atmo.cpp:231
 #, fuzzy
-msgid "Framedelay"
+msgid "Frame delay"
 msgstr "帧率"
 
-#: modules/video_filter/atmo/atmo.cpp:228
+#: modules/video_filter/atmo/atmo.cpp:232
 msgid ""
-"helps to get video out and light effects insync values around 20ms should do "
-"the trick"
+"Helps to get the video output and the light effects in sync. Values around "
+"20ms should do the trick."
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:232
+#: modules/video_filter/atmo/atmo.cpp:237
 #, fuzzy
 msgid "Channel summary"
 msgstr "频道混音器"
 
-#: modules/video_filter/atmo/atmo.cpp:233
+#: modules/video_filter/atmo/atmo.cpp:238
 #, fuzzy
 msgid "Channel left"
 msgstr "频道名称"
 
-#: modules/video_filter/atmo/atmo.cpp:234
+#: modules/video_filter/atmo/atmo.cpp:239
 #, fuzzy
 msgid "Channel right"
 msgstr "频道"
 
-#: modules/video_filter/atmo/atmo.cpp:235
+#: modules/video_filter/atmo/atmo.cpp:240
 #, fuzzy
 msgid "Channel top"
 msgstr "频道"
 
-#: modules/video_filter/atmo/atmo.cpp:236
+#: modules/video_filter/atmo/atmo.cpp:241
 #, fuzzy
 msgid "Channel bottom"
 msgstr "频道名称"
 
-#: modules/video_filter/atmo/atmo.cpp:238
-msgid "maps the hardware channel X to logical channel Y to fix wrong wiring:-)"
+#: modules/video_filter/atmo/atmo.cpp:243
+msgid ""
+"Maps the hardware channel X to logical channel Y to fix wrong wiring :-)"
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:249
+#: modules/video_filter/atmo/atmo.cpp:254
 #, fuzzy
 msgid "disabled"
 msgstr "关闭"
 
-#: modules/video_filter/atmo/atmo.cpp:250
+#: modules/video_filter/atmo/atmo.cpp:255
 #, fuzzy
 msgid "summary"
 msgstr "摘要"
 
-#: modules/video_filter/atmo/atmo.cpp:251
+#: modules/video_filter/atmo/atmo.cpp:256
 #, fuzzy
 msgid "left"
 msgstr "左"
 
-#: modules/video_filter/atmo/atmo.cpp:252
+#: modules/video_filter/atmo/atmo.cpp:257
 #, fuzzy
 msgid "right"
 msgstr "右"
 
-#: modules/video_filter/atmo/atmo.cpp:253
+#: modules/video_filter/atmo/atmo.cpp:258
 #, fuzzy
 msgid "top"
 msgstr "停止"
 
-#: modules/video_filter/atmo/atmo.cpp:254
+#: modules/video_filter/atmo/atmo.cpp:259
 #, fuzzy
 msgid "bottom"
 msgstr "底部"
 
-#: modules/video_filter/atmo/atmo.cpp:257
-msgid "summary gradient"
-msgstr ""
+#: modules/video_filter/atmo/atmo.cpp:262
+#, fuzzy
+msgid "Summary gradient"
+msgstr "灰度"
 
-#: modules/video_filter/atmo/atmo.cpp:258
+#: modules/video_filter/atmo/atmo.cpp:263
 #, fuzzy
-msgid "left gradient"
+msgid "Left gradient"
 msgstr "灰度"
 
-#: modules/video_filter/atmo/atmo.cpp:259
+#: modules/video_filter/atmo/atmo.cpp:264
 #, fuzzy
-msgid "right gradient"
+msgid "Right gradient"
 msgstr "灰度"
 
-#: modules/video_filter/atmo/atmo.cpp:260
+#: modules/video_filter/atmo/atmo.cpp:265
 #, fuzzy
-msgid "top gradient"
+msgid "Top gradient"
 msgstr "灰度"
 
-#: modules/video_filter/atmo/atmo.cpp:261
+#: modules/video_filter/atmo/atmo.cpp:266
 #, fuzzy
-msgid "bottom gradient"
+msgid "Bottom gradient"
 msgstr "灰度"
 
-#: modules/video_filter/atmo/atmo.cpp:262
+#: modules/video_filter/atmo/atmo.cpp:267
 msgid ""
-"defines a small bitmap with 64x48 pixels, containing a grayscale gradient"
+"Defines a small bitmap with 64x48 pixels, containing a grayscale gradient"
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:266
+#: modules/video_filter/atmo/atmo.cpp:271
 #, fuzzy
 msgid "Filename of AtmoWinA.exe"
 msgstr "文件名称"
 
-#: modules/video_filter/atmo/atmo.cpp:267
+#: modules/video_filter/atmo/atmo.cpp:272
 msgid ""
-"if you wan't that the AtmoLight control software is launched by\n"
-"VLC enter the complete Filename of AtmoWinA.exe here"
+"if you want the AtmoLight control software to be launched by VLC, enter the "
+"complete path of AtmoWinA.exe here."
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:270
-msgid "Use buildin AtmoLight"
+#: modules/video_filter/atmo/atmo.cpp:275
+msgid "Use built-in AtmoLight"
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:271
+#: modules/video_filter/atmo/atmo.cpp:276
 msgid ""
-"VideoLan will directly use your AtmoLight hardware without running the "
-"external AtmoWinA.exe Userspace driver."
+"VLC will directly use your AtmoLight hardware without running the external "
+"AtmoWinA.exe Userspace driver."
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:282
+#: modules/video_filter/atmo/atmo.cpp:287
 msgid "AtmoLight Filter"
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:284
+#: modules/video_filter/atmo/atmo.cpp:289
 msgid "AtmoLight"
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:291
-msgid "Choose between the buildin AtmoLight driver or the external"
+#: modules/video_filter/atmo/atmo.cpp:296
+msgid "Choose between the built-in AtmoLight driver or the external"
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:310
-msgid "Enter connection of your AtmoLight hardware"
+#: modules/video_filter/atmo/atmo.cpp:315
+msgid "Enter the connection of your AtmoLight hardware"
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:319
+#: modules/video_filter/atmo/atmo.cpp:324
 msgid "Illuminate the room with this color on pause"
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:335
+#: modules/video_filter/atmo/atmo.cpp:340
 msgid "Illuminate the room with this color on shutdown"
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:351
-msgid "Settings only for buildin Live Video Processor"
-msgstr ""
+#: modules/video_filter/atmo/atmo.cpp:356
+#, fuzzy
+msgid "Settings for the built-in Live Video Processor only"
+msgstr "主界面设置"
 
-#: modules/video_filter/atmo/atmo.cpp:388
+#: modules/video_filter/atmo/atmo.cpp:393
 msgid "Change channel assignment (fixes wrong wiring)"
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:417
+#: modules/video_filter/atmo/atmo.cpp:422
 msgid "Adjust the white light to your LED stripes"
 msgstr ""
 
-#: modules/video_filter/atmo/atmo.cpp:439
+#: modules/video_filter/atmo/atmo.cpp:444
 msgid "Change gradients"
 msgstr ""
 
@@ -20563,6 +20523,25 @@ msgstr "修整视频过滤器"
 msgid "Bluescreen"
 msgstr "蓝屏"
 
+#: modules/video_filter/canvas.c:47 modules/video_filter/canvas.c:49
+#: modules/video_output/image.c:56
+msgid "Image width"
+msgstr "图像宽度"
+
+#: modules/video_filter/canvas.c:50 modules/video_filter/canvas.c:52
+#: modules/video_output/image.c:61
+msgid "Image height"
+msgstr "图像高度"
+
+#: modules/video_filter/canvas.c:55
+msgid "Set aspect (like 4:3) of the video canvas"
+msgstr ""
+
+#: modules/video_filter/canvas.c:63
+#, fuzzy
+msgid "Automatically resize and padd a video"
+msgstr "自动预解释文件"
+
 #: modules/video_filter/chain.c:43
 msgid "Video filtering using a chain of video filter modules"
 msgstr ""
@@ -21124,6 +21103,10 @@ msgstr ""
 "强制指定视频在其窗口中的对齐方式。默认值 0 为居中（0 = 居中，1 = 左，2 = 右，"
 "4 = 上，8 = 下，可以设置组合值，如 6 = 4 + 2 表示右上方对齐）。"
 
+#: modules/video_filter/marq.c:146
+msgid "Marquee"
+msgstr "字幕"
+
 #: modules/video_filter/marq.c:169 modules/video_filter/rss.c:212
 msgid "Misc"
 msgstr "杂项"
@@ -22217,20 +22200,12 @@ msgstr "影像格式"
 msgid "Format of the output images (png or jpg)."
 msgstr "设置输出影像格式 (png 获 jpg)。"
 
-#: modules/video_output/image.c:56
-msgid "Image width"
-msgstr "图像宽度"
-
 #: modules/video_output/image.c:57
 msgid ""
 "You can enforce the image width. By default (-1) VLC will adapt to the video "
 "characteristics."
 msgstr "您可以强制图像宽度。默认值 (-1) 下 VLC 将会根据视频来自动调整。"
 
-#: modules/video_output/image.c:61
-msgid "Image height"
-msgstr "图像高度"
-
 #: modules/video_output/image.c:62
 msgid ""
 "You can enforce the image height. By default (-1) VLC will adapt to the "
@@ -22651,12 +22626,22 @@ msgid ""
 msgstr ""
 "指定您想要使用的 X11 硬件显示。默认状态下 VLC 将会使用 DISPLAY 环境变量的值。"
 
-#: modules/video_output/x11/glx.c:109 modules/video_output/x11/x11.c:64
+#: modules/video_output/x11/glx.c:109 modules/video_output/x11/x11.c:60
+#: modules/video_output/x11/xvideo.c:71 modules/video_output/x11/xvmc.c:121
+msgid "Use shared memory"
+msgstr "使用共享内存"
+
+#: modules/video_output/x11/glx.c:111 modules/video_output/x11/x11.c:62
+#: modules/video_output/x11/xvideo.c:73 modules/video_output/x11/xvmc.c:123
+msgid "Use shared memory to communicate between VLC and the X server."
+msgstr "使用共享内存来在 VLC 和 X 服务器间通信。"
+
+#: modules/video_output/x11/glx.c:113 modules/video_output/x11/x11.c:64
 #: modules/video_output/x11/xvideo.c:75
 msgid "Screen for fullscreen mode."
 msgstr "用于全屏幕模式的屏幕。"
 
-#: modules/video_output/x11/glx.c:111 modules/video_output/x11/x11.c:66
+#: modules/video_output/x11/glx.c:115 modules/video_output/x11/x11.c:66
 #: modules/video_output/x11/xvideo.c:77
 msgid ""
 "Screen to use in fullscreen mode. For instance set it to 0 for first screen, "
@@ -22665,20 +22650,10 @@ msgstr ""
 "选择您所要在全屏模式下所使用的屏幕。例如，将它设为 0 可以使用第一个屏幕，1 为"
 "第二个。"
 
-#: modules/video_output/x11/glx.c:118
+#: modules/video_output/x11/glx.c:122
 msgid "OpenGL(GLX) provider"
 msgstr "OpenGL(GLX) 提供者"
 
-#: modules/video_output/x11/x11.c:60 modules/video_output/x11/xvideo.c:71
-#: modules/video_output/x11/xvmc.c:121
-msgid "Use shared memory"
-msgstr "使用共享内存"
-
-#: modules/video_output/x11/x11.c:62 modules/video_output/x11/xvideo.c:73
-#: modules/video_output/x11/xvmc.c:123
-msgid "Use shared memory to communicate between VLC and the X server."
-msgstr "使用共享内存来在 VLC 和 X 服务器间通信。"
-
 #: modules/video_output/x11/x11.c:81
 msgid "X11 video output"
 msgstr "X11视频输出"
@@ -22942,26 +22917,131 @@ msgstr "可视化过滤器"
 msgid "Spectrum analyser"
 msgstr "频谱分析器"
 
+#~ msgid "Add node"
+#~ msgstr "添加节点"
+
+#~ msgid "%s: unrecognized option `--%s'\n"
+#~ msgstr "%s: 不能识别的选项 `--%s'\n"
+
 #, fuzzy
-#~ msgid "RTP reordering timeout in ms"
-#~ msgstr "TCP连接超时时间"
+#~ msgid "Subscreen height."
+#~ msgstr "边界高度"
+
+#~ msgid "Get Stream Information"
+#~ msgstr "获取串流信息"
+
+#~ msgid "%i items in the playlist"
+#~ msgstr "播放列表中有 %i 个项目"
+
+#~ msgid "1 item in the playlist"
+#~ msgstr "播放列表中有 1 个项目"
+
+#~ msgid "Some options are hidden. Check \"Advanced\" to display them."
+#~ msgstr ""
+#~ "除了这些选项之外, 还有一些已被隐藏的选项。单击 \"高级\" 可以看到它们。"
 
 #, fuzzy
-#~ msgid "FFmpeg audio/video decoders/encoders"
-#~ msgstr "ffmpeg 音频/视频编码器"
+#~ msgid "Input and Codecs"
+#~ msgstr "输入 / 编码器"
+
+#, fuzzy
+#~ msgid "close"
+#~ msgstr "关闭"
+
+#, fuzzy
+#~ msgid "Media information"
+#~ msgstr "元信息"
+
+#, fuzzy
+#~ msgid "Choose a filename to save the logs under..."
+#~ msgstr "你必须选择文件以另存"
+
+#, fuzzy
+#~ msgid "Choose a VLM configuration file to open..."
+#~ msgstr "VLM设置档"
+
+#, fuzzy
+#~ msgid "Check for updates..."
+#~ msgstr "检查更新..."
+
+#, fuzzy
+#~ msgid "No DVD Menus"
+#~ msgstr "使用DVD选单"
+
+#, fuzzy
+#~ msgid "Disk Device"
+#~ msgstr "设备"
+
+#, fuzzy
+#~ msgid "Subtitles languages"
+#~ msgstr "字幕语言"
+
+#, fuzzy
+#~ msgid "Skip Frames"
+#~ msgstr "跳过帧"
+
+#, fuzzy
+#~ msgid "Display Device"
+#~ msgstr "显示"
+
+#, fuzzy
+#~ msgid "Enable Wallpaper Mode"
+#~ msgstr "打开壁纸模式"
+
+#, fuzzy
+#~ msgid "use Pause Color"
+#~ msgstr "仅暂停"
 
 #, fuzzy
 #~ msgid "Enable the strict rate control algorithm."
 #~ msgstr "启用噪声消除算法"
 
-#~ msgid "FFmpeg crop padd filter"
-#~ msgstr "ffmpeg 修整填补过滤器"
+#~ msgid "Subpicture Filters"
+#~ msgstr "子画面过滤器"
 
-#~ msgid "FFmpeg chroma conversion"
-#~ msgstr "ffmpeg 彩度转换"
+#~ msgid "Save settings"
+#~ msgstr "保存设置"
 
-#~ msgid "Image adjustment"
-#~ msgstr "影像调整"
+#~ msgid "Enabled"
+#~ msgstr "启用"
+
+#, fuzzy
+#~ msgid "Image:"
+#~ msgstr "图像"
+
+#, fuzzy
+#~ msgid "Position:"
+#~ msgstr "位置"
+
+#, fuzzy
+#~ msgid "Timestamp:"
+#~ msgstr "时间戳"
+
+#, fuzzy
+#~ msgid "Color:"
+#~ msgstr "色彩"
+
+#, fuzzy
+#~ msgid "Opaqueness:"
+#~ msgstr "打开:"
+
+#~ msgid "(in pixels)"
+#~ msgstr "(像素)"
+
+#, fuzzy
+#~ msgid "Marquee:"
+#~ msgstr "字幕"
+
+#, fuzzy
+#~ msgid "Timeout:"
+#~ msgstr "超时"
+
+#~ msgid "ms"
+#~ msgstr "ms"
+
+#, fuzzy
+#~ msgid "Not Available"
+#~ msgstr "尚无可用的帮助文件"
 
 #~ msgid "Previous track"
 #~ msgstr "上一轨"
@@ -22981,11 +23061,8 @@ msgstr "频谱分析器"
 #~ msgid "Go to time:"
 #~ msgstr "前往标题"
 
-#~ msgid "Open &File..."
-#~ msgstr "打开文件(&F)"
-
-#~ msgid "Empty"
-#~ msgstr "无项目"
+#~ msgid "3dfx Glide video output"
+#~ msgstr "3dfx Glide视频输出"
 
 #~ msgid "&OK"
 #~ msgstr "确定(&O)"
@@ -23162,9 +23239,6 @@ msgstr "频谱分析器"
 #~ msgid "Info"
 #~ msgstr "信息"
 
-#~ msgid "Add Node"
-#~ msgstr "添加节点"
-
 #~ msgid "%i items in playlist"
 #~ msgstr "%i个项目在播放列表中"
 
@@ -23354,11 +23428,13 @@ msgstr "频谱分析器"
 #~ msgid "Creates several clones of the image"
 #~ msgstr "建立数个影像复制"
 
-#~ msgid "Distortion"
-#~ msgstr "畸变"
+#, fuzzy
+#~ msgid "Cartoon effect"
+#~ msgstr "应用动画效果"
 
-#~ msgid "Adds distortion effects"
-#~ msgstr "增加畸变效果"
+#, fuzzy
+#~ msgid "Gradient effects (cartoon) on the image"
+#~ msgstr "放大部分影像"
 
 #~ msgid "Image inversion"
 #~ msgstr "图像翻转"
@@ -23366,12 +23442,30 @@ msgstr "频谱分析器"
 #~ msgid "Blurring"
 #~ msgstr "模糊"
 
+#, fuzzy
+#~ msgid "Adds water effect to the image"
+#~ msgstr "修整图像的一个自定义的部分。"
+
+#, fuzzy
+#~ msgid "Wave effect"
+#~ msgstr "耳机效果"
+
+#, fuzzy
+#~ msgid "Adds wave effect to the image"
+#~ msgstr "修整图像的一个自定义的部分。"
+
 #~ msgid "Magnifies part of the image"
 #~ msgstr "放大部分影像"
 
+#~ msgid "Image adjustment"
+#~ msgstr "影像调整"
+
 #~ msgid "Video Options"
 #~ msgstr "视频选项"
 
+#~ msgid "Aspect Ratio"
+#~ msgstr "纵横比"
+
 #~ msgid "Prevents the audio output level from going over a predefined value."
 #~ msgstr "阻止音频输出超过设定值."
 
@@ -23444,9 +23538,6 @@ msgstr "频谱分析器"
 #~ msgid "Online Help"
 #~ msgstr "在线论坛"
 
-#~ msgid "Check for Updates..."
-#~ msgstr "检查更新..."
-
 #, fuzzy
 #~ msgid "V&iew"
 #~ msgstr "查看"
@@ -23500,6 +23591,9 @@ msgstr "频谱分析器"
 #~ msgid "Show/Hide Interface"
 #~ msgstr "显示/隐藏界面"
 
+#~ msgid "Open &File..."
+#~ msgstr "打开文件(&F)"
+
 #~ msgid "Open D&irectory..."
 #~ msgstr "打开目录(&I)..."
 
@@ -23515,6 +23609,9 @@ msgstr "频谱分析器"
 #~ msgid "&Preferences..."
 #~ msgstr "偏好设置(&P)"
 
+#~ msgid "Empty"
+#~ msgstr "无项目"
+
 #~ msgid ""
 #~ "MPEG-1 Video codec (useable with MPEG PS, MPEG TS, MPEG1, OGG and RAW)"
 #~ msgstr ""
@@ -23614,8 +23711,25 @@ msgstr "频谱分析器"
 #~ msgid "wxWidgets dialogs provider"
 #~ msgstr "wxWidgets dialogs 提供者"
 
-#~ msgid "3dfx Glide video output"
-#~ msgstr "3dfx Glide视频输出"
+#~ msgid "Distortion"
+#~ msgstr "畸变"
+
+#~ msgid "Adds distortion effects"
+#~ msgstr "增加畸变效果"
+
+#, fuzzy
+#~ msgid "RTP reordering timeout in ms"
+#~ msgstr "TCP连接超时时间"
+
+#~ msgid "FFmpeg crop padd filter"
+#~ msgstr "ffmpeg 修整填补过滤器"
+
+#~ msgid "FFmpeg chroma conversion"
+#~ msgstr "ffmpeg 彩度转换"
+
+#, fuzzy
+#~ msgid "FFmpeg audio/video decoders/encoders"
+#~ msgstr "ffmpeg 音频/视频编码器"
 
 #, fuzzy
 #~ msgid "Size of the black border to add at the top of the video."
@@ -24491,10 +24605,6 @@ msgstr "频谱分析器"
 #~ msgid "Extra Audio File"
 #~ msgstr "音频滤波器"
 
-#, fuzzy
-#~ msgid "Download when asked"
-#~ msgstr "现在下载"
-
 #, fuzzy
 #~ msgid "QWidget"
 #~ msgstr "宽度"