Disable crashy FS controller by default

[vlc] / po / zh_CN.po

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 31154f7922c984536b02b7492fb5085afe5906dd..1ea974e8b1c57081e5bc44c3fe58a4977fe1b9d5 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-30 22:42+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:889
 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,14 +39,14 @@ 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:76 modules/gui/wince/playlist.cpp:671
 #: modules/visualization/visual/visual.c:116
 msgid "General"
 msgstr "一般"
 
-#: include/vlc_config_cat.h:39 modules/gui/macosx/simple_prefs.m:167
+#: include/vlc_config_cat.h:39 modules/gui/macosx/simple_prefs.m:168
 #: modules/gui/qt4/components/simple_preferences.cpp:74
-#: modules/gui/qt4/menus.cpp:837 modules/misc/dummy/dummy.c:68
+#: modules/gui/qt4/menus.cpp:839 modules/misc/dummy/dummy.c:68
 msgid "Interface"
 msgstr "界面"
 
@@ -75,16 +75,16 @@ msgid "Settings for VLC's control interfaces"
 msgstr "控制界面设置"
 
 #: include/vlc_config_cat.h:50 include/vlc_config_cat.h:51
-#: modules/gui/macosx/simple_prefs.m:187
+#: modules/gui/macosx/simple_prefs.m:188
 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:2051
+#: src/libvlc-module.c:1429 modules/gui/beos/InterfaceWindow.cpp:283
+#: modules/gui/macosx/intf.m:625 modules/gui/macosx/output.m:170
+#: modules/gui/macosx/playlistinfo.m:110 modules/gui/macosx/simple_prefs.m:172
 #: modules/gui/macosx/wizard.m:378
-#: modules/gui/qt4/components/info_panels.cpp:519
+#: modules/gui/qt4/components/info_panels.cpp:522
 #: modules/gui/qt4/components/simple_preferences.cpp:76
 #: modules/gui/qt4/ui/sout.ui:631 modules/stream_out/transcode.c:199
 msgid "Audio"
@@ -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:414
 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,11 +133,11 @@ 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
-#: modules/gui/macosx/simple_prefs.m:175 modules/gui/macosx/wizard.m:379
-#: modules/gui/qt4/components/info_panels.cpp:520
+#: include/vlc_config_cat.h:75 src/input/es_out.c:2079
+#: src/libvlc-module.c:1479 modules/gui/macosx/intf.m:638
+#: modules/gui/macosx/output.m:160 modules/gui/macosx/playlistinfo.m:99
+#: modules/gui/macosx/simple_prefs.m:176 modules/gui/macosx/wizard.m:379
+#: modules/gui/qt4/components/info_panels.cpp:523
 #: modules/gui/qt4/components/simple_preferences.cpp:77
 #: modules/gui/qt4/ui/sout.ui:542 modules/misc/dummy/dummy.c:98
 #: modules/stream_out/transcode.c:168
@@ -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,14 +340,14 @@ 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
-#: src/playlist/engine.c:110 modules/demux/playlist/playlist.c:66
+#: include/vlc_config_cat.h:182 src/libvlc-module.c:1901
+#: src/playlist/engine.c:111 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:232
+#: modules/gui/beos/InterfaceWindow.cpp:326 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
+#: modules/gui/qt4/main_interface.cpp:128
 msgid "Playlist"
 msgstr "播放列表"
 
@@ -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:439
 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 "高级"
 
@@ -403,7 +401,7 @@ msgid "Other advanced settings"
 msgstr "其它高级设置"
 
 #: include/vlc_config_cat.h:203 modules/gui/macosx/open.m:172
-#: modules/gui/macosx/open.m:427 modules/gui/macosx/simple_prefs.m:249
+#: modules/gui/macosx/open.m:427 modules/gui/macosx/simple_prefs.m:250
 #: modules/gui/pda/pda_interface.c:546 modules/gui/qt4/ui/sprefs_input.ui:49
 msgid "Network"
 msgstr "网络"
@@ -458,11 +456,12 @@ msgstr "尚无可用的帮助文件"
 msgid "There is no help available for these modules."
 msgstr "这些模块尚无可用的帮助文件"
 
-#: include/vlc_interface.h:134
+#: include/vlc_interface.h:136
+#, 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,74 +486,72 @@ 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
 #, fuzzy
-msgid "Media Information..."
+msgid "Media &Information..."
 msgstr "元信息"
 
 #: include/vlc_intf_strings.h:38
 #, fuzzy
-msgid "Codec Information..."
+msgid "&Codec Information..."
 msgstr "信息"
 
-#: include/vlc_intf_strings.h:39 modules/gui/macosx/intf.m:753
-#, fuzzy
-msgid "Messages..."
+#: include/vlc_intf_strings.h:39
+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
 #, fuzzy
-msgid "Bookmarks..."
+msgid "&Bookmarks..."
 msgstr "书签"
 
 #: include/vlc_intf_strings.h:43
 #, fuzzy
-msgid "VLM Configuration..."
+msgid "&VLM Configuration..."
 msgstr "VLM设置档"
 
 #: include/vlc_intf_strings.h:45
-msgid "About..."
+#, fuzzy
+msgid "&About..."
 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:431
 #: 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/menus.cpp:652 modules/gui/qt4/menus.cpp:656
-#: modules/gui/qt4/menus.cpp:659
+#: modules/gui/qt4/menus.cpp:654 modules/gui/qt4/menus.cpp:658
+#: modules/gui/qt4/menus.cpp:661
 msgid "Play"
 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:432
 #: modules/gui/pda/pda_interface.c:1252
-#: modules/gui/qt4/dialogs/bookmarks.cpp:45
+#: modules/gui/qt4/dialogs/bookmarks.cpp:46
 #: modules/gui/qt4/ui/podcast_configuration.ui:59
 #: modules/gui/qt4/ui/streampanel.ui:41
 msgid "Delete"
 msgstr "删除"
 
-#: include/vlc_intf_strings.h:51
+#: include/vlc_intf_strings.h:51 modules/gui/macosx/playlist.m:435
 #, fuzzy
 msgid "Information..."
 msgstr "信息"
@@ -565,7 +562,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 +580,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 +593,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 +630,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 +644,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 +751,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:459 src/libvlc-module.c:560
+#: src/video_output/video_output.c:391 modules/video_filter/postproc.c:222
 msgid "Disable"
 msgstr "关闭"
 
@@ -804,8 +801,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 "音频"
 
@@ -822,7 +819,7 @@ msgstr "立体声"
 #: src/audio_output/output.c:107 src/audio_output/output.c:143
 #: src/libvlc-module.c:371 src/libvlc-module.c:420
 #: modules/audio_filter/channel_mixer/mono.c:101 modules/codec/dvbsub.c:75
-#: modules/codec/subtitles/subsdec.c:102 modules/codec/zvbi.c:101
+#: modules/codec/subtitles/subsdec.c:102 modules/codec/zvbi.c:78
 #: modules/control/gestures.c:92 modules/gui/fbosd.c:164
 #: modules/gui/qt4/ui/video_effects.ui:352
 #: modules/gui/qt4/ui/video_effects.ui:861
@@ -835,7 +832,7 @@ msgstr "左"
 #: src/audio_output/output.c:109 src/audio_output/output.c:145
 #: src/libvlc-module.c:371 src/libvlc-module.c:420
 #: modules/audio_filter/channel_mixer/mono.c:101 modules/codec/dvbsub.c:75
-#: modules/codec/subtitles/subsdec.c:102 modules/codec/zvbi.c:101
+#: modules/codec/subtitles/subsdec.c:102 modules/codec/zvbi.c:78
 #: modules/control/gestures.c:92 modules/gui/fbosd.c:164
 #: modules/gui/qt4/ui/video_effects.ui:369 modules/video_filter/logo.c:100
 #: modules/video_filter/marq.c:136 modules/video_filter/mosaic.c:172
@@ -859,19 +856,19 @@ 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 "字符串型"
 
-#: src/control/media_list.c:227 src/playlist/engine.c:124
+#: src/control/media_list.c:227 src/playlist/engine.c:127
 #: src/playlist/loadsave.c:144
 msgid "Media Library"
 msgstr ""
@@ -891,42 +888,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 +957,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
-#: modules/access/cdda/info.c:938
-#, c-format
-msgid "Track %i"
-msgstr "音轨 %i"
+#: src/input/es_out.c:480 src/input/es_out.c:485 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:335
+msgid "Track"
+msgstr "轨道"
 
-#: src/input/es_out.c:666
+#: src/input/es_out.c:672
 #, 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:672 src/input/es_out.c:674 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:1458 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:1459 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:1460 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:1461 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:2038 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:2040 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
-#: modules/gui/beos/InterfaceWindow.cpp:280
-#: modules/gui/macosx/simple_prefs.m:260
+#: src/input/es_out.c:2043 src/input/meta.c:63 src/libvlc-module.c:173
+#: modules/gui/beos/InterfaceWindow.cpp:279
+#: modules/gui/macosx/simple_prefs.m:261
 #: 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:2051 src/input/es_out.c:2079 src/input/es_out.c:2106
 #: 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:2054 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:2059 modules/codec/faad.c:393
 msgid "Sample rate"
 msgstr "采样率"
 
-#: src/input/es_out.c:2054
+#: src/input/es_out.c:2060
 #, fuzzy, c-format
 msgid "%u Hz"
 msgstr "%d Hz"
 
-#: src/input/es_out.c:2060
+#: src/input/es_out.c:2066
 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:2071 modules/access_output/shout.c:91
+#: modules/access/pvr.c:97 modules/gui/qt4/components/open_panels.cpp:849
 msgid "Bitrate"
 msgstr "位率"
 
-#: src/input/es_out.c:2066
+#: src/input/es_out.c:2072
 #, fuzzy, c-format
 msgid "%u kb/s"
 msgstr "%d kb/s"
 
-#: src/input/es_out.c:2077
+#: src/input/es_out.c:2083
 msgid "Resolution"
 msgstr "分辨率"
 
-#: src/input/es_out.c:2083
+#: src/input/es_out.c:2089
 msgid "Display resolution"
 msgstr "显示分辨率"
 
-#: src/input/es_out.c:2093 modules/access/screen/screen.c:43
+#: src/input/es_out.c:2099 modules/access/screen/screen.c:43
 msgid "Frame rate"
 msgstr "帧率"
 
-#: src/input/es_out.c:2100
+#: src/input/es_out.c:2106
 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
-#: modules/gui/qt4/components/open_panels.cpp:298
-#: modules/gui/qt4/ui/open_disk.ui:206 modules/mux/asf.c:52
+#: 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:72 modules/gui/macosx/wizard.m:348
+#: modules/gui/qt4/components/open_panels.cpp:309
+#: modules/gui/qt4/ui/open_disk.ui:200 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:73
+#: modules/gui/macosx/playlist.m:1098
 msgid "Artist"
 msgstr "艺术家"
 
@@ -1115,7 +1107,7 @@ msgid "Track number"
 msgstr "轨道编号。"
 
 #: src/input/meta.c:58 modules/gui/macosx/bookmarks.m:96
-#: modules/gui/qt4/dialogs/bookmarks.cpp:57
+#: modules/gui/qt4/dialogs/bookmarks.cpp:66
 msgid "Description"
 msgstr "描述"
 
@@ -1158,69 +1150,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
-#: modules/gui/macosx/open.m:180 modules/gui/qt4/ui/open_disk.ui:177
+#: 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:171
 msgid "Chapter"
 msgstr "章节"
 
-#: src/input/var.c:176 modules/access/vcdx/info.c:305
-#: modules/access/vcdx/info.c:306 modules/gui/beos/InterfaceWindow.cpp:295
+#: src/input/var.c:178 modules/access/vcdx/info.c:305
+#: modules/access/vcdx/info.c:306 modules/gui/beos/InterfaceWindow.cpp:294
 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:291
+#: modules/gui/qt4/components/interface_widgets.cpp:759
 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:290
+#: modules/gui/qt4/components/interface_widgets.cpp:758
 msgid "Previous chapter"
 msgstr "上一个章节"
 
-#: src/input/vlm.c:519 src/input/vlm.c:849
+#: src/input/vlm.c:523 src/input/vlm.c:852
 #, c-format
 msgid "Media: %s"
 msgstr "媒体: %s"
@@ -1230,91 +1222,112 @@ 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/simple_prefs.m:231 modules/gui/macosx/simple_prefs.m:295
+#: modules/gui/macosx/prefs.m:126 modules/gui/macosx/prefs.m:147
+#: modules/gui/macosx/simple_prefs.m:232 modules/gui/macosx/simple_prefs.m:296
 #: 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:1140
+#: modules/gui/qt4/components/preferences_widgets.cpp:1287
 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:405
+#: 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:519 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:425
+#: modules/gui/macosx/simple_prefs.m:233 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:1139
+#: modules/gui/qt4/components/preferences_widgets.cpp:1286
+#: modules/gui/qt4/main_interface.cpp:526
+msgid "OK"
+msgstr "确定"
 
-#: src/interface/interface.c:186 modules/gui/macosx/intf.m:663
-#: modules/gui/macosx/intf.m:664
+#: src/interface/interface.c:204 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:208
+msgid "Console"
+msgstr "控制台"
+
+#: src/interface/interface.c:211
 msgid "Telnet Interface"
 msgstr "Telnet 界面"
 
-#: src/interface/interface.c:195
+#: src/interface/interface.c:214
 msgid "Web Interface"
 msgstr "Web 界面"
 
-#: src/interface/interface.c:198
+#: src/interface/interface.c:217
 msgid "Debug logging"
 msgstr "调试记录"
 
-#: src/interface/interface.c:201
+#: src/interface/interface.c:220
 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 +1335,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 +1343,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 双倍"
 
@@ -1719,7 +1732,7 @@ msgid ""
 "played)."
 msgstr ""
 
-#: src/libvlc-module.c:267 modules/gui/macosx/simple_prefs.m:224
+#: src/libvlc-module.c:267 modules/gui/macosx/simple_prefs.m:225
 #: modules/gui/qt4/ui/sprefs_audio.ui:99
 msgid "Use S/PDIF when available"
 msgstr "当可用时使用 S/PDIF 音频输出"
@@ -1730,7 +1743,7 @@ msgid ""
 "audio stream being played."
 msgstr ""
 
-#: src/libvlc-module.c:272 modules/gui/macosx/simple_prefs.m:214
+#: src/libvlc-module.c:272 modules/gui/macosx/simple_prefs.m:215
 #: modules/gui/qt4/ui/sprefs_audio.ui:113
 msgid "Force detection of Dolby Surround"
 msgstr "强制检测杜比环绕"
@@ -1804,18 +1817,11 @@ 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:258
 #: modules/video_output/opengl.c:126 modules/video_output/opengl.c:182
 msgid "None"
 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
-msgid "Track"
-msgstr "轨道"
-
 #: src/libvlc-module.c:323
 msgid ""
 "These options allow you to modify the behavior of the video output "
@@ -1915,7 +1921,7 @@ msgstr ""
 
 #: src/libvlc-module.c:371 src/libvlc-module.c:420
 #: modules/audio_filter/channel_mixer/mono.c:101 modules/codec/dvbsub.c:75
-#: modules/codec/subtitles/subsdec.c:102 modules/codec/zvbi.c:101
+#: modules/codec/subtitles/subsdec.c:102 modules/codec/zvbi.c:78
 #: modules/gui/fbosd.c:164 modules/video_filter/logo.c:100
 #: modules/video_filter/marq.c:136 modules/video_filter/mosaic.c:172
 #: modules/video_filter/osdmenu.c:85 modules/video_filter/rss.c:171
@@ -1923,7 +1929,7 @@ msgid "Center"
 msgstr "居中"
 
 #: src/libvlc-module.c:371 src/libvlc-module.c:420 modules/codec/dvbsub.c:75
-#: modules/codec/zvbi.c:101 modules/gui/fbosd.c:164
+#: modules/codec/zvbi.c:78 modules/gui/fbosd.c:164
 #: modules/gui/qt4/ui/video_effects.ui:335
 #: modules/gui/qt4/ui/video_effects.ui:868
 #: modules/gui/qt4/ui/video_effects.ui:922 modules/video_filter/logo.c:100
@@ -1933,7 +1939,7 @@ msgid "Top"
 msgstr "顶部"
 
 #: src/libvlc-module.c:371 src/libvlc-module.c:420 modules/codec/dvbsub.c:75
-#: modules/codec/zvbi.c:101 modules/gui/fbosd.c:164
+#: modules/codec/zvbi.c:78 modules/gui/fbosd.c:164
 #: modules/gui/qt4/ui/video_effects.ui:386 modules/video_filter/logo.c:100
 #: modules/video_filter/marq.c:136 modules/video_filter/mosaic.c:172
 #: modules/video_filter/osdmenu.c:85 modules/video_filter/rss.c:171
@@ -1941,7 +1947,7 @@ msgid "Bottom"
 msgstr "底部"
 
 #: src/libvlc-module.c:372 src/libvlc-module.c:421 modules/codec/dvbsub.c:76
-#: modules/codec/zvbi.c:102 modules/gui/fbosd.c:165
+#: modules/codec/zvbi.c:79 modules/gui/fbosd.c:165
 #: modules/video_filter/logo.c:101 modules/video_filter/marq.c:137
 #: modules/video_filter/mosaic.c:173 modules/video_filter/osdmenu.c:86
 #: modules/video_filter/rss.c:172
@@ -1949,7 +1955,7 @@ msgid "Top-Left"
 msgstr "左上"
 
 #: src/libvlc-module.c:372 src/libvlc-module.c:421 modules/codec/dvbsub.c:76
-#: modules/codec/zvbi.c:102 modules/gui/fbosd.c:165
+#: modules/codec/zvbi.c:79 modules/gui/fbosd.c:165
 #: modules/video_filter/logo.c:101 modules/video_filter/marq.c:137
 #: modules/video_filter/mosaic.c:173 modules/video_filter/osdmenu.c:86
 #: modules/video_filter/rss.c:172
@@ -1957,7 +1963,7 @@ msgid "Top-Right"
 msgstr "右上"
 
 #: src/libvlc-module.c:372 src/libvlc-module.c:421 modules/codec/dvbsub.c:76
-#: modules/codec/zvbi.c:102 modules/gui/fbosd.c:165
+#: modules/codec/zvbi.c:79 modules/gui/fbosd.c:165
 #: modules/video_filter/logo.c:101 modules/video_filter/marq.c:137
 #: modules/video_filter/mosaic.c:173 modules/video_filter/osdmenu.c:86
 #: modules/video_filter/rss.c:172
@@ -1965,7 +1971,7 @@ msgid "Bottom-Left"
 msgstr "左下"
 
 #: src/libvlc-module.c:372 src/libvlc-module.c:421 modules/codec/dvbsub.c:76
-#: modules/codec/zvbi.c:102 modules/gui/fbosd.c:165
+#: modules/codec/zvbi.c:79 modules/gui/fbosd.c:165
 #: modules/video_filter/logo.c:101 modules/video_filter/marq.c:137
 #: modules/video_filter/mosaic.c:173 modules/video_filter/osdmenu.c:86
 #: modules/video_filter/rss.c:172
@@ -2019,7 +2025,7 @@ msgid ""
 msgstr "“覆盖”是显卡的硬件加速能力（直接视频渲染能力）。VLC 默认尝试使用覆盖。"
 
 #: src/libvlc-module.c:396 src/video_output/vout_intf.c:400
-#: modules/gui/macosx/simple_prefs.m:282 modules/gui/qt4/ui/sprefs_video.ui:68
+#: modules/gui/macosx/simple_prefs.m:283 modules/gui/qt4/ui/sprefs_video.ui:68
 msgid "Always on top"
 msgstr "永远在最上层"
 
@@ -2029,7 +2035,7 @@ msgstr "永远让视频窗口显示在其它窗口之上"
 
 #: src/libvlc-module.c:400
 #, fuzzy
-msgid "Show media title on video."
+msgid "Show media title on video"
 msgstr "覆盖/字幕"
 
 #: src/libvlc-module.c:402
@@ -2038,8 +2044,9 @@ msgid "Display the title of the video on top of the movie."
 msgstr "永远让视频窗口显示在其它窗口之上"
 
 #: src/libvlc-module.c:404
-msgid "Show video title for x miliseconds."
-msgstr ""
+#, fuzzy
+msgid "Show video title for x miliseconds"
+msgstr "覆盖/字幕"
 
 #: src/libvlc-module.c:406
 msgid "Show the video title for n miliseconds, default is 5000 ms (5 sec.)"
@@ -2047,7 +2054,7 @@ msgstr ""
 
 #: src/libvlc-module.c:408
 #, fuzzy
-msgid "Position of video title."
+msgid "Position of video title"
 msgstr "动作检测视频过滤器"
 
 #: src/libvlc-module.c:410
@@ -2055,7 +2062,7 @@ msgid "Place on video where to display the title (default bottom center)."
 msgstr ""
 
 #: src/libvlc-module.c:412
-msgid "Hide cursor and fullscreen controller after x miliseconds."
+msgid "Hide cursor and fullscreen controller after x miliseconds"
 msgstr ""
 
 #: src/libvlc-module.c:415
@@ -2074,7 +2081,7 @@ msgstr "在播放视频时关闭屏幕保护程序"
 
 #: src/libvlc-module.c:426
 #, fuzzy
-msgid "Inhibits the power management daemon during playback."
+msgid "Inhibit the power management daemon during playback"
 msgstr "在播放视频时关闭屏幕保护程序"
 
 #: src/libvlc-module.c:427
@@ -2242,7 +2249,8 @@ msgid ""
 "order to keep proportions."
 msgstr ""
 
-#: src/libvlc-module.c:517 modules/gui/macosx/simple_prefs.m:284
+#: src/libvlc-module.c:517 modules/gui/macosx/simple_prefs.m:285
+#: modules/gui/qt4/ui/sprefs_video.ui:101
 msgid "Skip frames"
 msgstr "跳过帧"
 
@@ -2315,8 +2323,8 @@ 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/simple_prefs.m:342 modules/gui/macosx/simple_prefs.m:428
+#: modules/gui/macosx/prefs_widgets.m:1280
+#: modules/gui/macosx/simple_prefs.m:343 modules/gui/macosx/simple_prefs.m:429
 #: modules/gui/macosx/simple_prefs.m:674 modules/gui/macosx/vout.m:203
 #: modules/gui/qt4/components/preferences_widgets.cpp:556
 #: modules/video_filter/marq.c:61 modules/video_filter/rss.c:70
@@ -2403,7 +2411,7 @@ msgid ""
 "(like DVB streams for example)."
 msgstr ""
 
-#: src/libvlc-module.c:607 modules/gui/qt4/ui/open_disk.ui:244
+#: src/libvlc-module.c:607 modules/gui/qt4/ui/open_disk.ui:238
 msgid "Audio track"
 msgstr "音轨"
 
@@ -2411,7 +2419,7 @@ msgstr "音轨"
 msgid "Stream number of the audio track to use (from 0 to n)."
 msgstr "设置你想使用的音频轨道的串流号码 (从 0 到 n)"
 
-#: src/libvlc-module.c:612 modules/gui/qt4/ui/open_disk.ui:276
+#: src/libvlc-module.c:612 modules/gui/qt4/ui/open_disk.ui:270
 msgid "Subtitles track"
 msgstr "字幕轨"
 
@@ -2549,8 +2557,8 @@ 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
-#: modules/gui/macosx/simple_prefs.m:273
+#: src/libvlc-module.c:686 src/libvlc-module.c:1585 src/text/iso-639_def.h:143
+#: modules/gui/macosx/simple_prefs.m:274
 #: modules/gui/qt4/ui/sprefs_subtitles.ui:22
 #: modules/stream_out/transcode.c:227
 msgid "On Screen Display"
@@ -2677,7 +2685,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"
 
@@ -2823,7 +2831,7 @@ msgid ""
 msgstr "允许你选择编码器清单，VLC会依照先后顺序使用"
 
 #: src/libvlc-module.c:830
-msgid "Prefer system plugins over vlc"
+msgid "Prefer system plugins over VLC"
 msgstr ""
 
 #: src/libvlc-module.c:832
@@ -3121,88 +3129,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 "
+"by concatenating them using \" PATH_SEP \" as separator"
 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 +3223,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 +3233,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,860 +3263,850 @@ 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
-#: modules/gui/qt4/components/interface_widgets.cpp:606
+#: 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:282
 #: 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
-#: modules/gui/qt4/components/interface_widgets.cpp:440
+#: src/libvlc-module.c:1164 modules/control/hotkeys.c:699
+#: modules/gui/macosx/controls.m:891 modules/gui/macosx/intf.m:608
+#: modules/gui/qt4/components/interface_widgets.cpp:439
 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:705
+#: 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:682
+#: 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
-#: modules/gui/qt4/menus.cpp:666 modules/gui/qt4/ui/streampanel.ui:108
-#: modules/misc/notify/notify.c:305
+#: modules/gui/macosx/wizard.m:1619 modules/gui/qt4/menus.cpp:668
+#: modules/gui/qt4/ui/streampanel.ui:108 modules/misc/notify/notify.c:305
 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
-#: modules/gui/qt4/components/interface_widgets.cpp:592
-#: modules/gui/qt4/menus.cpp:664 modules/misc/notify/notify.c:303
+#: src/libvlc-module.c:1170 modules/control/hotkeys.c:688
+#: 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/menus.cpp:666 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
-#: 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
-#: modules/misc/notify/xosd.c:230
+#: 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/menus.cpp:664
+#: modules/gui/qt4/ui/streampanel.ui:101 modules/misc/notify/xosd.c:230
 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
-#: modules/gui/qt4/menus.cpp:698
+#: src/libvlc-module.c:1212 modules/control/hotkeys.c:189
+#: modules/gui/beos/InterfaceWindow.cpp:277 modules/gui/macosx/intf.m:725
+#: modules/gui/qt4/menus.cpp:700
 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
-#: modules/gui/qt4/components/interface_widgets.cpp:633
+#: 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:798
 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
-#: modules/access_filter/record.c:57 modules/gui/macosx/simple_prefs.m:251
-#: modules/gui/qt4/components/interface_widgets.cpp:326
+#: src/libvlc-module.c:1312 modules/access_filter/record.c:56
+#: modules/access_filter/record.c:57 modules/gui/macosx/simple_prefs.m:252
+#: modules/gui/qt4/components/interface_widgets.cpp:331
 #: 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
-#: modules/access_filter/dump.c:55 modules/gui/macosx/simple_prefs.m:245
+#: src/libvlc-module.c:1314 modules/access_filter/dump.c:54
+#: modules/access_filter/dump.c:55 modules/gui/macosx/simple_prefs.m:246
 #: 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 +4172,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
-#: modules/gui/qt4/menus.cpp:508 modules/video_output/snapshot.c:81
+#: 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/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
-#: modules/demux/subtitle.c:74 modules/gui/beos/InterfaceWindow.cpp:281
+#: src/libvlc-module.c:1594 modules/codec/subtitles/subsdec.c:117
+#: modules/demux/subtitle.c:74 modules/gui/beos/InterfaceWindow.cpp:280
 #: 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
-#: modules/gui/qt4/components/info_panels.cpp:521
+#: src/libvlc-module.c:1737 modules/access/v4l2/v4l2.c:92
+#: modules/gui/macosx/playlistinfo.m:93
+#: modules/gui/qt4/components/info_panels.cpp:524
 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 +4934,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:389 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:393 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:395 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:397 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:399 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:401 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 +4992,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:876
 msgid "Adapter card to tune"
 msgstr "要调整的适配卡"
 
@@ -5000,8 +5007,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:635
+#: modules/gui/qt4/components/open_panels.cpp:898
 msgid "Transponder/multiplex frequency"
 msgstr ""
 
@@ -5346,7 +5353,7 @@ msgstr "音频 CD 的默认缓存值。这个值是以毫秒为单位的。"
 
 #: modules/access/cdda.c:72 modules/gui/macosx/open.m:187
 #: modules/gui/macosx/open.m:554 modules/gui/macosx/open.m:642
-#: modules/gui/qt4/ui/open_disk.ui:85
+#: modules/gui/qt4/ui/open_disk.ui:148
 msgid "Audio CD"
 msgstr "音频 CD"
 
@@ -5383,7 +5390,7 @@ msgstr "音频 CD - 轨"
 msgid "Audio CD - Track %i"
 msgstr "音频 CD - 轨 %i"
 
-#: modules/access/cdda/cdda.c:43 modules/access/directory.c:85
+#: modules/access/cdda/cdda.c:43 modules/access/directory.c:86
 #: modules/codec/x264.c:392 modules/codec/x264.c:398 modules/codec/x264.c:403
 msgid "none"
 msgstr "无"
@@ -5611,7 +5618,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 "长度"
@@ -5628,16 +5635,21 @@ msgstr "轨道"
 msgid "MRL"
 msgstr "MRL"
 
+#: modules/access/cdda/info.c:907 modules/access/cdda/info.c:938
+#, c-format
+msgid "Track %i"
+msgstr "音轨 %i"
+
 #: modules/access/dc1394.c:67
 #, fuzzy
 msgid "dc1394 input"
 msgstr "没有输入"
 
-#: modules/access/directory.c:76
+#: modules/access/directory.c:77
 msgid "Subdirectory behavior"
 msgstr "子目录行为"
 
-#: modules/access/directory.c:78
+#: modules/access/directory.c:79
 msgid ""
 "Select whether subdirectories must be expanded.\n"
 "none: subdirectories do not appear in the playlist.\n"
@@ -5645,19 +5657,19 @@ msgid ""
 "expand: all subdirectories are expanded.\n"
 msgstr ""
 
-#: modules/access/directory.c:85
+#: modules/access/directory.c:86
 msgid "collapse"
 msgstr "折叠"
 
-#: modules/access/directory.c:85
+#: modules/access/directory.c:86
 msgid "expand"
 msgstr "展开"
 
-#: modules/access/directory.c:87
+#: modules/access/directory.c:88
 msgid "Ignored extensions"
 msgstr "忽略的扩展"
 
-#: modules/access/directory.c:89
+#: modules/access/directory.c:90
 msgid ""
 "Files with these extensions will not be added to playlist when opening a "
 "directory.\n"
@@ -5665,11 +5677,11 @@ msgid ""
 "instance. Use a comma-separated list of extensions."
 msgstr ""
 
-#: modules/access/directory.c:96 modules/gui/qt4/ui/sprefs_video.ui:171
+#: modules/access/directory.c:97 modules/gui/qt4/ui/sprefs_video.ui:171
 msgid "Directory"
 msgstr "目录"
 
-#: modules/access/directory.c:98
+#: modules/access/directory.c:99
 msgid "Standard filesystem directory input"
 msgstr "标准文件目录输入"
 
@@ -5704,8 +5716,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:686
+#: modules/gui/qt4/components/open_panels.cpp:721
 msgid "Video device name"
 msgstr "视频装置名称"
 
@@ -5717,8 +5729,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:692
+#: modules/gui/qt4/components/open_panels.cpp:727
 msgid "Audio device name"
 msgstr "音频装置名称"
 
@@ -5730,7 +5742,7 @@ msgid ""
 msgstr "默认的音频设备，如果你不指定，则没有设备将会被使用。"
 
 #: modules/access/dshow/dshow.cpp:112
-#: modules/gui/qt4/components/open_panels.cpp:588
+#: modules/gui/qt4/components/open_panels.cpp:600
 msgid "Video size"
 msgstr "视频大小"
 
@@ -5862,7 +5874,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 +5968,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 +5977,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 +5986,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 +5995,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 文件"
 
@@ -6192,7 +6204,7 @@ msgid "File input"
 msgstr "文件输入"
 
 #: modules/access/file.c:91 modules/access_output/file.c:70
-#: modules/audio_output/file.c:114 modules/gui/beos/InterfaceWindow.cpp:265
+#: modules/audio_output/file.c:114 modules/gui/beos/InterfaceWindow.cpp:264
 #: modules/gui/beos/MediaControlView.cpp:1236
 #: modules/gui/beos/PlayListWindow.cpp:88 modules/gui/macosx/open.m:170
 #: modules/gui/macosx/open.m:419 modules/gui/macosx/output.m:142
@@ -6203,12 +6215,12 @@ msgid "File"
 msgstr "文件"
 
 #: modules/access/file.c:246 modules/access/file.c:364
-#: modules/access/file.c:378 modules/access/mmap.c:217
+#: modules/access/file.c:378 modules/access/mmap.c:214
 #, fuzzy
 msgid "File reading failed"
 msgstr "视频缩放过滤器"
 
-#: modules/access/file.c:247 modules/access/mmap.c:218
+#: modules/access/file.c:247 modules/access/mmap.c:215
 #, fuzzy
 msgid "VLC could not read the file."
 msgstr "视频输入色彩."
@@ -6229,12 +6241,12 @@ msgid ""
 msgstr ""
 
 #: modules/access_filter/bandwidth.c:45
-#: modules/gui/qt4/components/open_panels.cpp:642
+#: modules/gui/qt4/components/open_panels.cpp:654
 #, fuzzy
 msgid "Bandwidth"
 msgstr "边界宽度"
 
-#: modules/access_filter/bandwidth.c:46 modules/gui/macosx/simple_prefs.m:241
+#: modules/access_filter/bandwidth.c:46 modules/gui/macosx/simple_prefs.m:242
 #: modules/gui/qt4/ui/sprefs_input.ui:208
 #, fuzzy
 msgid "Bandwidth limiter"
@@ -6309,7 +6321,7 @@ msgid ""
 msgstr ""
 
 #: modules/access_filter/timeshift.c:65 modules/access_filter/timeshift.c:66
-#: modules/gui/macosx/simple_prefs.m:254
+#: modules/gui/macosx/simple_prefs.m:255
 #: modules/gui/qt4/ui/sprefs_input.ui:187
 msgid "Timeshift"
 msgstr "时间差"
@@ -6388,6 +6400,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 代理"
 
@@ -6456,12 +6469,12 @@ msgstr "HTTP输入"
 msgid "HTTP(S)"
 msgstr "HTTP(S)"
 
-#: modules/access/http.c:443
+#: modules/access/http.c:445
 #, fuzzy, c-format
 msgid "Please enter a valid login name and a password for realm %s."
 msgstr "请输入节点编号"
 
-#: modules/access/http.c:447
+#: modules/access/http.c:449
 #, fuzzy
 msgid "HTTP authentication"
 msgstr "RTP 多播"
@@ -6597,7 +6610,7 @@ msgid "User name that will be requested to access the stream."
 msgstr "用于这个连接的用户名。"
 
 #: modules/access_output/http.c:68 modules/control/telnet.c:87
-#: modules/gui/macosx/simple_prefs.m:221
+#: modules/gui/macosx/simple_prefs.m:222
 #: modules/gui/qt4/dialogs/interaction.cpp:97
 #: modules/gui/qt4/ui/sprefs_audio.ui:319 modules/misc/audioscrobbler.c:135
 #: modules/misc/notify/growl_udp.c:64
@@ -6816,8 +6829,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:734
+#: modules/gui/qt4/components/open_panels.cpp:833
 msgid "Norm"
 msgstr "规范"
 
@@ -6846,8 +6859,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:741
+#: modules/gui/qt4/components/open_panels.cpp:840
 msgid "Frequency"
 msgstr "频率"
 
@@ -6909,7 +6922,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 "音量"
 
@@ -6961,16 +6974,16 @@ msgstr "PVR"
 msgid "IVTV MPEG Encoding cards input"
 msgstr "IVTV MPEG 压缩卡输入"
 
-#: modules/access/qtcapture.m:54 modules/access/qtcapture.m:55
+#: modules/access/qtcapture.m:55 modules/access/qtcapture.m:56
 msgid "Quicktime Capture"
 msgstr ""
 
-#: modules/access/qtcapture.m:219
+#: modules/access/qtcapture.m:226
 #, fuzzy
 msgid "No Input device found"
 msgstr "没有输入"
 
-#: modules/access/qtcapture.m:220
+#: modules/access/qtcapture.m:227
 msgid ""
 "Your Mac does not seem to be equipped with a suitable input device. Please "
 "check your connectors and drivers."
@@ -7051,30 +7064,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
@@ -7082,7 +7086,7 @@ msgid "Screen Input"
 msgstr "画面输入"
 
 #: modules/access/screen/screen.c:87 modules/gui/macosx/open.m:207
-#: modules/gui/macosx/open.m:863 modules/gui/macosx/simple_prefs.m:434
+#: modules/gui/macosx/open.m:863 modules/gui/macosx/simple_prefs.m:435
 #: modules/gui/macosx/vout.m:214
 msgid "Screen"
 msgstr "画面"
@@ -7140,7 +7144,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:820
 msgid "Device name"
 msgstr "装置名称"
 
@@ -7152,7 +7156,7 @@ msgid ""
 msgstr "默认的视频设备，如果你不指定，则没有设备将会被使用。"
 
 #: modules/access/v4l2/v4l2.c:83
-#: modules/gui/qt4/components/open_panels.cpp:687
+#: modules/gui/qt4/components/open_panels.cpp:699
 #: modules/stream_out/standard.c:100
 msgid "Standard"
 msgstr "标准"
@@ -7212,7 +7216,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 +7571,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 +7721,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:322
 msgid "Entry"
 msgstr "项"
 
@@ -7727,7 +7731,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:5436
 msgid "Segment"
 msgstr "段"
 
@@ -7739,7 +7743,7 @@ msgstr "LID"
 msgid "VCD Format"
 msgstr "VCD格式"
 
-#: modules/access/vcdx/info.c:95 modules/gui/qt4/dialogs/messages.cpp:255
+#: modules/access/vcdx/info.c:95 modules/gui/qt4/dialogs/messages.cpp:257
 msgid "Application"
 msgstr "应用程序"
 
@@ -7968,12 +7972,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 格式转换的音频过滤器"
@@ -8197,7 +8201,7 @@ msgid ""
 msgstr ""
 
 #: modules/audio_filter/normvol.c:83 modules/audio_filter/normvol.c:84
-#: modules/gui/macosx/simple_prefs.m:223
+#: modules/gui/macosx/simple_prefs.m:224
 #: modules/gui/qt4/ui/sprefs_audio.ui:266
 msgid "Volume normalizer"
 msgstr "音量正常化"
@@ -8283,6 +8287,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 +8356,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 +8397,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 +8574,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/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/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:361
+#: modules/gui/qt4/main_interface.cpp:365
+#: modules/gui/qt4/main_interface.cpp:956
+#: modules/gui/qt4/main_interface.cpp:958
+#: modules/gui/qt4/main_interface.cpp:1022
+#: modules/gui/qt4/main_interface.cpp:1037
+#: modules/gui/qt4/main_interface.cpp:1044
+#: modules/gui/qt4/main_interface.cpp:1061
 msgid "VLC media player"
 msgstr "VLC多媒体播放程序"
 
@@ -8623,9 +8661,9 @@ msgstr "双线性"
 msgid "Non-key"
 msgstr "无"
 
-#: modules/codec/avcodec/avcodec.c:71 modules/gui/macosx/prefs.m:131
-#: modules/gui/macosx/simple_prefs.m:294
-#: modules/gui/qt4/dialogs/preferences.cpp:67
+#: modules/codec/avcodec/avcodec.c:71 modules/gui/macosx/prefs.m:129
+#: modules/gui/macosx/simple_prefs.m:295
+#: modules/gui/qt4/dialogs/preferences.cpp:73
 msgid "All"
 msgstr "全部"
 
@@ -9067,12 +9105,12 @@ msgstr "Cinepak视频译码器"
 msgid "CMML annotations decoder"
 msgstr "ADPCM音频译码器"
 
-#: modules/codec/csri.c:67
+#: modules/codec/csri.c:52
 #, fuzzy
 msgid "Subtitles (advanced)"
 msgstr "字幕编码器"
 
-#: modules/codec/csri.c:68
+#: modules/codec/csri.c:53
 msgid "Wrapper for subtitle renderers using CSRI/asa"
 msgstr ""
 
@@ -9313,7 +9351,7 @@ msgstr "字体字幕译码器"
 msgid "Kate text subtitles packetizer"
 msgstr "DVD字幕封包器"
 
-#: modules/codec/kate.c:631
+#: modules/codec/kate.c:634
 #, fuzzy
 msgid "Kate comment"
 msgstr "Speex 注释"
@@ -9370,6 +9408,11 @@ msgstr "RealAudio 函式库译码器"
 msgid "RealVideo library decoder"
 msgstr "RealAudio 函式库译码器"
 
+#: modules/codec/schroedinger.c:51
+#, fuzzy
+msgid "Schroedinger video decoder"
+msgstr "Theora视频译码器"
+
 #: modules/codec/sdl_image.c:60
 #, fuzzy
 msgid "SDL Image decoder"
@@ -9442,7 +9485,7 @@ msgstr ""
 msgid "Text subtitles decoder"
 msgstr "字体字幕译码器"
 
-#: modules/codec/subtitles/subsdec.c:348 modules/codec/subtitles/subsdec.c:384
+#: modules/codec/subtitles/subsdec.c:354 modules/codec/subtitles/subsdec.c:390
 msgid ""
 "failed to convert subtitle encoding.\n"
 "Try manually setting a character-encoding before you open the file."
@@ -9457,7 +9500,7 @@ msgstr ""
 msgid "USF subtitles decoder"
 msgstr "DVB 字幕译码器"
 
-#: modules/codec/subtitles/subsusf.c:209
+#: modules/codec/subtitles/subsusf.c:215
 msgid ""
 "USF subtitles must be in UTF-8 format.\n"
 "This stream contains USF subtitles which aren't."
@@ -9495,39 +9538,39 @@ msgstr "Philips OGT(SVCD字幕)封包器"
 msgid "Tarkin decoder module"
 msgstr "Tarkin译码器模块"
 
-#: modules/codec/telx.c:55
+#: modules/codec/telx.c:56
 #, fuzzy
 msgid "Override page"
 msgstr "覆盖参数"
 
-#: modules/codec/telx.c:56
+#: modules/codec/telx.c:57
 msgid ""
 "Override the indicated page, try this if your subtitles don't appear (-1 = "
 "autodetect from TS, 0 = autodetect from teletext, >0 = actual page number, "
 "usually 888 or 889)."
 msgstr ""
 
-#: modules/codec/telx.c:61
+#: modules/codec/telx.c:62
 #, fuzzy
 msgid "Ignore subtitle flag"
 msgstr "使用字幕文件"
 
-#: modules/codec/telx.c:62
+#: modules/codec/telx.c:63
 msgid "Ignore the subtitle flag, try this if your subtitles don't appear."
 msgstr ""
 
-#: modules/codec/telx.c:65
+#: modules/codec/telx.c:66
 msgid "Workaround for France"
 msgstr ""
 
-#: modules/codec/telx.c:66
+#: modules/codec/telx.c:67
 msgid ""
 "Some French channels do not flag their subtitling pages correctly due to a "
 "historical interpretation mistake. Try using this wrong interpretation if "
 "your subtitles don't appear."
 msgstr ""
 
-#: modules/codec/telx.c:72
+#: modules/codec/telx.c:73
 #, fuzzy
 msgid "Teletext subtitles decoder"
 msgstr "字体字幕译码器"
@@ -9550,7 +9593,7 @@ msgstr "Theora视频封包器"
 msgid "Theora video encoder"
 msgstr "Theora视频编码器"
 
-#: modules/codec/theora.c:512
+#: modules/codec/theora.c:533
 #, fuzzy
 msgid "Theora comment"
 msgstr "Vorbis 注释"
@@ -10228,7 +10271,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:78
 #: modules/gui/qt4/ui/streampanel.ui:28
 #, fuzzy
 msgid "Statistics"
@@ -10320,29 +10363,29 @@ msgstr ""
 msgid "MPEG I/II hw video decoder (using libmpeg2)"
 msgstr "MPEG I/II视频译码器(使用 libmpeg2)"
 
-#: modules/codec/zvbi.c:79
+#: modules/codec/zvbi.c:58
 #, fuzzy
 msgid "Teletext page"
 msgstr "字体字幕译码器"
 
-#: modules/codec/zvbi.c:80
+#: modules/codec/zvbi.c:59
 msgid "Open the indicated Teletext page.Default page is index 100"
 msgstr ""
 
-#: modules/codec/zvbi.c:83
+#: modules/codec/zvbi.c:62
 msgid "Text is always opaque"
 msgstr ""
 
-#: modules/codec/zvbi.c:84
+#: modules/codec/zvbi.c:63
 msgid "Setting vbi-opaque to false makes the boxed text transparent."
 msgstr ""
 
-#: modules/codec/zvbi.c:87
+#: modules/codec/zvbi.c:66
 #, fuzzy
 msgid "Teletext alignment"
 msgstr "数据对齐"
 
-#: modules/codec/zvbi.c:89
+#: modules/codec/zvbi.c:68
 #, fuzzy
 msgid ""
 "You can enforce the teletext position on the video (0=center, 1=left, "
@@ -10352,21 +10395,21 @@ msgstr ""
 "强制指定视频在其窗口中的对齐方式。默认值 0 为居中（0 = 居中，1 = 左，2 = 右，"
 "4 = 上，8 = 下，可以设置组合值，如 6 = 4 + 2 表示右上方对齐）。"
 
-#: modules/codec/zvbi.c:93
+#: modules/codec/zvbi.c:72
 #, fuzzy
 msgid "Teletext text subtitles"
 msgstr "字体字幕译码器"
 
-#: modules/codec/zvbi.c:94
+#: modules/codec/zvbi.c:73
 msgid "Output teletext subtitles as text instead of as RGBA"
 msgstr ""
 
-#: modules/codec/zvbi.c:105
+#: modules/codec/zvbi.c:82
 #, fuzzy
 msgid "VBI and Teletext decoder"
 msgstr "字体字幕译码器"
 
-#: modules/codec/zvbi.c:106
+#: modules/codec/zvbi.c:83
 #, fuzzy
 msgid "VBI & Teletext"
 msgstr "字体字幕译码器"
@@ -10415,7 +10458,7 @@ msgstr "VLM 遥控界面"
 msgid "Define playlist bookmarks."
 msgstr "设置播放列表书签。"
 
-#: modules/control/hotkeys.c:97 modules/gui/macosx/simple_prefs.m:187
+#: modules/control/hotkeys.c:97 modules/gui/macosx/simple_prefs.m:188
 #: modules/gui/qt4/components/simple_preferences.cpp:82
 msgid "Hotkeys"
 msgstr "热键"
@@ -10448,97 +10491,97 @@ msgstr "不可用"
 msgid "Aspect ratio: %s"
 msgstr "纵横比: %s"
 
-#: modules/control/hotkeys.c:595
+#: modules/control/hotkeys.c:597
 #, c-format
 msgid "Crop: %s"
 msgstr "修整: %s"
 
-#: modules/control/hotkeys.c:621
+#: modules/control/hotkeys.c:625
 #, c-format
 msgid "Deinterlace mode: %s"
 msgstr "解除交错模块: %s"
 
-#: modules/control/hotkeys.c:651
+#: modules/control/hotkeys.c:657
 #, fuzzy, c-format
 msgid "Zoom mode: %s"
 msgstr "缩放视频"
 
-#: modules/control/hotkeys.c:732 modules/control/hotkeys.c:742
+#: modules/control/hotkeys.c:740 modules/control/hotkeys.c:750
 #, fuzzy, c-format
 msgid "Subtitle delay %i ms"
 msgstr "增加字幕延迟"
 
-#: modules/control/hotkeys.c:752 modules/control/hotkeys.c:762
+#: modules/control/hotkeys.c:760 modules/control/hotkeys.c:770
 #, fuzzy, c-format
 msgid "Audio delay %i ms"
 msgstr "增加音频延迟"
 
-#: modules/control/hotkeys.c:1009
+#: modules/control/hotkeys.c:1017
 #, fuzzy, c-format
 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,12 +10719,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/menus.cpp:649 modules/misc/notify/xosd.c:235
+#: modules/gui/qt4/menus.cpp:651 modules/misc/notify/xosd.c:235
 msgid "Pause"
 msgstr "暂停"
 
@@ -11111,82 +11153,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:2039
 #, fuzzy
 msgid "+-[Incoming]"
 msgstr "编码"
 
-#: modules/control/rc.c:2003 modules/gui/ncurses.c:2038
+#: modules/control/rc.c:2003 modules/gui/ncurses.c:2042
 #, 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:2045
 #, 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:2047
 #, 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:2050
 #, 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:2058
 #, fuzzy
 msgid "+-[Video Decoding]"
 msgstr "视频修整"
 
-#: modules/control/rc.c:2014 modules/gui/ncurses.c:2057
+#: modules/control/rc.c:2014 modules/gui/ncurses.c:2061
 #, 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:2064
 #, 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:2067
 #, 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:2075
 #, fuzzy
 msgid "+-[Audio Decoding]"
 msgstr "音频编码器"
 
-#: modules/control/rc.c:2023 modules/gui/ncurses.c:2074
+#: modules/control/rc.c:2023 modules/gui/ncurses.c:2078
 #, 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:2081
 #, 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:2084
 #, 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:2090
 #, fuzzy
 msgid "+-[Streaming]"
 msgstr "串流"
 
-#: modules/control/rc.c:2032 modules/gui/ncurses.c:2089
+#: modules/control/rc.c:2032 modules/gui/ncurses.c:2093
 #, 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:2095
 #, c-format
 msgid "| bytes sent       : %8.0f kB"
 msgstr ""
@@ -11227,7 +11269,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 "端口"
@@ -11439,7 +11481,7 @@ msgid "RTSP/RTP access and demux"
 msgstr "RTSP/RTP 存取及分离器"
 
 #: modules/demux/live555.cpp:108 modules/demux/live555.cpp:109
-#: modules/gui/macosx/simple_prefs.m:252
+#: modules/gui/macosx/simple_prefs.m:253
 #: modules/gui/qt4/ui/sprefs_input.ui:171
 msgid "Use RTP over RTSP (TCP)"
 msgstr "在 RTSP 上使用 RTP (TCP)"
@@ -11468,19 +11510,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:103
 msgid "Frames per Second"
 msgstr "每秒帧数"
 
@@ -11543,19 +11585,19 @@ msgstr ""
 msgid "Read and discard unknown EBML elements (not good for broken files)."
 msgstr ""
 
-#: modules/demux/mkv.cpp:3371
+#: modules/demux/mkv.cpp:3368
 msgid "---  DVD Menu"
 msgstr "---  DVD 选单"
 
-#: modules/demux/mkv.cpp:3377
+#: modules/demux/mkv.cpp:3374
 msgid "First Played"
 msgstr "首次播放"
 
-#: modules/demux/mkv.cpp:3379
+#: modules/demux/mkv.cpp:3376
 msgid "Video Manager"
 msgstr "视频管理器"
 
-#: modules/demux/mkv.cpp:3385
+#: modules/demux/mkv.cpp:3382
 msgid "----- Title"
 msgstr "----- 标题"
 
@@ -11861,6 +11903,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 +12050,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 ""
 
@@ -12233,95 +12276,77 @@ msgstr ""
 
 #: modules/gui/beos/InterfaceWindow.cpp:161 modules/gui/macosx/open.m:499
 #: modules/gui/macosx/open.m:690 modules/gui/macosx/open.m:803
-#: modules/gui/macosx/open.m:1022 modules/gui/qt4/dialogs/open.cpp:72
-#: modules/gui/qt4/menus.cpp:678
+#: modules/gui/macosx/open.m:1022 modules/gui/qt4/dialogs/open.cpp:77
+#: modules/gui/qt4/menus.cpp:680
 msgid "Open"
 msgstr "打开"
 
-#: modules/gui/beos/InterfaceWindow.cpp:227
-#: modules/gui/beos/InterfaceWindow.cpp:332 modules/gui/macosx/prefs.m:125
-#: modules/gui/macosx/simple_prefs.m:298
-#: modules/gui/qt4/dialogs/preferences.cpp:50
+#: modules/gui/beos/InterfaceWindow.cpp:226
+#: modules/gui/beos/InterfaceWindow.cpp:331 modules/gui/macosx/prefs.m:124
+#: modules/gui/macosx/simple_prefs.m:299
+#: modules/gui/qt4/dialogs/preferences.cpp:51
 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:238
+#: modules/gui/beos/InterfaceWindow.cpp:329 modules/gui/macosx/intf.m:572
 #: modules/gui/qt4/dialogs/messages.cpp:48
 #: modules/gui/qt4/dialogs/messages.cpp:66
 msgid "Messages"
 msgstr "信息"
 
-#: modules/gui/beos/InterfaceWindow.cpp:267
+#: modules/gui/beos/InterfaceWindow.cpp:266
 #: modules/gui/beos/PlayListWindow.cpp:90 modules/gui/macosx/open.m:498
 #: modules/gui/macosx/open.m:802 modules/gui/macosx/open.m:1021
 #: modules/gui/qt4/ui/open_file.ui:20
 msgid "Open File"
 msgstr "打开文件"
 
-#: modules/gui/beos/InterfaceWindow.cpp:269
+#: modules/gui/beos/InterfaceWindow.cpp:268
 #: modules/gui/beos/PlayListWindow.cpp:95
 msgid "Open Disc"
 msgstr "打开光盘"
 
-#: modules/gui/beos/InterfaceWindow.cpp:270
+#: modules/gui/beos/InterfaceWindow.cpp:269
 msgid "Open Subtitles"
 msgstr "打开字幕"
 
-#: modules/gui/beos/InterfaceWindow.cpp:274
+#: modules/gui/beos/InterfaceWindow.cpp:273
 #: 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 "关于"
 
-#: modules/gui/beos/InterfaceWindow.cpp:289
+#: modules/gui/beos/InterfaceWindow.cpp:288
 msgid "Prev Title"
 msgstr "上一个标题"
 
-#: modules/gui/beos/InterfaceWindow.cpp:290
+#: modules/gui/beos/InterfaceWindow.cpp:289
 msgid "Next Title"
 msgstr "下一个标题"
 
-#: modules/gui/beos/InterfaceWindow.cpp:299
+#: modules/gui/beos/InterfaceWindow.cpp:298
 msgid "Go to Title"
 msgstr "前往标题"
 
-#: modules/gui/beos/InterfaceWindow.cpp:303
+#: modules/gui/beos/InterfaceWindow.cpp:302
 msgid "Go to Chapter"
 msgstr "前往章节"
 
-#: modules/gui/beos/InterfaceWindow.cpp:306
+#: modules/gui/beos/InterfaceWindow.cpp:305
 msgid "Speed"
 msgstr "速度"
 
-#: modules/gui/beos/InterfaceWindow.cpp:325 modules/gui/macosx/intf.m:744
+#: modules/gui/beos/InterfaceWindow.cpp:324 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
+#: modules/gui/beos/InterfaceWindow.cpp:413
 msgid "VLC media player: Open Media Files"
 msgstr "VLC media player:打开多媒体文件"
 
-#: modules/gui/beos/InterfaceWindow.cpp:418
+#: modules/gui/beos/InterfaceWindow.cpp:417
 msgid "VLC media player: Open Subtitle File"
 msgstr "VLC media player:打开字幕文件"
 
@@ -12334,17 +12359,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:434
 msgid "Select All"
 msgstr "全选"
 
@@ -12385,7 +12409,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,8 +12418,8 @@ 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/simple_prefs.m:297 modules/gui/qt4/ui/vlm.ui:209
+#: modules/gui/macosx/playlist.m:670 modules/gui/macosx/prefs.m:125
+#: modules/gui/macosx/simple_prefs.m:298 modules/gui/qt4/ui/vlm.ui:209
 msgid "Save"
 msgstr "储存"
 
@@ -12508,7 +12532,7 @@ msgstr ""
 "强制指定视频在其窗口中的对齐方式。默认值 0 为居中（0 = 居中，1 = 左，2 = 右，"
 "4 = 上，8 = 下，可以设置组合值，如 6 = 4 + 2 表示右上方对齐）。"
 
-#: modules/gui/fbosd.c:135 modules/misc/freetype.c:116
+#: modules/gui/fbosd.c:135 modules/misc/freetype.c:91
 #: modules/misc/win32text.c:64 modules/video_filter/marq.c:115
 #: modules/video_filter/rss.c:146
 msgid "Opacity"
@@ -12573,112 +12597,113 @@ 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/gui/fbosd.c:173 modules/misc/freetype.c:128
+#: modules/misc/quartztext.c:102 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/gui/fbosd.c:174 modules/misc/freetype.c:128
+#: modules/misc/quartztext.c:102 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/gui/fbosd.c:174 modules/misc/freetype.c:128
+#: modules/misc/quartztext.c:102 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/gui/fbosd.c:174 modules/misc/freetype.c:128
+#: modules/misc/quartztext.c:102 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/gui/fbosd.c:174 modules/misc/freetype.c:128
+#: modules/misc/quartztext.c:102 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/gui/fbosd.c:174 modules/misc/freetype.c:129
+#: modules/misc/quartztext.c:103 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/gui/fbosd.c:175 modules/misc/freetype.c:129
+#: modules/misc/quartztext.c:103 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/gui/fbosd.c:175 modules/misc/freetype.c:129
+#: modules/misc/quartztext.c:103 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/gui/fbosd.c:175 modules/misc/freetype.c:129
+#: modules/misc/quartztext.c:103 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/gui/fbosd.c:175 modules/misc/freetype.c:129
+#: modules/misc/quartztext.c:103 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/gui/fbosd.c:176 modules/misc/freetype.c:129
+#: modules/misc/quartztext.c:103 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/gui/fbosd.c:176 modules/misc/freetype.c:130
+#: modules/misc/quartztext.c:104 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/gui/fbosd.c:176 modules/misc/freetype.c:130
+#: modules/misc/quartztext.c:104 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/gui/fbosd.c:176 modules/misc/freetype.c:130
+#: modules/misc/quartztext.c:104 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/gui/fbosd.c:176 modules/misc/freetype.c:130
+#: modules/misc/quartztext.c:104 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/gui/fbosd.c:177 modules/misc/freetype.c:130
+#: modules/misc/quartztext.c:104 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 "浅绿色"
 
-#: modules/gui/fbosd.c:205 modules/gui/macosx/simple_prefs.m:270
-#: modules/gui/qt4/ui/sprefs_subtitles.ui:147 modules/misc/freetype.c:109
-#: modules/misc/notify/xosd.c:81 modules/misc/win32text.c:57
-#: modules/video_filter/marq.c:159 modules/video_filter/rss.c:203
+#: modules/gui/fbosd.c:205 modules/gui/macosx/simple_prefs.m:271
+#: modules/gui/qt4/ui/sprefs_subtitles.ui:147 modules/misc/freetype.c:84
+#: modules/misc/notify/xosd.c:81 modules/misc/quartztext.c:84
+#: modules/misc/win32text.c:57 modules/video_filter/marq.c:159
+#: modules/video_filter/rss.c:203
 msgid "Font"
 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 "授权"
 
@@ -12728,67 +12753,66 @@ msgstr "索引"
 msgid "Bookmarks"
 msgstr "书签"
 
-#: modules/gui/macosx/bookmarks.m:90 modules/gui/qt4/dialogs/bookmarks.cpp:44
+#: modules/gui/macosx/bookmarks.m:90
 #: modules/gui/qt4/ui/podcast_configuration.ui:49
 #: modules/gui/qt4/ui/vlm.ui:195
 msgid "Add"
 msgstr "增加"
 
-#: modules/gui/macosx/bookmarks.m:91 modules/gui/macosx/intf.m:685
-#: modules/gui/macosx/simple_prefs.m:233
-#: modules/gui/qt4/components/playlist/standardpanel.cpp:163
+#: modules/gui/macosx/bookmarks.m:91 modules/gui/macosx/intf.m:602
+#: modules/gui/macosx/simple_prefs.m:234
+#: modules/gui/qt4/components/playlist/standardpanel.cpp:162
 #: modules/gui/qt4/components/preferences_widgets.cpp:1126
-#: modules/gui/qt4/dialogs/bookmarks.cpp:46 modules/gui/qt4/ui/vlm.ui:202
+#: modules/gui/qt4/dialogs/bookmarks.cpp:48 modules/gui/qt4/ui/vlm.ui:202
 msgid "Clear"
 msgstr "清除"
 
-#: modules/gui/macosx/bookmarks.m:93 modules/gui/qt4/dialogs/bookmarks.cpp:47
+#: modules/gui/macosx/bookmarks.m:93 modules/gui/qt4/dialogs/bookmarks.cpp:51
 #: modules/video_filter/extract.c:76
 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:68
 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:666
 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,30 +13022,29 @@ 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 "不透明度"
 
-#: modules/gui/macosx/extended.m:171 modules/gui/macosx/extended.m:233
+#: modules/gui/macosx/extended.m:172 modules/gui/macosx/extended.m:234
 msgid "Adjust Image"
 msgstr "调整影像"
 
-#: modules/gui/macosx/extended.m:172 modules/gui/macosx/extended.m:237
+#: modules/gui/macosx/extended.m:173 modules/gui/macosx/extended.m:238
 #, fuzzy
 msgid "Video Filter"
 msgstr "视频过滤器"
 
-#: modules/gui/macosx/extended.m:173 modules/gui/macosx/extended.m:235
+#: modules/gui/macosx/extended.m:174 modules/gui/macosx/extended.m:236
 #, fuzzy
 msgid "Audio Filter"
 msgstr "音频滤波器"
 
-#: modules/gui/macosx/extended.m:517
+#: modules/gui/macosx/extended.m:518
 #, fuzzy
 msgid "About the video filters"
 msgstr "墙视频过滤器"
 
-#: modules/gui/macosx/extended.m:526
+#: modules/gui/macosx/extended.m:527
 msgid ""
 "This panel allows on-the-fly selection of various video effects.\n"
 "These filters can be configured individually in the Preferences, in the "
@@ -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,232 @@ 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
 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:279 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:667
+#, fuzzy
+msgid "Bookmarks..."
+msgstr "书签"
+
+#: modules/gui/macosx/intf.m:668
 #, fuzzy
 msgid "Playlist..."
 msgstr "播放列表"
 
-#: modules/gui/macosx/intf.m:754
+#: modules/gui/macosx/intf.m:669
+#, fuzzy
+msgid "Media Information..."
+msgstr "元信息"
+
+#: modules/gui/macosx/intf.m:670
+#, fuzzy
+msgid "Messages..."
+msgstr "讯息(&M)"
+
+#: 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/qt4/menus.cpp:694
+#: modules/gui/macosx/intf.m:675 modules/gui/qt4/dialogs/help.cpp:58
+#: modules/gui/qt4/menus.cpp:696
 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,15 +13436,15 @@ 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/simple_prefs.m:266 modules/gui/macosx/simple_prefs.m:286
+#: modules/gui/macosx/prefs_widgets.m:1174
+#: modules/gui/macosx/simple_prefs.m:267 modules/gui/macosx/simple_prefs.m:287
 #: modules/gui/qt4/components/preferences_widgets.cpp:257
 #: modules/gui/qt4/components/simple_preferences.cpp:236
-#: modules/gui/qt4/ui/open_disk.ui:161 modules/gui/qt4/ui/open_file.ui:181
+#: modules/gui/qt4/ui/open_disk.ui:141 modules/gui/qt4/ui/open_file.ui:181
 #: modules/gui/qt4/ui/open.ui:168 modules/gui/qt4/ui/sout.ui:77
 #: modules/gui/qt4/ui/sprefs_audio.ui:237
 #: modules/gui/qt4/ui/sprefs_input.ui:39
-#: modules/gui/qt4/ui/sprefs_interface.ui:171
+#: modules/gui/qt4/ui/sprefs_interface.ui:184
 #: modules/gui/qt4/ui/sprefs_subtitles.ui:137
 #: modules/gui/qt4/ui/sprefs_video.ui:164
 #: modules/gui/wince/preferences_widgets.cpp:509
@@ -13417,7 +13455,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:94
 #, fuzzy
 msgid "No DVD menus"
 msgstr "使用DVD选单"
@@ -13431,7 +13469,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 +13487,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 ""
@@ -13519,7 +13557,7 @@ msgid "Delay"
 msgstr "延迟"
 
 #: modules/gui/macosx/open.m:291
-#: modules/gui/qt4/components/info_panels.cpp:538
+#: modules/gui/qt4/components/info_panels.cpp:541
 msgid "FPS"
 msgstr "FPS"
 
@@ -13648,195 +13686,205 @@ msgstr "SDP URL"
 msgid "Save File"
 msgstr "储存文件"
 
-#: modules/gui/macosx/playlistinfo.m:67
+#: modules/gui/macosx/playlistinfo.m:70
+#: modules/gui/qt4/dialogs/mediainfo.cpp:55
 #, fuzzy
 msgid "Media Information"
 msgstr "元信息"
 
-#: modules/gui/macosx/playlistinfo.m:68
+#: modules/gui/macosx/playlistinfo.m:71
 #, fuzzy
 msgid "Location"
 msgstr "拉丁文"
 
-#: modules/gui/macosx/playlistinfo.m:71
+#: modules/gui/macosx/playlistinfo.m:74
 #, fuzzy
 msgid "Save Metadata"
 msgstr "元信息"
 
-#: modules/gui/macosx/playlistinfo.m:74
+#: modules/gui/macosx/playlistinfo.m:77
 #, fuzzy
 msgid "Codec Details"
 msgstr "显示全部"
 
-#: modules/gui/macosx/playlistinfo.m:91
-#: modules/gui/qt4/components/info_panels.cpp:524
+#: modules/gui/macosx/playlistinfo.m:94
+#: modules/gui/qt4/components/info_panels.cpp:527
 msgid "Read at media"
 msgstr "在媒体中读取"
 
-#: modules/gui/macosx/playlistinfo.m:92
-#: modules/gui/qt4/components/info_panels.cpp:526
+#: modules/gui/macosx/playlistinfo.m:95
+#: modules/gui/qt4/components/info_panels.cpp:529
 msgid "Input bitrate"
 msgstr "输入比特率"
 
-#: modules/gui/macosx/playlistinfo.m:93
-#: modules/gui/qt4/components/info_panels.cpp:528
+#: modules/gui/macosx/playlistinfo.m:96
+#: modules/gui/qt4/components/info_panels.cpp:531
 msgid "Demuxed"
 msgstr "已分离的"
 
-#: modules/gui/macosx/playlistinfo.m:94
-#: modules/gui/qt4/components/info_panels.cpp:529
+#: modules/gui/macosx/playlistinfo.m:97
+#: modules/gui/qt4/components/info_panels.cpp:532
 msgid "Stream bitrate"
 msgstr "串流比特率"
 
-#: modules/gui/macosx/playlistinfo.m:97 modules/gui/macosx/playlistinfo.m:108
-#: modules/gui/qt4/components/info_panels.cpp:532
-#: modules/gui/qt4/components/info_panels.cpp:546
+#: modules/gui/macosx/playlistinfo.m:100 modules/gui/macosx/playlistinfo.m:111
+#: modules/gui/qt4/components/info_panels.cpp:535
+#: modules/gui/qt4/components/info_panels.cpp:549
 msgid "Decoded blocks"
 msgstr "已解码的帧"
 
-#: modules/gui/macosx/playlistinfo.m:98
-#: modules/gui/qt4/components/info_panels.cpp:534
+#: modules/gui/macosx/playlistinfo.m:101
+#: modules/gui/qt4/components/info_panels.cpp:537
 msgid "Displayed frames"
 msgstr "已显示的帧"
 
-#: modules/gui/macosx/playlistinfo.m:99
-#: modules/gui/qt4/components/info_panels.cpp:536
+#: modules/gui/macosx/playlistinfo.m:102
+#: modules/gui/qt4/components/info_panels.cpp:539
 msgid "Lost frames"
 msgstr "丢失帧"
 
-#: modules/gui/macosx/playlistinfo.m:102 modules/gui/macosx/wizard.m:361
-#: modules/gui/qt4/components/info_panels.cpp:522
+#: modules/gui/macosx/playlistinfo.m:105 modules/gui/macosx/wizard.m:361
+#: modules/gui/qt4/components/info_panels.cpp:525
 #: modules/video_filter/deinterlace.c:142
 msgid "Streaming"
 msgstr "串流"
 
-#: modules/gui/macosx/playlistinfo.m:103
-#: modules/gui/qt4/components/info_panels.cpp:540
+#: modules/gui/macosx/playlistinfo.m:106
+#: modules/gui/qt4/components/info_panels.cpp:543
 msgid "Sent packets"
 msgstr "已发送的包"
 
-#: modules/gui/macosx/playlistinfo.m:104
-#: modules/gui/qt4/components/info_panels.cpp:541
+#: modules/gui/macosx/playlistinfo.m:107
+#: modules/gui/qt4/components/info_panels.cpp:544
 msgid "Sent bytes"
 msgstr "已发送的字节"
 
-#: modules/gui/macosx/playlistinfo.m:105
+#: modules/gui/macosx/playlistinfo.m:108
 msgid "Send rate"
 msgstr "发送率"
 
-#: modules/gui/macosx/playlistinfo.m:109
-#: modules/gui/qt4/components/info_panels.cpp:548
+#: modules/gui/macosx/playlistinfo.m:112
+#: modules/gui/qt4/components/info_panels.cpp:551
 msgid "Played buffers"
 msgstr "已播放的缓冲区"
 
-#: modules/gui/macosx/playlistinfo.m:110
-#: modules/gui/qt4/components/info_panels.cpp:550
+#: modules/gui/macosx/playlistinfo.m:113
+#: modules/gui/qt4/components/info_panels.cpp:553
 msgid "Lost buffers"
 msgstr "丢失的缓冲区"
 
-#: modules/gui/macosx/playlistinfo.m:395 modules/gui/macosx/playlist.m:434
+#: modules/gui/macosx/playlistinfo.m:423
+msgid "Error while saving meta"
+msgstr ""
+
+#: modules/gui/macosx/playlistinfo.m:424
+msgid "VLC was unable to save the meta data."
+msgstr ""
+
+#: modules/gui/macosx/playlistinfo.m:442
 msgid "Information"
 msgstr "信息"
 
-#: modules/gui/macosx/playlist.m:126 modules/gui/macosx/wizard.m:350
-#: modules/gui/wince/playlist.cpp:675 modules/mux/asf.c:54
+#: modules/gui/macosx/playlist.m:127 modules/gui/macosx/wizard.m:350
+#: modules/gui/wince/playlist.cpp:671 modules/mux/asf.c:54
 msgid "Author"
 msgstr "作者"
 
-#: modules/gui/macosx/playlist.m:429
+#: modules/gui/macosx/playlist.m:430
 msgid "Save Playlist..."
 msgstr "储存播放列表..."
 
-#: modules/gui/macosx/playlist.m:432
+#: modules/gui/macosx/playlist.m:433
 msgid "Expand Node"
 msgstr "展开结点"
 
-#: modules/gui/macosx/playlist.m:435
-msgid "Get Stream Information"
-msgstr "获取串流信息"
-
 #: modules/gui/macosx/playlist.m:436
+#, fuzzy
+msgid "Fetch Meta Data"
+msgstr "标题数据"
+
+#: modules/gui/macosx/playlist.m:437
 msgid "Sort Node by Name"
 msgstr "依名称排序节点"
 
-#: modules/gui/macosx/playlist.m:437
+#: modules/gui/macosx/playlist.m:438
 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:440 modules/gui/macosx/playlist.m:478
+#: modules/gui/macosx/playlist.m:1385
 msgid "No items in the playlist"
 msgstr "播放列表中没有项目"
 
-#: modules/gui/macosx/playlist.m:441
+#: modules/gui/macosx/playlist.m:442
 msgid "Search in Playlist"
 msgstr "搜索播放列表"
 
-#: modules/gui/macosx/playlist.m:442
+#: modules/gui/macosx/playlist.m:443
 msgid "Add Folder to Playlist"
 msgstr "增加文件夹至播放列表"
 
-#: modules/gui/macosx/playlist.m:444
+#: modules/gui/macosx/playlist.m:445
 msgid "File Format:"
 msgstr "文件格式:"
 
-#: modules/gui/macosx/playlist.m:445
+#: modules/gui/macosx/playlist.m:446
 msgid "Extended M3U"
 msgstr "扩展 M3U"
 
-#: modules/gui/macosx/playlist.m:446
+#: modules/gui/macosx/playlist.m:447
 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:472 modules/gui/macosx/playlist.m:1378
+#: 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:480 modules/gui/macosx/playlist.m:1389
+#, fuzzy
+msgid "1 item"
+msgstr "%i 项"
 
-#: modules/gui/macosx/playlist.m:642
+#: modules/gui/macosx/playlist.m:669
 msgid "Save Playlist"
 msgstr "储存播放列表"
 
-#: modules/gui/macosx/playlist.m:1078 modules/gui/ncurses.c:1804
+#: modules/gui/macosx/playlist.m:1098 modules/gui/ncurses.c:1808
 msgid "Meta-information"
 msgstr "元信息"
 
-#: modules/gui/macosx/playlist.m:1323
+#: modules/gui/macosx/playlist.m:1346
 #, fuzzy
 msgid "New Node"
 msgstr "新节点"
 
-#: modules/gui/macosx/playlist.m:1324
+#: modules/gui/macosx/playlist.m:1347
 #, fuzzy
 msgid "Please enter a name for the new node."
 msgstr "请输入节点编号"
 
-#: modules/gui/macosx/playlist.m:1332
+#: modules/gui/macosx/playlist.m:1355
 msgid "Empty Folder"
 msgstr "空文件夹"
 
-#: modules/gui/macosx/prefs.m:128
+#: modules/gui/macosx/prefs.m:127 modules/gui/macosx/simple_prefs.m:297
 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:294
 #: 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/simple_prefs.m:606
-#: modules/gui/qt4/dialogs/preferences.cpp:345
+#: modules/gui/macosx/prefs.m:147 modules/gui/macosx/simple_prefs.m:606
+#: modules/gui/qt4/dialogs/preferences.cpp:352
 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,384 +13892,295 @@ 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
+#: modules/gui/macosx/simple_prefs.m:168
+#: modules/gui/qt4/components/simple_preferences.cpp:450
 #, fuzzy
-msgid "Image:"
-msgstr "图像"
+msgid "Interface Settings"
+msgstr "一般界面设置"
 
-#: modules/gui/macosx/sfilters.m:77 modules/gui/macosx/sfilters.m:84
-#: modules/gui/macosx/sfilters.m:92
+#: modules/gui/macosx/simple_prefs.m:172
+#: modules/gui/qt4/components/simple_preferences.cpp:211
 #, fuzzy
-msgid "Position:"
-msgstr "ä½\8d置"
+msgid "General Audio Settings"
+msgstr "ä¸\80è\88¬é\9f³é¢\91设置"
 
-#: modules/gui/macosx/sfilters.m:80
+#: modules/gui/macosx/simple_prefs.m:176
+#: modules/gui/qt4/components/simple_preferences.cpp:181
 #, 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 "大小:"
+msgid "General Video Settings"
+msgstr "一般视频设置"
 
-#: modules/gui/macosx/sfilters.m:82 modules/gui/macosx/sfilters.m:87
+#: modules/gui/macosx/simple_prefs.m:180
 #, fuzzy
-msgid "Color:"
-msgstr "色彩"
+msgid "Subtitles & OSD"
+msgstr "字幕/OSD"
 
-#: modules/gui/macosx/sfilters.m:83
+#: modules/gui/macosx/simple_prefs.m:180
+#: modules/gui/qt4/components/simple_preferences.cpp:509
 #, fuzzy
-msgid "Opaqueness:"
-msgstr "打开:"
-
-#: modules/gui/macosx/sfilters.m:85 modules/gui/macosx/sfilters.m:94
-msgid "(in pixels)"
-msgstr "(像素)"
+msgid "Subtitles & On Screen Display Settings"
+msgstr "字幕分离器设置"
 
-#: modules/gui/macosx/sfilters.m:88
+#: modules/gui/macosx/simple_prefs.m:184
 #, fuzzy
-msgid "Marquee:"
-msgstr "字幕"
+msgid "Input & Codecs"
+msgstr "输入 / 编码器"
 
-#: modules/gui/macosx/sfilters.m:90
+#: modules/gui/macosx/simple_prefs.m:184
 #, fuzzy
-msgid "Timeout:"
-msgstr "超时"
-
-#: modules/gui/macosx/sfilters.m:91
-msgid "ms"
-msgstr "ms"
+msgid "Input & Codec settings"
+msgstr "输入 / 编码器"
 
-#: 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
-#, fuzzy
-msgid "Interface Settings"
-msgstr "一般界面设置"
-
-#: modules/gui/macosx/simple_prefs.m:171
-#: modules/gui/qt4/components/simple_preferences.cpp:211
-#, fuzzy
-msgid "General Audio Settings"
-msgstr "一般音频设置"
-
-#: modules/gui/macosx/simple_prefs.m:175
-#: modules/gui/qt4/components/simple_preferences.cpp:181
-#, fuzzy
-msgid "General Video Settings"
-msgstr "一般视频设置"
-
-#: modules/gui/macosx/simple_prefs.m:179
-#: modules/gui/qt4/components/simple_preferences.cpp:78
-#, fuzzy
-msgid "Subtitles & OSD"
-msgstr "字幕/OSD"
-
-#: modules/gui/macosx/simple_prefs.m:179
-#: modules/gui/qt4/components/simple_preferences.cpp:510
-#, fuzzy
-msgid "Subtitles & OSD Settings"
-msgstr "字幕分离器设置"
-
-#: modules/gui/macosx/simple_prefs.m:183
-#, fuzzy
-msgid "Input & Codecs"
-msgstr "输入 / 编码器"
-
-#: modules/gui/macosx/simple_prefs.m:183
-#, fuzzy
-msgid "Input & Codec settings"
-msgstr "输入 / 编码器"
-
-#: modules/gui/macosx/simple_prefs.m:215
+#: modules/gui/macosx/simple_prefs.m:216
 #: modules/gui/qt4/ui/sprefs_audio.ui:250
 #, fuzzy
 msgid "Effects"
 msgstr "效果"
 
-#: modules/gui/macosx/simple_prefs.m:216
+#: modules/gui/macosx/simple_prefs.m:217
 #, fuzzy
 msgid "Enable Audio"
 msgstr "打开音频"
 
-#: modules/gui/macosx/simple_prefs.m:217 modules/gui/qt4/ui/sprefs_audio.ui:30
+#: modules/gui/macosx/simple_prefs.m:218 modules/gui/qt4/ui/sprefs_audio.ui:30
 #, fuzzy
 msgid "General Audio"
 msgstr "一般"
 
-#: modules/gui/macosx/simple_prefs.m:218
+#: modules/gui/macosx/simple_prefs.m:219
 #: modules/gui/qt4/ui/sprefs_audio.ui:259
 #, fuzzy
 msgid "Headphone surround effect"
 msgstr "耳机效果"
 
-#: modules/gui/macosx/simple_prefs.m:219
+#: modules/gui/macosx/simple_prefs.m:220
 #, fuzzy
 msgid "Preferred Audio language"
 msgstr "音频语言"
 
-#: modules/gui/macosx/simple_prefs.m:220
+#: modules/gui/macosx/simple_prefs.m:221
 msgid "Enable Last.fm submissions"
 msgstr ""
 
-#: modules/gui/macosx/simple_prefs.m:222
+#: modules/gui/macosx/simple_prefs.m:223
 #, fuzzy
 msgid "User name"
 msgstr "用户名"
 
-#: modules/gui/macosx/simple_prefs.m:225
+#: modules/gui/macosx/simple_prefs.m:226
 #: modules/gui/qt4/ui/sprefs_audio.ui:273
 #, fuzzy
 msgid "Visualization"
 msgstr "视觉效果"
 
-#: modules/gui/macosx/simple_prefs.m:226
+#: modules/gui/macosx/simple_prefs.m:227
 #, fuzzy
 msgid "Default Volume"
 msgstr "默认音量"
 
-#: modules/gui/macosx/simple_prefs.m:229
+#: modules/gui/macosx/simple_prefs.m:230
 #, fuzzy
 msgid "Change"
 msgstr "频道"
 
-#: modules/gui/macosx/simple_prefs.m:230
+#: modules/gui/macosx/simple_prefs.m:231
 #, fuzzy
 msgid "Change Hotkey"
 msgstr "配置"
 
-#: modules/gui/macosx/simple_prefs.m:234
+#: modules/gui/macosx/simple_prefs.m:235
 msgid "Select an action to change the associated hotkey:"
 msgstr ""
 
-#: modules/gui/macosx/simple_prefs.m:235
+#: modules/gui/macosx/simple_prefs.m:236
 #: modules/gui/qt4/components/preferences_widgets.cpp:1120
 #, fuzzy
 msgid "Action"
 msgstr "应用程序"
 
-#: modules/gui/macosx/simple_prefs.m:236
+#: modules/gui/macosx/simple_prefs.m:237
 #: modules/gui/qt4/components/preferences_widgets.cpp:1121
 #, fuzzy
 msgid "Shortcut"
 msgstr "快照"
 
-#: modules/gui/macosx/simple_prefs.m:239
+#: modules/gui/macosx/simple_prefs.m:240
 #: modules/gui/qt4/ui/sprefs_input.ui:181
 #, fuzzy
 msgid "Access Filter"
 msgstr "存取过滤器"
 
-#: modules/gui/macosx/simple_prefs.m:240
+#: modules/gui/macosx/simple_prefs.m:241
 msgid "Repair AVI Files"
 msgstr ""
 
-#: modules/gui/macosx/simple_prefs.m:242
+#: modules/gui/macosx/simple_prefs.m:243
 #, fuzzy
 msgid "Default Caching Level"
 msgstr "默认 DVD 角度。"
 
-#: modules/gui/macosx/simple_prefs.m:243 modules/gui/qt4/ui/open.ui:64
+#: modules/gui/macosx/simple_prefs.m:244 modules/gui/qt4/ui/open.ui:64
 #: modules/gui/qt4/ui/sprefs_input.ui:97
 msgid "Caching"
 msgstr "缓存"
 
-#: modules/gui/macosx/simple_prefs.m:244
+#: modules/gui/macosx/simple_prefs.m:245
 msgid ""
 "Use the complete preferences to configure custom caching values for each "
 "access module."
 msgstr ""
 
-#: modules/gui/macosx/simple_prefs.m:246 modules/gui/qt4/ui/sprefs_input.ui:81
+#: modules/gui/macosx/simple_prefs.m:247
 #, fuzzy
 msgid "HTTP Proxy"
 msgstr "HTTP 代理"
 
-#: modules/gui/macosx/simple_prefs.m:247
+#: modules/gui/macosx/simple_prefs.m:248
 #, fuzzy
 msgid "Password for HTTP Proxy"
 msgstr "HTTP 代理"
 
-#: modules/gui/macosx/simple_prefs.m:248
+#: modules/gui/macosx/simple_prefs.m:249
 #: modules/gui/qt4/ui/sprefs_input.ui:119
 msgid "Codecs / Muxers"
 msgstr ""
 
-#: modules/gui/macosx/simple_prefs.m:250
-#: modules/gui/qt4/ui/sprefs_input.ui:125
+#: modules/gui/macosx/simple_prefs.m:251
 #, fuzzy
 msgid "Post-Processing Quality"
 msgstr "后处理质量"
 
-#: modules/gui/macosx/simple_prefs.m:253
+#: modules/gui/macosx/simple_prefs.m:254
 #, fuzzy
 msgid "Default Server Port"
 msgstr "默认设备"
 
-#: modules/gui/macosx/simple_prefs.m:257
-#: modules/gui/qt4/ui/sprefs_interface.ui:230
+#: modules/gui/macosx/simple_prefs.m:258
+#: modules/gui/qt4/ui/sprefs_interface.ui:250
 msgid "Album art download policy"
 msgstr ""
 
-#: modules/gui/macosx/simple_prefs.m:258
+#: modules/gui/macosx/simple_prefs.m:259
 #, fuzzy
 msgid "Add controls to the video window"
 msgstr "视频输入对比度."
 
-#: modules/gui/macosx/simple_prefs.m:259
+#: modules/gui/macosx/simple_prefs.m:260
 #, fuzzy
 msgid "Show Fullscreen Controller"
 msgstr "Telnet 界面"
 
-#: modules/gui/macosx/simple_prefs.m:261
-#: modules/gui/qt4/ui/sprefs_interface.ui:224
+#: modules/gui/macosx/simple_prefs.m:262
+#: modules/gui/qt4/ui/sprefs_interface.ui:244
 #, fuzzy
 msgid "Privacy / Network Interaction"
 msgstr "界面互动"
 
-#: modules/gui/macosx/simple_prefs.m:264
-#: modules/gui/qt4/ui/sprefs_subtitles.ui:79
+#: modules/gui/macosx/simple_prefs.m:265
 #, fuzzy
 msgid "Default Encoding"
 msgstr "解码"
 
-#: modules/gui/macosx/simple_prefs.m:265
+#: modules/gui/macosx/simple_prefs.m:266
 #: modules/gui/qt4/ui/sprefs_subtitles.ui:92
 #, fuzzy
 msgid "Display Settings"
 msgstr "显示分辨率"
 
-#: modules/gui/macosx/simple_prefs.m:267
+#: modules/gui/macosx/simple_prefs.m:268
 #, fuzzy
 msgid "Font Color"
 msgstr "色彩"
 
-#: modules/gui/macosx/simple_prefs.m:268
+#: modules/gui/macosx/simple_prefs.m:269
 #: modules/gui/qt4/ui/sprefs_subtitles.ui:101
 #: modules/video_output/opengl.c:174
 msgid "Effect"
 msgstr "效果"
 
-#: modules/gui/macosx/simple_prefs.m:269
+#: modules/gui/macosx/simple_prefs.m:270
 #, fuzzy
 msgid "Font Size"
 msgstr "字号"
 
-#: modules/gui/macosx/simple_prefs.m:271
+#: modules/gui/macosx/simple_prefs.m:272
 #, fuzzy
 msgid "Subtitle Languages"
 msgstr "字幕语言"
 
-#: modules/gui/macosx/simple_prefs.m:272
+#: modules/gui/macosx/simple_prefs.m:273
 #, fuzzy
 msgid "Preferred Subtitle Language"
 msgstr "音频语言"
 
-#: modules/gui/macosx/simple_prefs.m:274
+#: modules/gui/macosx/simple_prefs.m:275
 #: modules/gui/qt4/ui/sprefs_subtitles.ui:28
 #, fuzzy
 msgid "Enable OSD"
 msgstr "启动"
 
-#: modules/gui/macosx/simple_prefs.m:277
+#: modules/gui/macosx/simple_prefs.m:278
 #, fuzzy
 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/gui/macosx/simple_prefs.m:280 modules/gui/qt4/ui/sprefs_video.ui:36
 #: modules/stream_out/display.c:54 modules/video_filter/deinterlace.c:132
 msgid "Display"
 msgstr "显示"
 
-#: modules/gui/macosx/simple_prefs.m:280
+#: modules/gui/macosx/simple_prefs.m:281
 #, fuzzy
 msgid "Enable Video"
 msgstr "启动视频"
 
-#: modules/gui/macosx/simple_prefs.m:283
+#: modules/gui/macosx/simple_prefs.m:284
 #, fuzzy
 msgid "Output module"
 msgstr "输出模块"
 
-#: modules/gui/macosx/simple_prefs.m:285
+#: modules/gui/macosx/simple_prefs.m:286
 #: modules/gui/qt4/ui/sprefs_video.ui:149
 #, fuzzy
 msgid "Video snapshots"
 msgstr "视频快照格式"
 
-#: modules/gui/macosx/simple_prefs.m:287 modules/meta_engine/folder.c:58
+#: modules/gui/macosx/simple_prefs.m:288 modules/meta_engine/folder.c:58
 #, fuzzy
 msgid "Folder"
 msgstr "空文件夹"
 
-#: modules/gui/macosx/simple_prefs.m:288
+#: modules/gui/macosx/simple_prefs.m:289
 #: modules/gui/qt4/ui/sprefs_video.ui:198
 #, fuzzy
 msgid "Format"
 msgstr "规范"
 
-#: modules/gui/macosx/simple_prefs.m:289
+#: modules/gui/macosx/simple_prefs.m:290
 #: modules/gui/qt4/ui/sprefs_video.ui:181
 #, fuzzy
 msgid "Prefix"
 msgstr "上一项"
 
-#: modules/gui/macosx/simple_prefs.m:290
+#: modules/gui/macosx/simple_prefs.m:291
 #: modules/gui/qt4/ui/sprefs_video.ui:211
 msgid "Sequential numbering"
 msgstr ""
 
 #: modules/gui/macosx/simple_prefs.m:481 modules/gui/macosx/simple_prefs.m:525
-#: modules/gui/macosx/simple_prefs.m:1084
+#: modules/gui/macosx/simple_prefs.m:1093
 #, fuzzy
 msgid "Custom"
 msgstr "自定义: "
@@ -14234,8 +14193,8 @@ msgstr ""
 msgid "Low latency"
 msgstr ""
 
-#: modules/gui/macosx/simple_prefs.m:481 modules/misc/freetype.c:132
-#: modules/misc/win32text.c:80
+#: modules/gui/macosx/simple_prefs.m:481 modules/misc/freetype.c:107
+#: modules/misc/quartztext.c:108 modules/misc/win32text.c:80
 msgid "Normal"
 msgstr "正常"
 
@@ -14247,36 +14206,71 @@ msgstr ""
 msgid "Higher latency"
 msgstr ""
 
-#: modules/gui/macosx/simple_prefs.m:1015
+#: modules/gui/macosx/simple_prefs.m:695
+#, fuzzy
+msgid "Interface Settings not saved"
+msgstr "一般界面设置"
+
+#: modules/gui/macosx/simple_prefs.m:696 modules/gui/macosx/simple_prefs.m:761
+#: modules/gui/macosx/simple_prefs.m:796 modules/gui/macosx/simple_prefs.m:880
+#: modules/gui/macosx/simple_prefs.m:909 modules/gui/macosx/simple_prefs.m:934
+#, c-format
+msgid "An error occured while saving your settings via SimplePrefs (%i)."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:760
+#, fuzzy
+msgid "Audio Settings not saved"
+msgstr "音频设置"
+
+#: modules/gui/macosx/simple_prefs.m:795
+#, fuzzy
+msgid "Video Settings not saved"
+msgstr "视频设置"
+
+#: modules/gui/macosx/simple_prefs.m:879
+msgid "Input Settings not saved"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:908
+msgid "On Screen Display/Subtitle Settings not saved"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:933
+#, fuzzy
+msgid "Hotkeys not saved"
+msgstr "热键"
+
+#: modules/gui/macosx/simple_prefs.m:1026
 #, fuzzy
 msgid "Choose the folder to save your video snapshots to."
 msgstr "在这选择你的输入串流"
 
-#: modules/gui/macosx/simple_prefs.m:1017
-#: modules/gui/macosx/simple_prefs.m:1063
+#: modules/gui/macosx/simple_prefs.m:1028
+#: modules/gui/macosx/simple_prefs.m:1073
 msgid "Choose"
 msgstr "选择"
 
-#: modules/gui/macosx/simple_prefs.m:1061
+#: modules/gui/macosx/simple_prefs.m:1071
 msgid "Choose the font to display your Subtitles with."
 msgstr ""
 
-#: modules/gui/macosx/simple_prefs.m:1103
+#: modules/gui/macosx/simple_prefs.m:1111
 msgid ""
 "Press new keys for\n"
 "\"%@\""
 msgstr ""
 
-#: modules/gui/macosx/simple_prefs.m:1178
+#: modules/gui/macosx/simple_prefs.m:1185
 #, fuzzy
 msgid "Invalid combination"
 msgstr "无效的选择"
 
-#: modules/gui/macosx/simple_prefs.m:1179
+#: modules/gui/macosx/simple_prefs.m:1186
 msgid "Regrettably, these keys cannot be assigned as hotkey shortcuts."
 msgstr ""
 
-#: modules/gui/macosx/simple_prefs.m:1196
+#: modules/gui/macosx/simple_prefs.m:1203
 msgid "This combination is already taken by \"%@\"."
 msgstr ""
 
@@ -14792,11 +14786,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 +14879,343 @@ msgstr ""
 msgid "Ncurses interface"
 msgstr "Ncurses界面"
 
-#: modules/gui/ncurses.c:1538
+#: modules/gui/ncurses.c:1542
 #, fuzzy
 msgid "[Repeat] "
 msgstr "重复播放全部"
 
-#: modules/gui/ncurses.c:1539
+#: modules/gui/ncurses.c:1543
 #, fuzzy
 msgid "[Random] "
 msgstr "随机"
 
-#: modules/gui/ncurses.c:1540
+#: modules/gui/ncurses.c:1544
 #, fuzzy
 msgid "[Loop]"
 msgstr "循环"
 
-#: modules/gui/ncurses.c:1552
+#: modules/gui/ncurses.c:1556
 #, c-format
 msgid " Source   : %s"
 msgstr ""
 
-#: modules/gui/ncurses.c:1559
+#: modules/gui/ncurses.c:1563
 #, c-format
 msgid " State    : Playing %s"
 msgstr ""
 
-#: modules/gui/ncurses.c:1563
+#: modules/gui/ncurses.c:1567
 #, c-format
 msgid " State    : Stopped %s"
 msgstr ""
 
-#: modules/gui/ncurses.c:1567
+#: modules/gui/ncurses.c:1571
 #, c-format
 msgid " State    : Opening/Connecting %s"
 msgstr ""
 
-#: modules/gui/ncurses.c:1571
+#: modules/gui/ncurses.c:1575
 #, c-format
 msgid " State    : Buffering %s"
 msgstr ""
 
-#: modules/gui/ncurses.c:1575
+#: modules/gui/ncurses.c:1579
 #, c-format
 msgid " State    : Paused %s"
 msgstr ""
 
-#: modules/gui/ncurses.c:1589
+#: modules/gui/ncurses.c:1593
 #, c-format
 msgid " Position : %s/%s (%.2f%%)"
 msgstr ""
 
-#: modules/gui/ncurses.c:1593
+#: modules/gui/ncurses.c:1597
 #, fuzzy, c-format
 msgid " Volume   : %i%%"
 msgstr "音量: %d%%"
 
-#: modules/gui/ncurses.c:1601
+#: modules/gui/ncurses.c:1605
 #, fuzzy, c-format
 msgid " Title    : %d/%d"
 msgstr "标题 %d (%d)"
 
-#: modules/gui/ncurses.c:1612
+#: modules/gui/ncurses.c:1616
 #, fuzzy, c-format
 msgid " Chapter  : %d/%d"
 msgstr "章节 %d"
 
-#: modules/gui/ncurses.c:1624
+#: modules/gui/ncurses.c:1628
 #, c-format
 msgid " Source: <no current item> %s"
 msgstr ""
 
-#: modules/gui/ncurses.c:1626
+#: modules/gui/ncurses.c:1630
 msgid " [ h for help ]"
 msgstr ""
 
-#: modules/gui/ncurses.c:1648
+#: modules/gui/ncurses.c:1652
 #, fuzzy
 msgid " Help "
 msgstr "帮助"
 
-#: modules/gui/ncurses.c:1652
+#: modules/gui/ncurses.c:1656
 #, fuzzy
 msgid "[Display]"
 msgstr "显示"
 
-#: modules/gui/ncurses.c:1655
+#: modules/gui/ncurses.c:1659
 msgid "     h,H         Show/Hide help box"
 msgstr ""
 
-#: modules/gui/ncurses.c:1656
+#: modules/gui/ncurses.c:1660
 msgid "     i           Show/Hide info box"
 msgstr ""
 
-#: modules/gui/ncurses.c:1657
+#: modules/gui/ncurses.c:1661
 msgid "     m           Show/Hide metadata box"
 msgstr ""
 
-#: modules/gui/ncurses.c:1658
+#: modules/gui/ncurses.c:1662
 msgid "     L           Show/Hide messages box"
 msgstr ""
 
-#: modules/gui/ncurses.c:1659
+#: modules/gui/ncurses.c:1663
 msgid "     P           Show/Hide playlist box"
 msgstr ""
 
-#: modules/gui/ncurses.c:1660
+#: modules/gui/ncurses.c:1664
 msgid "     B           Show/Hide filebrowser"
 msgstr ""
 
-#: modules/gui/ncurses.c:1661
+#: modules/gui/ncurses.c:1665
 msgid "     x           Show/Hide objects box"
 msgstr ""
 
-#: modules/gui/ncurses.c:1662
+#: modules/gui/ncurses.c:1666
 msgid "     S           Show/Hide statistics box"
 msgstr ""
 
-#: modules/gui/ncurses.c:1663
+#: modules/gui/ncurses.c:1667
 msgid "     c           Switch color on/off"
 msgstr ""
 
-#: modules/gui/ncurses.c:1664
+#: modules/gui/ncurses.c:1668
 msgid "     Esc         Close Add/Search entry"
 msgstr ""
 
-#: modules/gui/ncurses.c:1669
+#: modules/gui/ncurses.c:1673
 #, fuzzy
 msgid "[Global]"
 msgstr "全域增益"
 
-#: modules/gui/ncurses.c:1672
+#: modules/gui/ncurses.c:1676
 msgid "     q, Q, Esc   Quit"
 msgstr ""
 
-#: modules/gui/ncurses.c:1673
+#: modules/gui/ncurses.c:1677
 msgid "     s           Stop"
 msgstr ""
 
-#: modules/gui/ncurses.c:1674
+#: modules/gui/ncurses.c:1678
 msgid "     <space>     Pause/Play"
 msgstr ""
 
-#: modules/gui/ncurses.c:1675
+#: modules/gui/ncurses.c:1679
 msgid "     f           Toggle Fullscreen"
 msgstr ""
 
-#: modules/gui/ncurses.c:1676
+#: modules/gui/ncurses.c:1680
 #, fuzzy
 msgid "     n, p        Next/Previous playlist item"
 msgstr "前一个播放列表项目"
 
-#: modules/gui/ncurses.c:1677
+#: modules/gui/ncurses.c:1681
 msgid "     [, ]        Next/Previous title"
 msgstr ""
 
-#: modules/gui/ncurses.c:1678
+#: modules/gui/ncurses.c:1682
 msgid "     <, >        Next/Previous chapter"
 msgstr ""
 
-#: modules/gui/ncurses.c:1679
+#: modules/gui/ncurses.c:1683
 #, c-format
 msgid "     <right>     Seek +1%%"
 msgstr ""
 
-#: modules/gui/ncurses.c:1680
+#: modules/gui/ncurses.c:1684
 #, c-format
 msgid "     <left>      Seek -1%%"
 msgstr ""
 
-#: modules/gui/ncurses.c:1681
+#: modules/gui/ncurses.c:1685
 msgid "     a           Volume Up"
 msgstr ""
 
-#: modules/gui/ncurses.c:1682
+#: modules/gui/ncurses.c:1686
 msgid "     z           Volume Down"
 msgstr ""
 
-#: modules/gui/ncurses.c:1687
+#: modules/gui/ncurses.c:1691
 #, fuzzy
 msgid "[Playlist]"
 msgstr "播放列表"
 
-#: modules/gui/ncurses.c:1690
+#: modules/gui/ncurses.c:1694
 msgid "     r           Toggle Random playing"
 msgstr ""
 
-#: modules/gui/ncurses.c:1691
+#: modules/gui/ncurses.c:1695
 msgid "     l           Toggle Loop Playlist"
 msgstr ""
 
-#: modules/gui/ncurses.c:1692
+#: modules/gui/ncurses.c:1696
 msgid "     R           Toggle Repeat item"
 msgstr ""
 
-#: modules/gui/ncurses.c:1693
+#: modules/gui/ncurses.c:1697
 msgid "     o           Order Playlist by title"
 msgstr ""
 
-#: modules/gui/ncurses.c:1694
+#: modules/gui/ncurses.c:1698
 msgid "     O           Reverse order Playlist by title"
 msgstr ""
 
-#: modules/gui/ncurses.c:1695
+#: modules/gui/ncurses.c:1699
 msgid "     g           Go to the current playing item"
 msgstr ""
 
-#: modules/gui/ncurses.c:1696
+#: modules/gui/ncurses.c:1700
 msgid "     /           Look for an item"
 msgstr ""
 
-#: modules/gui/ncurses.c:1697
+#: modules/gui/ncurses.c:1701
 msgid "     A           Add an entry"
 msgstr ""
 
-#: modules/gui/ncurses.c:1698
+#: modules/gui/ncurses.c:1702
 msgid "     D, <del>    Delete an entry"
 msgstr ""
 
-#: modules/gui/ncurses.c:1699
+#: modules/gui/ncurses.c:1703
 msgid "     <backspace> Delete an entry"
 msgstr ""
 
-#: modules/gui/ncurses.c:1700
+#: modules/gui/ncurses.c:1704
 msgid "     e           Eject (if stopped)"
 msgstr ""
 
-#: modules/gui/ncurses.c:1705
+#: modules/gui/ncurses.c:1709
 #, fuzzy
 msgid "[Filebrowser]"
 msgstr "过滤器"
 
-#: modules/gui/ncurses.c:1708
+#: modules/gui/ncurses.c:1712
 msgid "     <enter>     Add the selected file to the playlist"
 msgstr ""
 
-#: modules/gui/ncurses.c:1709
+#: modules/gui/ncurses.c:1713
 msgid "     <space>     Add the selected directory to the playlist"
 msgstr ""
 
-#: modules/gui/ncurses.c:1710
+#: modules/gui/ncurses.c:1714
 msgid "     .           Show/Hide hidden files"
 msgstr ""
 
-#: modules/gui/ncurses.c:1715
+#: modules/gui/ncurses.c:1719
 msgid "[Boxes]"
 msgstr ""
 
-#: modules/gui/ncurses.c:1718
+#: modules/gui/ncurses.c:1722
 msgid "     <up>,<down>     Navigate through the box line by line"
 msgstr ""
 
-#: modules/gui/ncurses.c:1719
+#: modules/gui/ncurses.c:1723
 msgid "     <pgup>,<pgdown> Navigate through the box page by page"
 msgstr ""
 
-#: modules/gui/ncurses.c:1724
+#: modules/gui/ncurses.c:1728
 #, fuzzy
 msgid "[Player]"
 msgstr "播放"
 
-#: modules/gui/ncurses.c:1727
+#: modules/gui/ncurses.c:1731
 #, c-format
 msgid "     <up>,<down>     Seek +/-5%%"
 msgstr ""
 
-#: modules/gui/ncurses.c:1732
+#: modules/gui/ncurses.c:1736
 #, fuzzy
 msgid "[Miscellaneous]"
 msgstr "杂项"
 
-#: modules/gui/ncurses.c:1735
+#: modules/gui/ncurses.c:1739
 msgid "     Ctrl-l          Refresh the screen"
 msgstr ""
 
-#: modules/gui/ncurses.c:1756
+#: modules/gui/ncurses.c:1760
 #, fuzzy
 msgid " Information "
 msgstr "信息"
 
-#: modules/gui/ncurses.c:1768
+#: modules/gui/ncurses.c:1772
 #, c-format
 msgid "  [%s]"
 msgstr ""
 
-#: modules/gui/ncurses.c:1775
+#: modules/gui/ncurses.c:1779
 #, c-format
 msgid "      %s: %s"
 msgstr ""
 
-#: modules/gui/ncurses.c:1782 modules/gui/ncurses.c:1870
+#: modules/gui/ncurses.c:1786 modules/gui/ncurses.c:1874
 #, fuzzy
 msgid "No item currently playing"
 msgstr "播放列表中没有项目"
 
-#: modules/gui/ncurses.c:1893
+#: modules/gui/ncurses.c:1897
 #, fuzzy
 msgid " Logs "
 msgstr "Logo"
 
-#: modules/gui/ncurses.c:1936
+#: modules/gui/ncurses.c:1940
 #, fuzzy
 msgid " Browse "
 msgstr "浏览..."
 
-#: modules/gui/ncurses.c:1991
+#: modules/gui/ncurses.c:1995
 msgid " Objects "
 msgstr ""
 
-#: modules/gui/ncurses.c:2005
+#: modules/gui/ncurses.c:2009
 #, fuzzy
 msgid " Stats "
 msgstr "设置(&S)"
 
-#: modules/gui/ncurses.c:2094
+#: modules/gui/ncurses.c:2098
 #, c-format
 msgid "\\ sending bitrate  :   %6.0f kb/s"
 msgstr ""
 
-#: modules/gui/ncurses.c:2127
+#: modules/gui/ncurses.c:2131
 msgid " Playlist (All, one level) "
 msgstr ""
 
-#: modules/gui/ncurses.c:2130
+#: modules/gui/ncurses.c:2134
 #, fuzzy
 msgid " Playlist (By category) "
 msgstr "按类别"
 
-#: modules/gui/ncurses.c:2133
+#: modules/gui/ncurses.c:2137
 #, fuzzy
 msgid " Playlist (Manually added) "
 msgstr "手动增加"
 
-#: modules/gui/ncurses.c:2221 modules/gui/ncurses.c:2225
+#: modules/gui/ncurses.c:2225 modules/gui/ncurses.c:2229
 #, c-format
 msgid "Find: %s"
 msgstr ""
 
-#: modules/gui/ncurses.c:2234
+#: modules/gui/ncurses.c:2238
 #, fuzzy, c-format
 msgid "Open: %s"
 msgstr "打开:"
@@ -15361,6 +15350,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 +15607,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/ui/video_effects.ui:996
 msgid "Update"
 msgstr "更新"
@@ -15665,54 +15658,54 @@ msgstr "无法找到 pixmap 文件: %s"
 msgid "QNX RTOS video and audio output"
 msgstr "QNX RTOS视频及音频输出"
 
-#: modules/gui/qt4/components/extended_panels.cpp:924
-#: modules/gui/qt4/components/extended_panels.cpp:982
+#: modules/gui/qt4/components/extended_panels.cpp:950
+#: modules/gui/qt4/components/extended_panels.cpp:1013
 #, fuzzy
 msgid "Preamp\n"
 msgstr "预放大"
 
-#: modules/gui/qt4/components/extended_panels.cpp:924
-#: modules/gui/qt4/components/extended_panels.cpp:982
+#: modules/gui/qt4/components/extended_panels.cpp:951
+#: modules/gui/qt4/components/extended_panels.cpp:1014
 msgid "dB"
 msgstr ""
 
-#: modules/gui/qt4/components/extended_panels.cpp:1204
+#: modules/gui/qt4/components/extended_panels.cpp:1243
 #, fuzzy
 msgid "Audio/Video"
 msgstr "音频编码器:"
 
-#: modules/gui/qt4/components/extended_panels.cpp:1220
+#: modules/gui/qt4/components/extended_panels.cpp:1259
 msgid "Advance of audio over video:"
 msgstr ""
 
-#: modules/gui/qt4/components/extended_panels.cpp:1229
+#: modules/gui/qt4/components/extended_panels.cpp:1268
 msgid ""
 "A positive value means that\n"
 "the audio is ahead of the video"
 msgstr ""
 
-#: modules/gui/qt4/components/extended_panels.cpp:1237
+#: modules/gui/qt4/components/extended_panels.cpp:1276
 #, fuzzy
 msgid "Subtitles/Video"
 msgstr "字幕文件"
 
-#: modules/gui/qt4/components/extended_panels.cpp:1253
+#: modules/gui/qt4/components/extended_panels.cpp:1292
 #, fuzzy
 msgid "Advance of subtitles over video:"
 msgstr "覆盖/字幕"
 
-#: modules/gui/qt4/components/extended_panels.cpp:1262
+#: modules/gui/qt4/components/extended_panels.cpp:1301
 msgid ""
 "A positive value means that\n"
 "the subtitles are ahead of the video"
 msgstr ""
 
-#: modules/gui/qt4/components/extended_panels.cpp:1281
+#: modules/gui/qt4/components/extended_panels.cpp:1320
 #, fuzzy
 msgid "Speed of the subtitles:"
 msgstr "字体字幕译码器"
 
-#: modules/gui/qt4/components/extended_panels.cpp:1297
+#: modules/gui/qt4/components/extended_panels.cpp:1350
 #, fuzzy
 msgid "Force update of this dialog's values"
 msgstr "存取输出模块"
@@ -15721,152 +15714,190 @@ msgstr "存取输出模块"
 msgid "Extra metadata and other information are shown in this panel.\n"
 msgstr ""
 
-#: modules/gui/qt4/components/info_panels.cpp:421
+#: modules/gui/qt4/components/info_panels.cpp:424
 msgid ""
 "Information about what your media or stream is made of.\n"
 "Muxer, Audio and Video Codecs, Subtitles are shown."
 msgstr ""
 
-#: modules/gui/qt4/components/info_panels.cpp:495
+#: modules/gui/qt4/components/info_panels.cpp:498
 msgid "Statistics about the currently playing media or stream."
 msgstr ""
 
-#: modules/gui/qt4/components/info_panels.cpp:543
+#: modules/gui/qt4/components/info_panels.cpp:546
 #, fuzzy
 msgid "Sent bitrate"
 msgstr "发送率"
 
-#: modules/gui/qt4/components/interface_widgets.cpp:253
+#: modules/gui/qt4/components/interface_widgets.cpp:256
 #, fuzzy
-msgid "Current visualization:"
+msgid "Current visualization"
 msgstr "音频视觉效果"
 
-#: modules/gui/qt4/components/interface_widgets.cpp:310
-#, fuzzy
-msgid "A to B"
-msgstr "到 "
+#: modules/gui/qt4/components/interface_widgets.cpp:314
+msgid ""
+"Loop from point A to point B continuously.\n"
+"Click to set point A"
+msgstr ""
 
-#: modules/gui/qt4/components/interface_widgets.cpp:319
+#: modules/gui/qt4/components/interface_widgets.cpp:324
 #, fuzzy
-msgid "Frame by Frame"
+msgid "Frame by frame"
 msgstr "帧率"
 
-#: modules/gui/qt4/components/interface_widgets.cpp:332
+#: modules/gui/qt4/components/interface_widgets.cpp:338
 #, fuzzy
 msgid "Take a snapshot"
 msgstr "获取视频快照"
 
-#: modules/gui/qt4/components/interface_widgets.cpp:473
+#: modules/gui/qt4/components/interface_widgets.cpp:385
+msgid ""
+"Loop from point A to point B continuously\n"
+"Click to set point A"
+msgstr ""
+
+#: modules/gui/qt4/components/interface_widgets.cpp:468
 msgid "Menu"
 msgstr "选单"
 
-#: modules/gui/qt4/components/interface_widgets.cpp:524
+#: modules/gui/qt4/components/interface_widgets.cpp:517
 #, fuzzy
 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:529
+#: modules/gui/qt4/components/interface_widgets.cpp:718
 #, fuzzy
 msgid "Teletext"
 msgstr "字体字幕译码器"
 
-#: modules/gui/qt4/components/interface_widgets.cpp:614
+#: modules/gui/qt4/components/interface_widgets.cpp:579
+#, fuzzy
+msgid "Previous media in the playlist"
+msgstr "播放列表中没有项目"
+
+#: modules/gui/qt4/components/interface_widgets.cpp:581
+#, fuzzy
+msgid "Next media in the playlist"
+msgstr "播放列表中没有项目"
+
+#: modules/gui/qt4/components/interface_widgets.cpp:582
+#, fuzzy
+msgid "Stop playback"
+msgstr "本地播放"
+
+#: modules/gui/qt4/components/interface_widgets.cpp:590
+#, fuzzy
+msgid "Toggle the video in fullscreen"
+msgstr "以全屏幕模式启动视频"
+
+#: modules/gui/qt4/components/interface_widgets.cpp:598
 #, fuzzy
 msgid "Show playlist"
 msgstr "保存播放列表"
 
-#: modules/gui/qt4/components/interface_widgets.cpp:619
+#: modules/gui/qt4/components/interface_widgets.cpp:604
 #, fuzzy
-msgid "Extended Settings"
-msgstr "编码器设置"
+msgid "Show extended settings"
+msgstr "显示高级选项"
 
-#: modules/gui/qt4/components/interface_widgets.cpp:699
+#: modules/gui/qt4/components/interface_widgets.cpp:724
 #, fuzzy
 msgid "Transparent"
 msgstr "透明"
 
-#: modules/gui/qt4/components/interface_widgets.cpp:1225
+#: modules/gui/qt4/components/interface_widgets.cpp:789
+#, fuzzy
+msgid "Unmute"
+msgstr "静音"
+
+#: modules/gui/qt4/components/interface_widgets.cpp:829
+#, fuzzy
+msgid "Pause the playback"
+msgstr "本地播放"
+
+#: modules/gui/qt4/components/interface_widgets.cpp:1272
 msgid "Revert to normal play speed"
 msgstr ""
 
-#: modules/gui/qt4/components/open_panels.cpp:84
+#: modules/gui/qt4/components/open_panels.cpp:88
 #, fuzzy
 msgid "Select one or multiple files"
 msgstr "选择文件以保存到"
 
-#: modules/gui/qt4/components/open_panels.cpp:102
+#: modules/gui/qt4/components/open_panels.cpp:106
 #, fuzzy
 msgid "File names:"
 msgstr "文件名称"
 
-#: modules/gui/qt4/components/open_panels.cpp:104
+#: modules/gui/qt4/components/open_panels.cpp:108
 #, fuzzy
 msgid "Filter:"
 msgstr "过滤器"
 
-#: modules/gui/qt4/components/open_panels.cpp:147
+#: modules/gui/qt4/components/open_panels.cpp:154
+#: modules/gui/qt4/dialogs_provider.cpp:611
 msgid "Open subtitles file"
 msgstr "打开字幕文件"
 
-#: modules/gui/qt4/components/open_panels.cpp:389
+#: modules/gui/qt4/components/open_panels.cpp:261
 #, fuzzy
-msgid "Open a device or a VIDEO_TS directory"
-msgstr "开启VIDEO_TS目录"
+msgid "Eject the disc"
+msgstr "选择文件"
 
-#: modules/gui/qt4/components/open_panels.cpp:609
-#: modules/gui/qt4/components/open_panels.cpp:865
+#: modules/gui/qt4/components/open_panels.cpp:621
+#: modules/gui/qt4/components/open_panels.cpp:877
 #, 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:645
+#: modules/gui/qt4/components/open_panels.cpp:907
 msgid "Transponder symbol rate"
 msgstr ""
 
-#: modules/gui/qt4/components/open_panels.cpp:755
+#: modules/gui/qt4/components/open_panels.cpp:767
 #, fuzzy
 msgid "Channels:"
 msgstr "频道"
 
-#: modules/gui/qt4/components/open_panels.cpp:768
+#: modules/gui/qt4/components/open_panels.cpp:780
 #, fuzzy
 msgid "Selected ports:"
 msgstr "画面输入"
 
-#: modules/gui/qt4/components/open_panels.cpp:771
+#: modules/gui/qt4/components/open_panels.cpp:783
 msgid ".*"
 msgstr ""
 
-#: modules/gui/qt4/components/open_panels.cpp:776
+#: modules/gui/qt4/components/open_panels.cpp:788
 #, fuzzy
 msgid "Input caching:"
 msgstr "输入已改变"
 
-#: modules/gui/qt4/components/open_panels.cpp:786
+#: modules/gui/qt4/components/open_panels.cpp:798
 #, fuzzy
 msgid "Use VLC pace"
 msgstr "使用SAP缓存"
 
-#: modules/gui/qt4/components/open_panels.cpp:790
+#: modules/gui/qt4/components/open_panels.cpp:802
 #, fuzzy
 msgid "Auto connnection"
 msgstr "自动重新连接"
 
-#: modules/gui/qt4/components/open_panels.cpp:814
+#: modules/gui/qt4/components/open_panels.cpp:826
 #, 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:1112
+#, fuzzy
+msgid "Advanced Options"
+msgstr "高级选项"
 
-#: modules/gui/qt4/components/playlist/playlist.cpp:75
+#: modules/gui/qt4/components/playlist/playlist.cpp:74
 #, 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,33 +15923,38 @@ msgstr ""
 msgid "Set"
 msgstr "选择"
 
-#: modules/gui/qt4/components/preferences_widgets.cpp:1238
+#: modules/gui/qt4/components/preferences_widgets.cpp:1241
 #, fuzzy
 msgid "Unset"
 msgstr "用户"
 
-#: modules/gui/qt4/components/preferences_widgets.cpp:1276
+#: modules/gui/qt4/components/preferences_widgets.cpp:1279
 #, fuzzy
 msgid "Hotkey for "
 msgstr "热键"
 
-#: modules/gui/qt4/components/preferences_widgets.cpp:1279
+#: modules/gui/qt4/components/preferences_widgets.cpp:1282
 msgid "Press the new keys for "
 msgstr ""
 
-#: modules/gui/qt4/components/preferences_widgets.cpp:1304
+#: modules/gui/qt4/components/preferences_widgets.cpp:1307
 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:1327
+#: modules/gui/qt4/components/preferences_widgets.cpp:1335
 #, fuzzy
 msgid "Key: "
 msgstr "密钥"
 
+#: modules/gui/qt4/components/simple_preferences.cpp:78
+#, fuzzy
+msgid "Subtitles && OSD"
+msgstr "字幕/OSD"
+
 #: modules/gui/qt4/components/simple_preferences.cpp:80
 #, fuzzy
-msgid "Input and Codecs"
+msgid "Input && Codecs"
 msgstr "输入 / 编码器"
 
 #: modules/gui/qt4/components/simple_preferences.cpp:220
@@ -15931,70 +15967,98 @@ 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:534
 #, fuzzy
 msgid "Configure Hotkeys"
 msgstr "配置"
 
-#: modules/gui/qt4/components/simple_preferences.cpp:744
-#: modules/gui/qt4/dialogs_provider.hpp:54
+#: modules/gui/qt4/components/simple_preferences.cpp:743
+#: modules/gui/qt4/dialogs_provider.hpp:55
 #, fuzzy
 msgid "Audio Files"
 msgstr "音频滤波器"
 
-#: modules/gui/qt4/components/simple_preferences.cpp:745
-#: modules/gui/qt4/dialogs_provider.hpp:49
+#: modules/gui/qt4/components/simple_preferences.cpp:744
+#: modules/gui/qt4/dialogs_provider.hpp:50
 #, fuzzy
 msgid "Video Files"
 msgstr "视频过滤器"
 
-#: modules/gui/qt4/components/simple_preferences.cpp:746
-#: modules/gui/qt4/dialogs_provider.hpp:59
+#: modules/gui/qt4/components/simple_preferences.cpp:745
+#: modules/gui/qt4/dialogs_provider.hpp:60
 #, fuzzy
 msgid "Playlist Files"
 msgstr "播放列表视图"
 
-#: modules/gui/qt4/components/simple_preferences.cpp:793
+#: modules/gui/qt4/components/simple_preferences.cpp:792
 #, fuzzy
 msgid "&Apply"
 msgstr "应用"
 
-#: modules/gui/qt4/components/simple_preferences.cpp:794
-#: modules/gui/qt4/dialogs/gototime.cpp:52 modules/gui/qt4/dialogs/open.cpp:99
-#: modules/gui/qt4/dialogs/preferences.cpp:80
-#: modules/gui/qt4/dialogs/sout.cpp:130
+#: modules/gui/qt4/components/simple_preferences.cpp:793
+#: modules/gui/qt4/dialogs/gototime.cpp:52
+#: modules/gui/qt4/dialogs/help.cpp:210 modules/gui/qt4/dialogs/open.cpp:104
+#: modules/gui/qt4/dialogs/podcast_configuration.cpp:39
+#: modules/gui/qt4/dialogs/preferences.cpp:87
+#: 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
-msgid "Bytes"
-msgstr "å­\97è\8a\82"
+#: modules/gui/qt4/dialogs/bookmarks.cpp:44
+msgid "Create"
+msgstr "建ç«\8b"
 
-#: modules/gui/qt4/dialogs/errors.cpp:42
-msgid "Errors"
-msgstr "错误"
+#: modules/gui/qt4/dialogs/bookmarks.cpp:45
+msgid "Create a new bookmark"
+msgstr ""
+
+#: modules/gui/qt4/dialogs/bookmarks.cpp:47
+#: modules/gui/qt4/dialogs/podcast_configuration.cpp:37
+#, fuzzy
+msgid "Delete the selected item"
+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/bookmarks.cpp:49
+#, fuzzy
+msgid "Delete all the bookmarks"
+msgstr "设置播放列表书签。"
+
+#: modules/gui/qt4/dialogs/bookmarks.cpp:54
+#: 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/interaction.cpp:194
 #: modules/gui/qt4/dialogs/mediainfo.cpp:77
 #: modules/gui/qt4/dialogs/messages.cpp:82
+#: modules/gui/qt4/dialogs/podcast_configuration.cpp:38
+#: modules/gui/qt4/dialogs/vlm.cpp:139
 msgid "&Close"
 msgstr "关闭(&C)"
 
+#: modules/gui/qt4/dialogs/bookmarks.cpp:67
+msgid "Bytes"
+msgstr "字节"
+
+#: modules/gui/qt4/dialogs/errors.cpp:42
+msgid "Errors"
+msgstr "错误"
+
 #: modules/gui/qt4/dialogs/errors.cpp:51
 #: modules/gui/qt4/dialogs/messages.cpp:84
-#: modules/gui/qt4/dialogs/messages.cpp:128
+#: modules/gui/qt4/dialogs/messages.cpp:130
 msgid "&Clear"
 msgstr "清除(&C)"
 
@@ -16030,7 +16094,7 @@ msgstr "音频编码器"
 
 #: modules/gui/qt4/dialogs/extended.cpp:75
 #, fuzzy
-msgid "Synchronisation"
+msgid "Synchronization"
 msgstr "时钟同步"
 
 #: modules/gui/qt4/dialogs/extended.cpp:80
@@ -16039,9 +16103,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 +16112,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,89 +16126,106 @@ 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:206
 #, fuzzy
-msgid "&Update List"
-msgstr "更新"
+msgid "VLC media player updates"
+msgstr "VLC多媒体播放程序"
 
-#: modules/gui/qt4/dialogs/help.cpp:216
+#: modules/gui/qt4/dialogs/help.cpp:211
+msgid "&Recheck version"
+msgstr ""
+
+#: modules/gui/qt4/dialogs/help.cpp:218
 #, fuzzy
 msgid "Checking for an update..."
 msgstr "正在检查更新..."
 
-#: modules/gui/qt4/dialogs/help.cpp:259
+#: modules/gui/qt4/dialogs/help.cpp:222
+msgid ""
+"\n"
+"Do you want to download it?\n"
+msgstr ""
+
+#: modules/gui/qt4/dialogs/help.cpp:270
 #, fuzzy
-msgid "Select a directory ..."
-msgstr "选择一个目录"
+msgid "Launching an update request..."
+msgstr "正在检查更新..."
 
-#: modules/gui/qt4/dialogs/help.cpp:293
+#: modules/gui/qt4/dialogs/help.cpp:276
 #, fuzzy
-msgid "There is a new version of VLC :\n"
-msgstr "此版本的 VLC 不是最新的。"
+msgid "Select a directory..."
+msgstr "选择一个目录"
 
-#: modules/gui/qt4/dialogs/help.cpp:300
-msgid "You have the latest version of VLC"
-msgstr ""
+#: modules/gui/qt4/dialogs/help.cpp:314
+msgid "&Yes"
+msgstr "是(&Y)"
 
-#: modules/gui/qt4/dialogs/help.cpp:304
-msgid "An error occurred while checking for updates"
-msgstr ""
+#: modules/gui/qt4/dialogs/help.cpp:315
+#, fuzzy
+msgid "A new version of VLC("
+msgstr "此版本的 VLC 不是最新的。"
 
-#: modules/gui/qt4/dialogs/interaction.cpp:93
-msgid "Login"
-msgstr "登录"
+#: modules/gui/qt4/dialogs/help.cpp:321
+#, fuzzy
+msgid ") is available."
+msgstr "尚无可用的帮助文件"
 
-#: modules/gui/qt4/dialogs/interaction.cpp:194
+#: modules/gui/qt4/dialogs/help.cpp:334
 #, fuzzy
-msgid "close"
-msgstr "关闭"
+msgid "You have the latest version of VLC media player."
+msgstr "关于VLC多媒体播放程序"
 
-#: modules/gui/qt4/dialogs/mediainfo.cpp:55
+#: modules/gui/qt4/dialogs/help.cpp:338
 #, fuzzy
-msgid "Media information"
-msgstr "元信息"
+msgid "An error occurred while checking for updates..."
+msgstr "正在检查更新..."
+
+#: modules/gui/qt4/dialogs/interaction.cpp:93
+msgid "Login"
+msgstr "登录"
 
 #: modules/gui/qt4/dialogs/mediainfo.cpp:61
 #, fuzzy
@@ -16169,7 +16254,7 @@ msgstr "元信息"
 
 #: modules/gui/qt4/dialogs/mediainfo.cpp:81
 #, fuzzy
-msgid "Location :"
+msgid "Location:"
 msgstr "拉丁文"
 
 #: modules/gui/qt4/dialogs/messages.cpp:78
@@ -16182,85 +16267,108 @@ msgstr "鼠标手势"
 msgid "&Save as..."
 msgstr "另存为..."
 
-#: modules/gui/qt4/dialogs/messages.cpp:93
+#: modules/gui/qt4/dialogs/messages.cpp:86
+msgid "Save all the displayed logs to a file"
+msgstr ""
+
+#: modules/gui/qt4/dialogs/messages.cpp:94
 #, fuzzy
 msgid "Verbosity Level"
 msgstr "提示(0,1,2)"
 
-#: modules/gui/qt4/dialogs/messages.cpp:119
+#: modules/gui/qt4/dialogs/messages.cpp:121
 #, fuzzy
 msgid "&Update"
 msgstr "更新"
 
-#: modules/gui/qt4/dialogs/messages.cpp:247
+#: modules/gui/qt4/dialogs/messages.cpp:249
 #, 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
+#: modules/gui/qt4/dialogs/messages.cpp:251
 msgid "Texts / Logs (*.log *.txt);; All (*.*) "
 msgstr ""
 
-#: modules/gui/qt4/dialogs/messages.cpp:256
+#: modules/gui/qt4/dialogs/messages.cpp:258
 msgid ""
 "Cannot write file %1:\n"
 "%2."
 msgstr ""
 
-#: modules/gui/qt4/dialogs/open.cpp:83
+#: modules/gui/qt4/dialogs/open.cpp:88
 msgid "&File"
 msgstr "文件(&F)"
 
-#: modules/gui/qt4/dialogs/open.cpp:84
+#: modules/gui/qt4/dialogs/open.cpp:89
 #, fuzzy
 msgid "&Disc"
 msgstr "光盘"
 
-#: modules/gui/qt4/dialogs/open.cpp:85
+#: modules/gui/qt4/dialogs/open.cpp:90
 #, fuzzy
 msgid "&Network"
 msgstr "网络"
 
-#: modules/gui/qt4/dialogs/open.cpp:87
+#: modules/gui/qt4/dialogs/open.cpp:92
 #, fuzzy
 msgid "Capture &Device"
 msgstr "打开获取装置(&C)"
 
-#: modules/gui/qt4/dialogs/open.cpp:106 modules/gui/qt4/dialogs/open.cpp:186
+#: modules/gui/qt4/dialogs/open.cpp:107
+#, fuzzy
+msgid "&Select"
+msgstr "选择"
+
+#: modules/gui/qt4/dialogs/open.cpp:111 modules/gui/qt4/dialogs/open.cpp:192
 msgid "&Enqueue"
 msgstr ""
 
-#: modules/gui/qt4/dialogs/open.cpp:108 modules/gui/qt4/dialogs/open.cpp:190
+#: modules/gui/qt4/dialogs/open.cpp:113 modules/gui/qt4/dialogs/open.cpp:196
 #, fuzzy
 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/open.cpp:115 modules/gui/qt4/dialogs/open.cpp:186
+#: modules/gui/qt4/dialogs/sout.cpp:184
 #, fuzzy
 msgid "&Stream"
 msgstr "串流"
 
-#: modules/gui/qt4/dialogs/open.cpp:112
+#: modules/gui/qt4/dialogs/open.cpp:117
 #, fuzzy
 msgid "&Convert"
 msgstr "色彩反向"
 
-#: modules/gui/qt4/dialogs/open.cpp:183
+#: modules/gui/qt4/dialogs/open.cpp:189
 #, fuzzy
 msgid "&Convert / Save"
 msgstr "色彩反向"
 
-#: modules/gui/qt4/dialogs/preferences.cpp:79
+#: modules/gui/qt4/dialogs/preferences.cpp:70
+#, fuzzy
+msgid "Simple"
+msgstr "波纹"
+
+#: modules/gui/qt4/dialogs/preferences.cpp:71
+#, fuzzy
+msgid "Switch to simple preferences"
+msgstr "选择面板"
+
+#: modules/gui/qt4/dialogs/preferences.cpp:74
+msgid "Switch to complete preferences"
+msgstr ""
+
+#: modules/gui/qt4/dialogs/preferences.cpp:86
 msgid "&Save"
 msgstr "保存(&S)"
 
-#: modules/gui/qt4/dialogs/preferences.cpp:81
+#: modules/gui/qt4/dialogs/preferences.cpp:88
 #, fuzzy
 msgid "&Reset Preferences"
 msgstr "重设偏好设置"
 
-#: modules/gui/qt4/dialogs/preferences.cpp:346
+#: modules/gui/qt4/dialogs/preferences.cpp:353
 msgid ""
 "This will reset your VLC media player preferences.\n"
 "Are you sure you want to continue?"
@@ -16268,61 +16376,62 @@ msgstr ""
 "注意: 这将复位您的 VLC media player 设置。\n"
 "是否确定要继续?"
 
-#: modules/gui/qt4/dialogs_provider.cpp:379
+#: modules/gui/qt4/dialogs_provider.cpp:412
+#, fuzzy
+msgid "Open Directory"
+msgstr "打开目录(&I)..."
+
+#: modules/gui/qt4/dialogs_provider.cpp:442
 #, fuzzy
 msgid "Open playlist file"
 msgstr "打开播放列表"
 
-#: modules/gui/qt4/dialogs_provider.cpp:390
+#: modules/gui/qt4/dialogs_provider.cpp:453
 #, fuzzy
 msgid "Choose a filename to save playlist"
 msgstr "你必须选择文件以另存"
 
-#: modules/gui/qt4/dialogs_provider.cpp:392
+#: modules/gui/qt4/dialogs_provider.cpp:455
 #, fuzzy
 msgid "XSPF playlist (*.xspf);; "
 msgstr "XSPF 列表导出器"
 
-#: modules/gui/qt4/dialogs_provider.cpp:393
+#: modules/gui/qt4/dialogs_provider.cpp:456
 msgid "M3U playlist (*.m3u);; Any (*.*) "
 msgstr ""
 
-#: modules/gui/qt4/dialogs_provider.cpp:541
-#, fuzzy
-msgid "Choose subtitles file"
-msgstr "使用字幕文件"
-
-#: modules/gui/qt4/dialogs_provider.cpp:543
-msgid "Subtitles files (*.cdg *.idx *.srt *.sub *.utf);;All files (*)"
-msgstr ""
-
-#: modules/gui/qt4/dialogs_provider.hpp:44
+#: modules/gui/qt4/dialogs_provider.hpp:45
 #, fuzzy
 msgid "Media Files"
 msgstr "媒体: %s"
 
-#: modules/gui/qt4/dialogs_provider.hpp:64
+#: modules/gui/qt4/dialogs_provider.hpp:65
 #, fuzzy
 msgid "Subtitles Files"
 msgstr "字幕文件"
 
-#: modules/gui/qt4/dialogs_provider.hpp:69
+#: modules/gui/qt4/dialogs_provider.hpp:70
 #, fuzzy
 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,286 +16479,323 @@ 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
+#: modules/gui/qt4/main_interface.cpp:295
+msgid "Toggle between elapsed and remaining time"
+msgstr ""
+
+#: modules/gui/qt4/main_interface.cpp:301
+msgid ""
+"Current playback speed.\n"
+"Right click to adjust"
+msgstr ""
+
+#: modules/gui/qt4/main_interface.cpp:472
 #, fuzzy
-msgid "Privacy and Network policies"
+msgid "Privacy and Network Policies"
 msgstr "界面互动"
 
-#: modules/gui/qt4/main_interface.cpp:474
+#: modules/gui/qt4/main_interface.cpp:476
 #, fuzzy
 msgid "Privacy and Network Warning"
 msgstr "界面互动"
 
-#: modules/gui/qt4/main_interface.cpp:477
+#: modules/gui/qt4/main_interface.cpp:479
 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:1023
 msgid "Control menu for the player"
 msgstr ""
 
-#: modules/gui/qt4/main_interface.cpp:1059
+#: modules/gui/qt4/main_interface.cpp:1072
 msgid "Paused"
 msgstr "暂停"
 
-#: modules/gui/qt4/menus.cpp:272
+#: modules/gui/qt4/menus.cpp:275
 #, fuzzy
 msgid "&Media"
 msgstr "媒体: %s"
 
-#: modules/gui/qt4/menus.cpp:273
+#: modules/gui/qt4/menus.cpp:276
 #, fuzzy
 msgid "&Playlist"
 msgstr "播放列表"
 
-#: modules/gui/qt4/menus.cpp:275
+#: modules/gui/qt4/menus.cpp:278
 #, fuzzy
 msgid "&Tools"
 msgstr "工具"
 
-#: modules/gui/qt4/menus.cpp:276 modules/gui/qt4/menus.cpp:815
+#: modules/gui/qt4/menus.cpp:279 modules/gui/qt4/menus.cpp:817
 msgid "&Audio"
 msgstr "音频(&A)"
 
-#: modules/gui/qt4/menus.cpp:277 modules/gui/qt4/menus.cpp:821
+#: modules/gui/qt4/menus.cpp:280 modules/gui/qt4/menus.cpp:823
 msgid "&Video"
 msgstr "视频(&V)"
 
-#: modules/gui/qt4/menus.cpp:278 modules/gui/qt4/menus.cpp:827
+#: modules/gui/qt4/menus.cpp:281
 #, fuzzy
-msgid "&Playback"
+msgid "P&layback"
 msgstr "回放"
 
-#: modules/gui/qt4/menus.cpp:279
+#: modules/gui/qt4/menus.cpp:282
 msgid "&Help"
 msgstr "帮助(&H)"
 
-#: modules/gui/qt4/menus.cpp:292 modules/gui/qt4/menus.cpp:679
+#: modules/gui/qt4/menus.cpp:295 modules/gui/qt4/menus.cpp:681
 #, fuzzy
 msgid "&Open File..."
 msgstr "打开文件..."
 
-#: modules/gui/qt4/menus.cpp:296 modules/gui/qt4/menus.cpp:683
+#: modules/gui/qt4/menus.cpp:299 modules/gui/qt4/menus.cpp:685
 msgid "Open &Disc..."
 msgstr "打开光盘(&D)"
 
-#: modules/gui/qt4/menus.cpp:298 modules/gui/qt4/menus.cpp:685
+#: modules/gui/qt4/menus.cpp:301 modules/gui/qt4/menus.cpp:687
 #, fuzzy
 msgid "Open &Network..."
 msgstr "打开网络..."
 
-#: modules/gui/qt4/menus.cpp:300 modules/gui/qt4/menus.cpp:687
+#: modules/gui/qt4/menus.cpp:303 modules/gui/qt4/menus.cpp:689
 msgid "Open &Capture Device..."
 msgstr "打开获取装置(&C)"
 
-#: modules/gui/qt4/menus.cpp:305
+#: modules/gui/qt4/menus.cpp:308
 #, fuzzy
 msgid "&Streaming..."
 msgstr "串流"
 
-#: modules/gui/qt4/menus.cpp:308
+#: modules/gui/qt4/menus.cpp:311
 msgid "Conve&rt / Save..."
 msgstr ""
 
-#: modules/gui/qt4/menus.cpp:312 modules/gui/qt4/menus.cpp:904
+#: modules/gui/qt4/menus.cpp:315 modules/gui/qt4/menus.cpp:906
 #, fuzzy
 msgid "&Quit"
 msgstr "离开"
 
-#: modules/gui/qt4/menus.cpp:323 modules/gui/qt4/menus.cpp:839
+#: modules/gui/qt4/menus.cpp:326
 #, fuzzy
-msgid "Show Playlist"
+msgid "Show P&laylist"
 msgstr "保存播放列表"
 
-#: modules/gui/qt4/menus.cpp:331
-#, fuzzy
-msgid "Undock from interface"
-msgstr "控制界面"
-
-#: modules/gui/qt4/menus.cpp:332
+#: modules/gui/qt4/menus.cpp:355
 #, fuzzy
-msgid "Ctrl+U"
-msgstr "Ctrl"
+msgid "Play&list..."
+msgstr "播放列表"
 
-#: modules/gui/qt4/menus.cpp:353
+#: modules/gui/qt4/menus.cpp:356
 #, fuzzy
 msgid "Ctrl+L"
 msgstr "Ctrl"
 
-#: modules/gui/qt4/menus.cpp:364
-#, fuzzy
-msgid "Add Interfaces"
-msgstr "新增界面"
-
-#: modules/gui/qt4/menus.cpp:374 modules/gui/qt4/menus.cpp:843
+#: modules/gui/qt4/menus.cpp:375
 #, fuzzy
-msgid "Minimal View..."
+msgid "Mi&nimal View..."
 msgstr "最小界面"
 
-#: modules/gui/qt4/menus.cpp:375
+#: modules/gui/qt4/menus.cpp:376
 #, fuzzy
 msgid "Ctrl+H"
 msgstr "Ctrl"
 
-#: modules/gui/qt4/menus.cpp:381 modules/gui/qt4/menus.cpp:848
+#: modules/gui/qt4/menus.cpp:384
 #, fuzzy
-msgid "Toggle Fullscreen Interface"
+msgid "&Fullscreen Interface"
 msgstr "Telnet 界面"
 
-#: modules/gui/qt4/menus.cpp:385
+#: modules/gui/qt4/menus.cpp:390
 #, fuzzy
-msgid "Advanced controls"
+msgid "&Advanced Controls"
 msgstr "高级选项"
 
-#: modules/gui/qt4/menus.cpp:391
+#: modules/gui/qt4/menus.cpp:397
 #, fuzzy
 msgid "Visualizations selector"
 msgstr "视觉效果"
 
-#: modules/gui/qt4/menus.cpp:451
+#: modules/gui/qt4/menus.cpp:421
+msgid "&Preferences..."
+msgstr "偏好设置(&P)"
+
+#: modules/gui/qt4/menus.cpp:454
 #, fuzzy
 msgid "Audio &Track"
 msgstr "音频轨"
 
-#: modules/gui/qt4/menus.cpp:452
+#: modules/gui/qt4/menus.cpp:455
 #, fuzzy
 msgid "Audio &Device"
 msgstr "音频装置"
 
-#: modules/gui/qt4/menus.cpp:453
+#: modules/gui/qt4/menus.cpp:456
 #, fuzzy
 msgid "Audio &Channels"
 msgstr "音频"
 
-#: modules/gui/qt4/menus.cpp:454
-#, fuzzy
-msgid "&Equalizer"
-msgstr "均衡器"
-
-#: modules/gui/qt4/menus.cpp:456
+#: modules/gui/qt4/menus.cpp:458
 #, fuzzy
 msgid "&Visualizations"
 msgstr "视觉效果"
 
-#: modules/gui/qt4/menus.cpp:491
+#: modules/gui/qt4/menus.cpp:493
 #, fuzzy
 msgid "Video &Track"
 msgstr "视频轨"
 
-#: modules/gui/qt4/menus.cpp:494
+#: modules/gui/qt4/menus.cpp:496
 #, fuzzy
 msgid "&Subtitles Track"
 msgstr "字幕轨"
 
-#: modules/gui/qt4/menus.cpp:497
+#: modules/gui/qt4/menus.cpp:499
 #, fuzzy
 msgid "Load File..."
 msgstr "保存文件..."
 
-#: modules/gui/qt4/menus.cpp:501
+#: modules/gui/qt4/menus.cpp:503
 #, fuzzy
-msgid "Toggle &Fullscreen"
-msgstr "Telnet 界面"
+msgid "&Fullscreen"
+msgstr "全屏幕"
 
-#: modules/gui/qt4/menus.cpp:502
+#: modules/gui/qt4/menus.cpp:504
 #, fuzzy
 msgid "&Zoom"
 msgstr "缩放"
 
-#: modules/gui/qt4/menus.cpp:503
+#: modules/gui/qt4/menus.cpp:505
 #, fuzzy
 msgid "&Deinterlace"
 msgstr "解除交错"
 
-#: modules/gui/qt4/menus.cpp:504
+#: modules/gui/qt4/menus.cpp:506
 #, fuzzy
 msgid "&Aspect Ratio"
 msgstr "纵横比"
 
-#: modules/gui/qt4/menus.cpp:505
+#: modules/gui/qt4/menus.cpp:507
 #, fuzzy
 msgid "&Crop"
 msgstr "修整"
 
-#: modules/gui/qt4/menus.cpp:506
+#: modules/gui/qt4/menus.cpp:508
 #, fuzzy
 msgid "Always &On Top"
 msgstr "永远在最上层"
 
-#: modules/gui/qt4/menus.cpp:546
+#: modules/gui/qt4/menus.cpp:510
+#, fuzzy
+msgid "Sna&pshot"
+msgstr "快照"
+
+#: modules/gui/qt4/menus.cpp:548
 #, fuzzy
 msgid "&Bookmarks"
 msgstr "书签"
 
-#: modules/gui/qt4/menus.cpp:547
+#: modules/gui/qt4/menus.cpp:549
 #, fuzzy
-msgid "&Title"
+msgid "T&itle"
 msgstr "标题"
 
-#: modules/gui/qt4/menus.cpp:548
+#: modules/gui/qt4/menus.cpp:550
 #, fuzzy
 msgid "&Chapter"
 msgstr "章节"
 
-#: modules/gui/qt4/menus.cpp:549
+#: modules/gui/qt4/menus.cpp:551
 #, fuzzy
 msgid "&Program"
 msgstr "程序"
 
-#: modules/gui/qt4/menus.cpp:550
+#: modules/gui/qt4/menus.cpp:552
 msgid "&Navigation"
 msgstr "导航(&N)"
 
-#: modules/gui/qt4/menus.cpp:612
+#: modules/gui/qt4/menus.cpp:596
+#, fuzzy
+msgid "Configure podcasts..."
+msgstr "配置"
+
+#: modules/gui/qt4/menus.cpp:614
 #, fuzzy
-msgid "Help..."
+msgid "&Help..."
 msgstr "帮助"
 
-#: modules/gui/qt4/menus.cpp:615
+#: modules/gui/qt4/menus.cpp:617
 #, fuzzy
-msgid "Check for updates..."
+msgid "Check for &Updates..."
 msgstr "检查更新..."
 
-#: modules/gui/qt4/menus.cpp:674
+#: modules/gui/qt4/menus.cpp:676
 #, fuzzy
 msgid "Tools"
 msgstr "工具"
 
-#: modules/gui/qt4/menus.cpp:801
+#: modules/gui/qt4/menus.cpp:803
 #, fuzzy
 msgid "Leave Fullscreen"
 msgstr "放大到全屏幕"
 
-#: modules/gui/qt4/menus.cpp:888
+#: modules/gui/qt4/menus.cpp:829
+#, fuzzy
+msgid "&Playback"
+msgstr "回放"
+
+#: modules/gui/qt4/menus.cpp:841
+#, fuzzy
+msgid "Show Playlist"
+msgstr "保存播放列表"
+
+#: modules/gui/qt4/menus.cpp:845
+#, fuzzy
+msgid "Minimal View..."
+msgstr "最小界面"
+
+#: modules/gui/qt4/menus.cpp:850
+#, fuzzy
+msgid "Toggle Fullscreen Interface"
+msgstr "Telnet 界面"
+
+#: modules/gui/qt4/menus.cpp:890
 #, fuzzy
 msgid "Hide VLC media player in taskbar"
 msgstr "VLC多媒体播放程序"
 
-#: modules/gui/qt4/menus.cpp:894
+#: modules/gui/qt4/menus.cpp:896
 #, fuzzy
 msgid "Show VLC media player"
 msgstr "VLC多媒体播放程序"
 
-#: modules/gui/qt4/menus.cpp:902
+#: modules/gui/qt4/menus.cpp:904
 #, fuzzy
 msgid "&Open Media"
 msgstr "开启"
 
+#: modules/gui/qt4/menus.hpp:36
+#, fuzzy
+msgid "Open &Folder..."
+msgstr "打开文件..."
+
+#: modules/gui/qt4/menus.hpp:38
+msgid "Open D&irectory..."
+msgstr "打开目录(&I)..."
+
 #: 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 +16811,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 +16819,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,46 +16907,47 @@ 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
-msgid "Show the opening dialog view in detail mode"
-msgstr ""
-
-#: modules/gui/qt4/qt4.cpp:129
 msgid "Selection of the starting mode and look "
 msgstr ""
 
-#: modules/gui/qt4/qt4.cpp:130
+#: modules/gui/qt4/qt4.cpp:128
 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 ""
 
-#: modules/gui/qt4/qt4.cpp:136
+#: modules/gui/qt4/qt4.cpp:134
 #, fuzzy
 msgid "Classic look"
 msgstr "古典"
 
-#: modules/gui/qt4/qt4.cpp:137
+#: modules/gui/qt4/qt4.cpp:135
 msgid "Complete look with information area"
 msgstr ""
 
-#: modules/gui/qt4/qt4.cpp:138
+#: modules/gui/qt4/qt4.cpp:136
 msgid "Minimal look with no menus"
 msgstr ""
 
+#: modules/gui/qt4/qt4.cpp:138
+#, fuzzy
+msgid "Show a controller in fullscreen mode"
+msgstr "选择全屏幕模式所使用的屏幕。"
+
 #: modules/gui/qt4/qt4.cpp:147
 msgid "Qt interface"
 msgstr "Qt界面"
@@ -16814,7 +16959,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 +16972,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,36 +16980,30 @@ 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
+#: modules/gui/qt4/ui/open_disk.ui:91
 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"
 msgstr "设备"
 
-#: modules/gui/qt4/ui/open_disk.ui:158
-#, fuzzy
-msgid "Select the device or the VIDEO_TS directory"
-msgstr "开启VIDEO_TS目录"
-
-#: modules/gui/qt4/ui/open_disk.ui:171
+#: modules/gui/qt4/ui/open_disk.ui:165
 #, fuzzy
-msgid "Starting position"
+msgid "Starting Position"
 msgstr "子图像位置"
 
-#: modules/gui/qt4/ui/open_disk.ui:238
+#: modules/gui/qt4/ui/open_disk.ui:232
 #, fuzzy
 msgid "Audio and Subtitles"
 msgstr "格式化字幕"
@@ -16881,7 +17020,7 @@ msgstr "使用字幕文件"
 
 #: modules/gui/qt4/ui/open_file.ui:52
 #, fuzzy
-msgid "Use a sub&amp;titles file"
+msgid "Use a sub&titles file"
 msgstr "使用字幕文件"
 
 #: modules/gui/qt4/ui/open_file.ui:126
@@ -16914,7 +17053,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 ""
 
@@ -16925,7 +17064,7 @@ msgstr "显示高级选项"
 
 #: modules/gui/qt4/ui/open.ui:54
 #, fuzzy
-msgid "Show &amp;more options"
+msgid "Show &more options"
 msgstr "显示高级选项"
 
 #: modules/gui/qt4/ui/open.ui:74
@@ -16966,16 +17105,16 @@ msgstr "自定义: "
 msgid "Complete MRL for VLC internal"
 msgstr ""
 
+#: modules/gui/qt4/ui/open.ui:234
+#, fuzzy
+msgid "Select play mode"
+msgstr "选择分析模式"
+
 #: modules/gui/qt4/ui/podcast_configuration.ui:19
 #: modules/services_discovery/podcast.c:58
 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 +17211,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 +17224,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 +17238,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 +17254,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,37 +17269,42 @@ 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
+#: modules/gui/qt4/ui/sprefs_interface.ui:191
+#, fuzzy
+msgid "Show a controller in fullscreen"
+msgstr "全屏模式中修整边界"
+
+#: modules/gui/qt4/ui/sprefs_interface.ui:201
 #, fuzzy
 msgid "Instances"
 msgstr "界面"
 
-#: modules/gui/qt4/ui/sprefs_interface.ui:187
+#: modules/gui/qt4/ui/sprefs_interface.ui:207
 #, fuzzy
 msgid "Allow only one instance"
 msgstr "只允许一个实例运行"
 
-#: modules/gui/qt4/ui/sprefs_interface.ui:194
+#: modules/gui/qt4/ui/sprefs_interface.ui:214
 msgid "Enqueue files in playlist when in one instance mode"
 msgstr ""
 
-#: modules/gui/qt4/ui/sprefs_interface.ui:201
+#: modules/gui/qt4/ui/sprefs_interface.ui:221
 #, fuzzy
 msgid "File associations:"
 msgstr "描述"
 
-#: modules/gui/qt4/ui/sprefs_interface.ui:214
+#: modules/gui/qt4/ui/sprefs_interface.ui:234
 msgid "Association Setup"
 msgstr ""
 
-#: modules/gui/qt4/ui/sprefs_interface.ui:240
+#: modules/gui/qt4/ui/sprefs_interface.ui:260
 msgid "Fetch the metadata from the Internet"
 msgstr ""
 
-#: modules/gui/qt4/ui/sprefs_interface.ui:247
+#: modules/gui/qt4/ui/sprefs_interface.ui:267
 msgid "Activate update notifier"
 msgstr ""
 
@@ -17165,7 +17315,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 +17323,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 +17342,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 +17349,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 +17564,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 +18190,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."
@@ -18120,15 +18275,15 @@ msgstr "虚拟视频输出"
 msgid "Dummy font renderer function"
 msgstr "虚拟编码器功能"
 
-#: modules/misc/freetype.c:110 modules/misc/win32text.c:58
+#: modules/misc/freetype.c:85 modules/misc/win32text.c:58
 msgid "Filename for the font you want to use"
 msgstr "您想使用的字体文件的文件名"
 
-#: modules/misc/freetype.c:111 modules/misc/win32text.c:59
+#: modules/misc/freetype.c:86 modules/misc/win32text.c:59
 msgid "Font size in pixels"
 msgstr "字体大小 (像素)"
 
-#: modules/misc/freetype.c:112 modules/misc/win32text.c:60
+#: modules/misc/freetype.c:87 modules/misc/win32text.c:60
 msgid ""
 "This is the default size of the fonts that will be rendered on the video. If "
 "set to something different than 0 this option will override the relative "
@@ -18137,17 +18292,19 @@ msgstr ""
 "这是将会被在视频上渲染的文字的字号。如果此项不为 0 的话, 此项将会覆盖相对字"
 "号。"
 
-#: modules/misc/freetype.c:117 modules/misc/win32text.c:65
+#: modules/misc/freetype.c:92 modules/misc/win32text.c:65
 msgid ""
 "The opacity (inverse of transparency) of the text that will be rendered on "
 "the video. 0 = transparent, 255 = totally opaque. "
 msgstr ""
 
-#: modules/misc/freetype.c:120 modules/misc/win32text.c:68
+#: modules/misc/freetype.c:95 modules/misc/quartztext.c:90
+#: modules/misc/win32text.c:68
 msgid "Text default color"
 msgstr "文字默认颜色"
 
-#: modules/misc/freetype.c:121 modules/misc/win32text.c:69
+#: modules/misc/freetype.c:96 modules/misc/quartztext.c:91
+#: modules/misc/win32text.c:69
 msgid ""
 "The color of the text that will be rendered on the video. This must be an "
 "hexadecimal (like HTML colors). The first two chars are for red, then green, "
@@ -18158,71 +18315,77 @@ msgstr ""
 "是红色，然后是绿色，然后是蓝色。#000000 = 黑, #FF0000 = 红, #00FF00 = 绿, "
 "#FFFF00 = 黄 (红 + 绿), #FFFFFF = 白"
 
-#: modules/misc/freetype.c:125 modules/misc/win32text.c:73
+#: modules/misc/freetype.c:100 modules/misc/quartztext.c:86
+#: modules/misc/win32text.c:73
 msgid "Relative font size"
 msgstr "相对字号"
 
-#: modules/misc/freetype.c:126 modules/misc/win32text.c:74
+#: modules/misc/freetype.c:101 modules/misc/quartztext.c:87
+#: modules/misc/win32text.c:74
 msgid ""
 "This is the relative default size of the fonts that will be rendered on the "
 "video. If absolute font size is set, relative size will be overriden."
 msgstr ""
 "这是将被在视频上渲染的文字的相对字号。如果设置了绝对字号，相对字号将被忽略。"
 
-#: modules/misc/freetype.c:132 modules/misc/win32text.c:80
+#: modules/misc/freetype.c:107 modules/misc/quartztext.c:108
+#: modules/misc/win32text.c:80
 msgid "Smaller"
 msgstr "更小"
 
-#: modules/misc/freetype.c:132 modules/misc/win32text.c:80
+#: modules/misc/freetype.c:107 modules/misc/quartztext.c:108
+#: modules/misc/win32text.c:80
 msgid "Small"
 msgstr "小"
 
-#: modules/misc/freetype.c:132 modules/misc/win32text.c:80
+#: modules/misc/freetype.c:107 modules/misc/quartztext.c:108
+#: modules/misc/win32text.c:80
 msgid "Large"
 msgstr "大"
 
-#: modules/misc/freetype.c:132 modules/misc/win32text.c:80
+#: modules/misc/freetype.c:107 modules/misc/quartztext.c:108
+#: modules/misc/win32text.c:80
 msgid "Larger"
 msgstr "更大"
 
-#: modules/misc/freetype.c:133
+#: modules/misc/freetype.c:108
 msgid "Use YUVP renderer"
 msgstr "使用 YUVP 渲染"
 
-#: modules/misc/freetype.c:134
+#: modules/misc/freetype.c:109
 msgid ""
 "This renders the font using \"paletized YUV\". This option is only needed if "
 "you want to encode into DVB subtitles"
 msgstr ""
 
-#: modules/misc/freetype.c:136
+#: modules/misc/freetype.c:111
 msgid "Font Effect"
 msgstr "字体效果"
 
-#: modules/misc/freetype.c:137
+#: modules/misc/freetype.c:112
 msgid ""
 "It is possible to apply effects to the rendered text to improve its "
 "readability."
 msgstr ""
 
-#: modules/misc/freetype.c:146
+#: modules/misc/freetype.c:121
 msgid "Background"
 msgstr "背景"
 
-#: modules/misc/freetype.c:146
+#: modules/misc/freetype.c:121
 msgid "Outline"
 msgstr "大纲"
 
-#: modules/misc/freetype.c:146
+#: modules/misc/freetype.c:121
 #, fuzzy
 msgid "Fat Outline"
 msgstr "大纲"
 
-#: modules/misc/freetype.c:158 modules/misc/win32text.c:92
+#: modules/misc/freetype.c:133 modules/misc/win32text.c:92
 msgid "Text renderer"
 msgstr "字体渲染"
 
-#: modules/misc/freetype.c:159
+#: modules/misc/freetype.c:134
 msgid "Freetype2 font renderer"
 msgstr "Freetype2 字体渲染器"
 
@@ -18534,19 +18697,24 @@ msgstr "视频"
 
 #: modules/misc/quartztext.c:85
 #, fuzzy
+msgid "Name for the font you want to use"
+msgstr "您想使用的字体文件的文件名"
+
+#: modules/misc/quartztext.c:111
+#, fuzzy
 msgid "Mac Text renderer"
 msgstr "字体渲染"
 
-#: modules/misc/quartztext.c:86
+#: modules/misc/quartztext.c:112
 #, fuzzy
 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 +18722,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 +18748,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 服务器"
 
@@ -19021,7 +19189,7 @@ msgstr "Bonjour"
 
 #: modules/services_discovery/hal.c:150
 #: modules/services_discovery/upnp_cc.cpp:87
-#: modules/services_discovery/upnp_intel.cpp:298
+#: modules/services_discovery/upnp_intel.cpp:299
 msgid "Devices"
 msgstr "装置"
 
@@ -19085,7 +19253,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 +19291,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:892 modules/services_discovery/sap.c:896
 msgid "Session"
 msgstr "部分"
 
-#: modules/services_discovery/sap.c:888
+#: modules/services_discovery/sap.c:892
 msgid "Tool"
 msgstr "工具"
 
-#: modules/services_discovery/sap.c:892
+#: modules/services_discovery/sap.c:896
 msgid "User"
 msgstr "用户"
 
@@ -19980,7 +20148,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 +20163,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 +20734,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 ""
@@ -20709,12 +20899,12 @@ msgstr ""
 msgid "Crop video filter"
 msgstr "修整视频过滤器"
 
-#: modules/video_filter/crop.c:378 modules/video_filter/crop.c:472
+#: modules/video_filter/crop.c:378 modules/video_filter/crop.c:474
 #, fuzzy
 msgid "Cropping failed"
 msgstr "修整视频过滤器"
 
-#: modules/video_filter/crop.c:379 modules/video_filter/crop.c:473
+#: modules/video_filter/crop.c:379 modules/video_filter/crop.c:475
 #, fuzzy
 msgid "VLC could not open the video output module."
 msgstr "视频输入色彩."
@@ -20800,7 +20990,7 @@ msgid "Number of pixels to padd to the right of the image after cropping."
 msgstr "从视频右侧修剪一个像素"
 
 #: modules/video_filter/croppadd.c:79 modules/video_filter/scale.c:59
-#: modules/video_filter/swscale.c:71
+#: modules/video_filter/swscale.c:63
 msgid "Video scaling filter"
 msgstr "视频缩放过滤器"
 
@@ -20906,22 +21096,22 @@ msgstr "修整视频过滤器"
 msgid "video-filter-event"
 msgstr "视频过滤器"
 
-#: modules/video_filter/gaussianblur.c:49
+#: modules/video_filter/gaussianblur.c:47
 msgid "Gaussian's std deviation"
 msgstr ""
 
-#: modules/video_filter/gaussianblur.c:51
+#: modules/video_filter/gaussianblur.c:49
 msgid ""
 "Gaussian's standard deviation. The bluring will take into account pixels up "
 "to 3*sigma away in any direction."
 msgstr ""
 
-#: modules/video_filter/gaussianblur.c:60
+#: modules/video_filter/gaussianblur.c:55
 #, fuzzy
 msgid "Gaussian blur video filter"
 msgstr "修整视频过滤器"
 
-#: modules/video_filter/gaussianblur.c:61
+#: modules/video_filter/gaussianblur.c:56
 #, fuzzy
 msgid "Gaussian Blur"
 msgstr "俄语"
@@ -21060,11 +21250,11 @@ msgstr "Logo 覆盖"
 msgid "Logo sub filter"
 msgstr "Logo 子过滤器"
 
-#: modules/video_filter/magnify.c:64
+#: modules/video_filter/magnify.c:50
 msgid "Magnify/Zoom interactive video filter"
 msgstr "放大/缩放交互视频过滤器"
 
-#: modules/video_filter/magnify.c:65
+#: modules/video_filter/magnify.c:51
 msgid "Magnify"
 msgstr "放大镜"
 
@@ -21124,6 +21314,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 "杂项"
@@ -21301,11 +21495,11 @@ msgstr "模糊化的程度，从 1 到 127。"
 msgid "Motion blur filter"
 msgstr "动作模糊化过滤器"
 
-#: modules/video_filter/motiondetect.c:61
+#: modules/video_filter/motiondetect.c:49
 msgid "Motion detect video filter"
 msgstr "动作检测视频过滤器"
 
-#: modules/video_filter/motiondetect.c:62
+#: modules/video_filter/motiondetect.c:50
 #, fuzzy
 msgid "Motion Detect"
 msgstr "动作检测"
@@ -21490,7 +21684,7 @@ msgid ""
 "intensive. The range is 0 - 1000 ms."
 msgstr ""
 
-#: modules/video_filter/osdmenu.c:76 modules/video_filter/remoteosd.c:157
+#: modules/video_filter/osdmenu.c:76 modules/video_filter/remoteosd.c:102
 msgid "Alpha transparency value (default 255)"
 msgstr ""
 
@@ -21799,72 +21993,72 @@ msgstr "解除交错视频过滤器"
 msgid "Puzzle"
 msgstr "紫色"
 
-#: modules/video_filter/remoteosd.c:129
+#: modules/video_filter/remoteosd.c:74
 msgid "VNC Host"
 msgstr ""
 
-#: modules/video_filter/remoteosd.c:131
+#: modules/video_filter/remoteosd.c:76
 msgid "VNC hostname or IP address."
 msgstr ""
 
-#: modules/video_filter/remoteosd.c:133
+#: modules/video_filter/remoteosd.c:78
 #, fuzzy
 msgid "VNC Port"
 msgstr "VCD格式"
 
-#: modules/video_filter/remoteosd.c:135
+#: modules/video_filter/remoteosd.c:80
 #, fuzzy
 msgid "VNC portnumber."
 msgstr "XVideo 适配器数目"
 
-#: modules/video_filter/remoteosd.c:137
+#: modules/video_filter/remoteosd.c:82
 #, fuzzy
 msgid "VNC Password"
 msgstr "密码"
 
-#: modules/video_filter/remoteosd.c:139
+#: modules/video_filter/remoteosd.c:84
 #, fuzzy
 msgid "VNC password."
 msgstr "SOCKS密码"
 
-#: modules/video_filter/remoteosd.c:141
+#: modules/video_filter/remoteosd.c:86
 #, fuzzy
 msgid "VNC poll interval"
 msgstr "关键帧间隔"
 
-#: modules/video_filter/remoteosd.c:143
+#: modules/video_filter/remoteosd.c:88
 msgid ""
 "In this interval an update from VNC is requested, default every 300 ms. "
 msgstr ""
 
-#: modules/video_filter/remoteosd.c:145
+#: modules/video_filter/remoteosd.c:90
 #, fuzzy
 msgid "VNC polling"
 msgstr "正在播放"
 
-#: modules/video_filter/remoteosd.c:147
+#: modules/video_filter/remoteosd.c:92
 msgid "Activate VNC polling. Do NOT activate for use as VDR ffnetdev client."
 msgstr ""
 
-#: modules/video_filter/remoteosd.c:149
+#: modules/video_filter/remoteosd.c:94
 #, fuzzy
 msgid "Mouse events"
 msgstr "鼠标手势"
 
-#: modules/video_filter/remoteosd.c:151
+#: modules/video_filter/remoteosd.c:96
 msgid ""
 "Send mouse events to VNC host. Not needed for use as VDR ffnetdev client."
 msgstr ""
 
-#: modules/video_filter/remoteosd.c:153
+#: modules/video_filter/remoteosd.c:98
 msgid "Key events"
 msgstr ""
 
-#: modules/video_filter/remoteosd.c:155
+#: modules/video_filter/remoteosd.c:100
 msgid "Send key events to VNC host."
 msgstr ""
 
-#: modules/video_filter/remoteosd.c:159
+#: modules/video_filter/remoteosd.c:104
 msgid ""
 "The transparency of the OSD VNC can be changed by giving a value between 0 "
 "and 255. A lower value specifies more transparency a higher means less "
@@ -21872,11 +22066,11 @@ msgid ""
 "is fully transparent (value 0)."
 msgstr ""
 
-#: modules/video_filter/remoteosd.c:172
+#: modules/video_filter/remoteosd.c:119
 msgid "Remote-OSD over VNC"
 msgstr ""
 
-#: modules/video_filter/remoteosd.c:174
+#: modules/video_filter/remoteosd.c:121
 #, fuzzy
 msgid "Remote-OSD"
 msgstr "移除"
@@ -22021,57 +22215,57 @@ msgstr ""
 msgid "Sharpen video filter"
 msgstr "修整视频过滤器"
 
-#: modules/video_filter/swscale.c:56
+#: modules/video_filter/swscale.c:52
 msgid "Scaling mode"
 msgstr "缩放模式"
 
-#: modules/video_filter/swscale.c:57
+#: modules/video_filter/swscale.c:53
 msgid "Scaling mode to use."
 msgstr "要使用的缩放模式"
 
-#: modules/video_filter/swscale.c:61
+#: modules/video_filter/swscale.c:57
 msgid "Fast bilinear"
 msgstr "快速双线性"
 
-#: modules/video_filter/swscale.c:61
+#: modules/video_filter/swscale.c:57
 msgid "Bilinear"
 msgstr "双线性"
 
-#: modules/video_filter/swscale.c:61
+#: modules/video_filter/swscale.c:57
 msgid "Bicubic (good quality)"
 msgstr ""
 
-#: modules/video_filter/swscale.c:62
+#: modules/video_filter/swscale.c:58
 msgid "Experimental"
 msgstr "试验性的"
 
-#: modules/video_filter/swscale.c:62
+#: modules/video_filter/swscale.c:58
 msgid "Nearest neighbour (bad quality)"
 msgstr ""
 
-#: modules/video_filter/swscale.c:63
+#: modules/video_filter/swscale.c:59
 msgid "Area"
 msgstr "区域"
 
-#: modules/video_filter/swscale.c:63
+#: modules/video_filter/swscale.c:59
 msgid "Luma bicubic / chroma bilinear"
 msgstr ""
 
-#: modules/video_filter/swscale.c:63
+#: modules/video_filter/swscale.c:59
 msgid "Gauss"
 msgstr "高斯"
 
-#: modules/video_filter/swscale.c:64
+#: modules/video_filter/swscale.c:60
 #, fuzzy
 msgid "SincR"
 msgstr "皮肤"
 
-#: modules/video_filter/swscale.c:64
+#: modules/video_filter/swscale.c:60
 #, fuzzy
 msgid "Lanczos"
 msgstr "老挝文"
 
-#: modules/video_filter/swscale.c:64
+#: modules/video_filter/swscale.c:60
 msgid "Bicubic spline"
 msgstr ""
 
@@ -22217,20 +22411,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 +22837,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 +22861,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视频输出"
@@ -22943,25 +23129,182 @@ msgid "Spectrum analyser"
 msgstr "频谱分析器"
 
 #, fuzzy
-#~ msgid "RTP reordering timeout in ms"
-#~ msgstr "TCP连接超时时间"
+#~ msgid "A to B"
+#~ msgstr "到 "
 
 #, fuzzy
-#~ msgid "FFmpeg audio/video decoders/encoders"
-#~ msgstr "ffmpeg 音频/视频编码器"
+#~ msgid "Extended settings"
+#~ msgstr "编码器设置"
+
+#, fuzzy
+#~ msgid "Open a device or a VIDEO_TS directory"
+#~ msgstr "开启VIDEO_TS目录"
+
+#, fuzzy
+#~ msgid "&Update List"
+#~ msgstr "更新"
+
+#, fuzzy
+#~ msgid "Choose subtitles file"
+#~ msgstr "使用字幕文件"
+
+#, fuzzy
+#~ msgid "&Equalizer"
+#~ msgstr "均衡器"
+
+#, fuzzy
+#~ msgid "Toggle &Fullscreen"
+#~ msgstr "Telnet 界面"
+
+#, fuzzy
+#~ msgid "&Title"
+#~ msgstr "标题"
+
+#, fuzzy
+#~ msgid "Select the device or the VIDEO_TS directory"
+#~ msgstr "开启VIDEO_TS目录"
+
+#, fuzzy
+#~ msgid "Undock from Interface"
+#~ msgstr "控制界面"
+
+#, fuzzy
+#~ msgid "Ctrl+U"
+#~ msgstr "Ctrl"
+
+#, fuzzy
+#~ msgid "Add Interfaces"
+#~ msgstr "新增界面"
+
+#, fuzzy
+#~ msgid "Use a sub&amp;titles file"
+#~ msgstr "使用字幕文件"
+
+#~ msgid "Add node"
+#~ msgstr "添加节点"
+
+#~ msgid "%s: unrecognized option `--%s'\n"
+#~ msgstr "%s: 不能识别的选项 `--%s'\n"
+
+#, fuzzy
+#~ 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 "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 +23324,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)"
@@ -22993,9 +23333,6 @@ msgstr "频谱分析器"
 #~ msgid "&Delete"
 #~ msgstr "删除(&D)"
 
-#~ msgid "Removes the selected bookmarks"
-#~ msgstr "删除选定的书签"
-
 #~ msgid "Removes all the bookmarks for that stream"
 #~ msgstr "删除关于那个串流的所有书签"
 
@@ -23030,9 +23367,6 @@ msgstr "频谱分析器"
 #~ msgid "URI"
 #~ msgstr "URI"
 
-#~ msgid "&Yes"
-#~ msgstr "是(&Y)"
-
 #~ msgid "&No"
 #~ msgstr "否(&N)"
 
@@ -23066,9 +23400,6 @@ msgstr "频谱分析器"
 #~ msgid "Customize:"
 #~ msgstr "自定义: "
 
-#~ msgid "Use a subtitles file"
-#~ msgstr "使用字幕文件"
-
 #~ msgid "Use an external subtitles file."
 #~ msgstr "使用外部字幕文件"
 
@@ -23162,9 +23493,6 @@ msgstr "频谱分析器"
 #~ msgid "Info"
 #~ msgstr "信息"
 
-#~ msgid "Add Node"
-#~ msgstr "添加节点"
-
 #~ msgid "%i items in playlist"
 #~ msgstr "%i个项目在播放列表中"
 
@@ -23268,9 +23596,6 @@ msgstr "频谱分析器"
 #~ msgid "New broadcast"
 #~ msgstr "新广播"
 
-#~ msgid "Create"
-#~ msgstr "建立"
-
 #~ msgid "VLM stream"
 #~ msgstr "VLM 流"
 
@@ -23354,11 +23679,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 +23693,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 +23789,6 @@ msgstr "频谱分析器"
 #~ msgid "Online Help"
 #~ msgstr "在线论坛"
 
-#~ msgid "Check for Updates..."
-#~ msgstr "检查更新..."
-
 #, fuzzy
 #~ msgid "V&iew"
 #~ msgstr "查看"
@@ -23500,8 +23842,8 @@ msgstr "频谱分析器"
 #~ msgid "Show/Hide Interface"
 #~ msgstr "显示/隐藏界面"
 
-#~ msgid "Open D&irectory..."
-#~ msgstr "打开目录(&I)..."
+#~ msgid "Open &File..."
+#~ msgstr "打开文件(&F)"
 
 #~ msgid "Open &Network Stream..."
 #~ msgstr "打开网络串流(&N)"
@@ -23509,11 +23851,8 @@ msgstr "频谱分析器"
 #~ msgid "Media &Info..."
 #~ msgstr "媒体信息(&I)"
 
-#~ msgid "&Messages..."
-#~ msgstr "讯息(&M)"
-
-#~ msgid "&Preferences..."
-#~ msgstr "偏好设置(&P)"
+#~ msgid "Empty"
+#~ msgstr "无项目"
 
 #~ msgid ""
 #~ "MPEG-1 Video codec (useable with MPEG PS, MPEG TS, MPEG1, OGG and RAW)"
@@ -23614,8 +23953,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."
@@ -23715,16 +24071,9 @@ msgstr "频谱分析器"
 #~ msgid "Embedded video output"
 #~ msgstr "嵌入视频输出"
 
-#~ msgid "Checking for Updates..."
-#~ msgstr "正在检查更新..."
-
 #~ msgid "The latest VLC media player release is %s (%i MB to download)."
 #~ msgstr "最新版本的 VLC 是 %s (下载大小 %i MB)。"
 
-#, fuzzy
-#~ msgid "Information about VLC media player."
-#~ msgstr "关于VLC多媒体播放程序"
-
 #~ msgid "Based on SVN revision: "
 #~ msgstr "基于 SVN 版本:"
 
@@ -23736,10 +24085,6 @@ msgstr "频谱分析器"
 #~ msgid "Distribution License"
 #~ msgstr "畸变"
 
-#, fuzzy
-#~ msgid "Switch to skins"
-#~ msgstr "选择面板"
-
 #, fuzzy
 #~ msgid "Always show video area"
 #~ msgstr "显示视频快照预览"
@@ -23814,14 +24159,6 @@ msgstr "频谱分析器"
 #~ msgid "Video Adjustments and Effects"
 #~ msgstr "视频编码器"
 
-#, fuzzy
-#~ msgid "Open directory"
-#~ msgstr "打开目录(&I)..."
-
-#, fuzzy
-#~ msgid "Select the device"
-#~ msgstr "选择文件"
-
 #~ msgid "Save file..."
 #~ msgstr "保存文件..."
 
@@ -24066,10 +24403,6 @@ msgstr "频谱分析器"
 #~ msgid "&Shuffle Playlist"
 #~ msgstr "乱化播放清单"
 
-#, fuzzy
-#~ msgid "VLC media player - Updates"
-#~ msgstr "VLC多媒体播放程序"
-
 #~ msgid "Check for updates now !"
 #~ msgstr "现在检查更新 !"
 
@@ -24327,9 +24660,6 @@ msgstr "频谱分析器"
 #~ msgid "ISO-9660 Volume Set"
 #~ msgstr "ISO-9660 卷系列"
 
-#~ msgid "Console"
-#~ msgstr "控制台"
-
 #~ msgid "IPv6 multicast output interface"
 #~ msgstr "IPv6 多播输出接口"
 
@@ -24402,9 +24732,6 @@ msgstr "频谱分析器"
 #~ msgid "Do not display further errors"
 #~ msgstr "不再显示以后的错误"
 
-#~ msgid "Crop borders in fullscreen"
-#~ msgstr "全屏模式中修整边界"
-
 #, fuzzy
 #~ msgid "Enable skinned playlist"
 #~ msgstr "无法找到播放列表"
@@ -24491,10 +24818,6 @@ msgstr "频谱分析器"
 #~ msgid "Extra Audio File"
 #~ msgstr "音频滤波器"
 
-#, fuzzy
-#~ msgid "Download when asked"
-#~ msgstr "现在下载"
-
 #, fuzzy
 #~ msgid "QWidget"
 #~ msgstr "宽度"