Split playlist include file in public/private

[vlc] / po / zh_CN.po

diff --git a/po/zh_CN.po b/po/zh_CN.po
index d778748f0df0c215e4c88d15fea6d2ae12a0d02f..19727df35a1a8b699b75c9a67642a4f15a6fe315 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: \n"
-"POT-Creation-Date: 2006-05-22 10:47+0200\n"
+"POT-Creation-Date: 2006-09-05 07:49+0200\n"
 "PO-Revision-Date: 2006-05-03 20:30+0700\n"
 "Last-Translator: Wei Mingzhi <whistler@openoffice.org>\n"
 "Language-Team: Simplified Chinese\n"
@@ -38,9 +38,9 @@ msgstr "VLC 选项"
 msgid "Select \"Advanced Options\" to see all options."
 msgstr "选择 \"高级选项\" 查看所有选项。"
 
-#: include/vlc_config_cat.h:36 include/vlc_config_cat.h:127
-#: src/input/input.c:1826 src/playlist/item.c:619
-#: modules/gui/macosx/playlistinfo.m:62 modules/gui/wince/playlist.cpp:674
+#: include/vlc_config_cat.h:36 include/vlc_config_cat.h:131
+#: src/input/input.c:1843 modules/gui/macosx/playlistinfo.m:62
+#: modules/gui/wince/playlist.cpp:674
 #: modules/gui/wxwidgets/dialogs/fileinfo.cpp:82
 #: modules/visualization/visual/visual.c:113
 msgid "General"
@@ -78,13 +78,13 @@ msgstr "控制界面设置"
 msgid "Hotkeys settings"
 msgstr "热键设置"
 
-#: include/vlc_config_cat.h:54 src/input/es_out.c:1581 src/libvlc.h:1167
-#: modules/gui/beos/InterfaceWindow.cpp:280 modules/gui/macosx/extended.m:81
-#: modules/gui/macosx/intf.m:549 modules/gui/macosx/output.m:170
+#: include/vlc_config_cat.h:54 src/input/es_out.c:1585 src/libvlc.h:1217
+#: modules/gui/beos/InterfaceWindow.cpp:282 modules/gui/macosx/extended.m:81
+#: modules/gui/macosx/intf.m:555 modules/gui/macosx/output.m:170
 #: modules/gui/macosx/playlistinfo.m:96 modules/gui/macosx/wizard.m:421
 #: modules/gui/wxwidgets/dialogs/infopanels.cpp:336
 #: modules/gui/wxwidgets/dialogs/wizard.cpp:864
-#: modules/gui/wxwidgets/extrapanel.cpp:178 modules/stream_out/transcode.c:249
+#: modules/gui/wxwidgets/extrapanel.cpp:178 modules/stream_out/transcode.c:253
 msgid "Audio"
 msgstr "音频"
 
@@ -97,7 +97,7 @@ msgid "General audio settings"
 msgstr "一般音频设置"
 
 #: include/vlc_config_cat.h:60 include/vlc_config_cat.h:85
-#: src/video_output/video_output.c:403
+#: src/video_output/video_output.c:445
 msgid "Filters"
 msgstr "过滤器"
 
@@ -106,7 +106,7 @@ msgid "Audio filters are used to postprocess the audio stream."
 msgstr "音频过滤器可以用于对音频流进行善后处理。"
 
 #: include/vlc_config_cat.h:64 src/audio_output/input.c:78
-#: modules/gui/macosx/intf.m:559 modules/gui/macosx/intf.m:560
+#: modules/gui/macosx/intf.m:565 modules/gui/macosx/intf.m:566
 msgid "Visualizations"
 msgstr "视觉效果"
 
@@ -122,9 +122,9 @@ msgstr "输出模块"
 msgid "These are general settings for audio output modules."
 msgstr "音频输出模块的一般设置"
 
-#: include/vlc_config_cat.h:71 src/libvlc.h:1493
+#: include/vlc_config_cat.h:71 src/libvlc.h:1563
 #: modules/gui/wxwidgets/dialogs/streamout.cpp:578
-#: modules/gui/wxwidgets/menus.cpp:279 modules/stream_out/transcode.c:278
+#: modules/gui/wxwidgets/menus.cpp:280 modules/stream_out/transcode.c:285
 msgid "Miscellaneous"
 msgstr "杂项"
 
@@ -132,14 +132,14 @@ msgstr "杂项"
 msgid "Miscellaneous audio settings and modules."
 msgstr "模块及音频杂项设置"
 
-#: include/vlc_config_cat.h:75 src/input/es_out.c:1609 src/libvlc.h:1202
-#: modules/gui/macosx/extended.m:80 modules/gui/macosx/intf.m:562
+#: include/vlc_config_cat.h:75 src/input/es_out.c:1613 src/libvlc.h:1252
+#: modules/gui/macosx/extended.m:80 modules/gui/macosx/intf.m:568
 #: modules/gui/macosx/output.m:160 modules/gui/macosx/playlistinfo.m:86
 #: modules/gui/macosx/wizard.m:422
 #: modules/gui/wxwidgets/dialogs/infopanels.cpp:290
 #: modules/gui/wxwidgets/dialogs/wizard.cpp:825
 #: modules/gui/wxwidgets/extrapanel.cpp:176 modules/misc/dummy/dummy.c:95
-#: modules/stream_out/transcode.c:193
+#: modules/stream_out/transcode.c:197
 msgid "Video"
 msgstr "视频"
 
@@ -155,36 +155,41 @@ msgstr "一般视频设置"
 msgid "Choose your preferred video output and configure it here."
 msgstr "选择你所偏好的视频输出模块并设置"
 
-#: include/vlc_config_cat.h:87
+#: include/vlc_config_cat.h:87 include/vlc_config_cat.h:91
 msgid "Video filters are used to postprocess the video stream."
 msgstr "视频过滤器可以用于对视频流进行善后处理"
 
 #: include/vlc_config_cat.h:89
+#, fuzzy
+msgid "Filters (v2)"
+msgstr "过滤器"
+
+#: include/vlc_config_cat.h:93
 msgid "Subtitles/OSD"
 msgstr "字幕/OSD"
 
-#: include/vlc_config_cat.h:90
+#: include/vlc_config_cat.h:94
 msgid ""
 "Miscellaneous settings related to On-Screen-Display, subtitles and \"overlay "
 "subpictures\"."
 msgstr "关于 OSD，字幕和覆盖的子图的一些杂项"
 
-#: include/vlc_config_cat.h:99
+#: include/vlc_config_cat.h:103
 msgid "Input / Codecs"
 msgstr "输入 / 编码器"
 
-#: include/vlc_config_cat.h:100
+#: include/vlc_config_cat.h:104
 msgid ""
 "These are the settings for the input, demultiplexing and decoding parts of "
 "VLC. Encoder settings can also be found here."
 msgstr ""
 "这些是关于 VLC 的输入、多路传输和解码的部分。编码器的设置也可以在这里找到。"
 
-#: include/vlc_config_cat.h:103
+#: include/vlc_config_cat.h:107
 msgid "Access modules"
 msgstr "存取模块"
 
-#: include/vlc_config_cat.h:105
+#: include/vlc_config_cat.h:109
 msgid ""
 "Settings related to the various access methods used by VLC. Common settings "
 "you may want to alter are HTTP proxy or caching settings."
@@ -192,11 +197,11 @@ msgstr ""
 "关于各种 VLC 使用的存取方法的设置。您可能要更改的一般的设置为 HTTP 代理或缓存"
 "设置。"
 
-#: include/vlc_config_cat.h:109
+#: include/vlc_config_cat.h:113
 msgid "Access filters"
 msgstr "存取过滤器"
 
-#: include/vlc_config_cat.h:111
+#: include/vlc_config_cat.h:115
 msgid ""
 "Access filters are special modules that allow advanced operations on the "
 "input side of VLC. You should not touch anything here unless you know what "
@@ -205,48 +210,48 @@ msgstr ""
 "存取过滤器是允许 VLC 的在输入方面上的高级操作的特殊模块。除非您知道您在做什"
 "么，您不应该改变这里的设置。"
 
-#: include/vlc_config_cat.h:115
+#: include/vlc_config_cat.h:119
 msgid "Demuxers"
 msgstr "解多任务器"
 
-#: include/vlc_config_cat.h:116
+#: include/vlc_config_cat.h:120
 msgid "Demuxers are used to separate audio and video streams."
 msgstr "解多任务器可以用来分离音频和视频串流"
 
-#: include/vlc_config_cat.h:118
+#: include/vlc_config_cat.h:122
 msgid "Video codecs"
 msgstr "视频编码器"
 
-#: include/vlc_config_cat.h:119
+#: include/vlc_config_cat.h:123
 msgid "Settings for the video-only decoders and encoders."
 msgstr "设置纯视频编码及译码器"
 
-#: include/vlc_config_cat.h:121
+#: include/vlc_config_cat.h:125
 msgid "Audio codecs"
 msgstr "音频编码器"
 
-#: include/vlc_config_cat.h:122
+#: include/vlc_config_cat.h:126
 msgid "Settings for the audio-only decoders and encoders."
 msgstr "设置纯音频编码及译码器"
 
-#: include/vlc_config_cat.h:124
+#: include/vlc_config_cat.h:128
 msgid "Other codecs"
 msgstr "其它编码器"
 
-#: include/vlc_config_cat.h:125
+#: include/vlc_config_cat.h:129
 msgid "Settings for audio+video and miscellaneous decoders and encoders."
 msgstr "设置音频+视频、杂项编码及译码器"
 
-#: include/vlc_config_cat.h:128
+#: include/vlc_config_cat.h:132
 msgid "General input settings. Use with care."
 msgstr "一般输入设置，请注意。"
 
-#: include/vlc_config_cat.h:131 src/libvlc.h:1430
+#: include/vlc_config_cat.h:135 src/libvlc.h:1493
 #: modules/gui/wxwidgets/dialogs/streamout.cpp:152
 msgid "Stream output"
 msgstr "串流输出"
 
-#: include/vlc_config_cat.h:133
+#: include/vlc_config_cat.h:137
 msgid ""
 "Stream output is what allows VLC to act as a streaming server or to save "
 "incoming streams.\n"
@@ -257,15 +262,15 @@ msgid ""
 "duplicating...)."
 msgstr ""
 
-#: include/vlc_config_cat.h:141
+#: include/vlc_config_cat.h:145
 msgid "General stream output settings"
 msgstr "一般串流输出设置"
 
-#: include/vlc_config_cat.h:143
+#: include/vlc_config_cat.h:147
 msgid "Muxers"
 msgstr "Muxers"
 
-#: include/vlc_config_cat.h:145
+#: include/vlc_config_cat.h:149
 msgid ""
 "Muxers create the encapsulation formats that are used to put all the "
 "elementary streams (video, audio, ...) together. This setting allows you to "
@@ -273,11 +278,11 @@ msgid ""
 "You can also set default parameters for each muxer."
 msgstr ""
 
-#: include/vlc_config_cat.h:151
+#: include/vlc_config_cat.h:155
 msgid "Access output"
 msgstr "存取输出"
 
-#: include/vlc_config_cat.h:153
+#: include/vlc_config_cat.h:157
 msgid ""
 "Access output modules control the ways the muxed streams are sent. This "
 "setting allows you to always force a specific access output method. You "
@@ -285,11 +290,11 @@ msgid ""
 "You can also set default parameters for each access output."
 msgstr ""
 
-#: include/vlc_config_cat.h:158
+#: include/vlc_config_cat.h:162
 msgid "Packetizers"
 msgstr "封包器"
 
-#: include/vlc_config_cat.h:160
+#: include/vlc_config_cat.h:164
 msgid ""
 "Packetizers are used to \"preprocess\" the elementary streams before muxing. "
 "This setting allows you to always force a packetizer. You should probably "
@@ -297,153 +302,153 @@ msgid ""
 "You can also set default parameters for each packetizer."
 msgstr ""
 
-#: include/vlc_config_cat.h:166
+#: include/vlc_config_cat.h:170
 msgid "Sout stream"
 msgstr "Sout流输出"
 
-#: include/vlc_config_cat.h:167
+#: include/vlc_config_cat.h:171
 msgid ""
 "Sout stream modules allow to build a sout processing chain. Please refer to "
 "the Streaming Howto for more information. You can configure default options "
 "for each sout stream module here."
 msgstr ""
 
-#: include/vlc_config_cat.h:172 modules/services_discovery/sap.c:123
+#: include/vlc_config_cat.h:176 modules/services_discovery/sap.c:123
 msgid "SAP"
 msgstr "SAP"
 
-#: include/vlc_config_cat.h:174
+#: include/vlc_config_cat.h:178
 msgid ""
 "SAP is a way to publically announce streams that are being sent using "
 "multicast UDP or RTP."
 msgstr "SAP 是一种可公开通告正在通过多播 UDP 或 RTP 来发送的串流的方式。"
 
-#: include/vlc_config_cat.h:177
+#: include/vlc_config_cat.h:181
 #: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:67
 msgid "VOD"
 msgstr "VOD"
 
-#: include/vlc_config_cat.h:178
+#: include/vlc_config_cat.h:182
 msgid "VLC's implementation of Video On Demand"
 msgstr "VLC 的 Video On Demand 实现"
 
-#: include/vlc_config_cat.h:182 src/libvlc.h:1539 src/playlist/engine.c:78
-#: src/playlist/engine.c:82 modules/demux/playlist/playlist.c:55
-#: modules/demux/playlist/playlist.c:56
-#: modules/gui/beos/InterfaceWindow.cpp:230
-#: modules/gui/beos/InterfaceWindow.cpp:322 modules/gui/macosx/intf.m:494
-#: modules/gui/macosx/intf.m:592 modules/gui/pda/pda_interface.c:1264
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:208
-#: modules/gui/wxwidgets/interface.cpp:676
-#: modules/gui/wxwidgets/interface.cpp:687
+#: include/vlc_config_cat.h:186 src/libvlc.h:1618 src/playlist/engine.c:92
+#: src/playlist/engine.c:94 modules/demux/playlist/playlist.c:56
+#: modules/demux/playlist/playlist.c:57
+#: modules/gui/beos/InterfaceWindow.cpp:231
+#: modules/gui/beos/InterfaceWindow.cpp:325 modules/gui/macosx/intf.m:500
+#: modules/gui/macosx/intf.m:598 modules/gui/pda/pda_interface.c:1264
+#: modules/gui/qt4/zep.cpp:2 modules/gui/wxwidgets/dialogs/playlist.cpp:208
+#: modules/gui/wxwidgets/interface.cpp:679
+#: modules/gui/wxwidgets/interface.cpp:690
 msgid "Playlist"
 msgstr "播放列表"
 
-#: include/vlc_config_cat.h:183
+#: include/vlc_config_cat.h:187
 msgid ""
 "Settings related to playlist behaviour (e.g. playback mode) and to modules "
 "that automatically add items to the playlist (\"service discovery\" modules)."
 msgstr ""
 
-#: include/vlc_config_cat.h:187
+#: include/vlc_config_cat.h:191
 msgid "General playlist behaviour"
 msgstr "一般播放列表行为"
 
-#: include/vlc_config_cat.h:188 modules/gui/macosx/playlist.m:445
+#: include/vlc_config_cat.h:192 modules/gui/macosx/playlist.m:443
 msgid "Services discovery"
 msgstr "服务探索"
 
-#: include/vlc_config_cat.h:189
+#: include/vlc_config_cat.h:193
 msgid ""
 "Services discovery modules are facilities that automatically add items to "
 "playlist."
 msgstr "自动将项目添加到播放列表的服务探索模块及设备。"
 
-#: include/vlc_config_cat.h:193 src/libvlc.h:1391
+#: include/vlc_config_cat.h:197 src/libvlc.h:1454
 #: modules/gui/macosx/prefs.m:124
 msgid "Advanced"
 msgstr "高级"
 
-#: include/vlc_config_cat.h:194
+#: include/vlc_config_cat.h:198
 msgid "Advanced settings. Use with care."
 msgstr "高级设置，请小心设置。"
 
-#: include/vlc_config_cat.h:196
+#: include/vlc_config_cat.h:200
 msgid "CPU features"
 msgstr "CPU 特性"
 
-#: include/vlc_config_cat.h:197
+#: include/vlc_config_cat.h:201
 msgid ""
 "You can choose to disable some CPU accelerations here. You should probably "
 "not change these settings."
 msgstr ""
 "这里您可以选择是否不使用一些 CPU 加速功能。您可能不应该更改这里的设置。"
 
-#: include/vlc_config_cat.h:200
+#: include/vlc_config_cat.h:204
 msgid "Advanced settings"
 msgstr "高级选项"
 
-#: include/vlc_config_cat.h:201
+#: include/vlc_config_cat.h:205
 msgid "Other advanced settings"
 msgstr "其它高级设置"
 
-#: include/vlc_config_cat.h:203 modules/gui/macosx/open.m:162
+#: include/vlc_config_cat.h:207 modules/gui/macosx/open.m:162
 #: modules/gui/macosx/open.m:379 modules/gui/pda/pda_interface.c:548
 #: modules/gui/wxwidgets/dialogs/open.cpp:506
 msgid "Network"
 msgstr "网络"
 
-#: include/vlc_config_cat.h:204
+#: include/vlc_config_cat.h:208
 msgid "These modules provide network functions to all other parts of VLC."
 msgstr "本模块对 VLC 其它部分提供网络的功能"
 
-#: include/vlc_config_cat.h:209
+#: include/vlc_config_cat.h:213
 msgid "Chroma modules settings"
 msgstr "彩度模块设置"
 
-#: include/vlc_config_cat.h:210
+#: include/vlc_config_cat.h:214
 msgid "These settings affect chroma transformation modules."
 msgstr "这个设置会影响彩度转换模块"
 
-#: include/vlc_config_cat.h:212
+#: include/vlc_config_cat.h:216
 msgid "Packetizer modules settings"
 msgstr "封包器模块设置"
 
-#: include/vlc_config_cat.h:216
+#: include/vlc_config_cat.h:220
 msgid "Encoders settings"
 msgstr "编码器设置"
 
-#: include/vlc_config_cat.h:218
+#: include/vlc_config_cat.h:222
 msgid "These are general settings for video/audio/subtitles encoding modules."
 msgstr "视频/音频/字幕编码模块的一般设置"
 
-#: include/vlc_config_cat.h:221
+#: include/vlc_config_cat.h:225
 msgid "Dialog providers settings"
 msgstr "Dialog providers 设置"
 
-#: include/vlc_config_cat.h:223
+#: include/vlc_config_cat.h:227
 msgid "Dialog providers can be configured here."
 msgstr "在这里可以设置 Dialog providers"
 
-#: include/vlc_config_cat.h:225
+#: include/vlc_config_cat.h:229
 msgid "Subtitle demuxer settings"
 msgstr "字幕demuxer设置"
 
-#: include/vlc_config_cat.h:227
+#: include/vlc_config_cat.h:231
 msgid ""
 "In this section you can force the behavior of the subtitle demuxer, for "
 "example by setting the subtitles type or file name."
 msgstr ""
 
-#: include/vlc_config_cat.h:230
+#: include/vlc_config_cat.h:234
 msgid "Video filters settings"
 msgstr "视频滤波器设置"
 
-#: include/vlc_config_cat.h:237
+#: include/vlc_config_cat.h:241
 msgid "No help available"
 msgstr "尚无可用的帮助文件"
 
-#: include/vlc_config_cat.h:238
+#: include/vlc_config_cat.h:242
 msgid "There is no help available for these modules."
 msgstr "这些模块尚无可用的帮助文件"
 
@@ -457,16 +462,73 @@ msgstr ""
 "警告: 如果您不能访问 GUI，打开一个命令行窗口，进入 VLC 的安装目录，并且运行  "
 "\"vlc -I wx\"\n"
 
-#: include/vlc_meta.h:28 modules/gui/macosx/playlist.m:1223
+#: include/vlc_intf_strings.h:29
+#, fuzzy
+msgid "Select one or more files to open"
+msgstr "选择文件以保存到"
+
+#: include/vlc_intf_strings.h:34 modules/gui/macosx/embeddedwindow.m:45
+#: modules/gui/macosx/embeddedwindow.m:72 modules/gui/macosx/intf.m:493
+#: modules/gui/macosx/intf.m:536 modules/gui/macosx/intf.m:615
+#: modules/gui/macosx/intf.m:622 modules/gui/macosx/intf.m:1403
+#: modules/gui/macosx/intf.m:1404 modules/gui/macosx/intf.m:1405
+#: modules/gui/macosx/intf.m:1406 modules/gui/macosx/playlist.m:435
+#: modules/gui/pda/pda_interface.c:262 modules/gui/pda/pda_interface.c:263
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:281
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:290
+#: modules/gui/wxwidgets/interface.cpp:677
+#: modules/gui/wxwidgets/interface.cpp:688
+#: modules/gui/wxwidgets/interface.cpp:1216
+#: modules/gui/wxwidgets/menus.cpp:264 modules/gui/wxwidgets/menus.cpp:275
+msgid "Play"
+msgstr "播放"
+
+#: include/vlc_intf_strings.h:35
+#, fuzzy
+msgid "Fetch information"
+msgstr "元信息"
+
+#: include/vlc_intf_strings.h:36 modules/gui/macosx/playlist.m:436
+#: modules/gui/pda/pda_interface.c:1254
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:285
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:292
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_streampanel.cpp:105
+msgid "Delete"
+msgstr "删除"
+
+#: include/vlc_intf_strings.h:37 modules/gui/macosx/intf.m:599
+#: modules/gui/macosx/intf.m:632 modules/gui/macosx/playlist.m:439
+#: modules/gui/macosx/playlistinfo.m:55 modules/gui/macosx/playlistinfo.m:363
+msgid "Information"
+msgstr "信息"
+
+#: include/vlc_intf_strings.h:38
+#, fuzzy
+msgid "Sort"
+msgstr "排序(&S)"
+
+#: include/vlc_intf_strings.h:39 modules/gui/qt4/zep.cpp:505
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:1615
+msgid "Add node"
+msgstr "添加节点"
+
+#: include/vlc_intf_strings.h:43
+#: modules/gui/wxwidgets/dialogs/preferences.cpp:1027
+msgid ""
+"Some options are available but hidden. Check \"Advanced options\" to see "
+"them."
+msgstr "除了这些选项之外, 还有一些已被隐藏的选项。单击 \"高级\" 可以看到它们。"
+
+#: include/vlc_meta.h:28 modules/gui/macosx/playlist.m:1220
 msgid "Meta-information"
 msgstr "元信息"
 
 #: include/vlc_meta.h:29 src/input/var.c:136 modules/demux/mpc.c:55
-#: modules/gui/beos/MediaControlView.cpp:1233 modules/gui/macosx/intf.m:544
-#: modules/gui/macosx/intf.m:545 modules/gui/macosx/open.m:168
+#: modules/gui/beos/MediaControlView.cpp:1235 modules/gui/macosx/intf.m:550
+#: modules/gui/macosx/intf.m:551 modules/gui/macosx/open.m:168
 #: modules/gui/macosx/playlistinfo.m:57 modules/gui/macosx/wizard.m:391
 #: modules/gui/wxwidgets/dialogs/open.cpp:760
-#: modules/gui/wxwidgets/dialogs/open.cpp:1657 modules/mux/asf.c:48
+#: modules/gui/wxwidgets/dialogs/open.cpp:1661 modules/mux/asf.c:48
 msgid "Title"
 msgstr "标题"
 
@@ -476,7 +538,7 @@ msgstr "标题"
 msgid "Author"
 msgstr "作者"
 
-#: include/vlc_meta.h:31 modules/gui/macosx/playlist.m:1223
+#: include/vlc_meta.h:31 modules/gui/macosx/playlist.m:1220
 msgid "Artist"
 msgstr "艺术家"
 
@@ -518,12 +580,12 @@ msgstr "设置"
 msgid "URL"
 msgstr "网址"
 
-#: include/vlc_meta.h:41 src/input/es_out.c:1573 src/libvlc.h:95
-#: modules/gui/beos/InterfaceWindow.cpp:276
+#: include/vlc_meta.h:41 src/input/es_out.c:1577 src/libvlc.h:95
+#: modules/gui/beos/InterfaceWindow.cpp:278
 msgid "Language"
 msgstr "语言"
 
-#: include/vlc_meta.h:42
+#: include/vlc_meta.h:42 modules/misc/notify.c:179
 msgid "Now Playing"
 msgstr "正在播放"
 
@@ -531,16 +593,32 @@ msgstr "正在播放"
 msgid "Publisher"
 msgstr "发行商"
 
-#: include/vlc_meta.h:45
+#: include/vlc_meta.h:44
+msgid "Encoded by"
+msgstr ""
+
+#: include/vlc_meta.h:46
 msgid "Codec Name"
 msgstr "编码器名称"
 
-#: include/vlc_meta.h:46
+#: include/vlc_meta.h:47
 msgid "Codec Description"
 msgstr "编码器描述"
 
+#: src/audio_output/filters.c:154 src/audio_output/filters.c:201
+#: src/audio_output/filters.c:224
+#, fuzzy
+msgid "Audio filtering failed"
+msgstr "音频滤波器"
+
+#: src/audio_output/filters.c:155 src/audio_output/filters.c:202
+#: src/audio_output/filters.c:225
+#, c-format
+msgid "The maximum number of filters (%d) was reached."
+msgstr ""
+
 #: src/audio_output/input.c:80 src/audio_output/input.c:126
-#: src/input/es_out.c:361 src/libvlc.h:394 src/video_output/video_output.c:379
+#: src/input/es_out.c:361 src/libvlc.h:421 src/video_output/video_output.c:421
 #: modules/codec/ffmpeg/postprocess.c:94
 msgid "Disable"
 msgstr "关闭"
@@ -559,24 +637,24 @@ msgstr "频谱"
 
 #: src/audio_output/input.c:123 modules/audio_filter/equalizer.c:71
 #: modules/gui/macosx/equalizer.m:140 modules/gui/macosx/equalizer.m:155
-#: modules/gui/macosx/intf.m:589 modules/gui/wxwidgets/extrapanel.cpp:177
+#: modules/gui/macosx/intf.m:595 modules/gui/wxwidgets/extrapanel.cpp:177
 msgid "Equalizer"
 msgstr "均衡器"
 
-#: src/audio_output/input.c:145 src/libvlc.h:198
+#: src/audio_output/input.c:145 src/libvlc.h:203
 #: modules/gui/macosx/extended.m:82 modules/gui/wxwidgets/extrapanel.cpp:390
 msgid "Audio filters"
 msgstr "音频滤波器"
 
 #: src/audio_output/output.c:102 src/audio_output/output.c:129
-#: modules/access/vcdx/info.c:118 modules/gui/macosx/intf.m:555
-#: modules/gui/macosx/intf.m:556
+#: modules/access/vcdx/info.c:118 modules/gui/macosx/intf.m:561
+#: modules/gui/macosx/intf.m:562
 msgid "Audio Channels"
 msgstr "音频"
 
 #: src/audio_output/output.c:105 src/audio_output/output.c:140
-#: modules/access/v4l/v4l.c:125 modules/audio_output/alsa.c:191
-#: modules/audio_output/alsa.c:222 modules/audio_output/directx.c:465
+#: modules/access/v4l.c:125 modules/audio_output/alsa.c:192
+#: modules/audio_output/alsa.c:223 modules/audio_output/directx.c:465
 #: modules/audio_output/oss.c:205 modules/audio_output/portaudio.c:408
 #: modules/audio_output/sdl.c:182 modules/audio_output/sdl.c:199
 #: modules/audio_output/waveout.c:420 modules/codec/twolame.c:66
@@ -584,7 +662,8 @@ msgid "Stereo"
 msgstr "立体声"
 
 #: src/audio_output/output.c:107 src/audio_output/output.c:143
-#: src/libvlc.h:261 modules/codec/dvbsub.c:64 modules/codec/subsdec.c:129
+#: src/libvlc.h:266 modules/audio_filter/converter/mono.c:100
+#: modules/codec/dvbsub.c:64 modules/codec/subsdec.c:129
 #: modules/control/gestures.c:86 modules/video_filter/logo.c:95
 #: modules/video_filter/marq.c:107 modules/video_filter/mosaic.c:172
 #: modules/video_filter/osdmenu.c:78 modules/video_filter/rss.c:160
@@ -593,7 +672,8 @@ msgid "Left"
 msgstr "左"
 
 #: src/audio_output/output.c:109 src/audio_output/output.c:145
-#: src/libvlc.h:261 modules/codec/dvbsub.c:64 modules/codec/subsdec.c:129
+#: src/libvlc.h:266 modules/audio_filter/converter/mono.c:100
+#: modules/codec/dvbsub.c:64 modules/codec/subsdec.c:129
 #: modules/control/gestures.c:86 modules/video_filter/logo.c:95
 #: modules/video_filter/marq.c:107 modules/video_filter/mosaic.c:172
 #: modules/video_filter/osdmenu.c:78 modules/video_filter/rss.c:160
@@ -669,120 +749,161 @@ msgstr "%s: 选项 `-W %s' 不允许一个参数\n"
 msgid "Bookmark %i"
 msgstr "书签 %i"
 
+#: src/input/decoder.c:113 src/input/decoder.c:125
+#: modules/codec/ffmpeg/encoder.c:227 modules/codec/ffmpeg/encoder.c:235
+#: modules/codec/ffmpeg/encoder.c:247 modules/codec/ffmpeg/encoder.c:618
+#: modules/codec/ffmpeg/encoder.c:627 modules/stream_out/es.c:365
+#: modules/stream_out/es.c:379
+#, fuzzy
+msgid "Streaming / Transcoding failed"
+msgstr "串流/转码向导"
+
+#: src/input/decoder.c:114
+msgid "VLC could not open the packetizer module."
+msgstr ""
+
+#: src/input/decoder.c:126
+msgid "VLC could not open the decoder module."
+msgstr ""
+
+#: src/input/decoder.c:136
+msgid "No suitable decoder module for format"
+msgstr ""
+
+#: src/input/decoder.c:137
+#, c-format
+msgid ""
+"VLC probably does not support the \"%4.4s\" audio or video format. "
+"Unfortunately there is no way for you to fix this."
+msgstr ""
+
 #: src/input/es_out.c:383 src/input/es_out.c:385 src/input/es_out.c:391
-#: src/input/es_out.c:392 modules/access/cdda.c:591
-#: modules/access/cdda/info.c:980 modules/access/cdda/info.c:1012
+#: src/input/es_out.c:392 modules/access/cdda/info.c:980
+#: modules/access/cdda/info.c:1012
 #, c-format
 msgid "Track %i"
 msgstr "音轨 %i"
 
 #: src/input/es_out.c:465 src/input/es_out.c:467 src/input/es_out.c:567
-#: src/input/es_out.c:574 src/input/var.c:125 src/libvlc.h:420
-#: modules/gui/macosx/intf.m:542 modules/gui/macosx/intf.m:543
+#: src/input/es_out.c:574 src/input/var.c:125 src/libvlc.h:447
+#: modules/gui/macosx/intf.m:548 modules/gui/macosx/intf.m:549
 msgid "Program"
 msgstr "程序"
 
-#: src/input/es_out.c:1568
+#: src/input/es_out.c:1572
 #, c-format
 msgid "Stream %d"
 msgstr "串流 %d"
 
-#: src/input/es_out.c:1570 modules/gui/macosx/wizard.m:426
+#: src/input/es_out.c:1574 modules/gui/macosx/wizard.m:426
 #: modules/gui/wxwidgets/dialogs/wizard.cpp:834
 #: modules/gui/wxwidgets/dialogs/wizard.cpp:874
 msgid "Codec"
 msgstr "编码器"
 
-#: src/input/es_out.c:1581 src/input/es_out.c:1609 src/input/es_out.c:1636
+#: src/input/es_out.c:1585 src/input/es_out.c:1613 src/input/es_out.c:1640
 #: modules/gui/macosx/output.m:153
 msgid "Type"
 msgstr "类型"
 
-#: src/input/es_out.c:1584 modules/gui/macosx/output.m:176
+#: src/input/es_out.c:1588 modules/gui/macosx/output.m:176
 #: modules/gui/wxwidgets/dialogs/streamout.cpp:857
 msgid "Channels"
 msgstr "频道"
 
-#: src/input/es_out.c:1589
+#: src/input/es_out.c:1593
 msgid "Sample rate"
 msgstr "采样率"
 
-#: src/input/es_out.c:1590
+#: src/input/es_out.c:1594
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: src/input/es_out.c:1596
+#: src/input/es_out.c:1600
 msgid "Bits per sample"
 msgstr "比特每采样"
 
-#: src/input/es_out.c:1601 modules/access/pvr/pvr.c:84
-#: modules/demux/playlist/shoutcast.c:490
+#: src/input/es_out.c:1605 modules/access/pvr.c:84
+#: modules/access_output/shout.c:86
 msgid "Bitrate"
 msgstr "位率"
 
-#: src/input/es_out.c:1602
+#: src/input/es_out.c:1606
 #, c-format
 msgid "%d kb/s"
 msgstr "%d kb/s"
 
-#: src/input/es_out.c:1613
+#: src/input/es_out.c:1617
 msgid "Resolution"
 msgstr "分辨率"
 
-#: src/input/es_out.c:1619
+#: src/input/es_out.c:1623
 msgid "Display resolution"
 msgstr "显示分辨率"
 
-#: src/input/es_out.c:1629 modules/access/screen/screen.c:41
+#: src/input/es_out.c:1633 modules/access/screen/screen.c:41
 msgid "Frame rate"
 msgstr "帧率"
 
-#: src/input/es_out.c:1636
+#: src/input/es_out.c:1640
 msgid "Subtitle"
 msgstr "字幕"
 
-#: src/input/input.c:1826 src/playlist/item.c:619
-#: modules/access/cdda/info.c:328 modules/access/cdda/info.c:396
-#: modules/gui/macosx/playlist.m:131
+#: src/input/input.c:1843 modules/access/cdda/info.c:328
+#: modules/access/cdda/info.c:396 modules/gui/macosx/playlist.m:131
 msgid "Duration"
 msgstr "长度"
 
-#: src/input/input.c:2005 src/input/input.c:2075
-msgid "Errors"
-msgstr "错误"
+#: src/input/input.c:2024
+msgid "Your input can't be opened"
+msgstr ""
+
+#: src/input/input.c:2025
+#, c-format
+msgid "VLC is unable to open the MRL '%s'. Check the log for details."
+msgstr ""
+
+#: src/input/input.c:2099
+msgid "Can't recognize the input's format"
+msgstr ""
+
+#: src/input/input.c:2100
+#, c-format
+msgid "The format of '%s' can't be detected. Have a look the log for details."
+msgstr ""
 
 #: src/input/var.c:115
 msgid "Bookmark"
 msgstr "书签"
 
-#: src/input/var.c:131 src/libvlc.h:426
+#: src/input/var.c:131 src/libvlc.h:453
 msgid "Programs"
 msgstr "程序"
 
-#: src/input/var.c:142 modules/gui/beos/MediaControlView.cpp:1234
-#: modules/gui/macosx/intf.m:546 modules/gui/macosx/intf.m:547
+#: src/input/var.c:142 modules/gui/beos/MediaControlView.cpp:1236
+#: modules/gui/macosx/intf.m:552 modules/gui/macosx/intf.m:553
 #: modules/gui/macosx/open.m:169 modules/gui/wxwidgets/dialogs/open.cpp:765
 msgid "Chapter"
 msgstr "章节"
 
 #: src/input/var.c:148 modules/access/vcdx/info.c:302
-#: modules/access/vcdx/info.c:303 modules/gui/beos/InterfaceWindow.cpp:291
+#: modules/access/vcdx/info.c:303 modules/gui/beos/InterfaceWindow.cpp:293
 msgid "Navigation"
 msgstr "导航"
 
-#: src/input/var.c:163 modules/gui/macosx/intf.m:570
-#: modules/gui/macosx/intf.m:571
+#: src/input/var.c:163 modules/gui/macosx/intf.m:576
+#: modules/gui/macosx/intf.m:577
 msgid "Video Track"
 msgstr "视频轨"
 
-#: src/input/var.c:169 modules/gui/macosx/intf.m:553
-#: modules/gui/macosx/intf.m:554
+#: src/input/var.c:169 modules/gui/macosx/intf.m:559
+#: modules/gui/macosx/intf.m:560
 msgid "Audio Track"
 msgstr "音频轨"
 
-#: src/input/var.c:175 modules/gui/macosx/intf.m:578
-#: modules/gui/macosx/intf.m:579
+#: src/input/var.c:175 modules/gui/macosx/intf.m:584
+#: modules/gui/macosx/intf.m:585
 msgid "Subtitles Track"
 msgstr "字幕轨"
 
@@ -804,13 +925,13 @@ msgstr "标题 %i"
 msgid "Chapter %i"
 msgstr "章节 %i"
 
-#: src/input/var.c:346 modules/gui/beos/InterfaceWindow.cpp:288
-#: modules/gui/wxwidgets/input_manager.cpp:223
+#: src/input/var.c:346 modules/gui/beos/InterfaceWindow.cpp:290
+#: modules/gui/wxwidgets/input_manager.cpp:227
 msgid "Next chapter"
 msgstr "下一个章节"
 
-#: src/input/var.c:351 modules/gui/beos/InterfaceWindow.cpp:287
-#: modules/gui/wxwidgets/input_manager.cpp:222
+#: src/input/var.c:351 modules/gui/beos/InterfaceWindow.cpp:289
+#: modules/gui/wxwidgets/input_manager.cpp:226
 msgid "Previous chapter"
 msgstr "上一个章节"
 
@@ -818,12 +939,12 @@ msgstr "上一个章节"
 msgid "Switch interface"
 msgstr "切换界面"
 
-#: src/interface/interface.c:375 modules/gui/macosx/intf.m:505
-#: modules/gui/macosx/intf.m:506
+#: src/interface/interface.c:375 modules/gui/macosx/intf.m:511
+#: modules/gui/macosx/intf.m:512
 msgid "Add Interface"
 msgstr "新增界面"
 
-#: src/libvlc.c:331 src/libvlc.c:479 src/misc/modules.c:1684
+#: src/libvlc.c:331 src/libvlc.c:506 src/misc/modules.c:1684
 #: src/misc/modules.c:1988
 msgid "C"
 msgstr "C"
@@ -832,47 +953,47 @@ msgstr "C"
 msgid "Help options"
 msgstr "说明选项"
 
-#: src/libvlc.c:2185 src/misc/configuration.c:1248
+#: src/libvlc.c:2204 src/misc/configuration.c:1248
 msgid "string"
 msgstr ""
 
-#: src/libvlc.c:2202 src/misc/configuration.c:1212
+#: src/libvlc.c:2221 src/misc/configuration.c:1212
 msgid "integer"
 msgstr ""
 
-#: src/libvlc.c:2220 src/misc/configuration.c:1237
+#: src/libvlc.c:2239 src/misc/configuration.c:1237
 msgid "float"
 msgstr ""
 
-#: src/libvlc.c:2226
+#: src/libvlc.c:2245
 msgid " (default enabled)"
 msgstr " (默认打开)"
 
-#: src/libvlc.c:2227
+#: src/libvlc.c:2246
 msgid " (default disabled)"
 msgstr " (默认关闭)"
 
-#: src/libvlc.c:2409
+#: src/libvlc.c:2428
 #, c-format
 msgid "VLC version %s\n"
 msgstr "VLC 版本 %s\n"
 
-#: src/libvlc.c:2410
+#: src/libvlc.c:2429
 #, c-format
 msgid "Compiled by %s@%s.%s\n"
 msgstr "由 %s 在 %s.%s 编译\n"
 
-#: src/libvlc.c:2412
+#: src/libvlc.c:2431
 #, c-format
 msgid "Compiler: %s\n"
 msgstr "编译器: %s\n"
 
-#: src/libvlc.c:2415
+#: src/libvlc.c:2434
 #, c-format
 msgid "Based upon svn changeset [%s]\n"
 msgstr "基于 svn 修改集[%s]\n"
 
-#: src/libvlc.c:2447
+#: src/libvlc.c:2466
 msgid ""
 "\n"
 "Dumped content to vlc-help.txt file.\n"
@@ -880,7 +1001,7 @@ msgstr ""
 "\n"
 "将内容写到 vlc-help.txt 文件.\n"
 
-#: src/libvlc.c:2468
+#: src/libvlc.c:2487
 msgid ""
 "\n"
 "Press the RETURN key to continue...\n"
@@ -888,7 +1009,7 @@ msgstr ""
 "\n"
 "按回车键继续...\n"
 
-#: src/libvlc.h:37 src/libvlc.h:195
+#: src/libvlc.h:37 src/libvlc.h:200
 msgid "Auto"
 msgstr "自动"
 
@@ -1095,7 +1216,18 @@ msgid ""
 "edge of the screen in fullscreen mode."
 msgstr ""
 
-#: src/libvlc.h:123
+#: src/libvlc.h:116
+#, fuzzy
+msgid "Interface interaction"
+msgstr "虚拟接口功能"
+
+#: src/libvlc.h:118
+msgid ""
+"When this is enabled, the interface will show a dialog box each time some "
+"user input is required."
+msgstr ""
+
+#: src/libvlc.h:128
 msgid ""
 "These options allow you to modify the behavior of the audio subsystem, and "
 "to add audio filters which can be used for post processing or visual effects "
@@ -1103,68 +1235,68 @@ msgid ""
 "the \"audio filters\" modules section."
 msgstr ""
 
-#: src/libvlc.h:129
+#: src/libvlc.h:134
 msgid "Audio output module"
 msgstr "音频输出模块"
 
-#: src/libvlc.h:131
+#: src/libvlc.h:136
 msgid ""
 "This is the audio output method used by VLC. The default behavior is to "
 "automatically select the best method available."
 msgstr "选择 VLC 所使用的音频输出方法。默认行为是自动选择可用的最好的模块。"
 
-#: src/libvlc.h:135 modules/stream_out/display.c:37
+#: src/libvlc.h:140 modules/stream_out/display.c:37
 msgid "Enable audio"
 msgstr "打开音频"
 
-#: src/libvlc.h:137
+#: src/libvlc.h:142
 msgid ""
 "You can completely disable the audio output. The audio decoding stage will "
 "not take place, thus saving some processing power."
 msgstr ""
 
-#: src/libvlc.h:140
+#: src/libvlc.h:145
 msgid "Force mono audio"
 msgstr "强制使用单声道"
 
-#: src/libvlc.h:141
+#: src/libvlc.h:146
 msgid "This will force a mono audio output."
 msgstr "强制使用单声道输出"
 
-#: src/libvlc.h:143
+#: src/libvlc.h:148
 msgid "Default audio volume"
 msgstr "默认音量"
 
-#: src/libvlc.h:145
+#: src/libvlc.h:150
 msgid ""
 "You can set the default audio output volume here, in a range from 0 to 1024."
 msgstr "你可以在这里设置默认的音频输出音量，范围从0到1024"
 
-#: src/libvlc.h:148
+#: src/libvlc.h:153
 msgid "Audio output saved volume"
 msgstr "已储存的音频输出音量"
 
-#: src/libvlc.h:150
+#: src/libvlc.h:155
 msgid ""
 "This saves the audio output volume when you use the mute function. You "
 "should not change this option manually."
 msgstr "在你使用静音功能时，这里保存音频输出音量。你不应该手动更改此项。"
 
-#: src/libvlc.h:153
+#: src/libvlc.h:158
 msgid "Audio output volume step"
 msgstr "输出音量步长"
 
-#: src/libvlc.h:155
+#: src/libvlc.h:160
 msgid ""
 "The step size of the volume is adjustable using this option, in a range from "
 "0 to 1024."
 msgstr "用此选项设置调整音量的步长，范围从 0 到 1024"
 
-#: src/libvlc.h:158
+#: src/libvlc.h:163
 msgid "Audio output frequency (Hz)"
 msgstr "音频输出频率(Hz)"
 
-#: src/libvlc.h:160
+#: src/libvlc.h:165
 msgid ""
 "You can force the audio output frequency here. Common values are -1 "
 "(default), 48000, 44100, 32000, 22050, 16000, 11025, 8000."
@@ -1172,53 +1304,53 @@ msgstr ""
 "你可以在这里强制改变音频输出的频率.一般值为 -1(缺省), 48000, 44100, 32000, "
 "22050, 16000, 11025, 8000."
 
-#: src/libvlc.h:164
+#: src/libvlc.h:169
 msgid "High quality audio resampling"
 msgstr "高质量音频采样"
 
-#: src/libvlc.h:166
+#: src/libvlc.h:171
 msgid ""
 "This uses a high quality audio resampling algorithm. High quality audio "
 "resampling can be processor intensive so you can disable it and a cheaper "
 "resampling algorithm will be used instead."
 msgstr ""
 
-#: src/libvlc.h:171
+#: src/libvlc.h:176
 msgid "Audio desynchronization compensation"
 msgstr "音频异步校正"
 
-#: src/libvlc.h:173
+#: src/libvlc.h:178
 msgid ""
 "This delays the audio output. The delay must be given in milliseconds.This "
 "can be handy if you notice a lag between the video and the audio."
 msgstr ""
 
-#: src/libvlc.h:176
+#: src/libvlc.h:181
 msgid "Audio output channels mode"
 msgstr "音频输出频道模式"
 
-#: src/libvlc.h:178
+#: src/libvlc.h:183
 msgid ""
 "This sets the audio output channels mode that will be used by default when "
 "possible (ie. if your hardware supports it as well as the audio stream being "
 "played)."
 msgstr ""
 
-#: src/libvlc.h:182
+#: src/libvlc.h:187
 msgid "Use S/PDIF when available"
 msgstr "当可用时使用 S/PDIF 音频输出"
 
-#: src/libvlc.h:184
+#: src/libvlc.h:189
 msgid ""
 "S/PDIF can be used by default when your hardware supports it as well as the "
 "audio stream being played."
 msgstr ""
 
-#: src/libvlc.h:187
+#: src/libvlc.h:192
 msgid "Force detection of Dolby Surround"
 msgstr "强制检测杜比环绕"
 
-#: src/libvlc.h:189
+#: src/libvlc.h:194
 msgid ""
 "Use this when you know your stream is (or is not) encoded with Dolby "
 "Surround but fails to be detected as such. Even if the stream is not "
@@ -1226,27 +1358,27 @@ msgid ""
 "your experience, especially when combined with the Headphone Channel Mixer."
 msgstr ""
 
-#: src/libvlc.h:195
+#: src/libvlc.h:200
 msgid "On"
 msgstr "开"
 
-#: src/libvlc.h:195
+#: src/libvlc.h:200
 msgid "Off"
 msgstr "关"
 
-#: src/libvlc.h:200
+#: src/libvlc.h:205
 msgid "This adds audio post processing filters, to modify the sound rendering."
 msgstr ""
 
-#: src/libvlc.h:203
+#: src/libvlc.h:208
 msgid "Audio visualizations "
 msgstr "音频视觉效果"
 
-#: src/libvlc.h:205
+#: src/libvlc.h:210
 msgid "This adds visualization modules (spectrum analyzer, etc.)."
 msgstr "增加视觉效果模块 (频谱分析器、其它...)"
 
-#: src/libvlc.h:213
+#: src/libvlc.h:218
 msgid ""
 "These options allow you to modify the behavior of the video output "
 "subsystem. You can for example enable video filters (deinterlacing, image "
@@ -1255,251 +1387,287 @@ msgid ""
 "options."
 msgstr ""
 
-#: src/libvlc.h:219
+#: src/libvlc.h:224
 msgid "Video output module"
 msgstr "视频输出模块"
 
-#: src/libvlc.h:221
+#: src/libvlc.h:226
 msgid ""
 "This is the the video output method used by VLC. The default behavior is to "
 "automatically select the best method available."
 msgstr "这是 VLC 所使用的视频输出方法。默认行为是自动选择最好的输出方法。"
 
-#: src/libvlc.h:224 modules/stream_out/display.c:39
+#: src/libvlc.h:229 modules/stream_out/display.c:39
 msgid "Enable video"
 msgstr "启动视频"
 
-#: src/libvlc.h:226
+#: src/libvlc.h:231
 msgid ""
 "You can completely disable the video output. The video decoding stage will "
 "not take place, thus saving some processing power."
 msgstr ""
 
-#: src/libvlc.h:229 modules/codec/fake.c:48
+#: src/libvlc.h:234 modules/codec/fake.c:48
 #: modules/stream_out/mosaic_bridge.c:107 modules/stream_out/transcode.c:68
 #: modules/visualization/visual/visual.c:43
 msgid "Video width"
 msgstr "视频宽度"
 
-#: src/libvlc.h:231
+#: src/libvlc.h:236
 msgid ""
 "You can enforce the video width. By default (-1) VLC will adapt to the video "
 "characteristics."
 msgstr "您可以强制视频宽度。默认值 (-1) 下 VLC 将会适应视频特征。"
 
-#: src/libvlc.h:234 modules/codec/fake.c:51
+#: src/libvlc.h:239 modules/codec/fake.c:51
 #: modules/stream_out/mosaic_bridge.c:110 modules/stream_out/transcode.c:71
 #: modules/visualization/visual/visual.c:47
 msgid "Video height"
 msgstr "视频高度"
 
-#: src/libvlc.h:236
+#: src/libvlc.h:241
 msgid ""
 "You can enforce the video height. By default (-1) VLC will adapt to the "
 "video characteristics."
 msgstr "您可以强制视频高度。默认值 (-1) 下 VLC 将会适应视频特征。"
 
-#: src/libvlc.h:239
+#: src/libvlc.h:244
 msgid "Video X coordinate"
 msgstr "视频 X 坐标"
 
-#: src/libvlc.h:241
+#: src/libvlc.h:246
 msgid ""
 "You can enforce the position of the top left corner of the video window (X "
 "coordinate)."
 msgstr ""
 
-#: src/libvlc.h:244
+#: src/libvlc.h:249
 msgid "Video Y coordinate"
 msgstr "视频 Y 坐标"
 
-#: src/libvlc.h:246
+#: src/libvlc.h:251
 msgid ""
 "You can enforce the position of the top left corner of the video window (Y "
 "coordinate)."
 msgstr ""
 
-#: src/libvlc.h:249
+#: src/libvlc.h:254
 msgid "Video title"
 msgstr "视频标题"
 
-#: src/libvlc.h:251
+#: src/libvlc.h:256
 msgid ""
 "Custom title for the video window (in case the video is not embedded in the "
 "interface)."
 msgstr ""
 
-#: src/libvlc.h:254
+#: src/libvlc.h:259
 msgid "Video alignment"
 msgstr "视频对齐"
 
-#: src/libvlc.h:256
+#: src/libvlc.h:261
 msgid ""
 "Enforce the alignment of the video in its window. By default (0) it will be "
 "centered (0=center, 1=left, 2=right, 4=top, 8=bottom, you can also use "
 "combinations of these values, like 6=4+2 meaning top-right)."
 msgstr ""
 
-#: src/libvlc.h:261 modules/codec/dvbsub.c:64 modules/codec/subsdec.c:129
+#: src/libvlc.h:266 modules/audio_filter/converter/mono.c:100
+#: modules/codec/dvbsub.c:64 modules/codec/subsdec.c:129
 #: modules/video_filter/logo.c:95 modules/video_filter/marq.c:107
 #: modules/video_filter/mosaic.c:172 modules/video_filter/osdmenu.c:78
 #: modules/video_filter/rss.c:160 modules/video_filter/time.c:99
 msgid "Center"
 msgstr "居中"
 
-#: src/libvlc.h:261 modules/codec/dvbsub.c:64 modules/video_filter/logo.c:95
+#: src/libvlc.h:266 modules/codec/dvbsub.c:64 modules/video_filter/logo.c:95
 #: modules/video_filter/marq.c:107 modules/video_filter/mosaic.c:172
 #: modules/video_filter/osdmenu.c:78 modules/video_filter/rss.c:160
 #: modules/video_filter/time.c:99
 msgid "Top"
 msgstr "顶部"
 
-#: src/libvlc.h:261 modules/codec/dvbsub.c:64 modules/video_filter/logo.c:95
+#: src/libvlc.h:266 modules/codec/dvbsub.c:64 modules/video_filter/logo.c:95
 #: modules/video_filter/marq.c:107 modules/video_filter/mosaic.c:172
 #: modules/video_filter/osdmenu.c:78 modules/video_filter/rss.c:160
 #: modules/video_filter/time.c:99
 msgid "Bottom"
 msgstr "底部"
 
-#: src/libvlc.h:262 modules/codec/dvbsub.c:65 modules/video_filter/logo.c:96
+#: src/libvlc.h:267 modules/codec/dvbsub.c:65 modules/video_filter/logo.c:96
 #: modules/video_filter/marq.c:108 modules/video_filter/mosaic.c:173
 #: modules/video_filter/osdmenu.c:79 modules/video_filter/rss.c:161
 #: modules/video_filter/time.c:100
 msgid "Top-Left"
 msgstr "左上"
 
-#: src/libvlc.h:262 modules/codec/dvbsub.c:65 modules/video_filter/logo.c:96
+#: src/libvlc.h:267 modules/codec/dvbsub.c:65 modules/video_filter/logo.c:96
 #: modules/video_filter/marq.c:108 modules/video_filter/mosaic.c:173
 #: modules/video_filter/osdmenu.c:79 modules/video_filter/rss.c:161
 #: modules/video_filter/time.c:100
 msgid "Top-Right"
 msgstr "右上"
 
-#: src/libvlc.h:262 modules/codec/dvbsub.c:65 modules/video_filter/logo.c:96
+#: src/libvlc.h:267 modules/codec/dvbsub.c:65 modules/video_filter/logo.c:96
 #: modules/video_filter/marq.c:108 modules/video_filter/mosaic.c:173
 #: modules/video_filter/osdmenu.c:79 modules/video_filter/rss.c:161
 #: modules/video_filter/time.c:100
 msgid "Bottom-Left"
 msgstr "左下"
 
-#: src/libvlc.h:262 modules/codec/dvbsub.c:65 modules/video_filter/logo.c:96
+#: src/libvlc.h:267 modules/codec/dvbsub.c:65 modules/video_filter/logo.c:96
 #: modules/video_filter/marq.c:108 modules/video_filter/mosaic.c:173
 #: modules/video_filter/osdmenu.c:79 modules/video_filter/rss.c:161
 #: modules/video_filter/time.c:100
 msgid "Bottom-Right"
 msgstr "右下"
 
-#: src/libvlc.h:264
+#: src/libvlc.h:269
 msgid "Zoom video"
 msgstr "缩放视频"
 
-#: src/libvlc.h:266
+#: src/libvlc.h:271
 msgid "You can zoom the video by the specified factor."
 msgstr "你可以通过特定参数缩放视频大小。"
 
-#: src/libvlc.h:268
+#: src/libvlc.h:273
 msgid "Grayscale video output"
 msgstr "灰度视频输出"
 
-#: src/libvlc.h:270
+#: src/libvlc.h:275
 msgid ""
 "Output video in grayscale. As the color information aren't decoded, this can "
 "save some processing power."
 msgstr ""
 
-#: src/libvlc.h:273
+#: src/libvlc.h:278
+#, fuzzy
+msgid "Embedded video"
+msgstr "嵌入视频输出"
+
+#: src/libvlc.h:280
+#, fuzzy
+msgid "Embed the video output in the main interface."
+msgstr "在界面中嵌入视频"
+
+#: src/libvlc.h:282
 msgid "Fullscreen video output"
 msgstr "全屏幕视频输出"
 
-#: src/libvlc.h:275
+#: src/libvlc.h:284
 msgid "Start video in fullscreen mode"
 msgstr "以全屏幕模式启动视频"
 
-#: src/libvlc.h:277
+#: src/libvlc.h:286
 msgid "Overlay video output"
 msgstr "重叠视频输出"
 
-#: src/libvlc.h:279
+#: src/libvlc.h:288
 msgid ""
 "Overlay is the hardware acceleration capability of your video card (ability "
 "to render video directly). VLC will try to use it by default."
 msgstr ""
 
-#: src/libvlc.h:282 src/video_output/vout_intf.c:391
+#: src/libvlc.h:291 src/video_output/vout_intf.c:399
 msgid "Always on top"
 msgstr "永远在最上层"
 
-#: src/libvlc.h:284
+#: src/libvlc.h:293
 msgid "Always place the video window on top of other windows."
 msgstr "永远让视频窗口显示在其它窗口之上"
 
-#: src/libvlc.h:286
+#: src/libvlc.h:295
 msgid "Disable screensaver"
 msgstr "关闭屏幕保护程序"
 
-#: src/libvlc.h:287
+#: src/libvlc.h:296
 msgid "Disable the screensaver during video playback."
 msgstr "在播放视频时关闭屏幕保护程序"
 
-#: src/libvlc.h:289
+#: src/libvlc.h:298
 msgid "Window decorations"
 msgstr "窗口装饰"
 
-#: src/libvlc.h:291
+#: src/libvlc.h:300
 msgid ""
 "VLC can avoid creating window caption, frames, etc... around the video, "
 "giving a \"minimal\" window."
 msgstr "VLC 可以不在视频周围显示窗口标题、框架等，从而得到一个“最小的”窗口。"
 
-#: src/libvlc.h:294
+#: src/libvlc.h:303
+#, fuzzy
+msgid "Video output filter module"
+msgstr "视频输出模块"
+
+#: src/libvlc.h:305
+msgid ""
+"This adds post-processing filters to enhance the picture quality, for "
+"instance deinterlacing, or to clone or distort the video window."
+msgstr ""
+
+#: src/libvlc.h:309
 msgid "Video filter module"
 msgstr "视频过滤器模块"
 
-#: src/libvlc.h:296
+#: src/libvlc.h:311
 msgid ""
 "This adds post-processing filters to enhance the picture quality, for "
-"instance deinterlacing, or to clone or distort the video window."
+"instance deinterlacing, or distortthe video."
 msgstr ""
 
-#: src/libvlc.h:300
-msgid "Video snapshot directory"
+#: src/libvlc.h:315
+#, fuzzy
+msgid "Video snapshot directory (or filename)"
 msgstr "视频快照目录"
 
-#: src/libvlc.h:302
+#: src/libvlc.h:317
 msgid "Directory where the video snapshots will be stored."
 msgstr "允许你指定视频快照的存放目录"
 
-#: src/libvlc.h:304
+#: src/libvlc.h:319 src/libvlc.h:321
+#, fuzzy
+msgid "Video snapshot file prefix"
+msgstr "视频快照格式"
+
+#: src/libvlc.h:323
 msgid "Video snapshot format"
 msgstr "视频快照格式"
 
-#: src/libvlc.h:306
+#: src/libvlc.h:325
 msgid "Image format which will be used to store the video snapshots"
 msgstr ""
 
-#: src/libvlc.h:308
+#: src/libvlc.h:327
 msgid "Display video snapshot preview"
 msgstr "显示视频快照预览"
 
-#: src/libvlc.h:310
+#: src/libvlc.h:329
 msgid "Display the snapshot preview in the screen's top-left corner."
 msgstr ""
 
-#: src/libvlc.h:312
+#: src/libvlc.h:331
+msgid "Use sequential numbers instead of timestamps"
+msgstr ""
+
+#: src/libvlc.h:333
+msgid "Use sequential numbers instead of timestamps for snapshot numbering"
+msgstr ""
+
+#: src/libvlc.h:335
 msgid "Video cropping"
 msgstr "视频修整"
 
-#: src/libvlc.h:314
+#: src/libvlc.h:337
 msgid ""
 "This forces the cropping of the source video. Accepted formats are x:y (4:3, "
 "16:9, etc.) expressing the global image aspect."
 msgstr ""
 
-#: src/libvlc.h:318
+#: src/libvlc.h:341
 msgid "Source aspect ratio"
 msgstr "源比率"
 
-#: src/libvlc.h:320
+#: src/libvlc.h:343
 msgid ""
 "This forces the source aspect ratio. For instance, some DVDs claim to be "
 "16:9 while they are actually 4:3. This can also be used as a hint for VLC "
@@ -1508,288 +1676,294 @@ msgid ""
 "(1.25, 1.3333, etc.) expressing pixel squareness."
 msgstr ""
 
-#: src/libvlc.h:327
+#: src/libvlc.h:350
 msgid "Custom crop ratios list"
 msgstr ""
 
-#: src/libvlc.h:329
+#: src/libvlc.h:352
 msgid ""
 "Comma seperated list of crop ratios which will be added in the interface's "
 "crop ratios list."
 msgstr ""
 
-#: src/libvlc.h:332
+#: src/libvlc.h:355
 #, fuzzy
 msgid "Custom aspect ratios list"
 msgstr "循环源纵横比"
 
-#: src/libvlc.h:334
+#: src/libvlc.h:357
 msgid ""
 "Comma seperated list of aspect ratios which will be added in the interface's "
 "aspect ratio list."
 msgstr ""
 
-#: src/libvlc.h:337
+#: src/libvlc.h:360
 msgid "Fix HDTV height"
 msgstr "固定 HDTV 高度"
 
-#: src/libvlc.h:339
+#: src/libvlc.h:362
 msgid ""
 "This allows proper handling of HDTV-1080 video format even if broken encoder "
 "incorrectly sets height to 1088 lines. You should only disable this option "
 "if your video has a non-standard format requiring all 1088 lines."
 msgstr ""
 
-#: src/libvlc.h:344
+#: src/libvlc.h:367
 msgid "Monitor pixel aspect ratio"
 msgstr "监视器像素纵横比"
 
-#: src/libvlc.h:346
+#: src/libvlc.h:369
 msgid ""
 "This forces the monitor aspect ratio. Most monitors have square pixels "
 "(1:1). If you have a 16:9 screen, you might need to change this to 4:3 in "
 "order to keep proportions."
 msgstr ""
 
-#: src/libvlc.h:351
+#: src/libvlc.h:374
 msgid "Skip frames"
 msgstr "跳过帧"
 
-#: src/libvlc.h:353
+#: src/libvlc.h:376
 msgid ""
 "This option enables framedropping on MPEG2 stream. Framedropping occurs when "
 "your computer is not powerful enough"
 msgstr "这个选项的选择可以在你的电脑不够好时允许MPEG2流产生丢帧"
 
-#: src/libvlc.h:356
+#: src/libvlc.h:379
 msgid "Drop late frames"
 msgstr "丢弃晚的帧"
 
-#: src/libvlc.h:358
+#: src/libvlc.h:381
 msgid ""
 "This drops frames that are late (arrive to the video output after their "
 "intended display date)."
 msgstr ""
 
-#: src/libvlc.h:361
+#: src/libvlc.h:384
 msgid "Quiet synchro"
 msgstr "静音同步"
 
-#: src/libvlc.h:363
+#: src/libvlc.h:386
 msgid ""
 "This avoids flooding the message log with debug output from the video output "
 "synchronization mechanism."
 msgstr ""
 
-#: src/libvlc.h:372
+#: src/libvlc.h:395
 msgid ""
 "These options allow you to modify the behavior of the input subsystem, such "
 "as the DVD or VCD device, the network interface settings or the subtitle "
 "channel."
 msgstr ""
 
-#: src/libvlc.h:376
+#: src/libvlc.h:400
+msgid ""
+"If you live in France, it is not allowed to workaround any Digital "
+"Restrictions Management measure."
+msgstr ""
+
+#: src/libvlc.h:403
 msgid "Clock reference average counter"
 msgstr "时钟参考平均计数器"
 
-#: src/libvlc.h:378
+#: src/libvlc.h:405
 msgid ""
 "When using the PVR input (or a very irregular source), you should set this "
 "to 10000."
 msgstr "当使用PVR输入(或者一个很不正常的源), 你必须设置这个值为10000."
 
-#: src/libvlc.h:381
+#: src/libvlc.h:408
 msgid "Clock synchronisation"
 msgstr "时钟同步"
 
-#: src/libvlc.h:383
+#: src/libvlc.h:410
 msgid ""
 "It is possible to disable the input clock synchronisation for real-time "
 "sources. Use this if you experience jerky playback of network streams."
 msgstr "您可以关闭实时源的时钟同步。"
 
-#: src/libvlc.h:387 modules/control/netsync.c:71
+#: src/libvlc.h:414 modules/control/netsync.c:71
 msgid "Network synchronisation"
 msgstr "网络同步化"
 
-#: src/libvlc.h:388
+#: src/libvlc.h:415
 msgid ""
 "This allows you to remotely synchronise clocks for server and client. The "
 "detailed settings are available in Advanced / Network Sync."
 msgstr ""
 
-#: src/libvlc.h:394 src/video_output/vout_intf.c:253
-#: src/video_output/vout_intf.c:340 modules/access/dshow/dshow.cpp:73
-#: modules/access/dshow/dshow.cpp:75 modules/access/dshow/dshow.cpp:78
-#: modules/access/dshow/dshow.cpp:84 modules/audio_output/alsa.c:101
-#: modules/gui/macosx/prefs_widgets.m:1292 modules/gui/macosx/sfilters.m:134
+#: src/libvlc.h:421 src/libvlc.h:972 src/video_output/vout_intf.c:261
+#: src/video_output/vout_intf.c:348 modules/access/dshow/dshow.cpp:74
+#: modules/access/dshow/dshow.cpp:76 modules/access/dshow/dshow.cpp:79
+#: modules/access/dshow/dshow.cpp:85 modules/audio_output/alsa.c:102
+#: modules/gui/macosx/prefs_widgets.m:1292 modules/gui/macosx/sfilters.m:120
 #: modules/gui/macosx/vout.m:199
 #: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:275
 #: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:325
 #: modules/video_filter/marq.c:52 modules/video_filter/rss.c:63
-#: modules/video_filter/time.c:52 modules/video_output/directx/directx.c:142
+#: modules/video_filter/time.c:52 modules/video_output/directx/directx.c:155
 msgid "Default"
 msgstr "默认"
 
-#: src/libvlc.h:394 modules/gui/macosx/equalizer.m:145
-#: modules/gui/macosx/extended.m:109 modules/gui/macosx/wizard.m:395
+#: src/libvlc.h:421 modules/gui/macosx/equalizer.m:145
+#: modules/gui/macosx/extended.m:113 modules/gui/macosx/wizard.m:395
 #: modules/gui/wxwidgets/dialogs/wizard.cpp:633
 #: modules/gui/wxwidgets/extrapanel.cpp:216
 #: modules/gui/wxwidgets/extrapanel.cpp:465
 msgid "Enable"
 msgstr "启动"
 
-#: src/libvlc.h:396
+#: src/libvlc.h:423
 msgid "UDP port"
 msgstr "UDP 端口"
 
-#: src/libvlc.h:398
+#: src/libvlc.h:425
 msgid "This is the default port used for UDP streams. Default is 1234."
 msgstr "这是用于 UDP 流的端口。默认值是 1234。"
 
-#: src/libvlc.h:400
+#: src/libvlc.h:427
 msgid "MTU of the network interface"
 msgstr "网络接口的MTU"
 
-#: src/libvlc.h:402
+#: src/libvlc.h:429
 msgid ""
 "This is the maximum packet size that can be transmitted over the network "
 "interface. On Ethernet it is usually 1500 bytes."
 msgstr "这是可以在网络接口上传输的包的最大大小。在以太网上通常是 1500 字节。"
 
-#: src/libvlc.h:405
+#: src/libvlc.h:432
 msgid "Hop limit (TTL)"
 msgstr "Hop 限制 (TTL)"
 
-#: src/libvlc.h:407
+#: src/libvlc.h:434
 msgid ""
 "This is the hop limit (also known as \"Time-To-Live\" or TTL) of the "
 "multicast packets sent by the stream output (0 = use operating system built-"
 "in default)."
 msgstr ""
 
-#: src/libvlc.h:411
+#: src/libvlc.h:438
 msgid "IPv6 multicast output interface"
 msgstr "IPv6 多播输出接口"
 
-#: src/libvlc.h:413
+#: src/libvlc.h:440
 msgid "Default IPv6 multicast interface. This overrides the routing table."
 msgstr "默认 IPv6 多播输出接口。这个将覆盖路由表。"
 
-#: src/libvlc.h:415
+#: src/libvlc.h:442
 msgid "IPv4 multicast output interface address"
 msgstr "IPv4 多播输出接口地址"
 
-#: src/libvlc.h:417
+#: src/libvlc.h:444
 msgid ""
 "IPv4 adress for the default multicast interface. This overrides the routing "
 "table."
 msgstr "默认 IPv4 多播输出接口。这个重写了路由表。"
 
-#: src/libvlc.h:422
+#: src/libvlc.h:449
 msgid ""
 "Choose the program to select by giving its Service ID. Only use this option "
 "if you want to read a multi-program stream (like DVB streams for example)."
 msgstr ""
 
-#: src/libvlc.h:428
+#: src/libvlc.h:455
 msgid ""
 "Choose the programs to select by giving a comma-separated list of Service "
 "IDs (SIDs). Only use this option if you want to read a multi-program stream "
 "(like DVB streams for example)."
 msgstr ""
 
-#: src/libvlc.h:434 modules/gui/wxwidgets/dialogs/open.cpp:779
+#: src/libvlc.h:461 modules/gui/wxwidgets/dialogs/open.cpp:779
 msgid "Audio track"
 msgstr "音轨"
 
-#: src/libvlc.h:436
+#: src/libvlc.h:463
 msgid "Stream number of the audio track to use (from 0 to n)."
 msgstr "设置你想使用的音频轨道的串流号码 (从 0 到 n)"
 
-#: src/libvlc.h:439 modules/gui/wxwidgets/dialogs/open.cpp:771
+#: src/libvlc.h:466 modules/gui/wxwidgets/dialogs/open.cpp:771
 msgid "Subtitles track"
 msgstr "字幕轨"
 
-#: src/libvlc.h:441
+#: src/libvlc.h:468
 msgid "Stream number of the subtitle track to use (from 0 to n)."
 msgstr "设置你想使用的字幕轨道的串流编号 (从 0 到 n)"
 
-#: src/libvlc.h:444
+#: src/libvlc.h:471
 msgid "Audio language"
 msgstr "音频语言"
 
-#: src/libvlc.h:446
+#: src/libvlc.h:473
 msgid ""
 "Language of the audio track you want to use (comma separated, two or three "
 "letter country code)."
 msgstr "设置你想使用的音频轨道的语言 (以逗号分隔, 两个或三个字母的国家代码)。"
 
-#: src/libvlc.h:449
+#: src/libvlc.h:476
 msgid "Subtitle language"
 msgstr "字幕语言"
 
-#: src/libvlc.h:451
+#: src/libvlc.h:478
 msgid ""
 "Language of the subtitle track you want to use (comma separated, two or tree "
 "letter country code)."
 msgstr "设置你想使用的字幕轨道的语言 (以逗号分隔, 两个或三个字母的国家代码)。"
 
-#: src/libvlc.h:455
+#: src/libvlc.h:482
 msgid "Audio track ID"
 msgstr "音轨 ID"
 
-#: src/libvlc.h:457
+#: src/libvlc.h:484
 msgid "Stream ID of the audio track to use."
 msgstr "要使用的音频轨道的 ID"
 
-#: src/libvlc.h:459
+#: src/libvlc.h:486
 msgid "Subtitles track ID"
 msgstr "字幕轨 ID"
 
-#: src/libvlc.h:461
+#: src/libvlc.h:488
 msgid "Stream ID of the subtitle track to use."
 msgstr "要使用的字幕轨道的 ID"
 
-#: src/libvlc.h:463
+#: src/libvlc.h:490
 msgid "Input repetitions"
 msgstr "输入重复"
 
-#: src/libvlc.h:465
+#: src/libvlc.h:492
 msgid "Number of time the same input will be repeated"
 msgstr "相同的输入将要被重复的时间"
 
-#: src/libvlc.h:467
+#: src/libvlc.h:494
 msgid "Start time"
 msgstr "开始时间"
 
-#: src/libvlc.h:469
+#: src/libvlc.h:496
 msgid "The stream will start at this position (in seconds)."
 msgstr "串流将从此位置开始 (以秒为单位)。"
 
-#: src/libvlc.h:471
+#: src/libvlc.h:498
 msgid "Stop time"
 msgstr "停止时间"
 
-#: src/libvlc.h:473
+#: src/libvlc.h:500
 msgid "The stream will stop at this position (in seconds)."
 msgstr "串流将从此位置停止 (以秒为单位)。"
 
-#: src/libvlc.h:475
+#: src/libvlc.h:502
 msgid "Input list"
 msgstr "输入清单"
 
-#: src/libvlc.h:477
+#: src/libvlc.h:504
 msgid ""
 "You can give a comma-separated list of inputs that will be concatenated "
 "together after the normal one."
 msgstr ""
 
-#: src/libvlc.h:480
+#: src/libvlc.h:507
 msgid "Input slave (experimental)"
 msgstr "从输入(试验性的)"
 
-#: src/libvlc.h:482
+#: src/libvlc.h:509
 msgid ""
 "This allows you to play from several inputs at the same time. This feature "
 "is experimental, not all formats are supported. Use a '#' separated list of "
@@ -1798,18 +1972,18 @@ msgstr ""
 "允许你同时播放一些输入.这个特性是测试阶段,不是所有格式都支持. 使用一个以井号"
 "分隔的列表."
 
-#: src/libvlc.h:486
+#: src/libvlc.h:513
 msgid "Bookmarks list for a stream"
 msgstr "串流书签清单"
 
-#: src/libvlc.h:488
+#: src/libvlc.h:515
 msgid ""
 "You can manually give a list of bookmarks for a stream in the form "
 "\"{name=bookmark-name,time=optional-time-offset,bytes=optional-byte-offset},"
 "{...}\""
 msgstr ""
 
-#: src/libvlc.h:494
+#: src/libvlc.h:521
 msgid ""
 "These options allow you to modify the behavior of the subpictures subsystem. "
 "You can for example enable subpictures filters (logo, etc.). Enable these "
@@ -1817,70 +1991,70 @@ msgid ""
 "section. You can also set many miscellaneous subpictures options."
 msgstr ""
 
-#: src/libvlc.h:500
+#: src/libvlc.h:527
 msgid "Force subtitle position"
 msgstr "强制字幕位置"
 
-#: src/libvlc.h:502
+#: src/libvlc.h:529
 msgid ""
 "You can use this option to place the subtitles under the movie, instead of "
 "over the movie. Try several positions."
 msgstr ""
 
-#: src/libvlc.h:505
+#: src/libvlc.h:532
 msgid "Enable sub-pictures"
 msgstr "启用子画面"
 
-#: src/libvlc.h:507
+#: src/libvlc.h:534
 msgid "You can completely disable the sub-picture processing."
 msgstr "您可以完全禁用子画面处理。"
 
-#: src/libvlc.h:509 src/libvlc.h:1273 src/misc/iso-639_def.h:143
-#: modules/stream_out/transcode.c:274
+#: src/libvlc.h:536 src/libvlc.h:1334 src/misc/iso-639_def.h:143
+#: modules/stream_out/transcode.c:281
 msgid "On Screen Display"
 msgstr "画面上显示(OSD)"
 
-#: src/libvlc.h:511
+#: src/libvlc.h:538
 msgid ""
 "VLC can display messages on the video. This is called OSD (On Screen "
 "Display)."
 msgstr "VLC可以在视频上显示讯息，称之为 OSD (On Screen Display)。"
 
-#: src/libvlc.h:514
+#: src/libvlc.h:541
 msgid "Text rendering module"
 msgstr "字体渲染模块"
 
-#: src/libvlc.h:516
+#: src/libvlc.h:543
 msgid ""
 "VLC normally uses Freetype for rendering, but this allows you to use svg for "
 "instance."
 msgstr ""
 
-#: src/libvlc.h:519
+#: src/libvlc.h:546
 msgid "Subpictures filter module"
 msgstr "子画面过滤器模块"
 
-#: src/libvlc.h:521
+#: src/libvlc.h:548
 msgid ""
 "This adds so-called \"subpicture filters\". These filters overlay some "
 "images or text over the video (like a logo, arbitraty text...)."
 msgstr ""
 
-#: src/libvlc.h:524
+#: src/libvlc.h:551
 msgid "Autodetect subtitle files"
 msgstr "自动侦测字幕档"
 
-#: src/libvlc.h:526
+#: src/libvlc.h:553
 msgid ""
 "Automatically detect a subtitle file, if no subtitle filename is specified "
 "(based on the filename of the movie)."
 msgstr "如果不指定字幕文件名称，就自动地侦测字幕文件"
 
-#: src/libvlc.h:529
+#: src/libvlc.h:556
 msgid "Subtitle autodetection fuzziness"
 msgstr "字幕自动侦测模糊化"
 
-#: src/libvlc.h:531
+#: src/libvlc.h:558
 msgid ""
 "This determines how fuzzy subtitle and movie filename matching will be. "
 "Options are:\n"
@@ -1897,97 +2071,97 @@ msgstr ""
 "3 = 字幕文件与电影名称吻合并包含其它字符\n"
 "4 = 字幕文件与电影名称完全吻合"
 
-#: src/libvlc.h:539
+#: src/libvlc.h:566
 msgid "Subtitle autodetection paths"
 msgstr "字幕自动侦测路径"
 
-#: src/libvlc.h:541
+#: src/libvlc.h:568
 msgid ""
 "Look for a subtitle file in those paths too, if your subtitle file was not "
 "found in the current directory."
 msgstr ""
 
-#: src/libvlc.h:544
+#: src/libvlc.h:571
 msgid "Use subtitle file"
 msgstr "使用字幕文件"
 
-#: src/libvlc.h:546
+#: src/libvlc.h:573
 msgid ""
 "Load this subtitle file. To be used when autodetect cannot detect your "
 "subtitle file."
 msgstr "当自动侦测字幕文件无效的时候，加载这个字幕文件"
 
-#: src/libvlc.h:549
+#: src/libvlc.h:576
 msgid "DVD device"
 msgstr "DVD装置"
 
-#: src/libvlc.h:552
+#: src/libvlc.h:579
 msgid ""
 "This is the default DVD drive (or file) to use. Don't forget the colon after "
 "the drive letter (eg. D:)"
 msgstr ""
 
-#: src/libvlc.h:556
+#: src/libvlc.h:583
 msgid "This is the default DVD device to use."
 msgstr "默认的 DVD 设备"
 
-#: src/libvlc.h:559
+#: src/libvlc.h:586
 msgid "VCD device"
 msgstr "VCD 设备"
 
-#: src/libvlc.h:562
+#: src/libvlc.h:589
 msgid ""
 "This is the default VCD device to use. If you don't specify anything, we'll "
 "scan for a suitable CD-ROM device."
 msgstr ""
 
-#: src/libvlc.h:566
+#: src/libvlc.h:593
 msgid "This is the default VCD device to use."
 msgstr "默认的 VCD 设备"
 
-#: src/libvlc.h:569
+#: src/libvlc.h:596
 msgid "Audio CD device"
 msgstr "音乐 CD 设备"
 
-#: src/libvlc.h:572
+#: src/libvlc.h:599
 msgid ""
 "This is the default Audio CD device to use. If you don't specify anything, "
 "we'll scan for a suitable CD-ROM device."
 msgstr "默认的音乐 CD 设备，如果你不指定，程序将会自动扫描适合的光驱"
 
-#: src/libvlc.h:576
+#: src/libvlc.h:603
 msgid "This is the default Audio CD device to use."
 msgstr "默认的音乐 CD 设备"
 
-#: src/libvlc.h:579 modules/gui/wxwidgets/dialogs/open.cpp:841
+#: src/libvlc.h:606 modules/gui/wxwidgets/dialogs/open.cpp:841
 msgid "Force IPv6"
 msgstr "强制使用 IPv6"
 
-#: src/libvlc.h:581
+#: src/libvlc.h:608
 msgid "IPv6 will be used by default for all connections."
 msgstr "对所有的连接默认使用 IPv6。"
 
-#: src/libvlc.h:583
+#: src/libvlc.h:610
 msgid "Force IPv4"
 msgstr "强制使用 IPv4"
 
-#: src/libvlc.h:585
+#: src/libvlc.h:612
 msgid "IPv4 will be used by default for all connections."
 msgstr "对所有的连接默认使用 IPv4。"
 
-#: src/libvlc.h:587
+#: src/libvlc.h:614
 msgid "TCP connection timeout"
 msgstr "TCP连接超时时间"
 
-#: src/libvlc.h:589
+#: src/libvlc.h:616
 msgid "Default TCP connection timeout (in milliseconds). "
 msgstr "默认 TCP 连接超时时间 (以毫秒为单位)"
 
-#: src/libvlc.h:591
+#: src/libvlc.h:618
 msgid "SOCKS server"
 msgstr "SOCKS服务器"
 
-#: src/libvlc.h:593
+#: src/libvlc.h:620
 msgid ""
 "SOCKS proxy server to use. This must be of the form address:port. It will be "
 "used for all TCP connections"
@@ -1995,329 +2169,329 @@ msgstr ""
 "要使用的 SOCKS 代理服务器。这必须以 地址:端口 的形式。它将被用于所有的 TCP 连"
 "接。"
 
-#: src/libvlc.h:596
+#: src/libvlc.h:623
 msgid "SOCKS user name"
 msgstr "SOCKS使用者名称"
 
-#: src/libvlc.h:598
+#: src/libvlc.h:625
 msgid "User name to be used for connection to the SOCKS proxy."
 msgstr "将被用于连接到 SOCKS 代理服务器的用户名。"
 
-#: src/libvlc.h:600
+#: src/libvlc.h:627
 msgid "SOCKS password"
 msgstr "SOCKS密码"
 
-#: src/libvlc.h:602
+#: src/libvlc.h:629
 msgid "Password to be used for connection to the SOCKS proxy."
 msgstr "将被用于连接到 SOCKS 代理服务器的密码。"
 
-#: src/libvlc.h:604
+#: src/libvlc.h:631
 msgid "Title metadata"
 msgstr "标题数据"
 
-#: src/libvlc.h:606
+#: src/libvlc.h:633
 msgid "Allows you to specify a \"title\" metadata for an input."
 msgstr "允许您为一个输入指定一个“标题”元数据。"
 
-#: src/libvlc.h:608
+#: src/libvlc.h:635
 msgid "Author metadata"
 msgstr "作者元数据"
 
-#: src/libvlc.h:610
+#: src/libvlc.h:637
 msgid "Allows you to specify an \"author\" metadata for an input."
 msgstr "允许您为一个输入指定一个“作者”元数据。"
 
-#: src/libvlc.h:612
+#: src/libvlc.h:639
 msgid "Artist metadata"
 msgstr "艺术家元数据"
 
-#: src/libvlc.h:614
+#: src/libvlc.h:641
 msgid "Allows you to specify an \"artist\" metadata for an input."
 msgstr "允许您为一个输入指定一个“艺术家”元数据。"
 
-#: src/libvlc.h:616
+#: src/libvlc.h:643
 msgid "Genre metadata"
 msgstr "流派元数据"
 
-#: src/libvlc.h:618
+#: src/libvlc.h:645
 msgid "Allows you to specify a \"genre\" metadata for an input."
 msgstr "允许您为一个输入指定一个“流派”元数据。"
 
-#: src/libvlc.h:620
+#: src/libvlc.h:647
 msgid "Copyright metadata"
 msgstr "版权元数据"
 
-#: src/libvlc.h:622
+#: src/libvlc.h:649
 msgid "Allows you to specify a \"copyright\" metadata for an input."
 msgstr "允许您为一个输入指定一个“版权”元数据。"
 
-#: src/libvlc.h:624
+#: src/libvlc.h:651
 msgid "Description metadata"
 msgstr "描述元数据"
 
-#: src/libvlc.h:626
+#: src/libvlc.h:653
 msgid "Allows you to specify a \"description\" metadata for an input."
 msgstr "允许您为一个输入指定一个“描述”元数据。"
 
-#: src/libvlc.h:628
+#: src/libvlc.h:655
 msgid "Date metadata"
 msgstr "日期元数据"
 
-#: src/libvlc.h:630
+#: src/libvlc.h:657
 msgid "Allows you to specify a \"date\" metadata for an input."
 msgstr "允许您为一个输入指定一个“日期”元数据。"
 
-#: src/libvlc.h:632
+#: src/libvlc.h:659
 msgid "URL metadata"
 msgstr "网址元数据"
 
-#: src/libvlc.h:634
+#: src/libvlc.h:661
 msgid "Allows you to specify a \"url\" metadata for an input."
 msgstr "允许您为一个输入指定一个“网址”元数据。"
 
-#: src/libvlc.h:638
+#: src/libvlc.h:665
 msgid ""
 "This option can be used to alter the way VLC selects its codecs "
 "(decompression methods). Only advanced users should alter this option as it "
 "can break playback of all your streams."
 msgstr ""
 
-#: src/libvlc.h:642
+#: src/libvlc.h:669
 msgid "Preferred decoders list"
 msgstr "偏好的解码器清单"
 
-#: src/libvlc.h:644
+#: src/libvlc.h:671
 msgid ""
 "List of codecs that VLC will use in priority. For instance, 'dummy,a52' will "
 "try the dummy and a52 codecs before trying the other ones. Only advanced "
 "users should alter this option as it can break playback of all your streams."
 msgstr ""
 
-#: src/libvlc.h:649
+#: src/libvlc.h:676
 msgid "Preferred encoders list"
 msgstr "偏好的编码器清单"
 
-#: src/libvlc.h:651
+#: src/libvlc.h:678
 msgid ""
 "This allows you to select a list of encoders that VLC will use in priority."
 msgstr "允许你选择编码器清单，VLC会依照先后顺序使用"
 
-#: src/libvlc.h:660
+#: src/libvlc.h:687
 msgid ""
 "These options allow you to set default global options for the stream output "
 "subsystem."
 msgstr "这些选项允许你设置默认的流输出子系统的全局选项."
 
-#: src/libvlc.h:663
+#: src/libvlc.h:690
 msgid "Default stream output chain"
 msgstr "默认串流输出链"
 
-#: src/libvlc.h:665
+#: src/libvlc.h:692
 msgid ""
 "You can enter here a default stream output chain. Refer to the documentation "
 "to learn how to build such chains.Warning: this chain will be enabled for "
 "all streams."
 msgstr ""
 
-#: src/libvlc.h:669
+#: src/libvlc.h:696
 msgid "Enable streaming of all ES"
 msgstr "打开串流所有 ES"
 
-#: src/libvlc.h:671
+#: src/libvlc.h:698
 msgid "Stream all elementary streams (video, audio and subtitles)"
 msgstr "允许串流所有的 ES (视频,音频和字幕)"
 
-#: src/libvlc.h:673
+#: src/libvlc.h:700
 msgid "Display while streaming"
 msgstr "串流时显示"
 
-#: src/libvlc.h:675
+#: src/libvlc.h:702
 msgid "Play locally the stream while streaming it."
 msgstr "串流时在本地播放该串流。"
 
-#: src/libvlc.h:677
+#: src/libvlc.h:704
 msgid "Enable video stream output"
 msgstr "启动视频串流输出"
 
-#: src/libvlc.h:679
+#: src/libvlc.h:706
 msgid ""
 "Choose whether the video stream should be redirected to the stream output "
 "facility when this last one is enabled."
 msgstr ""
 
-#: src/libvlc.h:682
+#: src/libvlc.h:709
 msgid "Enable audio stream output"
 msgstr "启动音频串流输出"
 
-#: src/libvlc.h:684
+#: src/libvlc.h:711
 msgid ""
 "Choose whether the audio stream should be redirected to the stream output "
 "facility when this last one is enabled."
 msgstr ""
 
-#: src/libvlc.h:687
+#: src/libvlc.h:714
 msgid "Enable SPU stream output"
 msgstr "启动 SPU 串流输出"
 
-#: src/libvlc.h:689
+#: src/libvlc.h:716
 msgid ""
 "Choose whether the SPU streams should be redirected to the stream output "
 "facility when this last one is enabled."
 msgstr ""
 
-#: src/libvlc.h:692
+#: src/libvlc.h:719
 msgid "Keep stream output open"
 msgstr "持续开启串流输出"
 
-#: src/libvlc.h:694
+#: src/libvlc.h:721
 msgid ""
 "This allows you to keep an unique stream output instance across multiple "
 "playlist item (automatically insert the gather stream output if not "
 "specified)"
 msgstr ""
 
-#: src/libvlc.h:698
+#: src/libvlc.h:725
 msgid "Preferred packetizer list"
 msgstr "偏好的封包器清单"
 
-#: src/libvlc.h:700
+#: src/libvlc.h:727
 msgid ""
 "This allows you to select the order in which VLC will choose its packetizers."
 msgstr "这个允许你选择VLC选择封包器的顺序"
 
-#: src/libvlc.h:703
+#: src/libvlc.h:730
 msgid "Mux module"
 msgstr "多任务模块"
 
-#: src/libvlc.h:705
+#: src/libvlc.h:732
 msgid "This is a legacy entry to let you configure mux modules"
 msgstr ""
 
-#: src/libvlc.h:707
+#: src/libvlc.h:734
 msgid "Access output module"
 msgstr "存取输出模块"
 
-#: src/libvlc.h:709
+#: src/libvlc.h:736
 msgid "This is a legacy entry to let you configure access output modules"
 msgstr ""
 
-#: src/libvlc.h:711
+#: src/libvlc.h:738
 msgid "Control SAP flow"
 msgstr "控制SAP流量"
 
-#: src/libvlc.h:713
+#: src/libvlc.h:740
 msgid ""
 "If this option is enabled, the flow on the SAP multicast address will be "
 "controlled. This is needed if you want to make announcements on the MBone."
 msgstr ""
 
-#: src/libvlc.h:717
+#: src/libvlc.h:744
 msgid "SAP announcement interval"
 msgstr "SAP 通告间隔"
 
-#: src/libvlc.h:719
+#: src/libvlc.h:746
 msgid ""
 "When the SAP flow control is disabled, this lets you set the fixed interval "
 "between SAP announcements."
 msgstr ""
 
-#: src/libvlc.h:729
+#: src/libvlc.h:756
 msgid ""
 "These options allow you to enable special CPU optimizations. You should "
 "always leave all these enabled."
 msgstr ""
 
-#: src/libvlc.h:732
+#: src/libvlc.h:759
 msgid "Enable FPU support"
 msgstr "启用 FPU 支持"
 
-#: src/libvlc.h:734
+#: src/libvlc.h:761
 msgid ""
 "If your processor has a floating point calculation unit, VLC can take "
 "advantage of it."
 msgstr "如果你的处理器有一个浮点处理器，VLC 可以利用它。"
 
-#: src/libvlc.h:737
+#: src/libvlc.h:764
 msgid "Enable CPU MMX support"
 msgstr "启用 CPU MMX 支持"
 
-#: src/libvlc.h:739
+#: src/libvlc.h:766
 msgid ""
 "If your processor supports the MMX instructions set, VLC can take advantage "
 "of them."
 msgstr "如果你的处理器支持 MMX 指令集，VLC 可以利用它。"
 
-#: src/libvlc.h:742
+#: src/libvlc.h:769
 msgid "Enable CPU 3D Now! support"
 msgstr "启用 CPU 3D Now! 支持"
 
-#: src/libvlc.h:744
+#: src/libvlc.h:771
 msgid ""
 "If your processor supports the 3D Now! instructions set, VLC can take "
 "advantage of them."
 msgstr "如果你的处理器支持 3D Now! 指令集，VLC 可以利用它。"
 
-#: src/libvlc.h:747
+#: src/libvlc.h:774
 msgid "Enable CPU MMX EXT support"
 msgstr "启用 CPU MMX EXT 支持"
 
-#: src/libvlc.h:749
+#: src/libvlc.h:776
 msgid ""
 "If your processor supports the MMX EXT instructions set, VLC can take "
 "advantage of them."
 msgstr "如果你的处理器支持 MMX EXT 指令集，VLC 可以利用它。"
 
-#: src/libvlc.h:752
+#: src/libvlc.h:779
 msgid "Enable CPU SSE support"
 msgstr "启用 CPU SSE 支持"
 
-#: src/libvlc.h:754
+#: src/libvlc.h:781
 msgid ""
 "If your processor supports the SSE instructions set, VLC can take advantage "
 "of them."
 msgstr "如果你的处理器支持 SSE 指令集，VLC 可以利用它。"
 
-#: src/libvlc.h:757
+#: src/libvlc.h:784
 msgid "Enable CPU SSE2 support"
 msgstr "启用 CPU SSE2 支持"
 
-#: src/libvlc.h:759
+#: src/libvlc.h:786
 msgid ""
 "If your processor supports the SSE2 instructions set, VLC can take advantage "
 "of them."
 msgstr "如果你的处理器支持 SSE2 指令集，VLC 可以利用它。"
 
-#: src/libvlc.h:762
+#: src/libvlc.h:789
 msgid "Enable CPU AltiVec support"
 msgstr "启用 CPU AltiVec 支持"
 
-#: src/libvlc.h:764
+#: src/libvlc.h:791
 msgid ""
 "If your processor supports the AltiVec instructions set, VLC can take "
 "advantage of them."
 msgstr "如果你的处理器支持 AltiVec 指令集，VLC 可以利用它。"
 
-#: src/libvlc.h:769
+#: src/libvlc.h:796
 msgid ""
 "These options allow you to select default modules. Leave these alone unless "
 "you really know what you are doing."
 msgstr ""
 
-#: src/libvlc.h:772
+#: src/libvlc.h:799
 msgid "Memory copy module"
 msgstr "内存复制模块"
 
-#: src/libvlc.h:774
+#: src/libvlc.h:801
 msgid ""
 "You can select which memory copy module you want to use. By default VLC will "
 "select the fastest one supported by your hardware."
 msgstr ""
 
-#: src/libvlc.h:777
+#: src/libvlc.h:804
 msgid "Access module"
 msgstr "存取模块"
 
-#: src/libvlc.h:779
+#: src/libvlc.h:806
 msgid ""
 "This allows you to force an access module. You can use it if the correct "
 "access is not automatically detected. You should not set this as a global "
@@ -2326,21 +2500,21 @@ msgstr ""
 "此选项允许您强制使用一个存取模块。如果正确的存取模块没有被自动检测到的话，您"
 "可以使用此选项。除非您知道你在做什么，您不应该将此选项设为一个全局选项。"
 
-#: src/libvlc.h:783
+#: src/libvlc.h:810
 msgid "Access filter module"
 msgstr "存取过滤器模块"
 
-#: src/libvlc.h:785
+#: src/libvlc.h:812
 msgid ""
 "Access filters are used to modify the stream that is being read. This is "
 "used for instance for timeshifting."
 msgstr ""
 
-#: src/libvlc.h:788
+#: src/libvlc.h:815
 msgid "Demux module"
 msgstr "解多任务模块"
 
-#: src/libvlc.h:790
+#: src/libvlc.h:817
 msgid ""
 "Demultiplexers are used to separate the \"elementary\" streams (like audio "
 "and video streams). You can use it if the correct demuxer is not "
@@ -2348,11 +2522,11 @@ msgid ""
 "you really know what you are doing."
 msgstr ""
 
-#: src/libvlc.h:795
+#: src/libvlc.h:822
 msgid "Allow real-time priority"
 msgstr "允许实时优先权"
 
-#: src/libvlc.h:797
+#: src/libvlc.h:824
 msgid ""
 "Running VLC in real-time priority will allow for much more precise "
 "scheduling and yield better, especially when streaming content. It can "
@@ -2360,86 +2534,94 @@ msgid ""
 "only activate this if you know what you're doing."
 msgstr ""
 
-#: src/libvlc.h:803
+#: src/libvlc.h:830
 msgid "Adjust VLC priority"
 msgstr "调整 VLC 优先权"
 
-#: src/libvlc.h:805
+#: src/libvlc.h:832
 msgid ""
 "This option adds an offset (positive or negative) to VLC default priorities. "
 "You can use it to tune VLC priority against other programs, or against other "
 "VLC instances."
 msgstr ""
 
-#: src/libvlc.h:809
+#: src/libvlc.h:836
 msgid "Minimize number of threads"
 msgstr "最小线程数量"
 
-#: src/libvlc.h:811
+#: src/libvlc.h:838
 msgid "This option minimizes the number of threads needed to run VLC."
 msgstr ""
 
-#: src/libvlc.h:813
+#: src/libvlc.h:840
 msgid "Modules search path"
 msgstr "模块搜寻路径"
 
-#: src/libvlc.h:815
+#: src/libvlc.h:842
 msgid "Additional path for VLC to look for its modules."
 msgstr "这个选项允许你指定其它的 VLC 模块搜寻路径"
 
-#: src/libvlc.h:817
+#: src/libvlc.h:844
 msgid "VLM configuration file"
 msgstr "VLM设置档"
 
-#: src/libvlc.h:819
+#: src/libvlc.h:846
 msgid "Read a VLM configuration file as soon as VLM is started."
 msgstr "当 VLM 启动时，读取一个 VLM 配置文件。"
 
-#: src/libvlc.h:821
+#: src/libvlc.h:848
 msgid "Use a plugins cache"
 msgstr "使用外挂缓存"
 
-#: src/libvlc.h:823
+#: src/libvlc.h:850
 msgid "Use a plugins cache which will greatly improve the startup time of VLC."
 msgstr "这个选项允许你使用插件缓存, 这将会大大提高 VLC 的开始时间"
 
-#: src/libvlc.h:825
+#: src/libvlc.h:852
 msgid "Collect statistics"
 msgstr "收集统计信息"
 
-#: src/libvlc.h:827
+#: src/libvlc.h:854
 msgid "Collect miscellaneous statistics."
 msgstr "收集杂项统计。"
 
-#: src/libvlc.h:829
+#: src/libvlc.h:856
 msgid "Run as daemon process"
 msgstr "使用常驻程序执行"
 
-#: src/libvlc.h:831
+#: src/libvlc.h:858
 msgid "Runs VLC as a background daemon process."
 msgstr "使用背景常驻程序执行VLC"
 
-#: src/libvlc.h:833
+#: src/libvlc.h:860
+msgid "Write process id to file"
+msgstr ""
+
+#: src/libvlc.h:862
+msgid "Writes process id into specified file."
+msgstr ""
+
+#: src/libvlc.h:864
 msgid "Log to file"
 msgstr "记录到文件"
 
-#: src/libvlc.h:835
+#: src/libvlc.h:866
 msgid "Log all VLC messages to a text file."
 msgstr "记录所有的 VLC 信息到一个文本文件。"
 
-#: src/libvlc.h:837
+#: src/libvlc.h:868
 msgid "Log to syslog"
 msgstr "记录到 syslog"
 
-#: src/libvlc.h:839
+#: src/libvlc.h:870
 msgid "Log all VLC messages to syslog (UNIX systems)."
 msgstr "记录所有的 VLC 信息到 sysloc (UNIX 系统)。"
 
-#: src/libvlc.h:841
+#: src/libvlc.h:872
 msgid "Allow only one running instance"
 msgstr "只允许一个实例运行"
 
-#: src/libvlc.h:843
+#: src/libvlc.h:874
 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 "
@@ -2448,23 +2630,29 @@ msgid ""
 "running instance or enqueue it."
 msgstr ""
 
-#: src/libvlc.h:849
+#: src/libvlc.h:880
 msgid "VLC is started from file association"
 msgstr ""
 
-#: src/libvlc.h:851
+#: src/libvlc.h:882
 msgid "Tell VLC that it is being launched due to a file association in the OS"
 msgstr ""
 
-#: src/libvlc.h:854 src/libvlc.h:856
-msgid "Allow only on running instance when started from file"
+#: src/libvlc.h:885
+#, fuzzy
+msgid "One instance when started from file"
+msgstr "当从文件开始时, 只允许一个实例运行"
+
+#: src/libvlc.h:887
+#, fuzzy
+msgid "Allow only one running instance when started from file."
 msgstr "当从文件开始时, 只允许一个实例运行"
 
-#: src/libvlc.h:858
+#: src/libvlc.h:889
 msgid "Increase the priority of the process"
 msgstr "提高程序优先权"
 
-#: src/libvlc.h:860
+#: src/libvlc.h:891
 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 "
@@ -2474,22 +2662,22 @@ msgid ""
 "machine."
 msgstr ""
 
-#: src/libvlc.h:867
+#: src/libvlc.h:898
 msgid "Fast mutex on NT/2K/XP (developers only)"
 msgstr ""
 
-#: src/libvlc.h:869
+#: src/libvlc.h:900
 msgid ""
 "On Windows NT/2K/XP we use a slow mutex implementation but which allows us "
 "to correctly implement condition variables. You can also use the faster "
 "Win9x implementation but you might experience problems with it."
 msgstr ""
 
-#: src/libvlc.h:874
+#: src/libvlc.h:905
 msgid "Condition variables implementation for Win9x (developers only)"
 msgstr ""
 
-#: src/libvlc.h:877
+#: src/libvlc.h:908
 msgid ""
 "On Windows 9x/Me you can use a fast but incorrect condition variables "
 "implementation (more precisely there is a possibility for a race condition "
@@ -2498,700 +2686,744 @@ msgid ""
 "fastest but slightly incorrect), 1 (default) and 2."
 msgstr ""
 
-#: src/libvlc.h:886
+#: src/libvlc.h:917
 msgid "Enqueue items to playlist when in one instance mode"
 msgstr ""
 
-#: src/libvlc.h:888
+#: src/libvlc.h:919
 msgid ""
 "When using the one instance only option, enqueue items to playlist and keep "
 "playing current item."
 msgstr ""
 
-#: src/libvlc.h:897
+#: src/libvlc.h:928
 msgid ""
 "These options define the behavior of the playlist. Some of them can be "
 "overridden in the playlist dialog box."
 msgstr ""
 
-#: src/libvlc.h:900
+#: src/libvlc.h:931
 msgid "Automatically preparse files"
 msgstr "自动预解释文件"
 
-#: src/libvlc.h:902
+#: src/libvlc.h:933
 msgid ""
 "Automatically preparse files added to the playlist (to retrieve some "
 "metadata)."
 msgstr ""
 
-#: src/libvlc.h:905
+#: src/libvlc.h:936
 msgid "Services discovery modules"
 msgstr "服务探索模块"
 
-#: src/libvlc.h:907
+#: src/libvlc.h:938
 msgid ""
 "Specifies the services discovery modules to load, separated by semi-colons. "
 "Typical values are sap, hal, ..."
 msgstr ""
 
-#: src/libvlc.h:910
+#: src/libvlc.h:941
 msgid "Play files randomly forever"
 msgstr "永远随机播放文件"
 
-#: src/libvlc.h:912
+#: src/libvlc.h:943
 msgid "VLC will randomly play files in the playlist until interrupted."
 msgstr "选择后，VLC 会随机地播放列表中的文件，直到中断"
 
-#: src/libvlc.h:914
+#: src/libvlc.h:945
 msgid "Repeat all"
 msgstr "重复播放全部"
 
-#: src/libvlc.h:916
+#: src/libvlc.h:947
 msgid "VLC will keep playing the playlist indefinitely."
 msgstr "启动后，VLC 会一遍又一遍地的播放目前的播放列表。"
 
-#: src/libvlc.h:918
+#: src/libvlc.h:949
 msgid "Repeat current item"
 msgstr "重复播放目前项目"
 
-#: src/libvlc.h:920
+#: src/libvlc.h:951
 msgid "VLC will keep playing the current playlist item."
 msgstr "启动后，VLC 会一遍又一遍地的播放目前的播放列表项目。"
 
-#: src/libvlc.h:922
+#: src/libvlc.h:953
 msgid "Play and stop"
 msgstr "播放和停止"
 
-#: src/libvlc.h:924
+#: src/libvlc.h:955
 msgid "Stop the playlist after each played playlist item."
 msgstr "每次播放完条目后停止播放列表中的项目"
 
-#: src/libvlc.h:931
+#: src/libvlc.h:957
+#, fuzzy
+msgid "Play and exit"
+msgstr "播放和停止"
+
+#: src/libvlc.h:959
+#, fuzzy
+msgid "Exit if there are no more items in the playlist."
+msgstr "播放列表中没有项目"
+
+#: src/libvlc.h:961
+#, fuzzy
+msgid "Use media library"
+msgstr "VLC多媒体播放程序"
+
+#: src/libvlc.h:963
+msgid ""
+"The media library is automatically saved and reloaded each time you start "
+"VLC."
+msgstr ""
+
+#: src/libvlc.h:966
+#, fuzzy
+msgid "Use playlist tree"
+msgstr "下一个播放列表项目"
+
+#: src/libvlc.h:968
+msgid ""
+"The playlist can use a tree to categorize some items, like the contents of a "
+"directory. \"Default\" means that the tree will only be used when really "
+"needed."
+msgstr ""
+
+#: src/libvlc.h:972
+#, fuzzy
+msgid "Always"
+msgstr "永远在最上层"
+
+#: src/libvlc.h:972
+msgid "Never"
+msgstr ""
+
+#: src/libvlc.h:981
 msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
 msgstr ""
 
-#: src/libvlc.h:934 src/video_output/vout_intf.c:400
+#: src/libvlc.h:984 src/video_output/vout_intf.c:408
 #: modules/gui/beos/VideoOutput.cpp:1057 modules/gui/macosx/applescript.m:126
-#: modules/gui/macosx/controls.m:338 modules/gui/macosx/controls.m:754
-#: modules/gui/macosx/controls.m:784 modules/gui/macosx/embeddedwindow.m:44
-#: modules/gui/macosx/intf.m:491 modules/gui/macosx/intf.m:567
+#: modules/gui/macosx/controls.m:344 modules/gui/macosx/controls.m:760
+#: modules/gui/macosx/controls.m:790 modules/gui/macosx/embeddedwindow.m:44
+#: modules/gui/macosx/intf.m:497 modules/gui/macosx/intf.m:573
+#: modules/gui/macosx/intf.m:629
 msgid "Fullscreen"
 msgstr "全屏幕"
 
-#: src/libvlc.h:935
+#: src/libvlc.h:985
 msgid "Select the hotkey to use to swap fullscreen state."
 msgstr "选择热键以切换全屏幕状态"
 
-#: src/libvlc.h:936 modules/gui/wxwidgets/dialogs/vlm/vlm_streampanel.cpp:82
-#: modules/gui/wxwidgets/interface.cpp:1487
+#: src/libvlc.h:986 modules/gui/wxwidgets/dialogs/vlm/vlm_streampanel.cpp:82
+#: modules/gui/wxwidgets/interface.cpp:1504
 msgid "Play/Pause"
 msgstr "播放/暂停"
 
-#: src/libvlc.h:937
+#: src/libvlc.h:987
 msgid "Select the hotkey to use to swap paused state."
 msgstr "选择热键以切换暂停状态"
 
-#: src/libvlc.h:938
+#: src/libvlc.h:988
 msgid "Pause only"
 msgstr "仅暂停"
 
-#: src/libvlc.h:939
+#: src/libvlc.h:989
 msgid "Select the hotkey to use to pause."
 msgstr "选择热键以暂停"
 
-#: src/libvlc.h:940
+#: src/libvlc.h:990
 msgid "Play only"
 msgstr "仅播放"
 
-#: src/libvlc.h:941
+#: src/libvlc.h:991
 msgid "Select the hotkey to use to play."
 msgstr "选择热键以播放"
 
-#: src/libvlc.h:942 modules/control/hotkeys.c:709
-#: modules/gui/macosx/controls.m:687 modules/gui/macosx/intf.m:532
-#: modules/gui/wxwidgets/interface.cpp:692
+#: src/libvlc.h:992 modules/control/hotkeys.c:713
+#: modules/gui/macosx/controls.m:693 modules/gui/macosx/intf.m:538
+#: modules/gui/wxwidgets/interface.cpp:695
 msgid "Faster"
 msgstr "加快"
 
-#: src/libvlc.h:943
+#: src/libvlc.h:993
 msgid "Select the hotkey to use for fast forward playback."
 msgstr "选择热键以快速回放"
 
-#: src/libvlc.h:944 modules/control/hotkeys.c:717
-#: modules/gui/macosx/controls.m:688 modules/gui/macosx/intf.m:533
-#: modules/gui/wxwidgets/interface.cpp:691
+#: src/libvlc.h:994 modules/control/hotkeys.c:721
+#: modules/gui/macosx/controls.m:694 modules/gui/macosx/intf.m:539
+#: modules/gui/wxwidgets/interface.cpp:694
 msgid "Slower"
 msgstr "放慢"
 
-#: src/libvlc.h:945
+#: src/libvlc.h:995
 msgid "Select the hotkey to use for slow motion playback."
 msgstr "选择热键以慢速回放"
 
-#: src/libvlc.h:946 modules/control/hotkeys.c:676
-#: modules/gui/macosx/controls.m:708 modules/gui/macosx/intf.m:490
-#: modules/gui/macosx/intf.m:535 modules/gui/macosx/intf.m:610
-#: modules/gui/macosx/wizard.m:313 modules/gui/macosx/wizard.m:364
-#: modules/gui/macosx/wizard.m:1605 modules/gui/wxwidgets/interface.cpp:690
-#: modules/gui/wxwidgets/interface.cpp:1492
-#: modules/gui/wxwidgets/menus.cpp:258
+#: src/libvlc.h:996 modules/control/hotkeys.c:680
+#: modules/gui/macosx/controls.m:714 modules/gui/macosx/intf.m:496
+#: modules/gui/macosx/intf.m:541 modules/gui/macosx/intf.m:617
+#: modules/gui/macosx/intf.m:625 modules/gui/macosx/wizard.m:313
+#: modules/gui/macosx/wizard.m:364 modules/gui/macosx/wizard.m:1606
+#: modules/gui/wxwidgets/interface.cpp:693
+#: modules/gui/wxwidgets/interface.cpp:1509
+#: modules/gui/wxwidgets/menus.cpp:259
 msgid "Next"
 msgstr "下一项"
 
-#: src/libvlc.h:947
+#: src/libvlc.h:997
 msgid "Select the hotkey to use to skip to the next item in the playlist."
 msgstr "选择热键以播放列表中的下一个项目"
 
-#: src/libvlc.h:948 modules/control/hotkeys.c:688
-#: modules/gui/macosx/controls.m:707 modules/gui/macosx/intf.m:485
-#: modules/gui/macosx/intf.m:534 modules/gui/macosx/intf.m:611
-#: modules/gui/wxwidgets/interface.cpp:689
-#: modules/gui/wxwidgets/interface.cpp:1491
-#: modules/gui/wxwidgets/menus.cpp:257
+#: src/libvlc.h:998 modules/control/hotkeys.c:692
+#: modules/gui/macosx/controls.m:713 modules/gui/macosx/intf.m:491
+#: modules/gui/macosx/intf.m:540 modules/gui/macosx/intf.m:618
+#: modules/gui/macosx/intf.m:624 modules/gui/wxwidgets/interface.cpp:692
+#: modules/gui/wxwidgets/interface.cpp:1508
+#: modules/gui/wxwidgets/menus.cpp:258
 msgid "Previous"
 msgstr "上一项"
 
-#: src/libvlc.h:949
+#: src/libvlc.h:999
 msgid "Select the hotkey to use to skip to the previous item in the playlist."
 msgstr "选择热键以播放列表中的上一个项目"
 
-#: src/libvlc.h:950 modules/gui/macosx/controls.m:699
-#: modules/gui/macosx/intf.m:488 modules/gui/macosx/intf.m:531
-#: modules/gui/macosx/intf.m:609 modules/gui/pda/pda_interface.c:274
-#: modules/gui/pda/pda_interface.c:275
+#: src/libvlc.h:1000 modules/gui/macosx/controls.m:705
+#: modules/gui/macosx/intf.m:494 modules/gui/macosx/intf.m:537
+#: modules/gui/macosx/intf.m:616 modules/gui/macosx/intf.m:623
+#: modules/gui/pda/pda_interface.c:274 modules/gui/pda/pda_interface.c:275
 #: modules/gui/wxwidgets/dialogs/vlm/vlm_streampanel.cpp:87
-#: modules/gui/wxwidgets/interface.cpp:673
-#: modules/gui/wxwidgets/interface.cpp:684
-#: modules/gui/wxwidgets/interface.cpp:1493
-#: modules/gui/wxwidgets/menus.cpp:256 modules/visualization/xosd.c:237
+#: modules/gui/wxwidgets/interface.cpp:676
+#: modules/gui/wxwidgets/interface.cpp:687
+#: modules/gui/wxwidgets/interface.cpp:1510
+#: modules/gui/wxwidgets/menus.cpp:257 modules/visualization/xosd.c:237
 msgid "Stop"
 msgstr "停止"
 
-#: src/libvlc.h:951
+#: src/libvlc.h:1001
 msgid "Select the hotkey to stop playback."
 msgstr "选择热键以停止回放"
 
-#: src/libvlc.h:952 modules/gui/macosx/bookmarks.m:101
+#: src/libvlc.h:1002 modules/gui/macosx/bookmarks.m:101
 #: modules/gui/macosx/bookmarks.m:110 modules/gui/macosx/embeddedwindow.m:46
-#: modules/gui/macosx/intf.m:493 modules/gui/macosx/sfilters.m:79
-#: modules/gui/macosx/sfilters.m:92 modules/gui/macosx/sfilters.m:105
-#: modules/video_filter/marq.c:122 modules/video_filter/rss.c:174
+#: modules/gui/macosx/intf.m:499 modules/video_filter/marq.c:122
+#: modules/video_filter/rss.c:174
 msgid "Position"
 msgstr "位置"
 
-#: src/libvlc.h:953
+#: src/libvlc.h:1003
 msgid "Select the hotkey to display the position."
 msgstr "选择热键以显示位置"
 
-#: src/libvlc.h:955
+#: src/libvlc.h:1005
 msgid "Very short backwards jump"
 msgstr "向后跳一很小的段"
 
-#: src/libvlc.h:957
+#: src/libvlc.h:1007
 msgid "Select the hotkey to make a very short backwards jump."
 msgstr "选择向后跳一很小的段的热键"
 
-#: src/libvlc.h:958
+#: src/libvlc.h:1008
 msgid "Short backwards jump"
 msgstr "向后跳一小段"
 
-#: src/libvlc.h:960
+#: src/libvlc.h:1010
 msgid "Select the hotkey to make a short backwards jump."
 msgstr "选择向后跳一小段的热键"
 
-#: src/libvlc.h:961
+#: src/libvlc.h:1011
 msgid "Medium backwards jump"
 msgstr "向后跳一中段"
 
-#: src/libvlc.h:963
+#: src/libvlc.h:1013
 msgid "Select the hotkey to make a medium backwards jump."
 msgstr "选择向后跳一中段的热键"
 
-#: src/libvlc.h:964
+#: src/libvlc.h:1014
 msgid "Long backwards jump"
 msgstr "向后跳一大段"
 
-#: src/libvlc.h:966
+#: src/libvlc.h:1016
 msgid "Select the hotkey to make a long backwards jump."
 msgstr "选择向后跳一大段的热键"
 
-#: src/libvlc.h:968
+#: src/libvlc.h:1018
 msgid "Very short forward jump"
 msgstr "向前跳一很小的段"
 
-#: src/libvlc.h:970
+#: src/libvlc.h:1020
 msgid "Select the hotkey to make a very short forward jump."
 msgstr "选择向前跳一很小的段的热键"
 
-#: src/libvlc.h:971
+#: src/libvlc.h:1021
 msgid "Short forward jump"
 msgstr "向前跳一小段"
 
-#: src/libvlc.h:973
+#: src/libvlc.h:1023
 msgid "Select the hotkey to make a short forward jump."
 msgstr "选择向前跳一小段的热键"
 
-#: src/libvlc.h:974
+#: src/libvlc.h:1024
 msgid "Medium forward jump"
 msgstr "向前跳一中段"
 
-#: src/libvlc.h:976
+#: src/libvlc.h:1026
 msgid "Select the hotkey to make a medium forward jump."
 msgstr "选择向前跳一中段的热键"
 
-#: src/libvlc.h:977
+#: src/libvlc.h:1027
 msgid "Long forward jump"
 msgstr "向前跳一大段"
 
-#: src/libvlc.h:979
+#: src/libvlc.h:1029
 msgid "Select the hotkey to make a long forward jump."
 msgstr "选择向前跳一大段的热键"
 
-#: src/libvlc.h:981
+#: src/libvlc.h:1031
 msgid "Very short jump length"
 msgstr "跳一很小的段的长度"
 
-#: src/libvlc.h:982
+#: src/libvlc.h:1032
 msgid "Very short jump length, in seconds."
 msgstr "跳一很小的段的长度，以秒为单位。"
 
-#: src/libvlc.h:983
+#: src/libvlc.h:1033
 msgid "Short jump length"
 msgstr "跳一小段的长度"
 
-#: src/libvlc.h:984
+#: src/libvlc.h:1034
 msgid "Short jump length, in seconds."
 msgstr "跳一小段的长度，以秒为单位。"
 
-#: src/libvlc.h:985
+#: src/libvlc.h:1035
 msgid "Medium jump length"
 msgstr "跳一中段的长度"
 
-#: src/libvlc.h:986
+#: src/libvlc.h:1036
 msgid "Medium jump length, in seconds."
 msgstr "跳一中段的长度，以秒为单位。"
 
-#: src/libvlc.h:987
+#: src/libvlc.h:1037
 msgid "Long jump length"
 msgstr "长跳长度"
 
-#: src/libvlc.h:988
+#: src/libvlc.h:1038
 msgid "Long jump length, in seconds."
 msgstr "跳一大段的长度，以秒为单位。"
 
-#: src/libvlc.h:990 modules/control/hotkeys.c:258
-#: modules/gui/beos/InterfaceWindow.cpp:274
+#: src/libvlc.h:1040 modules/control/hotkeys.c:258
+#: modules/gui/beos/InterfaceWindow.cpp:276
 msgid "Quit"
 msgstr "离开"
 
-#: src/libvlc.h:991
+#: src/libvlc.h:1041
 msgid "Select the hotkey to quit the application."
 msgstr "选择热键以离开应用程序"
 
-#: src/libvlc.h:992
+#: src/libvlc.h:1042
 msgid "Navigate up"
 msgstr "向上导览"
 
-#: src/libvlc.h:993
+#: src/libvlc.h:1043
 msgid "Select the key to move the selector up in DVD menus."
 msgstr "选择按键以向上移动DVD选单中的选择器"
 
-#: src/libvlc.h:994
+#: src/libvlc.h:1044
 msgid "Navigate down"
 msgstr "向下导览"
 
-#: src/libvlc.h:995
+#: src/libvlc.h:1045
 msgid "Select the key to move the selector down in DVD menus."
 msgstr "选择按键以向下移动DVD选单中的选择器"
 
-#: src/libvlc.h:996
+#: src/libvlc.h:1046
 msgid "Navigate left"
 msgstr "向左导览"
 
-#: src/libvlc.h:997
+#: src/libvlc.h:1047
 msgid "Select the key to move the selector left in DVD menus."
 msgstr "选择按键以向左移动DVD选单中的选择器"
 
-#: src/libvlc.h:998
+#: src/libvlc.h:1048
 msgid "Navigate right"
 msgstr "向右导览"
 
-#: src/libvlc.h:999
+#: src/libvlc.h:1049
 msgid "Select the key to move the selector right in DVD menus."
 msgstr "选择按键以向右移动DVD选单中的选择器"
 
-#: src/libvlc.h:1000
+#: src/libvlc.h:1050
 msgid "Activate"
 msgstr "启动"
 
-#: src/libvlc.h:1001
+#: src/libvlc.h:1051
 msgid "Select the key to activate selected item in DVD menus."
 msgstr "选择热键以启动所选择的DVD选单项目"
 
-#: src/libvlc.h:1002
+#: src/libvlc.h:1052
 msgid "Go to the DVD menu"
 msgstr "转到DVD选单"
 
-#: src/libvlc.h:1003
+#: src/libvlc.h:1053
 msgid "Select the key to take you to the DVD menu"
 msgstr "选择转到 DVD 选单的按键"
 
-#: src/libvlc.h:1004
+#: src/libvlc.h:1054
 msgid "Select previous DVD title"
 msgstr "选择上一个DVD章节"
 
-#: src/libvlc.h:1005
+#: src/libvlc.h:1055
 msgid "Select the key to choose the previous title from the DVD"
 msgstr "选择播放列表中的上一个项目的热键"
 
-#: src/libvlc.h:1006
+#: src/libvlc.h:1056
 msgid "Select next DVD title"
 msgstr "选择下一个DVD章节"
 
-#: src/libvlc.h:1007
+#: src/libvlc.h:1057
 msgid "Select the key to choose the next title from the DVD"
 msgstr "选择下一个 DVD 标题的按键"
 
-#: src/libvlc.h:1008
+#: src/libvlc.h:1058
 msgid "Select prev DVD chapter"
 msgstr "选择上一个 DVD 章节"
 
-#: src/libvlc.h:1009
+#: src/libvlc.h:1059
 msgid "Select the key to choose the previous chapter from the DVD"
 msgstr "选择 DVD 中的上一个章节的热键"
 
-#: src/libvlc.h:1010
+#: src/libvlc.h:1060
 msgid "Select next DVD chapter"
 msgstr "选择下一个 DVD 章节"
 
-#: src/libvlc.h:1011
+#: src/libvlc.h:1061
 msgid "Select the key to choose the next chapter from the DVD"
 msgstr "选择 DVD 中的下一个章节的热键"
 
-#: src/libvlc.h:1012
+#: src/libvlc.h:1062
 msgid "Volume up"
 msgstr "增加音量"
 
-#: src/libvlc.h:1013
+#: src/libvlc.h:1063
 msgid "Select the key to increase audio volume."
 msgstr "选择按键以增加音量"
 
-#: src/libvlc.h:1014
+#: src/libvlc.h:1064
 msgid "Volume down"
 msgstr "减低音量"
 
-#: src/libvlc.h:1015
+#: src/libvlc.h:1065
 msgid "Select the key to decrease audio volume."
 msgstr "选择按键以减低音量"
 
-#: src/libvlc.h:1016 modules/gui/macosx/controls.m:744
-#: modules/gui/macosx/intf.m:552 modules/gui/macosx/intf.m:612
+#: src/libvlc.h:1066 modules/gui/macosx/controls.m:750
+#: modules/gui/macosx/intf.m:558 modules/gui/macosx/intf.m:619
+#: modules/gui/macosx/intf.m:628
 msgid "Mute"
 msgstr "静音"
 
-#: src/libvlc.h:1017
+#: src/libvlc.h:1067
 msgid "Select the key to mute audio."
 msgstr "选择暂停的热键。"
 
-#: src/libvlc.h:1018
+#: src/libvlc.h:1068
 msgid "Subtitle delay up"
 msgstr "增加字幕延迟"
 
-#: src/libvlc.h:1019
+#: src/libvlc.h:1069
 msgid "Select the key to increase the subtitle delay."
 msgstr "选择按键以增加字幕延迟"
 
-#: src/libvlc.h:1020
+#: src/libvlc.h:1070
 msgid "Subtitle delay down"
 msgstr "减少字幕延迟"
 
-#: src/libvlc.h:1021
+#: src/libvlc.h:1071
 msgid "Select the key to decrease the subtitle delay."
 msgstr "选择按键以减少字幕延迟"
 
-#: src/libvlc.h:1022
+#: src/libvlc.h:1072
 msgid "Audio delay up"
 msgstr "增加音频延迟"
 
-#: src/libvlc.h:1023
+#: src/libvlc.h:1073
 msgid "Select the key to increase the audio delay."
 msgstr "选择按键以增加音频延迟"
 
-#: src/libvlc.h:1024
+#: src/libvlc.h:1074
 msgid "Audio delay down"
 msgstr "减少音频延迟"
 
-#: src/libvlc.h:1025
+#: src/libvlc.h:1075
 msgid "Select the key to decrease the audio delay."
 msgstr "选择按键以减少音频延迟"
 
-#: src/libvlc.h:1026
+#: src/libvlc.h:1076
 msgid "Play playlist bookmark 1"
 msgstr "播放播放列表书签 1"
 
-#: src/libvlc.h:1027
+#: src/libvlc.h:1077
 msgid "Play playlist bookmark 2"
 msgstr "播放播放列表书签 2"
 
-#: src/libvlc.h:1028
+#: src/libvlc.h:1078
 msgid "Play playlist bookmark 3"
 msgstr "播放播放列表书签 3"
 
-#: src/libvlc.h:1029
+#: src/libvlc.h:1079
 msgid "Play playlist bookmark 4"
 msgstr "播放播放列表书签 4"
 
-#: src/libvlc.h:1030
+#: src/libvlc.h:1080
 msgid "Play playlist bookmark 5"
 msgstr "播放播放列表书签 5"
 
-#: src/libvlc.h:1031
+#: src/libvlc.h:1081
 msgid "Play playlist bookmark 6"
 msgstr "播放播放列表书签 6"
 
-#: src/libvlc.h:1032
+#: src/libvlc.h:1082
 msgid "Play playlist bookmark 7"
 msgstr "播放播放列表书签 7"
 
-#: src/libvlc.h:1033
+#: src/libvlc.h:1083
 msgid "Play playlist bookmark 8"
 msgstr "播放播放列表书签 8"
 
-#: src/libvlc.h:1034
+#: src/libvlc.h:1084
 msgid "Play playlist bookmark 9"
 msgstr "播放播放列表书签 9"
 
-#: src/libvlc.h:1035
+#: src/libvlc.h:1085
 msgid "Play playlist bookmark 10"
 msgstr "播放播放列表书签 10"
 
-#: src/libvlc.h:1036
+#: src/libvlc.h:1086
 msgid "Select the key to play this bookmark."
 msgstr "选择按键以播放该书签"
 
-#: src/libvlc.h:1037
+#: src/libvlc.h:1087
 msgid "Set playlist bookmark 1"
 msgstr "设置播放列表书签 1"
 
-#: src/libvlc.h:1038
+#: src/libvlc.h:1088
 msgid "Set playlist bookmark 2"
 msgstr "设置播放列表书签 2"
 
-#: src/libvlc.h:1039
+#: src/libvlc.h:1089
 msgid "Set playlist bookmark 3"
 msgstr "设置播放列表书签 3"
 
-#: src/libvlc.h:1040
+#: src/libvlc.h:1090
 msgid "Set playlist bookmark 4"
 msgstr "设置播放列表书签 4"
 
-#: src/libvlc.h:1041
+#: src/libvlc.h:1091
 msgid "Set playlist bookmark 5"
 msgstr "设置播放列表书签 5"
 
-#: src/libvlc.h:1042
+#: src/libvlc.h:1092
 msgid "Set playlist bookmark 6"
 msgstr "设置播放列表书签 6"
 
-#: src/libvlc.h:1043
+#: src/libvlc.h:1093
 msgid "Set playlist bookmark 7"
 msgstr "设置播放列表书签 7"
 
-#: src/libvlc.h:1044
+#: src/libvlc.h:1094
 msgid "Set playlist bookmark 8"
 msgstr "设置播放列表书签 8"
 
-#: src/libvlc.h:1045
+#: src/libvlc.h:1095
 msgid "Set playlist bookmark 9"
 msgstr "设置播放列表书签 9"
 
-#: src/libvlc.h:1046
+#: src/libvlc.h:1096
 msgid "Set playlist bookmark 10"
 msgstr "设置播放列表书签 10"
 
-#: src/libvlc.h:1047
+#: src/libvlc.h:1097
 msgid "Select the key to set this playlist bookmark."
 msgstr "选择按键以设置该播放列表书签"
 
-#: src/libvlc.h:1049 modules/control/hotkeys.c:84
+#: src/libvlc.h:1099 modules/control/hotkeys.c:84
 msgid "Playlist bookmark 1"
 msgstr "播放列表书签 1"
 
-#: src/libvlc.h:1050 modules/control/hotkeys.c:85
+#: src/libvlc.h:1100 modules/control/hotkeys.c:85
 msgid "Playlist bookmark 2"
 msgstr "播放列表书签 2"
 
-#: src/libvlc.h:1051 modules/control/hotkeys.c:86
+#: src/libvlc.h:1101 modules/control/hotkeys.c:86
 msgid "Playlist bookmark 3"
 msgstr "播放列表书签 3"
 
-#: src/libvlc.h:1052 modules/control/hotkeys.c:87
+#: src/libvlc.h:1102 modules/control/hotkeys.c:87
 msgid "Playlist bookmark 4"
 msgstr "播放列表书签 4"
 
-#: src/libvlc.h:1053 modules/control/hotkeys.c:88
+#: src/libvlc.h:1103 modules/control/hotkeys.c:88
 msgid "Playlist bookmark 5"
 msgstr "播放列表书签 5"
 
-#: src/libvlc.h:1054 modules/control/hotkeys.c:89
+#: src/libvlc.h:1104 modules/control/hotkeys.c:89
 msgid "Playlist bookmark 6"
 msgstr "播放列表书签 6"
 
-#: src/libvlc.h:1055 modules/control/hotkeys.c:90
+#: src/libvlc.h:1105 modules/control/hotkeys.c:90
 msgid "Playlist bookmark 7"
 msgstr "播放列表书签 7"
 
-#: src/libvlc.h:1056 modules/control/hotkeys.c:91
+#: src/libvlc.h:1106 modules/control/hotkeys.c:91
 msgid "Playlist bookmark 8"
 msgstr "播放列表书签 8"
 
-#: src/libvlc.h:1057 modules/control/hotkeys.c:92
+#: src/libvlc.h:1107 modules/control/hotkeys.c:92
 msgid "Playlist bookmark 9"
 msgstr "播放列表书签 9"
 
-#: src/libvlc.h:1058 modules/control/hotkeys.c:93
+#: src/libvlc.h:1108 modules/control/hotkeys.c:93
 msgid "Playlist bookmark 10"
 msgstr "播放列表书签 10"
 
-#: src/libvlc.h:1060
+#: src/libvlc.h:1110
 msgid "This allows you to define playlist bookmarks."
 msgstr "这个选项允许你定义播放列表书签"
 
-#: src/libvlc.h:1062
+#: src/libvlc.h:1112
 msgid "Go back in browsing history"
 msgstr "在浏览历史中后退"
 
-#: src/libvlc.h:1063
+#: src/libvlc.h:1113
 msgid ""
 "Select the key to go back (to the previous media item) in the browsing "
 "history."
 msgstr ""
 
-#: src/libvlc.h:1064
+#: src/libvlc.h:1114
 msgid "Go forward in browsing history"
 msgstr "在浏览历史中前进"
 
-#: src/libvlc.h:1065
+#: src/libvlc.h:1115
 msgid ""
 "Select the key to go forward (to the next media item) in the browsing "
 "history."
 msgstr ""
 
-#: src/libvlc.h:1067
+#: src/libvlc.h:1117
 msgid "Cycle audio track"
 msgstr "循环音轨"
 
-#: src/libvlc.h:1068
+#: src/libvlc.h:1118
 msgid "Cycle through the available audio tracks(languages)."
 msgstr "循环可用音轨 (语言)"
 
-#: src/libvlc.h:1069
+#: src/libvlc.h:1119
 msgid "Cycle subtitle track"
 msgstr "循环字幕轨"
 
-#: src/libvlc.h:1070
+#: src/libvlc.h:1120
 msgid "Cycle through the available subtitle tracks."
 msgstr "循环可用字幕轨"
 
-#: src/libvlc.h:1071
+#: src/libvlc.h:1121
 msgid "Cycle source aspect ratio"
 msgstr "循环源纵横比"
 
-#: src/libvlc.h:1072
+#: src/libvlc.h:1122
 msgid "Cycle through a predefined list of source aspect ratios."
 msgstr "循环一个源纵横比的预定义的列表。"
 
-#: src/libvlc.h:1073
+#: src/libvlc.h:1123
 msgid "Cycle video crop"
 msgstr "循环视频修整"
 
-#: src/libvlc.h:1074
+#: src/libvlc.h:1124
 msgid "Cycle through a predefined list of crop formats."
 msgstr "循环一个修整格式的预定义的列表。"
 
-#: src/libvlc.h:1075
+#: src/libvlc.h:1125
 msgid "Cycle deinterlace modes"
 msgstr "循环解除交错模块"
 
-#: src/libvlc.h:1076
+#: src/libvlc.h:1126
 msgid "Cycle through deinterlace modes."
 msgstr "循环解除交错模块。"
 
-#: src/libvlc.h:1077
+#: src/libvlc.h:1127
 msgid "Show interface"
 msgstr "显示界面"
 
-#: src/libvlc.h:1078
+#: src/libvlc.h:1128
 msgid "Raise the interface above all other windows."
 msgstr "将界面提升到其它所有窗口上面。"
 
-#: src/libvlc.h:1079
+#: src/libvlc.h:1129
 msgid "Hide interface"
 msgstr "隐藏接口"
 
-#: src/libvlc.h:1080
+#: src/libvlc.h:1130
 msgid "Lower the interface below all other windows."
 msgstr "将界面下降到其它所有窗口下面。"
 
-#: src/libvlc.h:1081
+#: src/libvlc.h:1131
 msgid "Take video snapshot"
 msgstr "获取视频快照"
 
-#: src/libvlc.h:1082
+#: src/libvlc.h:1132
 msgid "Takes a video snapshot and writes it to disk."
 msgstr "获取视频快照并写入磁盘"
 
-#: src/libvlc.h:1084 modules/access_filter/record.c:51
+#: src/libvlc.h:1134 modules/access_filter/record.c:51
 #: modules/access_filter/record.c:52
 msgid "Record"
 msgstr "录制"
 
-#: src/libvlc.h:1085
+#: src/libvlc.h:1135
 msgid "Record access filter start/stop."
 msgstr "记录存取过滤器开始/停止"
 
-#: src/libvlc.h:1087 src/libvlc.h:1088 src/video_output/vout_intf.c:203
+#: src/libvlc.h:1137 src/libvlc.h:1138 src/video_output/vout_intf.c:211
 msgid "Zoom"
 msgstr "缩放"
 
-#: src/libvlc.h:1090 src/libvlc.h:1091
+#: src/libvlc.h:1140 src/libvlc.h:1141
 #, fuzzy
 msgid "Un-Zoom"
 msgstr "缩放"
 
-#: src/libvlc.h:1093 src/libvlc.h:1094
+#: src/libvlc.h:1143 src/libvlc.h:1144
 msgid "Crop one pixel from the top of the video"
 msgstr ""
 
-#: src/libvlc.h:1095 src/libvlc.h:1096
+#: src/libvlc.h:1145 src/libvlc.h:1146
 msgid "Uncrop one pixel from the top of the video"
 msgstr ""
 
-#: src/libvlc.h:1098 src/libvlc.h:1099
+#: src/libvlc.h:1148 src/libvlc.h:1149
 msgid "Crop one pixel from the left of the video"
 msgstr ""
 
-#: src/libvlc.h:1100 src/libvlc.h:1101
+#: src/libvlc.h:1150 src/libvlc.h:1151
 msgid "Uncrop one pixel from the left of the video"
 msgstr ""
 
-#: src/libvlc.h:1103 src/libvlc.h:1104
+#: src/libvlc.h:1153 src/libvlc.h:1154
 msgid "Crop one pixel from the bottom of the video"
 msgstr ""
 
-#: src/libvlc.h:1105 src/libvlc.h:1106
+#: src/libvlc.h:1155 src/libvlc.h:1156
 msgid "Uncrop one pixel from the bottom of the video"
 msgstr ""
 
-#: src/libvlc.h:1108 src/libvlc.h:1109
+#: src/libvlc.h:1158 src/libvlc.h:1159
 #, fuzzy
 msgid "Crop one pixel from the right of the video"
 msgstr "此项是峰值项目的总高度 (像素)"
 
-#: src/libvlc.h:1110 src/libvlc.h:1111
+#: src/libvlc.h:1160 src/libvlc.h:1161
 msgid "Uncrop one pixel from the right of the video"
 msgstr ""
 
-#: src/libvlc.h:1115
+#: src/libvlc.h:1165
 #, c-format
 msgid ""
 "Usage: %s [options] [stream] ...\n"
@@ -3228,138 +3460,140 @@ msgid ""
 "  vlc:quit                       Special item to quit VLC\n"
 msgstr ""
 
-#: src/libvlc.h:1225 src/video_output/vout_intf.c:412
-#: modules/gui/macosx/controls.m:322 modules/gui/macosx/controls.m:753
-#: modules/gui/macosx/intf.m:569 modules/video_output/snapshot.c:76
+#: src/libvlc.h:1277 src/video_output/vout_intf.c:420
+#: modules/gui/macosx/controls.m:328 modules/gui/macosx/controls.m:759
+#: modules/gui/macosx/intf.m:575 modules/gui/macosx/intf.m:630
+#: modules/video_output/snapshot.c:76
 msgid "Snapshot"
 msgstr "快照"
 
-#: src/libvlc.h:1234
+#: src/libvlc.h:1290
 msgid "Window properties"
 msgstr "窗口属性"
 
-#: src/libvlc.h:1274
+#: src/libvlc.h:1335
 msgid "Subpictures"
 msgstr "子画面"
 
-#: src/libvlc.h:1281 modules/codec/subsdec.c:144 modules/demux/subtitle.c:63
-#: modules/gui/beos/InterfaceWindow.cpp:277
+#: src/libvlc.h:1342 modules/codec/subsdec.c:144 modules/demux/subtitle.c:63
+#: modules/gui/beos/InterfaceWindow.cpp:279
 msgid "Subtitles"
 msgstr "字幕"
 
-#: src/libvlc.h:1298 modules/stream_out/transcode.c:147
+#: src/libvlc.h:1359 modules/stream_out/transcode.c:151
 msgid "Overlays"
 msgstr "覆盖"
 
-#: src/libvlc.h:1306
+#: src/libvlc.h:1369
 msgid "Track settings"
 msgstr "轨道设置"
 
-#: src/libvlc.h:1328
+#: src/libvlc.h:1391
 msgid "Playback control"
 msgstr "回放控制"
 
-#: src/libvlc.h:1343
+#: src/libvlc.h:1406
 msgid "Default devices"
 msgstr "默认设备"
 
-#: src/libvlc.h:1352
+#: src/libvlc.h:1415
 msgid "Network settings"
 msgstr "网络设置"
 
-#: src/libvlc.h:1364
+#: src/libvlc.h:1427
 msgid "Socks proxy"
 msgstr "Socks 代理"
 
-#: src/libvlc.h:1373
+#: src/libvlc.h:1436
 msgid "Metadata"
 msgstr "元信息"
 
-#: src/libvlc.h:1403
+#: src/libvlc.h:1466
 msgid "Decoders"
 msgstr "译码器"
 
-#: src/libvlc.h:1410 modules/gui/macosx/playlistinfo.m:80
+#: src/libvlc.h:1473 modules/access/v4l2.c:56
+#: modules/gui/macosx/playlistinfo.m:80
 #: modules/gui/wxwidgets/dialogs/infopanels.cpp:265
 #: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:378
 #: modules/gui/wxwidgets/dialogs/wizard.cpp:106
 msgid "Input"
 msgstr "输入"
 
-#: src/libvlc.h:1446 modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:522
+#: src/libvlc.h:1509 modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:522
 msgid "VLM"
 msgstr "VLM"
 
-#: src/libvlc.h:1477
+#: src/libvlc.h:1540
 msgid "CPU"
 msgstr "CPU"
 
-#: src/libvlc.h:1492
+#: src/libvlc.h:1562
 msgid "Special modules"
 msgstr "特殊模块"
 
-#: src/libvlc.h:1498
+#: src/libvlc.h:1569
 msgid "Plugins"
 msgstr "插件"
 
-#: src/libvlc.h:1504
+#: src/libvlc.h:1577
 msgid "Performance options"
 msgstr "性能选项"
 
-#: src/libvlc.h:1608
+#: src/libvlc.h:1714
 msgid "Hot keys"
 msgstr "热键"
 
-#: src/libvlc.h:1919
+#: src/libvlc.h:2025
 msgid "Jump sizes"
 msgstr "跳转长度"
 
-#: src/libvlc.h:1998
+#: src/libvlc.h:2104
 msgid "main program"
 msgstr "主程序"
 
-#: src/libvlc.h:2005
+#: src/libvlc.h:2111
 msgid "print help for VLC (can be combined with --advanced)"
 msgstr "打印 VLC 帮助信息 (可以和 --advanced 一起使用)"
 
-#: src/libvlc.h:2007
+#: src/libvlc.h:2113
 msgid ""
 "print help for VLC and all its modules (can be combined with --advanced)"
 msgstr "打印 VLC 用所有的模块的帮助信息 (可以和 --advanced 一起使用)"
 
-#: src/libvlc.h:2009
+#: src/libvlc.h:2115
 msgid "print help for the advanced options"
 msgstr "打印高级选项的帮助信息"
 
-#: src/libvlc.h:2011
+#: src/libvlc.h:2117
 msgid "ask for extra verbosity when displaying help"
 msgstr ""
 
-#: src/libvlc.h:2013
+#: src/libvlc.h:2119
 msgid "print a list of available modules"
 msgstr "打印一个可用模块的列表"
 
-#: src/libvlc.h:2015
+#: src/libvlc.h:2121
 msgid "print help on a specific module (can be combined with --advanced)"
 msgstr ""
 
-#: src/libvlc.h:2017
+#: src/libvlc.h:2123
 msgid "save the current command line options in the config"
 msgstr "在配置中保存当前的命令行选项"
 
-#: src/libvlc.h:2019
+#: src/libvlc.h:2125
 msgid "reset the current config to the default values"
 msgstr "将当前设置复位为默认值"
 
-#: src/libvlc.h:2021
+#: src/libvlc.h:2127
 msgid "use alternate config file"
 msgstr "使用替代的组态档"
 
-#: src/libvlc.h:2023
+#: src/libvlc.h:2129
 msgid "resets the current plugins cache"
 msgstr "重置目前外挂缓存"
 
-#: src/libvlc.h:2025
+#: src/libvlc.h:2131
 msgid "print version information"
 msgstr "打印版本信息"
 
@@ -3963,129 +4197,139 @@ msgstr "祖鲁文"
 msgid "Unknown"
 msgstr "未知"
 
-#: src/misc/vlm.c:1140 src/misc/vlm.c:1247
+#: src/misc/vlm.c:1137 src/misc/vlm.c:1244
 #, c-format
 msgid "Media: %s"
 msgstr "媒体: %s"
 
-#: src/playlist/engine.c:80 src/playlist/engine.c:84
+#: src/playlist/engine.c:105 src/playlist/engine.c:107
+#: src/playlist/loadsave.c:142
 msgid "Media Library"
 msgstr ""
 
-#: src/playlist/sort.c:287 src/playlist/tree.c:59
+#: src/playlist/tree.c:58
 msgid "Undefined"
 msgstr "未定义"
 
-#: src/video_output/video_output.c:377 modules/gui/macosx/intf.m:580
-#: modules/gui/macosx/intf.m:581 modules/video_filter/deinterlace.c:122
+#: src/video_output/video_output.c:419 modules/gui/macosx/intf.m:586
+#: modules/gui/macosx/intf.m:587 modules/video_filter/deinterlace.c:122
 msgid "Deinterlace"
 msgstr "解除交错"
 
-#: src/video_output/video_output.c:381 modules/video_filter/deinterlace.c:117
+#: src/video_output/video_output.c:423 modules/video_filter/deinterlace.c:117
 msgid "Discard"
 msgstr "丢弃"
 
-#: src/video_output/video_output.c:383 modules/video_filter/deinterlace.c:117
+#: src/video_output/video_output.c:425 modules/video_filter/deinterlace.c:117
 msgid "Blend"
 msgstr "混合"
 
-#: src/video_output/video_output.c:385 modules/video_filter/deinterlace.c:117
+#: src/video_output/video_output.c:427 modules/video_filter/deinterlace.c:117
 msgid "Mean"
 msgstr ""
 
-#: src/video_output/video_output.c:387 modules/video_filter/deinterlace.c:118
+#: src/video_output/video_output.c:429 modules/video_filter/deinterlace.c:118
 msgid "Bob"
 msgstr ""
 
-#: src/video_output/video_output.c:389 modules/video_filter/deinterlace.c:118
+#: src/video_output/video_output.c:431 modules/video_filter/deinterlace.c:118
 msgid "Linear"
 msgstr "线性"
 
-#: src/video_output/vout_intf.c:215
+#: src/video_output/vout_intf.c:223
 msgid "1:4 Quarter"
 msgstr "1:4 四分之一"
 
-#: src/video_output/vout_intf.c:217
+#: src/video_output/vout_intf.c:225
 msgid "1:2 Half"
 msgstr "1:2 一半"
 
-#: src/video_output/vout_intf.c:219
+#: src/video_output/vout_intf.c:227
 msgid "1:1 Original"
 msgstr "1:1 原始"
 
-#: src/video_output/vout_intf.c:221
+#: src/video_output/vout_intf.c:229
 msgid "2:1 Double"
 msgstr "2:1 双倍"
 
-#: src/video_output/vout_intf.c:248 modules/gui/macosx/intf.m:574
-#: modules/gui/macosx/intf.m:575 modules/video_filter/crop.c:62
+#: src/video_output/vout_intf.c:256 modules/gui/macosx/intf.m:580
+#: modules/gui/macosx/intf.m:581 modules/video_filter/crop.c:63
 msgid "Crop"
 msgstr "修整"
 
-#: src/video_output/vout_intf.c:335 modules/gui/macosx/intf.m:572
-#: modules/gui/macosx/intf.m:573
+#: src/video_output/vout_intf.c:343 modules/gui/macosx/intf.m:578
+#: modules/gui/macosx/intf.m:579
 msgid "Aspect-ratio"
 msgstr "纵横比"
 
-#: modules/access/cdda.c:52 modules/access/dshow/dshow.cpp:90
-#: modules/access/dv.c:68 modules/access/dvb/access.c:72
-#: modules/access/dvdnav.c:63 modules/access/dvdread.c:61
-#: modules/access/fake.c:40 modules/access/file.c:79 modules/access/ftp.c:42
+#: modules/access/cdda.c:58 modules/access/dshow/dshow.cpp:91
+#: modules/access/dv.c:68 modules/access/dvb/access.c:73
+#: modules/access/dvdnav.c:64 modules/access/dvdread.c:62
+#: modules/access/fake.c:40 modules/access/file.c:80 modules/access/ftp.c:43
 #: modules/access/gnomevfs.c:44 modules/access/http.c:53
-#: modules/access/mms/mms.c:46 modules/access/pvr/pvr.c:47
+#: modules/access/mms/mms.c:46 modules/access/pvr.c:47
 #: modules/access/screen/screen.c:37 modules/access/smb.c:59
-#: modules/access/tcp.c:37 modules/access/udp.c:42 modules/access/v4l/v4l.c:73
+#: modules/access/tcp.c:37 modules/access/udp.c:42 modules/access/v4l.c:73
 #: modules/access/vcd/vcd.c:40
 msgid "Caching value in ms"
 msgstr "缓存值(ms)"
 
-#: modules/access/cdda.c:54
+#: modules/access/cdda.c:60
 msgid ""
 "Default caching value for Audio CDs. This value should be set in "
 "milliseconds."
 msgstr "音频 CD 的默认缓存值。这个值是以毫秒为单位的。"
 
-#: modules/access/cdda.c:58 modules/gui/macosx/open.m:176
+#: modules/access/cdda.c:64 modules/gui/macosx/open.m:176
 #: modules/gui/macosx/open.m:496 modules/gui/macosx/open.m:587
 #: modules/gui/wxwidgets/dialogs/open.cpp:699
 msgid "Audio CD"
 msgstr "音乐CD"
 
-#: modules/access/cdda.c:59
+#: modules/access/cdda.c:65
 msgid "Audio CD input"
 msgstr "音乐CD输入"
 
-#: modules/access/cdda.c:65
+#: modules/access/cdda.c:71
 msgid "[cdda:][device][@[track]]"
 msgstr "[cdda:][设备][@[轨道]]"
 
-#: modules/access/cdda.c:71
+#: modules/access/cdda.c:83
 msgid "CDDB Server"
 msgstr "CDDB 服务器"
 
-#: modules/access/cdda.c:71
+#: modules/access/cdda.c:83
 msgid "Address of the CDDB server to use."
 msgstr "要使用的 CDDB 服务器的地址。"
 
-#: modules/access/cdda.c:74
+#: modules/access/cdda.c:86
 msgid "CDDB port"
 msgstr "CDDB 服务器端口"
 
-#: modules/access/cdda.c:74
+#: modules/access/cdda.c:86
 msgid "CDDB Server port to use."
 msgstr "要使用的 CDDB 服务器端口"
 
-#: modules/access/cdda.c:510 modules/access/cdda.c:604
+#: modules/access/cdda.c:452
 msgid "Audio CD - Track "
 msgstr "音频 CD - 轨"
 
-#: modules/access/cdda.c:511 modules/access/cdda.c:613
+#: modules/access/cdda.c:469
 #, c-format
 msgid "Audio CD - Track %i"
 msgstr "音频 CD - 轨 %i"
 
-#: modules/access/cdda/cdda.c:42 modules/access/directory.c:77
-#: modules/codec/x264.c:278 modules/codec/x264.c:285 modules/codec/x264.c:290
+#: modules/access/cdda/access.c:293
+msgid "CD reading failed"
+msgstr ""
+
+#: modules/access/cdda/access.c:294
+#, c-format
+msgid "VLC could not get a new block of size: %i."
+msgstr ""
+
+#: modules/access/cdda/cdda.c:42 modules/access/directory.c:78
+#: modules/codec/x264.c:280 modules/codec/x264.c:287 modules/codec/x264.c:292
 msgid "none"
 msgstr "无"
 
@@ -4300,7 +4544,7 @@ msgid ""
 msgstr ""
 
 #: modules/access/cdda/info.c:328 modules/access/cdda/info.c:333
-#: modules/access/cdda/info.c:337 modules/access/dvdread.c:84
+#: modules/access/cdda/info.c:337 modules/access/dvdread.c:85
 #: modules/access/vcdx/info.c:88 modules/gui/macosx/open.m:161
 #: modules/gui/macosx/open.m:375 modules/gui/wxwidgets/dialogs/open.cpp:504
 msgid "Disc"
@@ -4315,10 +4559,10 @@ msgid "Tracks"
 msgstr "轨道"
 
 #: modules/access/cdda/info.c:393 modules/access/cdda/info.c:815
-#: modules/access/cdda/info.c:862 modules/access/vcdx/access.c:472
+#: modules/access/cdda/info.c:862 modules/access/vcdx/access.c:470
 #: modules/access/vcdx/info.c:286 modules/access/vcdx/info.c:287
-#: modules/gui/wxwidgets/dialogs/open.cpp:1706
-#: modules/gui/wxwidgets/dialogs/open.cpp:1726
+#: modules/gui/wxwidgets/dialogs/open.cpp:1710
+#: modules/gui/wxwidgets/dialogs/open.cpp:1730
 msgid "Track"
 msgstr "轨道"
 
@@ -4330,11 +4574,11 @@ msgstr "MRL"
 msgid "Track Number"
 msgstr "轨道编号"
 
-#: modules/access/directory.c:69
+#: modules/access/directory.c:70
 msgid "Subdirectory behavior"
 msgstr "子目录行为"
 
-#: modules/access/directory.c:71
+#: modules/access/directory.c:72
 msgid ""
 "Select whether subdirectories must be expanded.\n"
 "none: subdirectories do not appear in the playlist.\n"
@@ -4342,19 +4586,19 @@ msgid ""
 "expand: all subdirectories are expanded.\n"
 msgstr ""
 
-#: modules/access/directory.c:77
+#: modules/access/directory.c:78
 msgid "collapse"
 msgstr ""
 
-#: modules/access/directory.c:78
+#: modules/access/directory.c:79
 msgid "expand"
 msgstr ""
 
-#: modules/access/directory.c:80
+#: modules/access/directory.c:81
 msgid "Ignored extensions"
 msgstr ""
 
-#: modules/access/directory.c:82
+#: modules/access/directory.c:83
 msgid ""
 "Files with these extensions will not be added to playlist when opening a "
 "directory.\n"
@@ -4362,96 +4606,96 @@ msgid ""
 "instance. Use a comma-separated list of extensions."
 msgstr ""
 
-#: modules/access/directory.c:89
+#: modules/access/directory.c:90
 msgid "Directory"
 msgstr "目录"
 
-#: modules/access/directory.c:91
+#: modules/access/directory.c:92
 msgid "Standard filesystem directory input"
 msgstr ""
 
-#: modules/access/dshow/dshow.cpp:73 modules/access/dshow/dshow.cpp:75
+#: modules/access/dshow/dshow.cpp:74 modules/access/dshow/dshow.cpp:76
 #: modules/codec/ffmpeg/ffmpeg.c:75 modules/demux/mpc.c:55
-#: modules/video_output/opengl.c:129
+#: modules/video_output/opengl.c:122 modules/video_output/opengl.c:173
 msgid "None"
 msgstr "无"
 
-#: modules/access/dshow/dshow.cpp:78
+#: modules/access/dshow/dshow.cpp:79
 msgid "Cable"
 msgstr "缆线"
 
-#: modules/access/dshow/dshow.cpp:78
+#: modules/access/dshow/dshow.cpp:79
 msgid "Antenna"
 msgstr "天线"
 
-#: modules/access/dshow/dshow.cpp:85
+#: modules/access/dshow/dshow.cpp:86
 msgid "TV"
 msgstr ""
 
-#: modules/access/dshow/dshow.cpp:86
+#: modules/access/dshow/dshow.cpp:87
 msgid "FM radio"
 msgstr "FM 收音机"
 
-#: modules/access/dshow/dshow.cpp:87
+#: modules/access/dshow/dshow.cpp:88
 msgid "AM radio"
 msgstr "AM 收音机"
 
-#: modules/access/dshow/dshow.cpp:88
+#: modules/access/dshow/dshow.cpp:89
 msgid "DSS"
 msgstr ""
 
-#: modules/access/dshow/dshow.cpp:92
+#: modules/access/dshow/dshow.cpp:93
 msgid ""
 "Caching value for DirectShow streams. This value should be set in "
 "millisecondss."
 msgstr "DirectShow 串流的缓存值。这个值是以毫秒为单位的。"
 
-#: modules/access/dshow/dshow.cpp:94 modules/access/v4l/v4l.c:77
+#: modules/access/dshow/dshow.cpp:95 modules/access/v4l.c:77
 msgid "Video device name"
 msgstr "视频装置名称"
 
-#: modules/access/dshow/dshow.cpp:96
+#: modules/access/dshow/dshow.cpp:97
 msgid ""
 "Name of the video device that will be used by the DirectShow plugin. If you "
 "don't specify anything, the default device will be used."
 msgstr ""
 
-#: modules/access/dshow/dshow.cpp:100 modules/access/v4l/v4l.c:81
+#: modules/access/dshow/dshow.cpp:101 modules/access/v4l.c:81
 msgid "Audio device name"
 msgstr "音频装置名称"
 
-#: modules/access/dshow/dshow.cpp:102
+#: modules/access/dshow/dshow.cpp:103
 msgid ""
 "Name of the audio device that will be used by the DirectShow plugin. If you "
 "don't specify anything, the default device will be used. You can specify a "
 "standard size (cif, d1, ...) or <width>x<height>"
 msgstr ""
 
-#: modules/access/dshow/dshow.cpp:105
+#: modules/access/dshow/dshow.cpp:106
 msgid "Video size"
 msgstr "视频大小"
 
-#: modules/access/dshow/dshow.cpp:107
+#: modules/access/dshow/dshow.cpp:108
 msgid ""
 "Size of the video that will be displayed by the DirectShow plugin. If you "
 "don't specify anything the default size for your device will be used."
 msgstr ""
 
-#: modules/access/dshow/dshow.cpp:110 modules/access/v4l/v4l.c:85
+#: modules/access/dshow/dshow.cpp:111 modules/access/v4l.c:85
 msgid "Video input chroma format"
 msgstr "视频输入彩度格式"
 
-#: modules/access/dshow/dshow.cpp:112
+#: modules/access/dshow/dshow.cpp:113
 msgid ""
 "Force the DirectShow video input to use a specific chroma format (eg. I420 "
 "(default), RV24, etc.)"
 msgstr ""
 
-#: modules/access/dshow/dshow.cpp:114
+#: modules/access/dshow/dshow.cpp:115
 msgid "Video input frame rate"
 msgstr "视频输入帧率"
 
-#: modules/access/dshow/dshow.cpp:116
+#: modules/access/dshow/dshow.cpp:117
 msgid ""
 "Force the DirectShow video input to use a specific frame rate(eg. 0 means "
 "default, 25, 29.97, 50, 59.94, etc.)"
@@ -4459,54 +4703,54 @@ msgstr ""
 "强制 Directshow 视频输出使用一个特定的帧率 (0代表默认, 25, 29.97, 50, 59.94等"
 "等)"
 
-#: modules/access/dshow/dshow.cpp:118
+#: modules/access/dshow/dshow.cpp:119
 msgid "Device properties"
 msgstr "设备属性"
 
-#: modules/access/dshow/dshow.cpp:120
+#: modules/access/dshow/dshow.cpp:121
 msgid ""
 "Show the properties dialog of the selected device before starting the stream."
 msgstr "在开始串流之前显示选择设备属性对话框"
 
-#: modules/access/dshow/dshow.cpp:122
+#: modules/access/dshow/dshow.cpp:123
 msgid "Tuner properties"
 msgstr "调谐器属性"
 
-#: modules/access/dshow/dshow.cpp:124
+#: modules/access/dshow/dshow.cpp:125
 msgid "Show the tuner properties [channel selection] page."
 msgstr "显示调谐器属性 (频道选择) 页"
 
-#: modules/access/dshow/dshow.cpp:125
+#: modules/access/dshow/dshow.cpp:126
 msgid "Tuner TV Channel"
 msgstr "调谐器 TV 频道"
 
-#: modules/access/dshow/dshow.cpp:127
+#: modules/access/dshow/dshow.cpp:128
 msgid "Set the TV channel the tuner will set to (0 means default)."
 msgstr ""
 
-#: modules/access/dshow/dshow.cpp:129
+#: modules/access/dshow/dshow.cpp:130
 msgid "Tuner country code"
 msgstr ""
 
-#: modules/access/dshow/dshow.cpp:131
+#: modules/access/dshow/dshow.cpp:132
 msgid ""
 "Set the tuner country code that establishes the current channel-to-frequency "
 "mapping (0 means default)."
 msgstr ""
 
-#: modules/access/dshow/dshow.cpp:133
+#: modules/access/dshow/dshow.cpp:134
 msgid "Tuner input type"
 msgstr ""
 
-#: modules/access/dshow/dshow.cpp:135
+#: modules/access/dshow/dshow.cpp:136
 msgid "Select the tuner input type (Cable/Antenna)."
 msgstr ""
 
-#: modules/access/dshow/dshow.cpp:136
+#: modules/access/dshow/dshow.cpp:137
 msgid "Video input pin"
 msgstr "视频输入端"
 
-#: modules/access/dshow/dshow.cpp:138
+#: modules/access/dshow/dshow.cpp:139
 msgid ""
 "Select the video input source, such as composite, s-video, or tuner. Since "
 "these settings are hardware-specfic, you should find good settings in the "
@@ -4514,55 +4758,70 @@ msgid ""
 "will not be changed."
 msgstr ""
 
-#: modules/access/dshow/dshow.cpp:142
+#: modules/access/dshow/dshow.cpp:143
 msgid "Audio input pin"
 msgstr "音频输入端"
 
-#: modules/access/dshow/dshow.cpp:144
+#: modules/access/dshow/dshow.cpp:145
 msgid "Select the audio input source. See the \"video input\" option."
 msgstr "选择音频输入源。请参看“视频输入”选项。"
 
-#: modules/access/dshow/dshow.cpp:145
+#: modules/access/dshow/dshow.cpp:146
 msgid "Video output pin"
 msgstr "视频输出端"
 
-#: modules/access/dshow/dshow.cpp:147
+#: modules/access/dshow/dshow.cpp:148
 msgid "Select the video output type. See the \"video input\" option."
 msgstr "选择视频输出类型。参看“视频输入”选项。"
 
-#: modules/access/dshow/dshow.cpp:148
+#: modules/access/dshow/dshow.cpp:149
 msgid "Audio output pin"
 msgstr "音频输出 pin"
 
-#: modules/access/dshow/dshow.cpp:150
+#: modules/access/dshow/dshow.cpp:151
 msgid "Select the audio output type. See the \"video input\" option."
 msgstr "选择音频输出类型。参看“视频输入”选项。"
 
-#: modules/access/dshow/dshow.cpp:152
+#: modules/access/dshow/dshow.cpp:153
 msgid "AM Tuner mode"
 msgstr "AM 调谐器模式"
 
-#: modules/access/dshow/dshow.cpp:154
+#: modules/access/dshow/dshow.cpp:155
 msgid "AM Tuner mode. Can be one of DEFAULT, TV, AM_RADIO, FM_RADIO or DSS."
 msgstr ""
 
-#: modules/access/dshow/dshow.cpp:166
+#: modules/access/dshow/dshow.cpp:167
 msgid "DirectShow"
 msgstr "DirectShow"
 
-#: modules/access/dshow/dshow.cpp:167 modules/access/dshow/dshow.cpp:228
+#: modules/access/dshow/dshow.cpp:168 modules/access/dshow/dshow.cpp:229
 msgid "DirectShow input"
 msgstr "DirectShow输入"
 
-#: modules/access/dshow/dshow.cpp:175 modules/access/dshow/dshow.cpp:180
-#: modules/audio_output/alsa.c:110 modules/video_output/directx/directx.c:158
+#: modules/access/dshow/dshow.cpp:176 modules/access/dshow/dshow.cpp:181
+#: modules/audio_output/alsa.c:111 modules/video_output/directx/directx.c:171
 msgid "Refresh list"
 msgstr "刷新清单"
 
-#: modules/access/dshow/dshow.cpp:176 modules/access/dshow/dshow.cpp:181
+#: modules/access/dshow/dshow.cpp:177 modules/access/dshow/dshow.cpp:182
 msgid "Configure"
 msgstr "配置"
 
+#: modules/access/dshow/dshow.cpp:894 modules/access/dshow/dshow.cpp:944
+msgid "Capturing failed"
+msgstr ""
+
+#: modules/access/dshow/dshow.cpp:895
+#, c-format
+msgid ""
+"VLC cannot use the device \"%s\", because its device type is not supported."
+msgstr ""
+
+#: modules/access/dshow/dshow.cpp:945
+#, c-format
+msgid "The capture device \"%s\" does not support the required parameters."
+msgstr ""
+
 #: modules/access/dv.c:70
 msgid "Caching value for DV streams. Thisvalue should be set in milliseconds."
 msgstr "DV 串流的缓存值。这个值是以毫秒为单位的。"
@@ -4575,272 +4834,304 @@ msgstr ""
 msgid "dv"
 msgstr ""
 
-#: modules/access/dvb/access.c:74
+#: modules/access/dvb/access.c:75
 msgid ""
 "Caching value for DVB streams. This value should be set in milliseconds."
 msgstr "DVB 串流的缓存值。这个值是以毫秒为单位的。"
 
-#: modules/access/dvb/access.c:77
+#: modules/access/dvb/access.c:78
 msgid "Adapter card to tune"
 msgstr "要调整的适配卡"
 
-#: modules/access/dvb/access.c:78
+#: modules/access/dvb/access.c:79
 msgid ""
 "Adapter cards have a device file in directory named /dev/dvb/adapter[n] with "
 "n>=0."
 msgstr ""
 
-#: modules/access/dvb/access.c:80
+#: modules/access/dvb/access.c:81
 msgid "Device number to use on adapter"
 msgstr "适配卡设备号"
 
-#: modules/access/dvb/access.c:83
+#: modules/access/dvb/access.c:84
 msgid "Transponder/multiplex frequency"
 msgstr ""
 
-#: modules/access/dvb/access.c:84
+#: modules/access/dvb/access.c:85
 msgid "In kHz for DVB-S or Hz for DVB-C/T"
 msgstr ""
 
-#: modules/access/dvb/access.c:86
+#: modules/access/dvb/access.c:87
 msgid "Inversion mode"
 msgstr ""
 
-#: modules/access/dvb/access.c:87
+#: modules/access/dvb/access.c:88
 msgid "Inversion mode [0=off, 1=on, 2=auto]"
 msgstr ""
 
-#: modules/access/dvb/access.c:89
+#: modules/access/dvb/access.c:90
 msgid "Probe DVB card for capabilities"
 msgstr ""
 
-#: modules/access/dvb/access.c:90
+#: modules/access/dvb/access.c:91
 msgid ""
 "Some DVB cards do not like to be probed for their capabilities, you can "
 "disable this feature if you experience some trouble."
 msgstr ""
 
-#: modules/access/dvb/access.c:92
+#: modules/access/dvb/access.c:93
 msgid "Budget mode"
 msgstr ""
 
-#: modules/access/dvb/access.c:93
+#: modules/access/dvb/access.c:94
 msgid "This allows you to stream an entire transponder with a \"budget\" card."
 msgstr ""
 
-#: modules/access/dvb/access.c:96
+#: modules/access/dvb/access.c:97
 msgid "Satellite number in the Diseqc system"
 msgstr ""
 
-#: modules/access/dvb/access.c:97
+#: modules/access/dvb/access.c:98
 msgid "[0=no diseqc, 1-4=satellite number]."
 msgstr ""
 
-#: modules/access/dvb/access.c:99
+#: modules/access/dvb/access.c:100
 msgid "LNB voltage"
 msgstr ""
 
-#: modules/access/dvb/access.c:100
+#: modules/access/dvb/access.c:101
 msgid "In Volts [0, 13=vertical, 18=horizontal]."
 msgstr ""
 
-#: modules/access/dvb/access.c:102
+#: modules/access/dvb/access.c:103
 msgid "High LNB voltage"
 msgstr ""
 
-#: modules/access/dvb/access.c:103
+#: modules/access/dvb/access.c:104
 msgid ""
 "Enable high voltage if your cables are particularly long. This is not "
 "supported by all frontends."
 msgstr ""
 
-#: modules/access/dvb/access.c:106
+#: modules/access/dvb/access.c:107
 msgid "22 kHz tone"
 msgstr "22 kHz 音调"
 
-#: modules/access/dvb/access.c:107
+#: modules/access/dvb/access.c:108
 msgid "[0=off, 1=on, -1=auto]."
 msgstr ""
 
-#: modules/access/dvb/access.c:109
+#: modules/access/dvb/access.c:110
 msgid "Transponder FEC"
 msgstr ""
 
-#: modules/access/dvb/access.c:110
+#: modules/access/dvb/access.c:111
 msgid "FEC=Forward Error Correction mode [9=auto]."
 msgstr ""
 
-#: modules/access/dvb/access.c:112
+#: modules/access/dvb/access.c:113
 msgid "Transponder symbol rate in kHz"
 msgstr ""
 
-#: modules/access/dvb/access.c:115
+#: modules/access/dvb/access.c:116
 msgid "Antenna lnb_lof1 (kHz)"
 msgstr ""
 
-#: modules/access/dvb/access.c:118
+#: modules/access/dvb/access.c:119
 msgid "Antenna lnb_lof2 (kHz)"
 msgstr ""
 
-#: modules/access/dvb/access.c:121
+#: modules/access/dvb/access.c:122
 msgid "Antenna lnb_slof (kHz)"
 msgstr ""
 
-#: modules/access/dvb/access.c:125
+#: modules/access/dvb/access.c:126
 msgid "Modulation type"
 msgstr "调变类型"
 
-#: modules/access/dvb/access.c:126
+#: modules/access/dvb/access.c:127
 msgid "Modulation type for front-end device."
 msgstr ""
 
-#: modules/access/dvb/access.c:129
+#: modules/access/dvb/access.c:130
 msgid "Terrestrial high priority stream code rate (FEC)"
 msgstr ""
 
-#: modules/access/dvb/access.c:132
+#: modules/access/dvb/access.c:133
 msgid "Terrestrial low priority stream code rate (FEC)"
 msgstr ""
 
-#: modules/access/dvb/access.c:135
+#: modules/access/dvb/access.c:136
 msgid "Terrestrial bandwidth"
 msgstr ""
 
-#: modules/access/dvb/access.c:136
+#: modules/access/dvb/access.c:137
 msgid "Terrestrial bandwidth [0=auto,6,7,8 in MHz]"
 msgstr ""
 
-#: modules/access/dvb/access.c:138
+#: modules/access/dvb/access.c:139
 msgid "Terrestrial guard interval"
 msgstr ""
 
-#: modules/access/dvb/access.c:141
+#: modules/access/dvb/access.c:142
 msgid "Terrestrial transmission mode"
 msgstr ""
 
-#: modules/access/dvb/access.c:144
+#: modules/access/dvb/access.c:145
 msgid "Terrestrial hierarchy mode"
 msgstr ""
 
-#: modules/access/dvb/access.c:147
+#: modules/access/dvb/access.c:148
 msgid "HTTP Host address"
 msgstr "HTTP 主机地址"
 
-#: modules/access/dvb/access.c:149
+#: modules/access/dvb/access.c:150
 msgid "To enable the internal HTTP server, set its address and port here."
 msgstr ""
 
-#: modules/access/dvb/access.c:151
+#: modules/access/dvb/access.c:152
 msgid "HTTP user name"
 msgstr "HTTP 用户名"
 
-#: modules/access/dvb/access.c:153
+#: modules/access/dvb/access.c:154
 msgid ""
 "User name the administrator will use to log into the internal HTTP server."
 msgstr ""
 
-#: modules/access/dvb/access.c:156
+#: modules/access/dvb/access.c:157
 msgid "HTTP password"
 msgstr "HTTP 密码"
 
-#: modules/access/dvb/access.c:158
+#: modules/access/dvb/access.c:159
 msgid ""
 "Password the administrator will use to log into the internal HTTP server."
 msgstr ""
 
-#: modules/access/dvb/access.c:161
+#: modules/access/dvb/access.c:162
 msgid "HTTP ACL"
 msgstr "HTTP ACL"
 
-#: modules/access/dvb/access.c:163
+#: modules/access/dvb/access.c:164
 msgid ""
 "Access control list (equivalent to .hosts) file path, which will limit the "
 "range of IPs entitled to log into the internal HTTP server."
 msgstr ""
 
-#: modules/access/dvb/access.c:167 modules/access_output/http.c:72
+#: modules/access/dvb/access.c:168 modules/access_output/http.c:70
 #: modules/control/http/http.c:49
 msgid "Certificate file"
 msgstr ""
 
-#: modules/access/dvb/access.c:168
+#: modules/access/dvb/access.c:169
 msgid "HTTP interface x509 PEM certificate file (enables SSL)"
 msgstr ""
 
-#: modules/access/dvb/access.c:171 modules/access_output/http.c:75
+#: modules/access/dvb/access.c:172 modules/access_output/http.c:73
 #: modules/control/http/http.c:52
 msgid "Private key file"
 msgstr "私钥文件"
 
-#: modules/access/dvb/access.c:172
+#: modules/access/dvb/access.c:173
 msgid "HTTP interface x509 PEM private key file"
 msgstr ""
 
-#: modules/access/dvb/access.c:174 modules/access_output/http.c:79
+#: modules/access/dvb/access.c:175 modules/access_output/http.c:77
 #: modules/control/http/http.c:54
 msgid "Root CA file"
 msgstr ""
 
-#: modules/access/dvb/access.c:175
+#: modules/access/dvb/access.c:176
 msgid "HTTP interface x509 PEM trusted root CA certificates file"
 msgstr ""
 
-#: modules/access/dvb/access.c:178 modules/access_output/http.c:84
+#: modules/access/dvb/access.c:179 modules/access_output/http.c:82
 #: modules/control/http/http.c:57
 msgid "CRL file"
 msgstr ""
 
-#: modules/access/dvb/access.c:179
+#: modules/access/dvb/access.c:180
 msgid "HTTP interface Certificates Revocation List file"
 msgstr ""
 
-#: modules/access/dvb/access.c:182
+#: modules/access/dvb/access.c:183
 msgid "DVB"
 msgstr "DVB"
 
-#: modules/access/dvb/access.c:183
+#: modules/access/dvb/access.c:184
 msgid "DVB input with v4l2 support"
 msgstr ""
 
-#: modules/access/dvb/access.c:235
+#: modules/access/dvb/access.c:236
 msgid "HTTP server"
 msgstr "HTTP 服务器"
 
-#: modules/access/dvdnav.c:59 modules/access/dvdread.c:57
+#: modules/access/dvb/access.c:716
+#, fuzzy
+msgid "Input syntax is deprecated"
+msgstr "输入已改变"
+
+#: modules/access/dvb/access.c:717
+msgid ""
+"The given syntax is deprecated. Run \"vlc -p dvb\" to see an explanation of "
+"the new syntax."
+msgstr ""
+
+#: modules/access/dvb/access.c:763
+#, fuzzy
+msgid "Illegal Polarization"
+msgstr "音量正规化"
+
+#: modules/access/dvb/access.c:764
+#, c-format
+msgid "The provided polarization \"%c\" is not valid."
+msgstr ""
+
+#: modules/access/dvdnav.c:60 modules/access/dvdread.c:58
 msgid "DVD angle"
 msgstr "DVD 角度"
 
-#: modules/access/dvdnav.c:61 modules/access/dvdread.c:59
+#: modules/access/dvdnav.c:62 modules/access/dvdread.c:60
 msgid "Default DVD angle."
 msgstr "默认 DVD 角度。"
 
-#: modules/access/dvdnav.c:65 modules/access/dvdread.c:63
+#: modules/access/dvdnav.c:66 modules/access/dvdread.c:64
 msgid "Caching value for DVDs. This value should be set in milliseconds."
 msgstr "DVD 的缓存值。这个值是以毫秒为单位的。"
 
-#: modules/access/dvdnav.c:67
+#: modules/access/dvdnav.c:68
 msgid "Start directly in menu"
 msgstr ""
 
-#: modules/access/dvdnav.c:69
+#: modules/access/dvdnav.c:70
 msgid ""
 "Start the DVD directly in the main menu. This will try to skip all the "
 "useless warning introductions."
 msgstr ""
 
-#: modules/access/dvdnav.c:78
+#: modules/access/dvdnav.c:79
 msgid "DVD with menus"
 msgstr "带有菜单的 DVD"
 
-#: modules/access/dvdnav.c:79
+#: modules/access/dvdnav.c:80
 msgid "DVDnav Input"
 msgstr "DVDnav输入"
 
-#: modules/access/dvdread.c:66
+#: modules/access/dvdnav.c:296 modules/access/dvdread.c:236
+#: modules/access/dvdread.c:495 modules/access/dvdread.c:557
+#, fuzzy
+msgid "Playback failure"
+msgstr "回放"
+
+#: modules/access/dvdnav.c:297
+msgid ""
+"VLC cannot set the DVD's title. It possibly cannot decrypt the entire disk."
+msgstr ""
+
+#: modules/access/dvdread.c:67
 msgid "Method used by libdvdcss for decryption"
 msgstr ""
 
-#: modules/access/dvdread.c:68
+#: modules/access/dvdread.c:69
 msgid ""
 "Set the method used by libdvdcss for key decryption.\n"
 "title: decrypted title key is guessed from the encrypted sectors of the "
@@ -4856,29 +5147,43 @@ msgid ""
 "The default method is: key."
 msgstr ""
 
-#: modules/access/dvdread.c:84
+#: modules/access/dvdread.c:85
 msgid "title"
 msgstr "标题"
 
-#: modules/access/dvdread.c:84
+#: modules/access/dvdread.c:85
 msgid "Key"
 msgstr ""
 
-#: modules/access/dvdread.c:90
+#: modules/access/dvdread.c:91
 msgid "DVD without menus"
 msgstr "没有菜单的 DVD"
 
-#: modules/access/dvdread.c:91
+#: modules/access/dvdread.c:92
 msgid "DVDRead Input (DVD without menu support)"
 msgstr ""
 
+#: modules/access/dvdread.c:237
+#, c-format
+msgid "DVDRead could not open disk \"%s\"."
+msgstr ""
+
+#: modules/access/dvdread.c:496
+#, c-format
+msgid "DVDRead could not read block %d."
+msgstr ""
+
+#: modules/access/dvdread.c:558
+#, c-format
+msgid "DVDRead could not read %d/%d blocks at 0x%02x."
+msgstr ""
+
 #: modules/access/fake.c:42
 msgid ""
 "Caching value for fake streams. This value should be set in milliseconds."
 msgstr "假串流的缓存值。这个值是以毫秒为单位的。"
 
-#: modules/access/fake.c:44 modules/access/pvr/pvr.c:73
-#: modules/access/v4l/v4l.c:136
+#: modules/access/fake.c:44 modules/access/pvr.c:73 modules/access/v4l.c:136
 msgid "Framerate"
 msgstr ""
 
@@ -4915,27 +5220,27 @@ msgstr ""
 msgid "Fake input"
 msgstr "假输入"
 
-#: modules/access/file.c:81
+#: modules/access/file.c:82
 msgid "Caching value for files. This value should be set in milliseconds."
 msgstr "文件的缓存值。这个值是以毫秒为单位的。"
 
-#: modules/access/file.c:83
+#: modules/access/file.c:84
 msgid "Concatenate with additional files"
 msgstr ""
 
-#: modules/access/file.c:85
+#: modules/access/file.c:86
 msgid ""
 "Play split files as if they were part of a unique file. You need to specify "
 "a comma-separated list of files."
 msgstr ""
 
-#: modules/access/file.c:89
+#: modules/access/file.c:90
 msgid "File input"
 msgstr "文件输入"
 
-#: modules/access/file.c:90 modules/access_output/file.c:67
-#: modules/audio_output/file.c:112 modules/gui/beos/InterfaceWindow.cpp:261
-#: modules/gui/beos/MediaControlView.cpp:1232
+#: modules/access/file.c:91 modules/access_output/file.c:67
+#: modules/audio_output/file.c:112 modules/gui/beos/InterfaceWindow.cpp:263
+#: modules/gui/beos/MediaControlView.cpp:1234
 #: modules/gui/beos/PlayListWindow.cpp:85 modules/gui/macosx/open.m:160
 #: modules/gui/macosx/open.m:371 modules/gui/macosx/output.m:142
 #: modules/gui/macosx/output.m:230 modules/gui/macosx/output.m:369
@@ -4945,39 +5250,98 @@ msgstr "文件输入"
 msgid "File"
 msgstr "文件"
 
-#: modules/access/ftp.c:44
+#: modules/access/file.c:248 modules/access/file.c:417
+#: modules/access/file.c:519 modules/access/file.c:606
+#: modules/access/file.c:631
+#, fuzzy
+msgid "File reading failed"
+msgstr "视频缩放过滤器"
+
+#: modules/access/file.c:249
+#, c-format
+msgid "\"%s\"'s file type is unknown."
+msgstr ""
+
+#: modules/access/file.c:418
+#, c-format
+msgid "VLC could not read file \"%s\"."
+msgstr ""
+
+#: modules/access/file.c:520
+msgid ""
+"VLC seeked in the file too far. This usually means that your file is broken "
+"and therefore cannot be played."
+msgstr ""
+
+#: modules/access/file.c:607
+#, c-format
+msgid "VLC could not open file \"%s\"."
+msgstr ""
+
+#: modules/access/file.c:632
+#, c-format
+msgid "VLC could not open file \"%s\" (%s)."
+msgstr ""
+
+#: modules/access/ftp.c:45
 msgid ""
 "Caching value for FTP streams. This value should be set in milliseconds."
 msgstr "FTP 串流的缓存值。这个值是以毫秒为单位的。"
 
-#: modules/access/ftp.c:46
+#: modules/access/ftp.c:47
 msgid "FTP user name"
 msgstr "FTP 用户名"
 
-#: modules/access/ftp.c:47 modules/access/smb.c:64
+#: modules/access/ftp.c:48 modules/access/smb.c:64
 msgid "User name that will be used for the connection."
 msgstr "用于这个连接的用户名。"
 
-#: modules/access/ftp.c:49
+#: modules/access/ftp.c:50
 msgid "FTP password"
 msgstr "FTP 密码"
 
-#: modules/access/ftp.c:50 modules/access/smb.c:67
+#: modules/access/ftp.c:51 modules/access/smb.c:67
 msgid "Password that will be used for the connection."
 msgstr "用于这个连接的密码。"
 
-#: modules/access/ftp.c:52
+#: modules/access/ftp.c:53
 msgid "FTP account"
 msgstr "FTP 账户"
 
-#: modules/access/ftp.c:53
+#: modules/access/ftp.c:54
 msgid "Account that will be used for the connection."
 msgstr "用于这个连接的账户。"
 
-#: modules/access/ftp.c:58
+#: modules/access/ftp.c:59
 msgid "FTP input"
 msgstr "FTP 输入"
 
+#: modules/access/ftp.c:109 modules/access/ftp.c:124 modules/access/ftp.c:185
+#: modules/access/ftp.c:195 modules/access/ftp.c:203
+#, fuzzy
+msgid "Network interaction failed"
+msgstr "网络同步化"
+
+#: modules/access/ftp.c:110
+msgid "VLC could not connect with the given server."
+msgstr ""
+
+#: modules/access/ftp.c:125
+msgid "VLC's connection to the given server was rejected."
+msgstr ""
+
+#: modules/access/ftp.c:186
+msgid "Your account was rejected."
+msgstr ""
+
+#: modules/access/ftp.c:196
+msgid "Your password was rejected."
+msgstr ""
+
+#: modules/access/ftp.c:204
+msgid "Your connection attemp to the server was rejected."
+msgstr ""
+
 #: modules/access/gnomevfs.c:46
 msgid ""
 "Caching value for GnomeVFS streams.This value should be set in milliseconds."
@@ -5039,11 +5403,11 @@ msgstr "HTTP输入"
 msgid "HTTP(S)"
 msgstr "HTTP(S)"
 
-#: modules/access/http.c:293
+#: modules/access/http.c:284
 msgid "HTTP authentication"
 msgstr ""
 
-#: modules/access/http.c:294
+#: modules/access/http.c:285 modules/demux/live555.cpp:753
 msgid "Please enter a valid login name and a password."
 msgstr ""
 
@@ -5074,176 +5438,195 @@ msgstr "选择在此限制下的最大比特率的串流。"
 msgid "Microsoft Media Server (MMS) input"
 msgstr "Microsoft Media Server (MMS)输入"
 
-#: modules/access/pvr/pvr.c:49
+#: modules/access/pvr.c:49
 msgid ""
 "Default caching value for PVR streams. This value should be set in "
 "milliseconds."
 msgstr "PVR 串流的默认的缓存值。这个值是以毫秒为单位的。"
 
-#: modules/access/pvr/pvr.c:52
+#: modules/access/pvr.c:52
 msgid "Device"
 msgstr "设备"
 
-#: modules/access/pvr/pvr.c:53
+#: modules/access/pvr.c:53
 msgid "PVR video device"
 msgstr "PVR 视频设备"
 
-#: modules/access/pvr/pvr.c:55
+#: modules/access/pvr.c:55
 msgid "Radio device"
 msgstr "收音机设备"
 
-#: modules/access/pvr/pvr.c:56
+#: modules/access/pvr.c:56
 msgid "PVR radio device"
 msgstr "PVR 收音机模式"
 
-#: modules/access/pvr/pvr.c:58 modules/access/v4l/v4l.c:96
+#: modules/access/pvr.c:58 modules/access/v4l.c:96
 msgid "Norm"
 msgstr "规范"
 
-#: modules/access/pvr/pvr.c:59 modules/access/v4l/v4l.c:98
+#: modules/access/pvr.c:59 modules/access/v4l.c:98
 msgid "Norm of the stream (Automatic, SECAM, PAL, or NTSC)."
 msgstr ""
 
-#: modules/access/pvr/pvr.c:62 modules/access/v4l/v4l.c:102
+#: modules/access/pvr.c:62 modules/access/v4l.c:102
 #: modules/video_filter/mosaic.c:96
 msgid "Width"
 msgstr "宽度"
 
-#: modules/access/pvr/pvr.c:63
+#: modules/access/pvr.c:63
 msgid "Width of the stream to capture (-1 for autodetection)."
 msgstr ""
 
-#: modules/access/pvr/pvr.c:66 modules/access/v4l/v4l.c:105
+#: modules/access/pvr.c:66 modules/access/v4l.c:105
 #: modules/video_filter/mosaic.c:94
 msgid "Height"
 msgstr "高度"
 
-#: modules/access/pvr/pvr.c:67
+#: modules/access/pvr.c:67
 msgid "Height of the stream to capture (-1 for autodetection)."
 msgstr ""
 
-#: modules/access/pvr/pvr.c:70 modules/access/v4l/v4l.c:89
+#: modules/access/pvr.c:70 modules/access/v4l.c:89
 msgid "Frequency"
 msgstr "频率"
 
-#: modules/access/pvr/pvr.c:71 modules/access/v4l/v4l.c:91
+#: modules/access/pvr.c:71 modules/access/v4l.c:91
 msgid "Frequency to capture (in kHz), if applicable."
 msgstr ""
 
-#: modules/access/pvr/pvr.c:74 modules/access/v4l/v4l.c:137
+#: modules/access/pvr.c:74 modules/access/v4l.c:137
 msgid "Framerate to capture, if applicable (-1 for autodetect)."
 msgstr ""
 
-#: modules/access/pvr/pvr.c:77
+#: modules/access/pvr.c:77
 msgid "Key interval"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:78
+#: modules/access/pvr.c:78
 msgid "Interval between keyframes (-1 for autodetect)."
 msgstr ""
 
-#: modules/access/pvr/pvr.c:80
+#: modules/access/pvr.c:80
 msgid "B Frames"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:81
+#: modules/access/pvr.c:81
 msgid ""
 "If this option is set, B-Frames will be used. Use this option to set the "
 "number of B-Frames."
 msgstr ""
 
-#: modules/access/pvr/pvr.c:85
+#: modules/access/pvr.c:85
 msgid "Bitrate to use (-1 for default)."
 msgstr ""
 
-#: modules/access/pvr/pvr.c:87
+#: modules/access/pvr.c:87
 msgid "Bitrate peak"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:88
+#: modules/access/pvr.c:88
 msgid "Peak bitrate in VBR mode."
 msgstr ""
 
-#: modules/access/pvr/pvr.c:91
+#: modules/access/pvr.c:91
 msgid "Bitrate mode)"
 msgstr "位率模式)"
 
-#: modules/access/pvr/pvr.c:92
+#: modules/access/pvr.c:92
 msgid "Bitrate mode to use (VBR or CBR)."
 msgstr ""
 
-#: modules/access/pvr/pvr.c:94
+#: modules/access/pvr.c:94
 msgid "Audio bitmask"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:95
+#: modules/access/pvr.c:95
 msgid "Bitmask that will get used by the audio part of the card."
 msgstr ""
 
-#: modules/access/pvr/pvr.c:98 modules/access/vcdx/info.c:97
-#: modules/gui/macosx/intf.m:492 modules/gui/wxwidgets/interface.cpp:1357
+#: modules/access/pvr.c:98 modules/access/vcdx/info.c:97
+#: modules/gui/macosx/intf.m:498 modules/gui/wxwidgets/interface.cpp:1374
 msgid "Volume"
 msgstr "音量"
 
-#: modules/access/pvr/pvr.c:99
+#: modules/access/pvr.c:99
 msgid "Audio volume (0-65535)."
 msgstr "音频音量 (0-65535)."
 
-#: modules/access/pvr/pvr.c:101 modules/access/v4l/v4l.c:92
+#: modules/access/pvr.c:101 modules/access/v4l.c:92
 msgid "Channel"
 msgstr "频道"
 
-#: modules/access/pvr/pvr.c:102
+#: modules/access/pvr.c:102
 msgid ""
 "Channel of the card to use (Usually, 0 = tuner, 1 = composite, 2 = svideo)"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:108 modules/access/v4l/v4l.c:143
+#: modules/access/pvr.c:108 modules/access/v4l.c:143
 msgid "Automatic"
 msgstr "自动"
 
-#: modules/access/pvr/pvr.c:108 modules/access/v4l/v4l.c:143
+#: modules/access/pvr.c:108 modules/access/v4l.c:143
 msgid "SECAM"
 msgstr "SECAM"
 
-#: modules/access/pvr/pvr.c:108 modules/access/v4l/v4l.c:143
+#: modules/access/pvr.c:108 modules/access/v4l.c:143
 msgid "PAL"
 msgstr "PAL"
 
-#: modules/access/pvr/pvr.c:108 modules/access/v4l/v4l.c:143
+#: modules/access/pvr.c:108 modules/access/v4l.c:143
 msgid "NTSC"
 msgstr "NTSC"
 
-#: modules/access/pvr/pvr.c:111
+#: modules/access/pvr.c:111
 msgid "vbr"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:111
+#: modules/access/pvr.c:111
 msgid "cbr"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:116
+#: modules/access/pvr.c:116
 msgid "PVR"
 msgstr "PVR"
 
-#: modules/access/pvr/pvr.c:117
+#: modules/access/pvr.c:117
 msgid "IVTV MPEG Encoding cards input"
 msgstr "IVTV MPEG 压缩卡输入"
 
-#: modules/access/rtsp/access.c:40 modules/access_output/udp.c:75
-#: modules/demux/live555.cpp:61
+#: modules/access/rtsp/access.c:41 modules/access_output/udp.c:75
+#: modules/demux/live555.cpp:63
 msgid "Caching value (ms)"
 msgstr "缓存值 (毫秒)"
 
-#: modules/access/rtsp/access.c:42
+#: modules/access/rtsp/access.c:43
 msgid ""
 "Caching value for RTSP streams. This value should be set in milliseconds."
 msgstr "RTSP 串流的缓存值。这个值是以毫秒为单位的。"
 
-#: modules/access/rtsp/access.c:46 modules/access/rtsp/access.c:47
+#: modules/access/rtsp/access.c:47 modules/access/rtsp/access.c:48
 msgid "Real RTSP"
 msgstr "Real RTSP"
 
+#: modules/access/rtsp/access.c:93
+#, fuzzy
+msgid "Connection failed"
+msgstr "设置文件"
+
+#: modules/access/rtsp/access.c:94
+#, c-format
+msgid "VLC could not connect to \"%s:%d\"."
+msgstr ""
+
+#: modules/access/rtsp/access.c:221
+#, fuzzy
+msgid "Session failed"
+msgstr "会话的电邮"
+
+#: modules/access/rtsp/access.c:222
+msgid "The requested RTSP session could not be established."
+msgstr ""
+
 #: modules/access/screen/screen.c:39
 msgid ""
 "Caching value for screen capture. This value should be set in milliseconds."
@@ -5344,141 +5727,167 @@ msgstr "UDP/RTP"
 msgid "UDP/RTP input"
 msgstr "UDP/RTP 输入"
 
-#: modules/access/v4l/v4l.c:75
+#: modules/access/v4l.c:75
 msgid ""
 "Caching value for V4L captures. This value should be set in milliseconds."
 msgstr "V4L 串流的缓存值。这个值是以毫秒为单位的。"
 
-#: modules/access/v4l/v4l.c:79
+#: modules/access/v4l.c:79
 msgid ""
 "Name of the video device to use. If you don't specify anything, no video "
 "device will be used."
 msgstr "默认的视频设备，如果你不指定，则没有设备将会被使用。"
 
-#: modules/access/v4l/v4l.c:83
+#: modules/access/v4l.c:83
 msgid ""
 "Name of the audio device to use. If you don't specify anything, no audio "
 "device will be used."
 msgstr "默认的音频设备，如果你不指定，则没有设备将会被使用。"
 
-#: modules/access/v4l/v4l.c:87
+#: modules/access/v4l.c:87
 msgid ""
 "Force the Video4Linux video device to use a specific chroma format (eg. I420 "
 "(default), RV24, etc.)"
 msgstr ""
 
-#: modules/access/v4l/v4l.c:94
+#: modules/access/v4l.c:94
 msgid ""
 "Channel of the card to use (Usually, 0 = tuner, 1 = composite, 2 = svideo)."
 msgstr ""
 
-#: modules/access/v4l/v4l.c:99
+#: modules/access/v4l.c:99
 msgid "Audio Channel"
 msgstr "音频频道"
 
-#: modules/access/v4l/v4l.c:101
+#: modules/access/v4l.c:101
 msgid "Audio Channel to use, if there are several audio inputs."
 msgstr "若有多个音频输入时，选择音频道"
 
-#: modules/access/v4l/v4l.c:103
+#: modules/access/v4l.c:103
 msgid "Width of the stream to capture (-1 for autodetect)."
 msgstr ""
 
-#: modules/access/v4l/v4l.c:106
+#: modules/access/v4l.c:106
 msgid "Height of the stream to capture (-1 for autodetect)."
 msgstr ""
 
-#: modules/access/v4l/v4l.c:108 modules/gui/macosx/extended.m:110
+#: modules/access/v4l.c:108 modules/gui/macosx/extended.m:114
 #: modules/gui/wxwidgets/extrapanel.cpp:234
 msgid "Brightness"
 msgstr "亮度"
 
-#: modules/access/v4l/v4l.c:110
+#: modules/access/v4l.c:110
 msgid "Brightness of the video input."
 msgstr "视频输入亮度."
 
-#: modules/access/v4l/v4l.c:111 modules/gui/macosx/extended.m:113
+#: modules/access/v4l.c:111 modules/gui/macosx/extended.m:117
 #: modules/gui/wxwidgets/extrapanel.cpp:224
 msgid "Hue"
 msgstr "色调"
 
-#: modules/access/v4l/v4l.c:113
+#: modules/access/v4l.c:113
 msgid "Hue of the video input."
 msgstr "视频输入色调."
 
-#: modules/access/v4l/v4l.c:114 modules/gui/macosx/sfilters.m:88
-#: modules/gui/macosx/sfilters.m:96 modules/video_filter/marq.c:93
+#: modules/access/v4l.c:114 modules/video_filter/marq.c:93
 #: modules/video_filter/rss.c:146 modules/video_filter/time.c:85
 #: modules/visualization/xosd.c:78
 msgid "Color"
 msgstr "色彩"
 
-#: modules/access/v4l/v4l.c:116
+#: modules/access/v4l.c:116
 msgid "Color of the video input."
 msgstr "视频输入色彩."
 
-#: modules/access/v4l/v4l.c:117 modules/gui/macosx/extended.m:111
+#: modules/access/v4l.c:117 modules/gui/macosx/extended.m:115
 #: modules/gui/wxwidgets/extrapanel.cpp:229
 msgid "Contrast"
 msgstr "对比"
 
-#: modules/access/v4l/v4l.c:119
+#: modules/access/v4l.c:119
 msgid "Contrast of the video input."
 msgstr "视频输入对比度."
 
-#: modules/access/v4l/v4l.c:120
+#: modules/access/v4l.c:120
 msgid "Tuner"
 msgstr "调节器"
 
-#: modules/access/v4l/v4l.c:121
+#: modules/access/v4l.c:121
 msgid "Tuner to use, if there are several ones."
 msgstr "若有多个调谐器时，选择要使用的一个"
 
-#: modules/access/v4l/v4l.c:122
+#: modules/access/v4l.c:122 modules/access_output/shout.c:89
 msgid "Samplerate"
 msgstr "采样率"
 
-#: modules/access/v4l/v4l.c:124
+#: modules/access/v4l.c:124
 msgid ""
 "Samplerate of the captured audio stream, in Hz (eg: 11025, 22050, 44100)"
 msgstr ""
 
-#: modules/access/v4l/v4l.c:127
+#: modules/access/v4l.c:127
 msgid "Capture the audio stream in stereo."
 msgstr ""
 
-#: modules/access/v4l/v4l.c:128
+#: modules/access/v4l.c:128
 msgid "MJPEG"
 msgstr "MJPEG"
 
-#: modules/access/v4l/v4l.c:130
+#: modules/access/v4l.c:130
 msgid "Set this option if the capture device outputs MJPEG"
 msgstr ""
 
-#: modules/access/v4l/v4l.c:131
+#: modules/access/v4l.c:131
 msgid "Decimation"
 msgstr ""
 
-#: modules/access/v4l/v4l.c:133
+#: modules/access/v4l.c:133
 msgid "Decimation level for MJPEG streams"
 msgstr ""
 
-#: modules/access/v4l/v4l.c:134
+#: modules/access/v4l.c:134
 msgid "Quality"
 msgstr "品质"
 
-#: modules/access/v4l/v4l.c:135
+#: modules/access/v4l.c:135
 msgid "Quality of the stream."
 msgstr "串流质量。"
 
-#: modules/access/v4l/v4l.c:146
+#: modules/access/v4l.c:146
 msgid "Video4Linux"
 msgstr "Video4Linux"
 
-#: modules/access/v4l/v4l.c:147
+#: modules/access/v4l.c:147
 msgid "Video4Linux input"
 msgstr "Video4Linux输入"
 
+#: modules/access/v4l2.c:52 modules/gui/macosx/open.m:167
+#: modules/gui/wxwidgets/dialogs/open.cpp:723
+msgid "Device name"
+msgstr "装置名称"
+
+#: modules/access/v4l2.c:54
+#, fuzzy
+msgid ""
+"Name of the device to use. If you don't specify anything, /dev/video0 will "
+"be used."
+msgstr "默认的视频设备，如果你不指定，则没有设备将会被使用。"
+
+#: modules/access/v4l2.c:58
+msgid ""
+"Input of the card to use (Usually, 0 = tuner, 1 = composite, 2 = svideo)."
+msgstr ""
+
+#: modules/access/v4l2.c:63
+#, fuzzy
+msgid "Video4Linux2"
+msgstr "Video4Linux"
+
+#: modules/access/v4l2.c:64
+#, fuzzy
+msgid "Video4Linux2 input"
+msgstr "Video4Linux输入"
+
 #: modules/access/vcd/vcd.c:42
 msgid "Caching value for VCDs. This value should be set in milliseconds."
 msgstr "VCD 的缓存值。这个值是以毫秒为单位的。"
@@ -5497,31 +5906,31 @@ msgstr "VCD 输入"
 msgid "[vcd:][device][@[title][,[chapter]]]"
 msgstr ""
 
-#: modules/access/vcdx/access.c:106
+#: modules/access/vcdx/access.c:104
 msgid "The above message had unknown log level"
 msgstr ""
 
-#: modules/access/vcdx/access.c:132
+#: modules/access/vcdx/access.c:130
 msgid "The above message had unknown vcdimager log level"
 msgstr ""
 
-#: modules/access/vcdx/access.c:282 modules/access/vcdx/access.c:364
-#: modules/access/vcdx/access.c:690 modules/access/vcdx/info.c:290
+#: modules/access/vcdx/access.c:280 modules/access/vcdx/access.c:362
+#: modules/access/vcdx/access.c:688 modules/access/vcdx/info.c:290
 #: modules/access/vcdx/info.c:291
 msgid "Entry"
 msgstr ""
 
-#: modules/access/vcdx/access.c:409 modules/access/vcdx/info.c:102
+#: modules/access/vcdx/access.c:407 modules/access/vcdx/info.c:102
 msgid "Segments"
 msgstr ""
 
-#: modules/access/vcdx/access.c:428 modules/access/vcdx/access.c:709
+#: modules/access/vcdx/access.c:426 modules/access/vcdx/access.c:707
 #: modules/access/vcdx/info.c:294 modules/access/vcdx/info.c:295
-#: modules/demux/mkv.cpp:5176
+#: modules/demux/mkv.cpp:5188
 msgid "Segment"
 msgstr ""
 
-#: modules/access/vcdx/access.c:533
+#: modules/access/vcdx/access.c:531
 msgid "LID"
 msgstr ""
 
@@ -5721,65 +6130,65 @@ msgstr "如果文件已经存在的话，追加到它后面而不是替换它。
 msgid "File stream output"
 msgstr "文件串流输出"
 
-#: modules/access_output/http.c:60
+#: modules/access_output/http.c:58
 msgid "Username"
 msgstr "用户名"
 
-#: modules/access_output/http.c:61
+#: modules/access_output/http.c:59
 msgid "User name that will be requested to access the stream."
 msgstr ""
 
-#: modules/access_output/http.c:63 modules/control/telnet.c:81
+#: modules/access_output/http.c:61 modules/control/telnet.c:81
 msgid "Password"
 msgstr "密码"
 
-#: modules/access_output/http.c:64
+#: modules/access_output/http.c:62
 msgid "Password that will be requested to access the stream."
 msgstr ""
 
-#: modules/access_output/http.c:68
+#: modules/access_output/http.c:66
 msgid "Mime"
 msgstr ""
 
-#: modules/access_output/http.c:69
+#: modules/access_output/http.c:67
 msgid "MIME returned by the server (autodetected if not specified."
 msgstr ""
 
-#: modules/access_output/http.c:73
+#: modules/access_output/http.c:71
 msgid "Path to the x509 PEM certificate file that will be used for HTTPS."
 msgstr ""
 
-#: modules/access_output/http.c:76
+#: modules/access_output/http.c:74
 msgid ""
 "Path to the x509 PEM private key file that will be used for HTTPS. Leave "
 "empty if you don't have one."
 msgstr ""
 
-#: modules/access_output/http.c:80
+#: modules/access_output/http.c:78
 msgid ""
 "Path to the x509 PEM trusted root CA certificates (certificate authority) "
 "file that will be used for HTTPS. Leave empty if you don't have one."
 msgstr ""
 
-#: modules/access_output/http.c:85
+#: modules/access_output/http.c:83
 msgid ""
 "Path to the x509 PEM Certificates Revocation List file that will be used for "
 "SSL. Leave empty if you don't have one."
 msgstr ""
 
-#: modules/access_output/http.c:88
+#: modules/access_output/http.c:86
 msgid "Advertise with Bonjour"
 msgstr ""
 
-#: modules/access_output/http.c:89
+#: modules/access_output/http.c:87
 msgid "Advertise the stream with the Bonjour protocol."
 msgstr ""
 
-#: modules/access_output/http.c:93
+#: modules/access_output/http.c:91
 msgid "HTTP stream output"
 msgstr "HTTP 串流输出"
 
-#: modules/access_output/http.c:95 modules/control/http/http.c:61
+#: modules/access_output/http.c:93 modules/control/http/http.c:61
 #: modules/gui/wxwidgets/dialogs/streamout.cpp:472
 msgid "HTTP"
 msgstr "HTTP"
@@ -5789,7 +6198,7 @@ msgid "Stream name"
 msgstr "串流名称"
 
 #: modules/access_output/shout.c:59
-msgid "Name to give to this stream/channel on the icecast server."
+msgid "Name to give to this stream/channel on the shoutcast/icecast server."
 msgstr ""
 
 #: modules/access_output/shout.c:62
@@ -5808,10 +6217,65 @@ msgstr "串流 MP3"
 msgid ""
 "You normally have to feed the shoutcast module with Ogg streams. It is also "
 "possible to stream MP3 instead, so you can forward MP3 streams to the "
-"icecast server."
+"shoutcast/icecast server."
+msgstr ""
+
+#: modules/access_output/shout.c:76
+#, fuzzy
+msgid "Genre description"
+msgstr "串流描述"
+
+#: modules/access_output/shout.c:77
+msgid "Genre of the content. "
+msgstr ""
+
+#: modules/access_output/shout.c:79
+#, fuzzy
+msgid "URL description"
+msgstr "描述"
+
+#: modules/access_output/shout.c:80
+msgid "URL with information about the stream or your channel. "
+msgstr ""
+
+#: modules/access_output/shout.c:87
+msgid "Bitrate information of the transcoded stream. "
+msgstr ""
+
+#: modules/access_output/shout.c:90
+msgid "Samplerate information of the transcoded stream. "
+msgstr ""
+
+#: modules/access_output/shout.c:92
+#, fuzzy
+msgid "Number of channels"
+msgstr "输出频道数量"
+
+#: modules/access_output/shout.c:93
+msgid "Number of channels information of the transcoded stream. "
+msgstr ""
+
+#: modules/access_output/shout.c:95
+msgid "Ogg Vorbis Quality"
+msgstr ""
+
+#: modules/access_output/shout.c:96
+msgid "Ogg Vorbis Quality information of the transcoded stream. "
+msgstr ""
+
+#: modules/access_output/shout.c:98
+#, fuzzy
+msgid "Stream public"
+msgstr "串流输出"
+
+#: modules/access_output/shout.c:99
+msgid ""
+"Make the server publicly available on the 'Yellow Pages' (directory listing "
+"of streams) on the icecast/shoutcast website. Requires the bitrate "
+"information specified for shoutcast. Requires Ogg streaming for icecast."
 msgstr ""
 
-#: modules/access_output/shout.c:73
+#: modules/access_output/shout.c:105
 msgid "IceCAST output"
 msgstr "IceCAST 输出"
 
@@ -5822,7 +6286,7 @@ msgid ""
 msgstr "外界 UDP 串流的默认的缓存值。这个值是以毫秒为单位的。"
 
 #: modules/access_output/udp.c:80 modules/gui/macosx/wizard.m:442
-#: modules/gui/macosx/wizard.m:1847
+#: modules/gui/macosx/wizard.m:1848
 #: modules/gui/wxwidgets/dialogs/streamout.cpp:610
 #: modules/gui/wxwidgets/dialogs/wizard.cpp:1340 modules/stream_out/rtp.c:87
 msgid "Time-To-Live (TTL)"
@@ -5870,7 +6334,7 @@ msgstr ""
 msgid "Dolby Surround decoder"
 msgstr "杜比环绕解码器"
 
-#: modules/audio_filter/channel_mixer/headphone.c:49
+#: modules/audio_filter/channel_mixer/headphone.c:56
 msgid ""
 "This effect gives you the feeling that you are standing in a room with a "
 "complete 7.1 speaker set when using only a headphone, providing a more "
@@ -5879,40 +6343,41 @@ msgid ""
 "It works with any source format from mono to 7.1."
 msgstr ""
 
-#: modules/audio_filter/channel_mixer/headphone.c:56
+#: modules/audio_filter/channel_mixer/headphone.c:63
 msgid "Characteristic dimension"
 msgstr ""
 
-#: modules/audio_filter/channel_mixer/headphone.c:58
+#: modules/audio_filter/channel_mixer/headphone.c:65
 msgid "Distance between front left speaker and listener in meters."
 msgstr ""
 
-#: modules/audio_filter/channel_mixer/headphone.c:60
+#: modules/audio_filter/channel_mixer/headphone.c:67
 msgid "Compensate delay"
 msgstr ""
 
-#: modules/audio_filter/channel_mixer/headphone.c:62
+#: modules/audio_filter/channel_mixer/headphone.c:69
 msgid ""
 "The delay which is introduced by the physical algorithm may sometimes be "
 "disturbing for the synchronization between lips-movement and speech. In "
 "case, turn this on to compensate."
 msgstr ""
 
-#: modules/audio_filter/channel_mixer/headphone.c:66
+#: modules/audio_filter/channel_mixer/headphone.c:73
 msgid "No decoding of Dolby Surround"
 msgstr ""
 
-#: modules/audio_filter/channel_mixer/headphone.c:68
+#: modules/audio_filter/channel_mixer/headphone.c:75
 msgid ""
 "Dolby Surround encoded streams won't be decoded before being processed by "
 "this filter. Enabling this setting is not recommended."
 msgstr ""
 
-#: modules/audio_filter/channel_mixer/headphone.c:72
+#: modules/audio_filter/channel_mixer/headphone.c:79
+#: modules/audio_filter/channel_mixer/headphone.c:98
 msgid "Headphone virtual spatialization effect"
 msgstr "耳机虚拟空间化效果"
 
-#: modules/audio_filter/channel_mixer/headphone.c:73
+#: modules/audio_filter/channel_mixer/headphone.c:80
 msgid "Headphone effect"
 msgstr ""
 
@@ -5991,6 +6456,24 @@ msgstr ""
 msgid "Audio filter for float32->u8 conversion"
 msgstr ""
 
+#: modules/audio_filter/converter/mono.c:100
+#, fuzzy
+msgid "Left rear"
+msgstr "左"
+
+#: modules/audio_filter/converter/mono.c:100
+#, fuzzy
+msgid "Right rear"
+msgstr "右"
+
+#: modules/audio_filter/converter/mono.c:101
+msgid "Left front"
+msgstr ""
+
+#: modules/audio_filter/converter/mono.c:113
+msgid "Audio filter for stereo to mono conversion"
+msgstr ""
+
 #: modules/audio_filter/converter/mpgatofixed32.c:67
 #: modules/audio_filter/converter/mpgatofixed32.c:72
 msgid "MPEG audio decoder"
@@ -6253,47 +6736,72 @@ msgstr "虚拟S/PDIF音频混音器"
 msgid "Trivial audio mixer"
 msgstr ""
 
-#: modules/audio_output/alsa.c:84 modules/codec/x264.c:272
-#: modules/codec/x264.c:278 modules/codec/x264.c:285 modules/codec/x264.c:290
+#: modules/audio_output/alsa.c:85 modules/codec/x264.c:274
+#: modules/codec/x264.c:280 modules/codec/x264.c:287 modules/codec/x264.c:292
 msgid "default"
 msgstr "默认"
 
-#: modules/audio_output/alsa.c:104
+#: modules/audio_output/alsa.c:105
 msgid "ALSA audio output"
 msgstr "ALSA音频输出"
 
-#: modules/audio_output/alsa.c:108
+#: modules/audio_output/alsa.c:109
 msgid "ALSA Device Name"
 msgstr "ALSA装置名称"
 
-#: modules/audio_output/alsa.c:128 modules/audio_output/auhal.c:129
-#: modules/audio_output/auhal.c:966 modules/audio_output/directx.c:401
+#: modules/audio_output/alsa.c:129 modules/audio_output/auhal.c:130
+#: modules/audio_output/auhal.c:974 modules/audio_output/directx.c:401
 #: modules/audio_output/oss.c:132 modules/audio_output/portaudio.c:394
 #: modules/audio_output/sdl.c:177 modules/audio_output/sdl.c:195
-#: modules/audio_output/waveout.c:371 modules/gui/macosx/intf.m:557
-#: modules/gui/macosx/intf.m:558
+#: modules/audio_output/waveout.c:371 modules/gui/macosx/intf.m:563
+#: modules/gui/macosx/intf.m:564
 msgid "Audio Device"
 msgstr "音频装置"
 
-#: modules/audio_output/alsa.c:185 modules/audio_output/directx.c:478
+#: modules/audio_output/alsa.c:186 modules/audio_output/directx.c:478
 #: modules/audio_output/oss.c:225 modules/audio_output/portaudio.c:400
 #: modules/audio_output/sdl.c:183 modules/audio_output/sdl.c:202
 #: modules/audio_output/waveout.c:433
 msgid "Mono"
 msgstr ""
 
-#: modules/audio_output/alsa.c:198 modules/audio_output/directx.c:451
+#: modules/audio_output/alsa.c:199 modules/audio_output/directx.c:451
 #: modules/audio_output/oss.c:181 modules/audio_output/portaudio.c:419
 #: modules/audio_output/waveout.c:405
 msgid "2 Front 2 Rear"
 msgstr ""
 
-#: modules/audio_output/alsa.c:246 modules/audio_output/directx.c:524
+#: modules/audio_output/alsa.c:247 modules/audio_output/directx.c:524
 #: modules/audio_output/oss.c:249 modules/audio_output/waveout.c:449
 msgid "A/52 over S/PDIF"
 msgstr ""
 
-#: modules/audio_output/alsa.c:924
+#: modules/audio_output/alsa.c:326
+#, fuzzy
+msgid "No Audio Device"
+msgstr "音频装置"
+
+#: modules/audio_output/alsa.c:327
+msgid "No audio device name was given. You might want to enter \"default\"."
+msgstr ""
+
+#: modules/audio_output/alsa.c:434 modules/audio_output/alsa.c:473
+#: modules/audio_output/alsa.c:485 modules/audio_output/auhal.c:244
+#, fuzzy
+msgid "Audio output failed"
+msgstr "音频输出 pin"
+
+#: modules/audio_output/alsa.c:435 modules/audio_output/alsa.c:486
+#, c-format
+msgid "VLC could not open the ALSA device \"%s\" (%s)."
+msgstr ""
+
+#: modules/audio_output/alsa.c:474
+#, c-format
+msgid "The audio device \"%s\" is already in use."
+msgstr ""
+
+#: modules/audio_output/alsa.c:940
 msgid "Unknown soundcard"
 msgstr "未知的声卡"
 
@@ -6301,18 +6809,34 @@ msgstr "未知的声卡"
 msgid "aRts audio output"
 msgstr "aRts音频输出"
 
-#: modules/audio_output/auhal.c:130
+#: modules/audio_output/auhal.c:131
 msgid ""
 "Choose a number corresponding to the number of an audio device, as listed in "
 "your 'Audio Device' menu. This device will then be used by default for audio "
 "playback."
 msgstr ""
 
-#: modules/audio_output/auhal.c:136
+#: modules/audio_output/auhal.c:137
 msgid "HAL AudioUnit output"
 msgstr "HAL AudioUnit 输出"
 
-#: modules/audio_output/auhal.c:1011
+#: modules/audio_output/auhal.c:245
+msgid ""
+"The selected audio output device is exclusively in use by another program."
+msgstr ""
+
+#: modules/audio_output/auhal.c:429
+#, fuzzy
+msgid "Audio device is not configured"
+msgstr "音频装置名称"
+
+#: modules/audio_output/auhal.c:430
+msgid ""
+"You should configure your speaker layout with the \"Audio Midi Setup Utility"
+"\" in /Applications/Utilities. Stereo mode is being used now."
+msgstr ""
+
+#: modules/audio_output/auhal.c:1019
 #, c-format
 msgid "%s (Encoded Output)"
 msgstr ""
@@ -6564,7 +7088,7 @@ msgstr "DVB 字幕编码器"
 msgid "AAC audio decoder (using libfaad2)"
 msgstr "AAC 音频译码器(使用 libfaad2)"
 
-#: modules/codec/fake.c:45 modules/video_output/image.c:69
+#: modules/codec/fake.c:45 modules/video_output/image.c:79
 msgid "Image file"
 msgstr "图像文件"
 
@@ -6618,6 +7142,25 @@ msgstr "要使用的解除交错模块"
 msgid "Fake video decoder"
 msgstr "伪视频译码器"
 
+#: modules/codec/ffmpeg/encoder.c:228
+#, fuzzy, c-format
+msgid "\"%s\" is no video encoder."
+msgstr "Dirac 视频编码器"
+
+#: modules/codec/ffmpeg/encoder.c:236
+#, fuzzy, c-format
+msgid "\"%s\" is no audio encoder."
+msgstr "Vorbis音频编码器"
+
+#: modules/codec/ffmpeg/encoder.c:248
+#, c-format
+msgid "VLC could not find encoder \"%s\"."
+msgstr ""
+
+#: modules/codec/ffmpeg/encoder.c:619 modules/codec/ffmpeg/encoder.c:628
+msgid "VLC could not open the encoder."
+msgstr ""
+
 #: modules/codec/ffmpeg/ffmpeg.c:75
 msgid "Non-ref"
 msgstr ""
@@ -6676,27 +7219,32 @@ msgstr "ffmpeg 音频/视频编码器"
 msgid "FFmpeg demuxer"
 msgstr "ffmpeg 解多任务器"
 
-#: modules/codec/ffmpeg/ffmpeg.c:198
+#: modules/codec/ffmpeg/ffmpeg.c:196
+#, fuzzy
+msgid "FFmpeg muxer"
+msgstr "ffmpeg 解多任务器"
+
+#: modules/codec/ffmpeg/ffmpeg.c:204
 msgid "FFmpeg video filter"
 msgstr "ffmpeg 视频过滤器"
 
-#: modules/codec/ffmpeg/ffmpeg.c:204
+#: modules/codec/ffmpeg/ffmpeg.c:210
 msgid "FFmpeg crop padd filter"
 msgstr "ffmpeg 修整填补过滤器"
 
-#: modules/codec/ffmpeg/ffmpeg.c:210
+#: modules/codec/ffmpeg/ffmpeg.c:216
 msgid "FFmpeg deinterlace video filter"
 msgstr "ffmpeg 解除交错视频过滤器"
 
-#: modules/codec/ffmpeg/ffmpeg.h:87 modules/codec/ffmpeg/ffmpeg.h:89
+#: modules/codec/ffmpeg/ffmpeg.h:91 modules/codec/ffmpeg/ffmpeg.h:93
 msgid "Direct rendering"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:91
+#: modules/codec/ffmpeg/ffmpeg.h:95
 msgid "Error resilience"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:93
+#: modules/codec/ffmpeg/ffmpeg.h:97
 msgid ""
 "Ffmpeg can do error resilience.\n"
 "However, with a buggy encoder (such as the ISO MPEG-4 encoder from M$) this "
@@ -6704,11 +7252,11 @@ msgid ""
 "Valid values range from 0 to 4 (0 disables all errors resilience)."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:98
+#: modules/codec/ffmpeg/ffmpeg.h:102
 msgid "Workaround bugs"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:100
+#: modules/codec/ffmpeg/ffmpeg.h:104
 msgid ""
 "Try to fix some bugs:\n"
 "1  autodetect\n"
@@ -6722,41 +7270,41 @@ msgid ""
 "\", enter 40."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:111 modules/codec/ffmpeg/ffmpeg.h:244
-#: modules/stream_out/transcode.c:171
+#: modules/codec/ffmpeg/ffmpeg.h:115 modules/codec/ffmpeg/ffmpeg.h:248
+#: modules/stream_out/transcode.c:175
 msgid "Hurry up"
 msgstr "快速"
 
-#: modules/codec/ffmpeg/ffmpeg.h:113
+#: modules/codec/ffmpeg/ffmpeg.h:117
 msgid ""
 "The decoder can partially decode or skip frame(s) when there is not enough "
 "time. It's useful with low CPU power but it can produce distorted pictures."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:117
+#: modules/codec/ffmpeg/ffmpeg.h:121
 msgid "Post processing quality"
 msgstr "后处理质量"
 
-#: modules/codec/ffmpeg/ffmpeg.h:119
+#: modules/codec/ffmpeg/ffmpeg.h:123
 msgid ""
 "Quality of post processing. Valid range is 0 to 6\n"
 "Higher levels require considerable more CPU power, but produce better "
 "looking pictures."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:123
+#: modules/codec/ffmpeg/ffmpeg.h:127
 msgid "Debug mask"
 msgstr "调试掩码"
 
-#: modules/codec/ffmpeg/ffmpeg.h:124
+#: modules/codec/ffmpeg/ffmpeg.h:128
 msgid "Set ffmpeg debug mask"
 msgstr "设置 ffmpeg 调试掩码"
 
-#: modules/codec/ffmpeg/ffmpeg.h:127
+#: modules/codec/ffmpeg/ffmpeg.h:131
 msgid "Visualize motion vectors"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:129
+#: modules/codec/ffmpeg/ffmpeg.h:133
 msgid ""
 "You can overlay the motion vectors (arrows showing how the images move) on "
 "the image. This value is a mask, based on these values:\n"
@@ -6766,147 +7314,147 @@ msgid ""
 "To visualize all vectors, the value should be 7."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:136
+#: modules/codec/ffmpeg/ffmpeg.h:140
 msgid "Low resolution decoding"
 msgstr "低分辨率译码"
 
-#: modules/codec/ffmpeg/ffmpeg.h:137
+#: modules/codec/ffmpeg/ffmpeg.h:141
 msgid ""
 "Only decode a low resolution version of the video. This requires less "
 "processing power"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:140
+#: modules/codec/ffmpeg/ffmpeg.h:144
 msgid "Skip the loop filter for H.264 decoding"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:141
+#: modules/codec/ffmpeg/ffmpeg.h:145
 msgid ""
 "Skipping the loop filter (aka deblocking) usually has a detrimental effect "
 "on quality. However it provides a big speedup for high definition streams."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:145
+#: modules/codec/ffmpeg/ffmpeg.h:149
 msgid "FFmpeg post processing filter chains"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:187
+#: modules/codec/ffmpeg/ffmpeg.h:191
 msgid "Ratio of key frames"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:188
+#: modules/codec/ffmpeg/ffmpeg.h:192
 msgid "Number of frames that will be coded for one key frame."
 msgstr "将会被为一个关键帧编码的帧数。"
 
-#: modules/codec/ffmpeg/ffmpeg.h:191
+#: modules/codec/ffmpeg/ffmpeg.h:195
 msgid "Ratio of B frames"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:192
+#: modules/codec/ffmpeg/ffmpeg.h:196
 msgid "Number of B frames that will be coded between two reference frames."
 msgstr "在两个参考帧之间将会被编码的 B 帧数。"
 
-#: modules/codec/ffmpeg/ffmpeg.h:195
+#: modules/codec/ffmpeg/ffmpeg.h:199
 msgid "Video bitrate tolerance"
 msgstr "视频比特率容忍度"
 
-#: modules/codec/ffmpeg/ffmpeg.h:196
+#: modules/codec/ffmpeg/ffmpeg.h:200
 msgid "Video bitrate tolerance in kbit/s."
 msgstr "视频比特率容忍度, 以千比特每秒为单位。"
 
-#: modules/codec/ffmpeg/ffmpeg.h:198
+#: modules/codec/ffmpeg/ffmpeg.h:202
 msgid "Interlaced encoding"
 msgstr "交错编码"
 
-#: modules/codec/ffmpeg/ffmpeg.h:199
+#: modules/codec/ffmpeg/ffmpeg.h:203
 msgid "Enable dedicated algorithms for interlaced frames."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:202
+#: modules/codec/ffmpeg/ffmpeg.h:206
 msgid "Interlaced motion estimation"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:203
+#: modules/codec/ffmpeg/ffmpeg.h:207
 msgid "Enable interlaced motion estimation algorithms. This requires more CPU."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:206
+#: modules/codec/ffmpeg/ffmpeg.h:210
 msgid "Pre-motion estimation"
 msgstr "动作前估计"
 
-#: modules/codec/ffmpeg/ffmpeg.h:207
+#: modules/codec/ffmpeg/ffmpeg.h:211
 msgid "Enable the pre-motion estimation algorithm."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:210
+#: modules/codec/ffmpeg/ffmpeg.h:214
 msgid "Strict rate control"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:211
+#: modules/codec/ffmpeg/ffmpeg.h:215
 msgid "Enable the strict rate control algorithm."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:214
+#: modules/codec/ffmpeg/ffmpeg.h:218
 msgid "Rate control buffer size"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:215
+#: modules/codec/ffmpeg/ffmpeg.h:219
 msgid ""
 "Rate control buffer size (in kbytes). A bigger buffer will allow for better "
 "rate control, but will cause a delay in the stream."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:219
+#: modules/codec/ffmpeg/ffmpeg.h:223
 msgid "Rate control buffer aggressiveness"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:220
+#: modules/codec/ffmpeg/ffmpeg.h:224
 msgid "Rate control buffer aggressiveness."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:223
+#: modules/codec/ffmpeg/ffmpeg.h:227
 msgid "I quantization factor"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:225
+#: modules/codec/ffmpeg/ffmpeg.h:229
 msgid ""
 "Quantization factor of I frames, compared with P frames (for instance 1.0 => "
 "same qscale for I and P frames)."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:228 modules/codec/x264.c:250
+#: modules/codec/ffmpeg/ffmpeg.h:232 modules/codec/x264.c:247
 #: modules/demux/mod.c:73
 msgid "Noise reduction"
 msgstr "噪声消除"
 
-#: modules/codec/ffmpeg/ffmpeg.h:229
+#: modules/codec/ffmpeg/ffmpeg.h:233
 msgid ""
 "Enable a simple noise reduction algorithm to lower the encoding length and "
 "bitrate, at the expense of lower quality frames."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:233
+#: modules/codec/ffmpeg/ffmpeg.h:237
 msgid "MPEG4 quantization matrix"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:234
+#: modules/codec/ffmpeg/ffmpeg.h:238
 msgid ""
 "Use the MPEG4 quantization matrix for MPEG2 encoding. This generally yields "
 "a better looking picture, while still retaining the compatibility with "
 "standard MPEG2 decoders."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:239
+#: modules/codec/ffmpeg/ffmpeg.h:243
 msgid "Quality level"
 msgstr "质量等级"
 
-#: modules/codec/ffmpeg/ffmpeg.h:240
+#: modules/codec/ffmpeg/ffmpeg.h:244
 msgid ""
 "Quality level for the encoding of motions vectors (this can slow down the "
 "encoding very much)."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:245
+#: modules/codec/ffmpeg/ffmpeg.h:249
 msgid ""
 "The encoder can make on-the-fly quality tradeoffs if your CPU can't keep up "
 "with the encoding rate. It will disable trellis quantization, then the rate "
@@ -6914,107 +7462,107 @@ msgid ""
 "to ease the encoder's task."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:251
+#: modules/codec/ffmpeg/ffmpeg.h:255
 msgid "Minimum video quantizer scale"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:252
+#: modules/codec/ffmpeg/ffmpeg.h:256
 msgid "Minimum video quantizer scale."
 msgstr "最小视频量化规模"
 
-#: modules/codec/ffmpeg/ffmpeg.h:255
+#: modules/codec/ffmpeg/ffmpeg.h:259
 msgid "Maximum video quantizer scale"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:256
+#: modules/codec/ffmpeg/ffmpeg.h:260
 msgid "Maximum video quantizer scale."
 msgstr "最大视频量化规模"
 
-#: modules/codec/ffmpeg/ffmpeg.h:259
+#: modules/codec/ffmpeg/ffmpeg.h:263
 msgid "Trellis quantization"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:260
+#: modules/codec/ffmpeg/ffmpeg.h:264
 msgid "Enable trellis quantization (rate distortion for block coefficients)."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:263
+#: modules/codec/ffmpeg/ffmpeg.h:267
 msgid "Fixed quantizer scale"
 msgstr "固定量化器刻度"
 
-#: modules/codec/ffmpeg/ffmpeg.h:264
+#: modules/codec/ffmpeg/ffmpeg.h:268
 msgid ""
 "A fixed video quantizer scale for VBR encoding (accepted values: 0.01 to "
 "255.0)."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:267
+#: modules/codec/ffmpeg/ffmpeg.h:271
 msgid "Strict standard compliance"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:268
+#: modules/codec/ffmpeg/ffmpeg.h:272
 msgid ""
 "Force a strict standard compliance when encoding (accepted values: -1, 0, 1)."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:271
+#: modules/codec/ffmpeg/ffmpeg.h:275
 msgid "Luminance masking"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:272
+#: modules/codec/ffmpeg/ffmpeg.h:276
 msgid "Raise the quantizer for very bright macroblocks (default: 0.0)."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:275
+#: modules/codec/ffmpeg/ffmpeg.h:279
 msgid "Darkness masking"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:276
+#: modules/codec/ffmpeg/ffmpeg.h:280
 msgid "Raise the quantizer for very dark macroblocks (default: 0.0)."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:279
+#: modules/codec/ffmpeg/ffmpeg.h:283
 msgid "Motion masking"
 msgstr "动作遮掩"
 
-#: modules/codec/ffmpeg/ffmpeg.h:280
+#: modules/codec/ffmpeg/ffmpeg.h:284
 msgid ""
 "Raise the quantizer for macroblocks with a high temporal complexity "
 "(default: 0.0)."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:283
+#: modules/codec/ffmpeg/ffmpeg.h:287
 msgid "Border masking"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:284
+#: modules/codec/ffmpeg/ffmpeg.h:288
 msgid ""
 "Raise the quantizer for macroblocks at the border of the frame (default: "
 "0.0)."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:287
+#: modules/codec/ffmpeg/ffmpeg.h:291
 msgid "Luminance elimination"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:288
+#: modules/codec/ffmpeg/ffmpeg.h:292
 msgid ""
 "Eliminates luminance blocks when the PSNR isn't much changed (default: 0.0). "
 "The H264 specification recommends -4."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:292
+#: modules/codec/ffmpeg/ffmpeg.h:296
 msgid "Chrominance elimination"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:293
+#: modules/codec/ffmpeg/ffmpeg.h:297
 msgid ""
 "Eliminates chrominance blocks when the PSNR isn't much changed (default: "
 "0.0). The H264 specification recommends 7."
 msgstr ""
 
-#: modules/codec/ffmpeg/postprocess.c:88 modules/gui/macosx/intf.m:582
-#: modules/gui/macosx/intf.m:583
+#: modules/codec/ffmpeg/postprocess.c:88 modules/gui/macosx/intf.m:588
+#: modules/gui/macosx/intf.m:589
 msgid "Post processing"
 msgstr "后处理"
 
@@ -7300,15 +7848,15 @@ msgid ""
 "Sets minimum interval between IDR-frames. In H.264, I-frames do not "
 "necessarily bound a closed GOP because it is allowable for a P-frame to be "
 "predicted from more frames than just the one frame before it (also see "
-"frameref). Therefore, I-frames are not necessarily seekable. IDR-Frames "
-"restrict subsequent P-frames from referring to any frame prior to the IDR-"
-"Frame. \n"
+"reference frame option). Therefore, I-frames are not necessarily seekable. "
+"IDR-frames restrict subsequent P-frames from referring to any frame prior to "
+"the IDR-frame. \n"
 "If scenecuts appear within this interval, they are still encoded as I-"
 "frames, but do not start a new GOP."
 msgstr ""
 
 #: modules/codec/x264.c:59
-msgid "Extra I-Frames aggressivity"
+msgid "Extra I-frames aggressivity"
 msgstr ""
 
 #: modules/codec/x264.c:60
@@ -7317,9 +7865,9 @@ msgid ""
 "With small values of scenecut, the codec often has to force an I-frame when "
 "it would exceed keyint. Good values of scenecut may find a better location "
 "for the I-frame. Large values use more I-frames than necessary, thus wasting "
-"bits. -1 disables scene-cut detection, so I-frames are be inserted only "
-"every other keyint frames, which probably leads to ugly encoding artifacts. "
-"(1-100)."
+"bits. -1 disables scene-cut detection, so I-frames are inserted only every "
+"other keyint frames, which probably leads to ugly encoding artifacts. Range "
+"1 to 100."
 msgstr ""
 
 #: modules/codec/x264.c:70
@@ -7327,207 +7875,209 @@ msgid "B-frames between I and P"
 msgstr "I 帧和 P 帧之间的 B 帧的数目"
 
 #: modules/codec/x264.c:71
-msgid "Number of consecutive B-frames between I and P-frames. (1 to 16)"
+#, fuzzy
+msgid "Number of consecutive B-frames between I and P-frames. Range 1 to 16."
 msgstr "I 帧 和 P 帧 之间的连贯的 B 帧的数目 (1 到 16)。"
 
-#: modules/codec/x264.c:75
+#: modules/codec/x264.c:74
 msgid "Adaptive B-frame decision"
 msgstr ""
 
-#: modules/codec/x264.c:76
+#: modules/codec/x264.c:75
 msgid ""
 "Force the specified number of consecutive B-frames to be used, except "
-"possibly before an I-frame. "
+"possibly before an I-frame."
 msgstr ""
 
-#: modules/codec/x264.c:80
+#: modules/codec/x264.c:78
 msgid "B-frames usage"
 msgstr ""
 
-#: modules/codec/x264.c:81
+#: modules/codec/x264.c:79
 msgid ""
 "Bias the choice to use B-frames. Positive values cause more B-frames, "
-"negative values cause less B-frames. "
+"negative values cause less B-frames."
 msgstr ""
 
-#: modules/codec/x264.c:84
+#: modules/codec/x264.c:82
 msgid "Keep some B-frames as references"
 msgstr ""
 
-#: modules/codec/x264.c:85
+#: modules/codec/x264.c:83
 msgid ""
 "Allows B-frames to be used as references for predicting other frames. Keeps "
 "the middle of 2+ consecutive B-frames as a reference, and reorders frame "
 "appropriately."
 msgstr ""
 
-#: modules/codec/x264.c:89
+#: modules/codec/x264.c:87
 msgid "CABAC"
 msgstr ""
 
-#: modules/codec/x264.c:90
+#: modules/codec/x264.c:88
 msgid ""
 "CABAC (Context-Adaptive Binary Arithmetic Coding). Slightly slows down "
-"encoding and decoding, but should save 10-15% bitrate."
+"encoding and decoding, but should save 10 to 15% bitrate."
 msgstr ""
 
-#: modules/codec/x264.c:94
+#: modules/codec/x264.c:92
 msgid "Number of reference frames"
 msgstr "参考帧的数目"
 
-#: modules/codec/x264.c:95
+#: modules/codec/x264.c:93
 msgid ""
 "Number of previous frames used as predictors. This is effective in Anime, "
 "but seems to make little difference in live-action source material. Some "
-"decoders are unable to deal with large frameref values. From 1 to 16"
+"decoders are unable to deal with large frameref values. Range 1 to 16."
 msgstr ""
 
-#: modules/codec/x264.c:100
+#: modules/codec/x264.c:98
 msgid "Skip loop filter"
 msgstr "跳过循环过滤器"
 
-#: modules/codec/x264.c:101
+#: modules/codec/x264.c:99
 msgid "Deactivate the deblocking loop filter (decreases quality)."
 msgstr ""
 
-#: modules/codec/x264.c:103
+#: modules/codec/x264.c:101
 msgid "Loop filter AlphaC0 and Beta parameters alpha:beta"
 msgstr ""
 
-#: modules/codec/x264.c:104
+#: modules/codec/x264.c:102
 msgid ""
 "Loop filter AlphaC0 and Beta parameters. Range -6 to 6 for both alpha and "
 "beta parameters. -6 means light filter, 6 means strong."
 msgstr ""
 
-#: modules/codec/x264.c:110
+#: modules/codec/x264.c:108
 msgid "Set QP"
 msgstr ""
 
-#: modules/codec/x264.c:111
+#: modules/codec/x264.c:109
 msgid ""
 "This selects the quantizer to use. Lower values result in better fidelity, "
-"but higher bitrates. 26 is a good default value. From 0 to 51. 0 means "
-"lossless"
+"but higher bitrates. 26 is a good default value. Range 0 (lossless) to 51."
 msgstr ""
 
-#: modules/codec/x264.c:116
+#: modules/codec/x264.c:113
 msgid "Quality-based VBR"
 msgstr ""
 
-#: modules/codec/x264.c:117
-msgid "1-pass Quality-based VBR. From 0 to 51"
+#: modules/codec/x264.c:114
+msgid "1-pass Quality-based VBR. Range 0 to 51."
 msgstr ""
 
-#: modules/codec/x264.c:119
+#: modules/codec/x264.c:116
 msgid "Min QP"
 msgstr ""
 
-#: modules/codec/x264.c:120
-msgid "Minimum quantizer, 15/35 seems to be a useful range."
+#: modules/codec/x264.c:117
+msgid "Minimum quantizer parameter. 15 to 35 seems to be a useful range."
 msgstr ""
 
-#: modules/codec/x264.c:124
+#: modules/codec/x264.c:120
 msgid "Max QP"
 msgstr ""
 
-#: modules/codec/x264.c:125
+#: modules/codec/x264.c:121
 msgid "Maximum quantizer parameter."
 msgstr ""
 
-#: modules/codec/x264.c:127
+#: modules/codec/x264.c:123
 msgid "Max QP step"
 msgstr ""
 
-#: modules/codec/x264.c:128
+#: modules/codec/x264.c:124
 msgid "Max QP step between frames."
 msgstr ""
 
-#: modules/codec/x264.c:130
+#: modules/codec/x264.c:126
 msgid "Average bitrate tolerance"
 msgstr "平均比特率容忍度"
 
-#: modules/codec/x264.c:131
-msgid "Allowed variance in average. bitrate (in kbits/s)."
+#: modules/codec/x264.c:127
+msgid "Allowed variance in average bitrate (in kbits/s)."
 msgstr ""
 
-#: modules/codec/x264.c:134
+#: modules/codec/x264.c:130
 msgid "Max local bitrate"
 msgstr "最大本地位率"
 
-#: modules/codec/x264.c:135
-msgid "Sets a maximum local bitrate in kbits/s."
+#: modules/codec/x264.c:131
+msgid "Sets a maximum local bitrate (in kbits/s)."
 msgstr ""
 
-#: modules/codec/x264.c:137
+#: modules/codec/x264.c:133
 msgid "VBV buffer"
 msgstr ""
 
-#: modules/codec/x264.c:138
-msgid "Averaging period for the maximum local bitrate in kbits."
+#: modules/codec/x264.c:134
+msgid "Averaging period for the maximum local bitrate (in kbits)."
 msgstr ""
 
-#: modules/codec/x264.c:141
+#: modules/codec/x264.c:137
 msgid "Initial VBV buffer occupancy"
 msgstr "初始 VBV 缓冲占有量"
 
-#: modules/codec/x264.c:142
-msgid "Sets the initial buffer occupancy as a fraction of the buffer size."
+#: modules/codec/x264.c:138
+msgid ""
+"Sets the initial buffer occupancy as a fraction of the buffer size. Range "
+"0.0 to 1.0."
 msgstr ""
 
-#: modules/codec/x264.c:145
+#: modules/codec/x264.c:142
 msgid "QP factor between I and P"
 msgstr ""
 
-#: modules/codec/x264.c:146
-msgid "QP factor between I and P."
+#: modules/codec/x264.c:143
+msgid "QP factor between I and P. Range 1.0 to 2.0."
 msgstr ""
 
-#: modules/codec/x264.c:148
+#: modules/codec/x264.c:146
 msgid "QP factor between P and B"
 msgstr ""
 
-#: modules/codec/x264.c:149
-msgid "QP factor between P and B."
+#: modules/codec/x264.c:147
+msgid "QP factor between P and B. Range 1.0 to 2.0."
 msgstr ""
 
-#: modules/codec/x264.c:151
+#: modules/codec/x264.c:149
 msgid "QP difference between chroma and luma"
 msgstr ""
 
-#: modules/codec/x264.c:152
+#: modules/codec/x264.c:150
 msgid "QP difference between chroma and luma."
 msgstr ""
 
-#: modules/codec/x264.c:154
+#: modules/codec/x264.c:152
 msgid "QP curve compression"
 msgstr ""
 
-#: modules/codec/x264.c:155
-msgid "QP curve compression. (0.0=CBR to 1.0=QCP)"
+#: modules/codec/x264.c:153
+msgid "QP curve compression. Range 0.0 (CBR) to 1.0 (QCP)."
 msgstr ""
 
-#: modules/codec/x264.c:157 modules/codec/x264.c:161
+#: modules/codec/x264.c:155 modules/codec/x264.c:159
 msgid "Reduce fluctuations in QP"
 msgstr ""
 
-#: modules/codec/x264.c:158
+#: modules/codec/x264.c:156
 msgid ""
 "This reduces the fluctuations in QP before curve compression. Temporally "
 "blurs complexity."
 msgstr ""
 
-#: modules/codec/x264.c:162
+#: modules/codec/x264.c:160
 msgid ""
 "This reduces the fluctations in QP after curve compression. Temporally blurs "
 "quants."
 msgstr ""
 
-#: modules/codec/x264.c:167
+#: modules/codec/x264.c:165
 msgid "Partitions to consider"
 msgstr ""
 
-#: modules/codec/x264.c:168
+#: modules/codec/x264.c:166
 msgid ""
 "Partitions to consider in analyse mode: \n"
 " - none  : \n"
@@ -7538,27 +8088,28 @@ msgid ""
 "(p4x4 requires p8x8. i8x8 requires 8x8dct)."
 msgstr ""
 
-#: modules/codec/x264.c:177
+#: modules/codec/x264.c:174
 msgid "Direct MV prediction mode"
 msgstr "直接 MV 预测模式"
 
-#: modules/codec/x264.c:178
-msgid "Direct MV prediction mode. "
+#: modules/codec/x264.c:175
+#, fuzzy
+msgid "Direct MV prediction mode."
 msgstr "直接 MV 预测模式。"
 
-#: modules/codec/x264.c:180
+#: modules/codec/x264.c:177
 msgid "Weighted prediction for B-frames"
 msgstr ""
 
-#: modules/codec/x264.c:181
+#: modules/codec/x264.c:178
 msgid "Weighted prediction for B-frames."
 msgstr ""
 
-#: modules/codec/x264.c:183
+#: modules/codec/x264.c:180
 msgid "Integer pixel motion estimation method"
 msgstr ""
 
-#: modules/codec/x264.c:184
+#: modules/codec/x264.c:181
 msgid ""
 "Selects the motion estimation algorithm:  - dia: diamond search, radius 1 "
 "(fast)\n"
@@ -7567,89 +8118,89 @@ msgid ""
 " - esa: exhaustive search (extremely slow, primarily for testing)\n"
 msgstr ""
 
-#: modules/codec/x264.c:190
+#: modules/codec/x264.c:187
 msgid "Maximum motion vector search range"
 msgstr ""
 
-#: modules/codec/x264.c:191
+#: modules/codec/x264.c:188
 msgid ""
 "Maximum distance to search for motion estimation, measured from predicted "
 "position(s). Default of 16 is good for most footage, high motion sequences "
-"may benefit from settings between 24-32. From 0 to 64."
+"may benefit from settings between 24 and 32. Range 0 to 64."
 msgstr ""
 
-#: modules/codec/x264.c:197
+#: modules/codec/x264.c:193
 msgid "Subpixel motion estimation and partition decision quality"
 msgstr ""
 
-#: modules/codec/x264.c:201
+#: modules/codec/x264.c:197
 msgid ""
 "This parameter controls quality versus speed tradeoffs involved in the "
 "motion estimation decision process (lower = quicker and higher = better "
 "quality). Range 1 to 7."
 msgstr ""
 
-#: modules/codec/x264.c:206
+#: modules/codec/x264.c:202
 msgid ""
 "This parameter controls quality versus speed tradeoffs involved in the "
 "motion estimation decision process (lower = quicker and higher = better "
 "quality). Range 1 to 6."
 msgstr ""
 
-#: modules/codec/x264.c:211
+#: modules/codec/x264.c:207
 msgid ""
 "This parameter controls quality versus speed tradeoffs involved in the "
 "motion estimation decision process (lower = quicker and higher = better "
 "quality). Range 1 to 5."
 msgstr ""
 
-#: modules/codec/x264.c:216
-msgid "RD based mode decision for B-frames."
+#: modules/codec/x264.c:212
+msgid "RD based mode decision for B-frames"
 msgstr ""
 
-#: modules/codec/x264.c:217
-msgid "RD based mode decision for B-frames. This requires subme 6."
+#: modules/codec/x264.c:213
+msgid "RD based mode decision for B-frames. This requires subme 6 (or higher)."
 msgstr ""
 
-#: modules/codec/x264.c:220
+#: modules/codec/x264.c:216
 msgid "Decide references on a per partition basis"
 msgstr ""
 
-#: modules/codec/x264.c:221
+#: modules/codec/x264.c:217
 msgid ""
 "Allows each 8x8 or 16x8 partition to independently select a reference frame, "
 "as opposed to only one ref per macroblock."
 msgstr ""
 
-#: modules/codec/x264.c:225
+#: modules/codec/x264.c:221
 msgid "Ignore chroma in motion estimation"
 msgstr ""
 
-#: modules/codec/x264.c:226
+#: modules/codec/x264.c:222
 msgid "Chroma ME for subpel and mode decision in P-frames."
 msgstr ""
 
-#: modules/codec/x264.c:229
+#: modules/codec/x264.c:225
 msgid "Jointly optimize both MVs in B-frames"
 msgstr ""
 
-#: modules/codec/x264.c:230
+#: modules/codec/x264.c:226
 msgid "Joint bidirectional motion refinement."
 msgstr ""
 
-#: modules/codec/x264.c:232
+#: modules/codec/x264.c:228
 msgid "Adaptive spatial transform size"
 msgstr ""
 
-#: modules/codec/x264.c:234
+#: modules/codec/x264.c:230
 msgid "SATD-based decision for 8x8 transform in inter-MBs."
 msgstr ""
 
-#: modules/codec/x264.c:236
+#: modules/codec/x264.c:232
 msgid "Trellis RD quantization"
 msgstr ""
 
-#: modules/codec/x264.c:237
+#: modules/codec/x264.c:233
 msgid ""
 "Trellis RD quantization: \n"
 " - 0: disabled\n"
@@ -7658,111 +8209,124 @@ msgid ""
 "This requires CABAC."
 msgstr ""
 
-#: modules/codec/x264.c:243
+#: modules/codec/x264.c:239
 msgid "Early SKIP detection on P-frames"
 msgstr ""
 
-#: modules/codec/x264.c:244
+#: modules/codec/x264.c:240
 msgid "Early SKIP detection on P-frames."
 msgstr ""
 
-#: modules/codec/x264.c:246
+#: modules/codec/x264.c:242
 msgid "Coefficient thresholding on P-frames"
 msgstr ""
 
-#: modules/codec/x264.c:247
+#: modules/codec/x264.c:243
 msgid ""
 "Coefficient thresholding on P-frames.Eliminate dct blocks containing only a "
 "small single coefficient."
 msgstr ""
 
-#: modules/codec/x264.c:251
-msgid "Dct-domain noise reduction. Adaptive pseudo-deadzone."
+#: modules/codec/x264.c:248
+msgid ""
+"Dct-domain noise reduction. Adaptive pseudo-deadzone. 10 to 1000 seems to be "
+"a useful range."
 msgstr ""
 
-#: modules/codec/x264.c:255
+#: modules/codec/x264.c:253
 msgid "CPU optimizations"
 msgstr ""
 
-#: modules/codec/x264.c:256
+#: modules/codec/x264.c:254
 msgid "Use assembler CPU optimizations."
 msgstr ""
 
-#: modules/codec/x264.c:258
-msgid "PSNR calculation"
+#: modules/codec/x264.c:256
+msgid "PSNR computation"
+msgstr ""
+
+#: modules/codec/x264.c:257
+msgid ""
+"Compute and print PSNR stats. This has no effect on the actual encoding "
+"quality."
 msgstr ""
 
-#: modules/codec/x264.c:259
+#: modules/codec/x264.c:260
+#, fuzzy
+msgid "SSIM computation"
+msgstr "SMB 域"
+
+#: modules/codec/x264.c:261
 msgid ""
-"This has no effect on actual encoding quality, it just prevents the stats "
-"from being calculated (for speed)."
+"Compute and print SSIM stats. This has no effect on the actual encoding "
+"quality."
 msgstr ""
 
-#: modules/codec/x264.c:262
+#: modules/codec/x264.c:264
 #, fuzzy
 msgid "Quiet mode"
 msgstr "静音模式"
 
-#: modules/codec/x264.c:263
+#: modules/codec/x264.c:265
 #, fuzzy
 msgid "Quiet mode."
 msgstr "静音模式"
 
-#: modules/codec/x264.c:265 modules/gui/macosx/playlistinfo.m:64
+#: modules/codec/x264.c:267 modules/gui/macosx/playlistinfo.m:64
 #: modules/gui/wxwidgets/dialogs/fileinfo.cpp:85
 msgid "Statistics"
 msgstr ""
 
-#: modules/codec/x264.c:266
+#: modules/codec/x264.c:268
 msgid "Print stats for each frame."
 msgstr ""
 
-#: modules/codec/x264.c:272
+#: modules/codec/x264.c:274
 msgid "dia"
 msgstr ""
 
-#: modules/codec/x264.c:272
+#: modules/codec/x264.c:274
 msgid "hex"
 msgstr ""
 
-#: modules/codec/x264.c:272
+#: modules/codec/x264.c:274
 msgid "umh"
 msgstr ""
 
-#: modules/codec/x264.c:272
+#: modules/codec/x264.c:274
 msgid "esa"
 msgstr ""
 
-#: modules/codec/x264.c:278
+#: modules/codec/x264.c:280
 msgid "fast"
 msgstr "快速"
 
-#: modules/codec/x264.c:278
+#: modules/codec/x264.c:280
 msgid "normal"
 msgstr "正常"
 
-#: modules/codec/x264.c:279
+#: modules/codec/x264.c:281
 msgid "slow"
 msgstr "慢速"
 
-#: modules/codec/x264.c:279
+#: modules/codec/x264.c:281
 msgid "all"
 msgstr "全部"
 
-#: modules/codec/x264.c:285 modules/codec/x264.c:290
+#: modules/codec/x264.c:287 modules/codec/x264.c:292
 msgid "spatial"
 msgstr ""
 
-#: modules/codec/x264.c:285 modules/codec/x264.c:290
+#: modules/codec/x264.c:287 modules/codec/x264.c:292
 msgid "temporal"
 msgstr ""
 
-#: modules/codec/x264.c:285 modules/gui/pda/pda_interface.c:743
+#: modules/codec/x264.c:287 modules/gui/pda/pda_interface.c:743
 #: modules/video_filter/mosaic.c:168
 msgid "auto"
 msgstr "自动"
 
-#: modules/codec/x264.c:294
+#: modules/codec/x264.c:296
 msgid "H.264/MPEG4 AVC encoder (using x264 library)"
 msgstr ""
 
@@ -7824,36 +8388,36 @@ msgstr "热键"
 msgid "Hotkeys management interface"
 msgstr "热键管理接口"
 
-#: modules/control/hotkeys.c:471
+#: modules/control/hotkeys.c:475
 #, c-format
 msgid "Audio track: %s"
 msgstr "音轨: %s"
 
-#: modules/control/hotkeys.c:486 modules/control/hotkeys.c:515
+#: modules/control/hotkeys.c:490 modules/control/hotkeys.c:519
 #, c-format
 msgid "Subtitle track: %s"
 msgstr "字幕轨: %s"
 
-#: modules/control/hotkeys.c:486
+#: modules/control/hotkeys.c:490
 msgid "N/A"
 msgstr ""
 
-#: modules/control/hotkeys.c:539
+#: modules/control/hotkeys.c:543
 #, c-format
 msgid "Aspect ratio: %s"
 msgstr "纵横比: %s"
 
-#: modules/control/hotkeys.c:565
+#: modules/control/hotkeys.c:569
 #, c-format
 msgid "Crop: %s"
 msgstr "修整: %s"
 
-#: modules/control/hotkeys.c:591
+#: modules/control/hotkeys.c:595
 #, c-format
 msgid "Deinterlace mode: %s"
 msgstr "解除交错模块: %s"
 
-#: modules/control/hotkeys.c:621
+#: modules/control/hotkeys.c:625
 #, fuzzy, c-format
 msgid "Zoom mode: %s"
 msgstr "缩放视频"
@@ -7919,6 +8483,16 @@ msgstr ""
 msgid "Infrared remote control interface"
 msgstr "红外线遥控接口"
 
+#: modules/control/motion.c:62
+#, fuzzy
+msgid "motion"
+msgstr "位置"
+
+#: modules/control/motion.c:64
+#, fuzzy
+msgid "motion control interface"
+msgstr "摇控界面"
+
 #: modules/control/netsync.c:60
 msgid "Act as master"
 msgstr ""
@@ -7989,382 +8563,398 @@ msgstr "NT 服务"
 msgid "Windows Service interface"
 msgstr "Windows服务接口"
 
-#: modules/control/rc.c:154
+#: modules/control/rc.c:156
 msgid "Show stream position"
 msgstr "显示串流位置"
 
-#: modules/control/rc.c:155
+#: modules/control/rc.c:157
 msgid ""
 "Show the current position in seconds within the stream from time to time."
 msgstr ""
 
-#: modules/control/rc.c:158
+#: modules/control/rc.c:160
 msgid "Fake TTY"
 msgstr ""
 
-#: modules/control/rc.c:159
+#: modules/control/rc.c:161
 msgid "Force the rc module to use stdin as if it was a TTY."
 msgstr ""
 
-#: modules/control/rc.c:161
+#: modules/control/rc.c:163
 msgid "UNIX socket command input"
 msgstr "Unix socket指令输入"
 
-#: modules/control/rc.c:162
+#: modules/control/rc.c:164
 msgid "Accept commands over a Unix socket rather than stdin."
 msgstr ""
 
-#: modules/control/rc.c:165
+#: modules/control/rc.c:167
 msgid "TCP command input"
 msgstr "TCP指令输入"
 
-#: modules/control/rc.c:166
+#: modules/control/rc.c:168
 msgid ""
 "Accept commands over a socket rather than stdin. You can set the address and "
 "port the interface will bind to."
 msgstr ""
 
-#: modules/control/rc.c:170 modules/misc/dummy/dummy.c:49
+#: modules/control/rc.c:172 modules/misc/dummy/dummy.c:49
 msgid "Do not open a DOS command box interface"
 msgstr "不要开启DOS指令窗口接口"
 
-#: modules/control/rc.c:172
+#: modules/control/rc.c:174
 msgid ""
 "By default the rc interface plugin will start a DOS command box. Enabling "
 "the quiet mode will not bring this command box but can also be pretty "
 "annoying when you want to stop VLC and no video window is open."
 msgstr ""
 
-#: modules/control/rc.c:179
+#: modules/control/rc.c:181
 msgid "RC"
 msgstr ""
 
-#: modules/control/rc.c:182
+#: modules/control/rc.c:184
 msgid "Remote control interface"
 msgstr "摇控界面"
 
-#: modules/control/rc.c:323
+#: modules/control/rc.c:325
 msgid "Remote control interface initialized. Type `help' for help."
 msgstr "遥控界面已初始化，打 'help' 显示帮助信息"
 
-#: modules/control/rc.c:837
+#: modules/control/rc.c:850
 #, c-format
 msgid "Unknown command `%s'. Type `help' for help."
 msgstr "未知命令 `%s', 键入 `help' 获得帮助"
 
-#: modules/control/rc.c:870
+#: modules/control/rc.c:883
 msgid "+----[ Remote control commands ]"
 msgstr ""
 
-#: modules/control/rc.c:872
+#: modules/control/rc.c:885
 msgid "| add XYZ  . . . . . . . . . . add XYZ to playlist"
 msgstr ""
 
-#: modules/control/rc.c:873
+#: modules/control/rc.c:886
+msgid "| enqueue XYZ  . . . . . . . queue XYZ to playlist"
+msgstr ""
+
+#: modules/control/rc.c:887
 msgid "| playlist . . .  show items currently in playlist"
 msgstr ""
 
-#: modules/control/rc.c:874
+#: modules/control/rc.c:888
 msgid "| play . . . . . . . . . . . . . . . . play stream"
 msgstr ""
 
-#: modules/control/rc.c:875
+#: modules/control/rc.c:889
 msgid "| stop . . . . . . . . . . . . . . . . stop stream"
 msgstr ""
 
-#: modules/control/rc.c:876
+#: modules/control/rc.c:890
 msgid "| next . . . . . . . . . . . .  next playlist item"
 msgstr ""
 
-#: modules/control/rc.c:877
+#: modules/control/rc.c:891
 msgid "| prev . . . . . . . . . .  previous playlist item"
 msgstr ""
 
-#: modules/control/rc.c:878
+#: modules/control/rc.c:892
 msgid "| goto . . . . . . . . . . . .  goto item at index"
 msgstr ""
 
-#: modules/control/rc.c:879
+#: modules/control/rc.c:893
 msgid "| clear . . . . . . . . . . .   clear the playlist"
 msgstr ""
 
-#: modules/control/rc.c:880
+#: modules/control/rc.c:894
 msgid "| status . . . . . . . . . current playlist status"
 msgstr ""
 
-#: modules/control/rc.c:881
+#: modules/control/rc.c:895
 msgid "| title [X]  . . . . set/get title in current item"
 msgstr ""
 
-#: modules/control/rc.c:882
+#: modules/control/rc.c:896
 msgid "| title_n  . . . . . .  next title in current item"
 msgstr ""
 
-#: modules/control/rc.c:883
+#: modules/control/rc.c:897
 msgid "| title_p  . . . .  previous title in current item"
 msgstr ""
 
-#: modules/control/rc.c:884
+#: modules/control/rc.c:898
 msgid "| chapter [X]  . . set/get chapter in current item"
 msgstr ""
 
-#: modules/control/rc.c:885
+#: modules/control/rc.c:899
 msgid "| chapter_n  . . . .  next chapter in current item"
 msgstr ""
 
-#: modules/control/rc.c:886
+#: modules/control/rc.c:900
 msgid "| chapter_p  . .  previous chapter in current item"
 msgstr ""
 
-#: modules/control/rc.c:888
+#: modules/control/rc.c:902
 msgid "| seek X . seek in seconds, for instance `seek 12'"
 msgstr ""
 
-#: modules/control/rc.c:889
+#: modules/control/rc.c:903
 msgid "| pause  . . . . . . . . . . . . . .  toggle pause"
 msgstr ""
 
-#: modules/control/rc.c:890
+#: modules/control/rc.c:904
 msgid "| fastforward  . . . . . .  .  set to maximum rate"
 msgstr ""
 
-#: modules/control/rc.c:891
+#: modules/control/rc.c:905
 msgid "| rewind  . . . . . . . . . .  set to minimum rate"
 msgstr ""
 
-#: modules/control/rc.c:892
+#: modules/control/rc.c:906
 msgid "| faster . . . . . . . .  faster playing of stream"
 msgstr ""
 
-#: modules/control/rc.c:893
+#: modules/control/rc.c:907
 msgid "| slower . . . . . . . .  slower playing of stream"
 msgstr ""
 
-#: modules/control/rc.c:894
+#: modules/control/rc.c:908
 msgid "| normal . . . . . . . .  normal playing of stream"
 msgstr ""
 
-#: modules/control/rc.c:895
+#: modules/control/rc.c:909
 msgid "| f [on|off] . . . . . . . . . . toggle fullscreen"
 msgstr ""
 
-#: modules/control/rc.c:896
+#: modules/control/rc.c:910
 msgid "| info . . .  information about the current stream"
 msgstr ""
 
-#: modules/control/rc.c:897
+#: modules/control/rc.c:911
 msgid "| get_time . . seconds elapsed since stream's beginning"
 msgstr ""
 
-#: modules/control/rc.c:898
+#: modules/control/rc.c:912
 msgid "| is_playing . .  1 if a stream plays, 0 otherwise"
 msgstr ""
 
-#: modules/control/rc.c:899
+#: modules/control/rc.c:913
 msgid "| get_title . . .  the title of the current stream"
 msgstr ""
 
-#: modules/control/rc.c:900
+#: modules/control/rc.c:914
 msgid "| get_length . .  the length of the current stream"
 msgstr ""
 
-#: modules/control/rc.c:902
+#: modules/control/rc.c:916
 msgid "| volume [X] . . . . . . . .  set/get audio volume"
 msgstr ""
 
-#: modules/control/rc.c:903
+#: modules/control/rc.c:917
 msgid "| volup [X]  . . . . .  raise audio volume X steps"
 msgstr ""
 
-#: modules/control/rc.c:904
+#: modules/control/rc.c:918
 msgid "| voldown [X]  . . . .  lower audio volume X steps"
 msgstr ""
 
-#: modules/control/rc.c:905
+#: modules/control/rc.c:919
 msgid "| adev [X] . . . . . . . . .  set/get audio device"
 msgstr ""
 
-#: modules/control/rc.c:906
+#: modules/control/rc.c:920
 msgid "| achan [X]. . . . . . . .  set/get audio channels"
 msgstr ""
 
-#: modules/control/rc.c:907
+#: modules/control/rc.c:921
+msgid "| atrack [X] . . . . . . . . . set/get audio track"
+msgstr ""
+
+#: modules/control/rc.c:922
+msgid "| vtrack [X] . . . . . . . . . set/get video track"
+msgstr ""
+
+#: modules/control/rc.c:923
+msgid "| strack [X] . . . . . . . set/get subtitles track"
+msgstr ""
+
+#: modules/control/rc.c:924
 msgid "| menu [on|off|up|down|left|right|select] use menu"
 msgstr ""
 
-#: modules/control/rc.c:912
+#: modules/control/rc.c:929
 msgid "| marq-marquee STRING  . . overlay STRING in video"
 msgstr ""
 
-#: modules/control/rc.c:913
+#: modules/control/rc.c:930
 msgid "| marq-x X . . . . . . . . . . . .offset from left"
 msgstr ""
 
-#: modules/control/rc.c:914
+#: modules/control/rc.c:931
 msgid "| marq-y Y . . . . . . . . . . . . offset from top"
 msgstr ""
 
-#: modules/control/rc.c:915
+#: modules/control/rc.c:932
 msgid "| marq-position #. . .  .relative position control"
 msgstr ""
 
-#: modules/control/rc.c:916
+#: modules/control/rc.c:933
 msgid "| marq-color # . . . . . . . . . . font color, RGB"
 msgstr ""
 
-#: modules/control/rc.c:917
+#: modules/control/rc.c:934
 msgid "| marq-opacity # . . . . . . . . . . . . . opacity"
 msgstr ""
 
-#: modules/control/rc.c:918
+#: modules/control/rc.c:935
 msgid "| marq-timeout T. . . . . . . . . . timeout, in ms"
 msgstr ""
 
-#: modules/control/rc.c:919
+#: modules/control/rc.c:936
 msgid "| marq-size # . . . . . . . . font size, in pixels"
 msgstr ""
 
-#: modules/control/rc.c:921
+#: modules/control/rc.c:938
 msgid "| time-format STRING . . . overlay STRING in video"
 msgstr ""
 
-#: modules/control/rc.c:922
+#: modules/control/rc.c:939
 msgid "| time-x X . . . . . . . . . . . .offset from left"
 msgstr ""
 
-#: modules/control/rc.c:923
+#: modules/control/rc.c:940
 msgid "| time-y Y . . . . . . . . . . . . offset from top"
 msgstr ""
 
-#: modules/control/rc.c:924
+#: modules/control/rc.c:941
 msgid "| time-position #. . . . . . . . relative position"
 msgstr ""
 
-#: modules/control/rc.c:925
+#: modules/control/rc.c:942
 msgid "| time-color # . . . . . . . . . . font color, RGB"
 msgstr ""
 
-#: modules/control/rc.c:926
+#: modules/control/rc.c:943
 msgid "| time-opacity # . . . . . . . . . . . . . opacity"
 msgstr ""
 
-#: modules/control/rc.c:927
+#: modules/control/rc.c:944
 msgid "| time-size # . . . . . . . . font size, in pixels"
 msgstr ""
 
-#: modules/control/rc.c:929
+#: modules/control/rc.c:946
 msgid "| logo-file STRING . . .the overlay file path/name"
 msgstr ""
 
-#: modules/control/rc.c:930
+#: modules/control/rc.c:947
 msgid "| logo-x X . . . . . . . . . . . .offset from left"
 msgstr ""
 
-#: modules/control/rc.c:931
+#: modules/control/rc.c:948
 msgid "| logo-y Y . . . . . . . . . . . . offset from top"
 msgstr ""
 
-#: modules/control/rc.c:932
+#: modules/control/rc.c:949
 msgid "| logo-position #. . . . . . . . relative position"
 msgstr ""
 
-#: modules/control/rc.c:933
+#: modules/control/rc.c:950
 msgid "| logo-transparency #. . . . . . . . .transparency"
 msgstr ""
 
-#: modules/control/rc.c:935
+#: modules/control/rc.c:952
 msgid "| mosaic-alpha # . . . . . . . . . . . . . . alpha"
 msgstr ""
 
-#: modules/control/rc.c:936
+#: modules/control/rc.c:953
 msgid "| mosaic-height #. . . . . . . . . . . . . .height"
 msgstr ""
 
-#: modules/control/rc.c:937
+#: modules/control/rc.c:954
 msgid "| mosaic-width # . . . . . . . . . . . . . . width"
 msgstr ""
 
-#: modules/control/rc.c:938
+#: modules/control/rc.c:955
 msgid "| mosaic-xoffset # . . . .top left corner position"
 msgstr ""
 
-#: modules/control/rc.c:939
+#: modules/control/rc.c:956
 msgid "| mosaic-yoffset # . . . .top left corner position"
 msgstr ""
 
-#: modules/control/rc.c:940
+#: modules/control/rc.c:957
 msgid "| mosaic-align 0..2,4..6,8..10. . .mosaic alignment"
 msgstr ""
 
-#: modules/control/rc.c:941
+#: modules/control/rc.c:958
 msgid "| mosaic-vborder # . . . . . . . . vertical border"
 msgstr ""
 
-#: modules/control/rc.c:942
+#: modules/control/rc.c:959
 msgid "| mosaic-hborder # . . . . . . . horizontal border"
 msgstr ""
 
-#: modules/control/rc.c:943
+#: modules/control/rc.c:960
 msgid "| mosaic-position {0=auto,1=fixed} . . . .position"
 msgstr ""
 
-#: modules/control/rc.c:944
+#: modules/control/rc.c:961
 msgid "| mosaic-rows #. . . . . . . . . . .number of rows"
 msgstr ""
 
-#: modules/control/rc.c:945
+#: modules/control/rc.c:962
 msgid "| mosaic-cols #. . . . . . . . . . .number of cols"
 msgstr ""
 
-#: modules/control/rc.c:946
+#: modules/control/rc.c:963
 msgid "| mosaic-order id(,id)* . . . . order of pictures "
 msgstr ""
 
-#: modules/control/rc.c:947
+#: modules/control/rc.c:964
 msgid "| mosaic-keep-aspect-ratio {0,1} . . .aspect ratio"
 msgstr ""
 
-#: modules/control/rc.c:949
+#: modules/control/rc.c:966
 msgid ""
 "| check-updates [newer] [equal] [older]\n"
 "|               [undef] [info] [source] [binary] [plugin]"
 msgstr ""
 
-#: modules/control/rc.c:953
+#: modules/control/rc.c:970
 msgid "| help . . . . . . . . . . . . . this help message"
 msgstr ""
 
-#: modules/control/rc.c:954
+#: modules/control/rc.c:971
 msgid "| longhelp . . . . . . . . . a longer help message"
 msgstr ""
 
-#: modules/control/rc.c:955
+#: modules/control/rc.c:972
 msgid "| logout . . . . .  exit (if in socket connection)"
 msgstr ""
 
-#: modules/control/rc.c:956
+#: modules/control/rc.c:973
 msgid "| quit . . . . . . . . . . . . . . . . .  quit vlc"
 msgstr ""
 
-#: modules/control/rc.c:958
+#: modules/control/rc.c:975
 msgid "+----[ end of help ]"
 msgstr ""
 
-#: modules/control/rc.c:1065
+#: modules/control/rc.c:1082
 msgid "Press menu select or pause to continue."
 msgstr "按菜单选择或暂停可继续"
 
-#: modules/control/rc.c:1234 modules/control/rc.c:1700
-#: modules/control/rc.c:1770 modules/control/rc.c:1819
-#: modules/control/rc.c:1918
+#: modules/control/rc.c:1326 modules/control/rc.c:1811
+#: modules/control/rc.c:1881 modules/control/rc.c:1930
+#: modules/control/rc.c:2029
 msgid "Type 'menu select' or 'pause' to continue."
 msgstr "打 'menu select' 或 'pause' 可继续"
 
-#: modules/control/rc.c:1352
+#: modules/control/rc.c:1463
 msgid "Type 'pause' to continue."
 msgstr "打 'pause' 可继续"
 
-#: modules/control/rc.c:1903 modules/control/rc.c:1942
+#: modules/control/rc.c:2014 modules/control/rc.c:2053
 msgid "Please provide one of the following parameters:"
 msgstr "请提供下列参数中的一个:"
 
@@ -8419,10 +9009,18 @@ msgstr "Raw A/52 解多任务器"
 msgid "AIFF demuxer"
 msgstr "AIFF 解多任务器"
 
-#: modules/demux/asf/asf.c:51
+#: modules/demux/asf/asf.c:52
 msgid "ASF v1.0 demuxer"
 msgstr "ASF v1.0 解多任务器"
 
+#: modules/demux/asf/asf.c:168
+msgid "Could not demux ASF stream"
+msgstr ""
+
+#: modules/demux/asf/asf.c:169
+msgid "VLC failed to load the ASF header."
+msgstr ""
+
 #: modules/demux/au.c:46
 msgid "AU demuxer"
 msgstr "AU 解多任务器"
@@ -8446,26 +9044,54 @@ msgid ""
 msgstr ""
 
 #: modules/demux/avi/avi.c:56
+msgid "Ask"
+msgstr ""
+
+#: modules/demux/avi/avi.c:56
+#, fuzzy
+msgid "Always fix"
+msgstr "永远在最上层"
+
+#: modules/demux/avi/avi.c:57
+msgid "Never fix"
+msgstr ""
+
+#: modules/demux/avi/avi.c:61
 msgid "AVI demuxer"
 msgstr "AVI 解多任务器"
 
-#: modules/demux/avi/avi.c:550
+#: modules/demux/avi/avi.c:557
 msgid "AVI Index"
 msgstr "AVI 索引"
 
-#: modules/demux/avi/avi.c:551
+#: modules/demux/avi/avi.c:558
 msgid ""
 "This AVI file is broken. Seeking will not work correctly.\n"
 "Do you want to try to repair it (this might take a long time) ?"
 msgstr ""
 
-#: modules/demux/avi/avi.c:2270
-msgid "Fixing AVI Index"
-msgstr "固定 AVI 索引"
+#: modules/demux/avi/avi.c:561
+msgid "Repair"
+msgstr ""
+
+#: modules/demux/avi/avi.c:561
+msgid "Don't repair"
+msgstr ""
+
+#: modules/demux/avi/avi.c:561 modules/gui/beos/InterfaceWindow.cpp:159
+#: modules/gui/macosx/bookmarks.m:107 modules/gui/macosx/controls.m:49
+#: modules/gui/macosx/interaction.m:128 modules/gui/macosx/interaction.m:132
+#: modules/gui/macosx/interaction.m:135 modules/gui/macosx/open.m:158
+#: modules/gui/macosx/playlistinfo.m:60 modules/gui/macosx/prefs.m:122
+#: modules/gui/macosx/prefs.m:142 modules/gui/macosx/wizard.m:363
+#: modules/gui/qt4/dialogs/prefs_dialog.cpp:88
+msgid "Cancel"
+msgstr "取消"
 
-#: modules/demux/avi/avi.c:2271 modules/demux/avi/avi.c:2294
-msgid "Creating AVI Index ..."
-msgstr "建立 AVI 索引 ..."
+#: modules/demux/avi/avi.c:2278 modules/demux/avi/avi.c:2301
+#, fuzzy
+msgid "Fixing AVI Index..."
+msgstr "固定 AVI 索引"
 
 #: modules/demux/demuxdump.c:38
 msgid "Dump filename"
@@ -8499,81 +9125,82 @@ msgstr "FLAC 解多任务器"
 msgid "GME demuxer (Game_Music_Emu)"
 msgstr ""
 
-#: modules/demux/live555.cpp:63
+#: modules/demux/live555.cpp:65
 msgid ""
 "Allows you to modify the default caching value for RTSP streams. This value "
 "should be set in millisecond units."
 msgstr ""
 
-#: modules/demux/live555.cpp:66
+#: modules/demux/live555.cpp:68
 msgid "Kasenna RTSP dialect"
 msgstr ""
 
-#: modules/demux/live555.cpp:67
+#: modules/demux/live555.cpp:69
 msgid ""
 "Kasenna servers use an old and unstandard dialect of RTSP. When you set this "
 "parameter, VLC will try this dialect for communication. In this mode you "
 "cannot connect to normal RTSP servers."
 msgstr ""
 
-#: modules/demux/live555.cpp:71
+#: modules/demux/live555.cpp:73
 #, fuzzy
 msgid "RTSP user name"
 msgstr "FTP 用户名"
 
-#: modules/demux/live555.cpp:72
+#: modules/demux/live555.cpp:74
 #, fuzzy
 msgid ""
 "Allows you to modify the user name that will be used for authenticating the "
 "connection."
 msgstr "用于这个连接的用户名。"
 
-#: modules/demux/live555.cpp:74
+#: modules/demux/live555.cpp:76
 #, fuzzy
 msgid "RTSP password"
 msgstr "FTP 密码"
 
-#: modules/demux/live555.cpp:75
+#: modules/demux/live555.cpp:77
 #, fuzzy
 msgid "Allows you to modify the password that will be used for the connection."
 msgstr "用于这个连接的密码。"
 
-#: modules/demux/live555.cpp:79
+#: modules/demux/live555.cpp:81
 #, fuzzy
 msgid "RTP/RTSP/SDP demuxer (using Live555)"
 msgstr "live.com (RTSP/RTP/SDP) 解多任务器"
 
-#: modules/demux/live555.cpp:89
+#: modules/demux/live555.cpp:91
 msgid "RTSP/RTP access and demux"
 msgstr "RTSP/RTP 存取及解多任务器"
 
-#: modules/demux/live555.cpp:95 modules/demux/live555.cpp:96
+#: modules/demux/live555.cpp:97 modules/demux/live555.cpp:98
 msgid "Use RTP over RTSP (TCP)"
 msgstr ""
 
-#: modules/demux/live555.cpp:98
+#: modules/demux/live555.cpp:100
 msgid "Client port"
 msgstr "客户端端口"
 
-#: modules/demux/live555.cpp:99
+#: modules/demux/live555.cpp:101
 msgid "Port to use for the RTP source of the session"
 msgstr ""
 
-#: modules/demux/live555.cpp:102 modules/demux/live555.cpp:103
+#: modules/demux/live555.cpp:104 modules/demux/live555.cpp:105
 msgid "Tunnel RTSP and RTP over HTTP"
 msgstr ""
 
-#: modules/demux/live555.cpp:105
+#: modules/demux/live555.cpp:107
 msgid "HTTP tunnel port"
 msgstr "HTTP 隧道端口"
 
-#: modules/demux/live555.cpp:106
+#: modules/demux/live555.cpp:108
 msgid "Port to use for tunneling the RTSP/RTP over HTTP."
 msgstr ""
 
-#: modules/demux/m3u.c:68
-msgid "Playlist metademux"
-msgstr ""
+#: modules/demux/live555.cpp:752
+#, fuzzy
+msgid "RTSP authentication"
+msgstr "RTP 多播"
 
 #: modules/demux/mjpeg.c:43 modules/demux/mpeg/h264.c:39
 msgid "Frames per Second"
@@ -8731,7 +9358,7 @@ msgstr "环绕等级"
 msgid "Surround delay (ms)"
 msgstr "环绕延迟(ms)"
 
-#: modules/demux/mp4/mp4.c:51
+#: modules/demux/mp4/mp4.c:52
 msgid "MP4 stream demuxer"
 msgstr "MP4 串流解多任务器"
 
@@ -8789,6 +9416,11 @@ msgstr "Nuv 解多任务器"
 msgid "OGG demuxer"
 msgstr "OGG 解多任务器"
 
+#: modules/demux/playlist/gvp.c:193
+#, fuzzy
+msgid "Google Video"
+msgstr "缩放视频"
+
 #: modules/demux/playlist/playlist.c:36
 msgid "Auto start"
 msgstr "自动开始"
@@ -8806,119 +9438,81 @@ msgid "Show NC17 rated video streams when using shoutcast video playlists."
 msgstr ""
 
 #: modules/demux/playlist/playlist.c:62
-msgid "Native playlist import"
-msgstr ""
-
-#: modules/demux/playlist/playlist.c:69
 msgid "M3U playlist import"
 msgstr "M3U播放列表汇入"
 
-#: modules/demux/playlist/playlist.c:74
+#: modules/demux/playlist/playlist.c:67
 msgid "PLS playlist import"
 msgstr "PLS播放列表汇入"
 
-#: modules/demux/playlist/playlist.c:79
+#: modules/demux/playlist/playlist.c:72
 msgid "B4S playlist import"
 msgstr "B4S 播放列表导入"
 
-#: modules/demux/playlist/playlist.c:85
+#: modules/demux/playlist/playlist.c:78
 msgid "DVB playlist import"
 msgstr "DVB 播放列表导入"
 
-#: modules/demux/playlist/playlist.c:90
+#: modules/demux/playlist/playlist.c:83
 msgid "Podcast parser"
 msgstr "Podcast 解释器"
 
-#: modules/demux/playlist/playlist.c:95
+#: modules/demux/playlist/playlist.c:88
 msgid "XSPF playlist import"
 msgstr "XSPF 播放列表导入"
 
-#: modules/demux/playlist/playlist.c:100
+#: modules/demux/playlist/playlist.c:93
 msgid "New winamp 5.2 shoutcast import"
 msgstr ""
 
-#: modules/demux/playlist/podcast.c:274 modules/demux/playlist/podcast.c:283
-#: modules/demux/playlist/podcast.c:292 modules/demux/playlist/podcast.c:301
-#: modules/demux/playlist/podcast.c:310 modules/demux/playlist/podcast.c:320
-#: modules/demux/playlist/podcast.c:348 modules/demux/playlist/podcast.c:356
-#: modules/demux/playlist/podcast.c:364 modules/demux/playlist/podcast.c:372
-#: modules/demux/playlist/podcast.c:380 modules/demux/playlist/podcast.c:388
-#: modules/demux/playlist/podcast.c:396 modules/demux/playlist/podcast.c:404
-#: modules/demux/playlist/podcast.c:412
-msgid "Podcast Info"
-msgstr "Podcast 信息"
-
-#: modules/demux/playlist/podcast.c:275
-msgid "Podcast Link"
-msgstr "Podcast 连接"
+#: modules/demux/playlist/playlist.c:100
+#, fuzzy
+msgid "ASX playlist import"
+msgstr "PLS播放列表汇入"
 
-#: modules/demux/playlist/podcast.c:284
-msgid "Podcast Copyright"
-msgstr "Podcast 版权"
+#: modules/demux/playlist/playlist.c:105
+msgid "Kasenna MediaBase parser"
+msgstr ""
 
-#: modules/demux/playlist/podcast.c:293
-msgid "Podcast Category"
-msgstr "Podcast 分类"
+#: modules/demux/playlist/playlist.c:110
+msgid "QuickTime Media Link importer"
+msgstr ""
 
-#: modules/demux/playlist/podcast.c:302 modules/demux/playlist/podcast.c:381
-msgid "Podcast Keywords"
-msgstr "Podcast 关键词"
+#: modules/demux/playlist/playlist.c:115
+#, fuzzy
+msgid "Google Video Playlist importer"
+msgstr "旧的列表导出器"
 
-#: modules/demux/playlist/podcast.c:311 modules/demux/playlist/podcast.c:389
-msgid "Podcast Subtitle"
-msgstr "Podcast 字幕"
+#: modules/demux/playlist/podcast.c:237 modules/demux/playlist/podcast.c:251
+#: modules/demux/playlist/podcast.c:276 modules/demux/playlist/podcast.c:288
+msgid "Podcast Info"
+msgstr "Podcast 信息"
 
-#: modules/demux/playlist/podcast.c:321 modules/demux/playlist/podcast.c:397
+#: modules/demux/playlist/podcast.c:251
 msgid "Podcast Summary"
 msgstr "Podcast 摘要"
 
-#: modules/demux/playlist/podcast.c:349
-msgid "Podcast Publication Date"
-msgstr "Podcast 出版目期"
-
-#: modules/demux/playlist/podcast.c:357
-msgid "Podcast Author"
-msgstr "Podcast 作者"
-
-#: modules/demux/playlist/podcast.c:365
-msgid "Podcast Subcategory"
-msgstr "Podcast 子类别"
-
-#: modules/demux/playlist/podcast.c:373
-msgid "Podcast Duration"
-msgstr "Podcast 长度"
-
-#: modules/demux/playlist/podcast.c:405
+#: modules/demux/playlist/podcast.c:289
 msgid "Podcast Size"
 msgstr "Podcast 大小"
 
-#: modules/demux/playlist/podcast.c:413
-msgid "Podcast Type"
-msgstr "Podcast 类别"
-
-#: modules/demux/playlist/shoutcast.c:481
-#: modules/demux/playlist/shoutcast.c:489
-#: modules/demux/playlist/shoutcast.c:513
-#: modules/demux/playlist/shoutcast.c:529
+#: modules/demux/playlist/shoutcast.c:424
 #: modules/services_discovery/shout.c:153
 msgid "Shoutcast"
 msgstr "Shoutcast"
 
-#: modules/demux/playlist/shoutcast.c:482
-#, fuzzy
-msgid "Mime type"
-msgstr "光盘类型"
-
-#: modules/demux/playlist/shoutcast.c:514
-msgid "Listeners"
-msgstr "监听者"
+#: modules/demux/ps.c:39
+msgid "Trust MPEG timestamps"
+msgstr ""
 
-#: modules/demux/playlist/shoutcast.c:530
-#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:78
-msgid "Load"
-msgstr "读取"
+#: modules/demux/ps.c:40
+msgid ""
+"Normally we use the timestamps of the MPEG files to calculate position and "
+"duration. However sometimes this might not be usable. Disable this option to "
+"calculate from the bitrate instead."
+msgstr ""
 
-#: modules/demux/ps.c:47 modules/demux/ps.c:55
+#: modules/demux/ps.c:52 modules/demux/ps.c:63
 msgid "MPEG-PS demuxer"
 msgstr "MPEG-PS 解多任务器"
 
@@ -8934,10 +9528,6 @@ msgstr "DV (数字视频) 解多任务器"
 msgid "Real demuxer"
 msgstr "Real解多任务器"
 
-#: modules/demux/sgimb.c:113
-msgid "Kasenna MediaBase parser"
-msgstr ""
-
 #: modules/demux/subtitle.c:64
 msgid "Text subtitles parser"
 msgstr "文字字幕解释器"
@@ -8954,107 +9544,120 @@ msgstr "字幕延迟"
 msgid "Subtitles format"
 msgstr "字幕格式"
 
-#: modules/demux/ts.c:84
+#: modules/demux/ts.c:86
 msgid "Extra PMT"
 msgstr ""
 
-#: modules/demux/ts.c:86
+#: modules/demux/ts.c:88
 msgid "Allows a user to specify an extra pmt (pmt_pid=pid:stream_type[,...])."
 msgstr ""
 
-#: modules/demux/ts.c:88
+#: modules/demux/ts.c:90
 msgid "Set id of ES to PID"
 msgstr ""
 
-#: modules/demux/ts.c:89
+#: modules/demux/ts.c:91
 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:94
+#: modules/demux/ts.c:96
 msgid "Fast udp streaming"
 msgstr ""
 
-#: modules/demux/ts.c:96
+#: modules/demux/ts.c:98
 msgid "Sends TS to specific ip:port by udp (you must know what you are doing)."
 msgstr ""
 
-#: modules/demux/ts.c:98
+#: modules/demux/ts.c:100
 msgid "MTU for out mode"
 msgstr ""
 
-#: modules/demux/ts.c:99
+#: modules/demux/ts.c:101
 msgid "MTU for out mode."
 msgstr ""
 
-#: modules/demux/ts.c:101
+#: modules/demux/ts.c:103
 msgid "CSA ck"
 msgstr ""
 
-#: modules/demux/ts.c:102
+#: modules/demux/ts.c:104
 msgid "Control word for the CSA encryption algorithm"
 msgstr ""
 
-#: modules/demux/ts.c:104
+#: modules/demux/ts.c:106
 msgid "Silent mode"
 msgstr "静音模式"
 
-#: modules/demux/ts.c:105
+#: modules/demux/ts.c:107
 msgid "Do not complain on encrypted PES."
 msgstr ""
 
-#: modules/demux/ts.c:107
+#: modules/demux/ts.c:109
 msgid "CAPMT System ID"
 msgstr ""
 
-#: modules/demux/ts.c:108
+#: modules/demux/ts.c:110
 msgid "Only forward descriptors from this SysID to the CAM."
 msgstr ""
 
-#: modules/demux/ts.c:110
+#: modules/demux/ts.c:112
 msgid "Packet size in bytes to decrypt"
 msgstr ""
 
-#: modules/demux/ts.c:111
+#: modules/demux/ts.c:113
 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:115
+#: modules/demux/ts.c:117
 msgid "Filename of dump"
 msgstr ""
 
-#: modules/demux/ts.c:116
+#: modules/demux/ts.c:118
 msgid "Specify a filename where to dump the TS in."
 msgstr ""
 
-#: modules/demux/ts.c:118
+#: modules/demux/ts.c:120
 msgid "Append"
 msgstr "添加"
 
-#: modules/demux/ts.c:120
+#: modules/demux/ts.c:122
 msgid ""
 "If the file exists and this option is selected, the existing file will not "
 "be overwritten."
 msgstr ""
 
-#: modules/demux/ts.c:123
+#: modules/demux/ts.c:125
 msgid "Dump buffer size"
 msgstr ""
 
-#: modules/demux/ts.c:125
+#: modules/demux/ts.c:127
 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:129
+#: modules/demux/ts.c:131
 msgid "MPEG Transport Stream demuxer"
 msgstr "MPEG 转码串流解多任务器"
 
+#: modules/demux/ts.c:3139 modules/demux/ts.c:3173
+#, fuzzy
+msgid "clean effects"
+msgstr "应用动画效果"
+
+#: modules/demux/ts.c:3143 modules/demux/ts.c:3177
+msgid "hearing impaired"
+msgstr ""
+
+#: modules/demux/ts.c:3147 modules/demux/ts.c:3181
+msgid "visual impaired commentary"
+msgstr ""
+
 #: modules/demux/ty.c:70
 msgid "TY Stream audio/video demux"
 msgstr "TY Stream 音频/视频 Demux"
@@ -9299,7 +9902,8 @@ msgstr ""
 msgid "New wave"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:95 modules/video_filter/distort.c:78
+#: modules/demux/util/id3genres.h:95 modules/gui/macosx/extended.m:88
+#: modules/video_filter/psychedelic.c:52
 msgid "Psychedelic"
 msgstr ""
 
@@ -9383,106 +9987,97 @@ msgstr "BeOS标准API接口"
 msgid "Open files from all sub-folders as well?"
 msgstr ""
 
-#: modules/gui/beos/InterfaceWindow.cpp:159 modules/gui/macosx/bookmarks.m:107
-#: modules/gui/macosx/controls.m:49 modules/gui/macosx/interaction.m:120
-#: modules/gui/macosx/interaction.m:124 modules/gui/macosx/interaction.m:127
-#: modules/gui/macosx/interaction.m:164 modules/gui/macosx/interaction.m:173
-#: modules/gui/macosx/open.m:158 modules/gui/macosx/playlistinfo.m:60
-#: modules/gui/macosx/prefs.m:122 modules/gui/macosx/prefs.m:142
-#: modules/gui/macosx/wizard.m:363
-msgid "Cancel"
-msgstr "取消"
-
 #: modules/gui/beos/InterfaceWindow.cpp:159 modules/gui/macosx/open.m:440
 #: modules/gui/macosx/open.m:634 modules/gui/macosx/open.m:738
-#: modules/gui/macosx/open.m:784 modules/gui/wxwidgets/interface.cpp:672
-#: modules/gui/wxwidgets/interface.cpp:683 modules/gui/wxwidgets/menus.cpp:348
-#: modules/gui/wxwidgets/menus.cpp:404
+#: modules/gui/macosx/open.m:784 modules/gui/wxwidgets/interface.cpp:675
+#: modules/gui/wxwidgets/interface.cpp:686 modules/gui/wxwidgets/menus.cpp:349
+#: modules/gui/wxwidgets/menus.cpp:405
 msgid "Open"
 msgstr "打开"
 
 #: modules/gui/beos/InterfaceWindow.cpp:225
-#: modules/gui/beos/InterfaceWindow.cpp:326 modules/gui/macosx/prefs.m:120
+#: modules/gui/beos/InterfaceWindow.cpp:330 modules/gui/macosx/prefs.m:120
 #: modules/gui/wxwidgets/dialogs/preferences.cpp:184
 msgid "Preferences"
 msgstr "设置"
 
-#: modules/gui/beos/InterfaceWindow.cpp:235
-#: modules/gui/beos/InterfaceWindow.cpp:324 modules/gui/macosx/intf.m:497
-#: modules/gui/macosx/intf.m:594 modules/gui/wxwidgets/dialogs/messages.cpp:47
+#: modules/gui/beos/InterfaceWindow.cpp:237
+#: modules/gui/beos/InterfaceWindow.cpp:328 modules/gui/macosx/intf.m:503
+#: modules/gui/macosx/intf.m:600 modules/gui/qt4/dialogs/messages.cpp:41
+#: modules/gui/wxwidgets/dialogs/messages.cpp:47
 msgid "Messages"
 msgstr "信息"
 
-#: modules/gui/beos/InterfaceWindow.cpp:263
+#: modules/gui/beos/InterfaceWindow.cpp:265
 #: modules/gui/beos/PlayListWindow.cpp:87 modules/gui/macosx/open.m:439
 #: modules/gui/macosx/open.m:737 modules/gui/macosx/open.m:783
 #: modules/gui/wxwidgets/dialogs.cpp:430
-#: modules/gui/wxwidgets/dialogs/open.cpp:1264
+#: modules/gui/wxwidgets/dialogs/open.cpp:1262
 msgid "Open File"
 msgstr "打开文件"
 
-#: modules/gui/beos/InterfaceWindow.cpp:265
+#: modules/gui/beos/InterfaceWindow.cpp:267
 #: modules/gui/beos/PlayListWindow.cpp:92
 msgid "Open Disc"
 msgstr "打开光盘"
 
-#: modules/gui/beos/InterfaceWindow.cpp:266
+#: modules/gui/beos/InterfaceWindow.cpp:268
 msgid "Open Subtitles"
 msgstr "打开字幕"
 
-#: modules/gui/beos/InterfaceWindow.cpp:270
+#: modules/gui/beos/InterfaceWindow.cpp:272
 #: modules/gui/pda/pda_interface.c:300 modules/gui/pda/pda_interface.c:301
 #: modules/gui/pda/pda_interface.c:1362
 msgid "About"
 msgstr "关于"
 
-#: modules/gui/beos/InterfaceWindow.cpp:285
+#: modules/gui/beos/InterfaceWindow.cpp:287
 msgid "Prev Title"
 msgstr "上一个标题"
 
-#: modules/gui/beos/InterfaceWindow.cpp:286
+#: modules/gui/beos/InterfaceWindow.cpp:288
 msgid "Next Title"
 msgstr "下一个标题"
 
-#: modules/gui/beos/InterfaceWindow.cpp:295
+#: modules/gui/beos/InterfaceWindow.cpp:297
 msgid "Go to Title"
 msgstr "前往标题"
 
-#: modules/gui/beos/InterfaceWindow.cpp:299
+#: modules/gui/beos/InterfaceWindow.cpp:301
 msgid "Go to Chapter"
 msgstr "前往章节"
 
-#: modules/gui/beos/InterfaceWindow.cpp:302
+#: modules/gui/beos/InterfaceWindow.cpp:304
 msgid "Speed"
 msgstr "速度"
 
-#: modules/gui/beos/InterfaceWindow.cpp:321 modules/gui/macosx/intf.m:585
+#: modules/gui/beos/InterfaceWindow.cpp:323 modules/gui/macosx/intf.m:591
 msgid "Window"
 msgstr "窗口"
 
-#: modules/gui/beos/InterfaceWindow.cpp:398 modules/gui/macosx/bookmarks.m:106
+#: modules/gui/beos/InterfaceWindow.cpp:404 modules/gui/macosx/bookmarks.m:106
 #: modules/gui/macosx/bookmarks.m:233 modules/gui/macosx/bookmarks.m:241
 #: modules/gui/macosx/bookmarks.m:292 modules/gui/macosx/bookmarks.m:302
-#: modules/gui/macosx/controls.m:50 modules/gui/macosx/extended.m:601
-#: modules/gui/macosx/interaction.m:125 modules/gui/macosx/interaction.m:126
-#: modules/gui/macosx/interaction.m:164 modules/gui/macosx/open.m:157
+#: modules/gui/macosx/controls.m:50 modules/gui/macosx/extended.m:620
+#: modules/gui/macosx/interaction.m:133 modules/gui/macosx/interaction.m:134
+#: modules/gui/macosx/interaction.m:174 modules/gui/macosx/open.m:157
 #: modules/gui/macosx/open.m:254 modules/gui/macosx/output.m:138
 #: modules/gui/macosx/playlistinfo.m:59 modules/gui/macosx/update.m:86
 #: modules/gui/macosx/wizard.m:631 modules/gui/macosx/wizard.m:695
 #: modules/gui/macosx/wizard.m:1087 modules/gui/macosx/wizard.m:1167
-#: modules/gui/macosx/wizard.m:1174 modules/gui/macosx/wizard.m:1660
-#: modules/gui/macosx/wizard.m:1668 modules/gui/macosx/wizard.m:1848
-#: modules/gui/macosx/wizard.m:1859 modules/gui/macosx/wizard.m:1872
+#: modules/gui/macosx/wizard.m:1174 modules/gui/macosx/wizard.m:1661
+#: modules/gui/macosx/wizard.m:1669 modules/gui/macosx/wizard.m:1849
+#: modules/gui/macosx/wizard.m:1860 modules/gui/macosx/wizard.m:1873
 #: modules/gui/wxwidgets/dialogs/preferences.cpp:205
 #: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:415
 msgid "OK"
 msgstr "确定"
 
-#: modules/gui/beos/InterfaceWindow.cpp:406
+#: modules/gui/beos/InterfaceWindow.cpp:412
 msgid "VLC media player: Open Media Files"
 msgstr "VLC media player:打开多媒体文件"
 
-#: modules/gui/beos/InterfaceWindow.cpp:410
+#: modules/gui/beos/InterfaceWindow.cpp:416
 msgid "VLC media player: Open Subtitle File"
 msgstr "VLC media player:打开字幕文件"
 
@@ -9499,14 +10094,14 @@ msgid "Close"
 msgstr "关闭"
 
 #: modules/gui/beos/PlayListWindow.cpp:101 modules/gui/macosx/bookmarks.m:95
-#: modules/gui/macosx/intf.m:522
+#: modules/gui/macosx/intf.m:528
 #: modules/gui/wxwidgets/dialogs/bookmarks.cpp:165
 #: modules/gui/wxwidgets/dialogs/vlm/vlm_streampanel.cpp:100
 msgid "Edit"
 msgstr "编辑"
 
-#: modules/gui/beos/PlayListWindow.cpp:103 modules/gui/macosx/intf.m:527
-#: modules/gui/macosx/playlist.m:440
+#: modules/gui/beos/PlayListWindow.cpp:103 modules/gui/macosx/intf.m:533
+#: modules/gui/macosx/playlist.m:438
 msgid "Select All"
 msgstr "全选"
 
@@ -9560,7 +10155,8 @@ msgid "Apply"
 msgstr "应用"
 
 #: modules/gui/beos/PreferencesWindow.cpp:254 modules/gui/macosx/output.m:526
-#: modules/gui/macosx/playlist.m:707 modules/gui/macosx/prefs.m:121
+#: modules/gui/macosx/playlist.m:704 modules/gui/macosx/prefs.m:121
+#: modules/gui/qt4/dialogs/prefs_dialog.cpp:87
 msgid "Save"
 msgstr "储存"
 
@@ -9600,7 +10196,7 @@ msgstr "总在最上面"
 msgid "Take Screen Shot"
 msgstr "获取画面快照"
 
-#: modules/gui/macosx/about.m:73 modules/gui/macosx/intf.m:501
+#: modules/gui/macosx/about.m:73 modules/gui/macosx/intf.m:507
 msgid "About VLC media player"
 msgstr "关于VLC多媒体播放程序"
 
@@ -9614,7 +10210,7 @@ msgstr "由 %s 编译, 基于 SVN 版本 %s"
 msgid "Compiled by %s"
 msgstr "由 %s 编译"
 
-#: modules/gui/macosx/bookmarks.m:92 modules/gui/macosx/intf.m:591
+#: modules/gui/macosx/bookmarks.m:92 modules/gui/macosx/intf.m:597
 #: modules/gui/wxwidgets/dialogs/bookmarks.cpp:139
 msgid "Bookmarks"
 msgstr "书签"
@@ -9624,7 +10220,7 @@ msgstr "书签"
 msgid "Add"
 msgstr "增加"
 
-#: modules/gui/macosx/bookmarks.m:94 modules/gui/macosx/intf.m:526
+#: modules/gui/macosx/bookmarks.m:94 modules/gui/macosx/intf.m:532
 #: modules/gui/wxwidgets/dialogs/messages.cpp:77
 msgid "Clear"
 msgstr "清除"
@@ -9641,7 +10237,7 @@ msgstr "提取"
 msgid "Time"
 msgstr "时间"
 
-#: modules/gui/macosx/bookmarks.m:136 modules/gui/macosx/playlist.m:703
+#: modules/gui/macosx/bookmarks.m:136 modules/gui/macosx/playlist.m:700
 msgid "Untitled"
 msgstr "无标题"
 
@@ -9683,7 +10279,7 @@ msgstr "没有输入"
 msgid "The stream must be playing or paused for bookmarks to work."
 msgstr ""
 
-#: modules/gui/macosx/controls.m:48 modules/gui/macosx/controls.m:735
+#: modules/gui/macosx/controls.m:48 modules/gui/macosx/controls.m:741
 msgid "Jump To Time"
 msgstr ""
 
@@ -9699,98 +10295,83 @@ msgstr ""
 msgid "Random On"
 msgstr "开启随机播放"
 
-#: modules/gui/macosx/controls.m:167
+#: modules/gui/macosx/controls.m:168
 msgid "Random Off"
 msgstr "关闭随机播放"
 
-#: modules/gui/macosx/controls.m:195 modules/gui/macosx/controls.m:719
-#: modules/gui/macosx/intf.m:537 modules/gui/macosx/playlist.m:455
-#: modules/gui/macosx/playlist.m:1170
+#: modules/gui/macosx/controls.m:197 modules/gui/macosx/controls.m:725
+#: modules/gui/macosx/intf.m:543 modules/gui/macosx/playlist.m:453
+#: modules/gui/macosx/playlist.m:1167
 #: modules/gui/wxwidgets/dialogs/playlist.cpp:54
 msgid "Repeat One"
 msgstr "重复一次"
 
-#: modules/gui/macosx/controls.m:199 modules/gui/macosx/controls.m:231
-#: modules/gui/macosx/playlist.m:1189
+#: modules/gui/macosx/controls.m:202 modules/gui/macosx/controls.m:236
+#: modules/gui/macosx/playlist.m:1186
 msgid "Repeat Off"
 msgstr "关闭重复播放"
 
-#: modules/gui/macosx/controls.m:227 modules/gui/macosx/controls.m:726
-#: modules/gui/macosx/intf.m:538 modules/gui/macosx/playlist.m:456
-#: modules/gui/macosx/playlist.m:1178
+#: modules/gui/macosx/controls.m:231 modules/gui/macosx/controls.m:732
+#: modules/gui/macosx/intf.m:544 modules/gui/macosx/playlist.m:454
+#: modules/gui/macosx/playlist.m:1175
 #: modules/gui/wxwidgets/dialogs/playlist.cpp:53
 msgid "Repeat All"
 msgstr "重复播放全部"
 
-#: modules/gui/macosx/controls.m:308 modules/gui/macosx/controls.m:749
-#: modules/gui/macosx/intf.m:563
+#: modules/gui/macosx/controls.m:314 modules/gui/macosx/controls.m:755
+#: modules/gui/macosx/intf.m:569
 msgid "Half Size"
 msgstr "一半大小"
 
-#: modules/gui/macosx/controls.m:310 modules/gui/macosx/controls.m:750
-#: modules/gui/macosx/intf.m:564
+#: modules/gui/macosx/controls.m:316 modules/gui/macosx/controls.m:756
+#: modules/gui/macosx/intf.m:570
 msgid "Normal Size"
 msgstr "正常值"
 
-#: modules/gui/macosx/controls.m:312 modules/gui/macosx/controls.m:751
-#: modules/gui/macosx/intf.m:565
+#: modules/gui/macosx/controls.m:318 modules/gui/macosx/controls.m:757
+#: modules/gui/macosx/intf.m:571
 msgid "Double Size"
 msgstr "双倍大小"
 
-#: modules/gui/macosx/controls.m:314 modules/gui/macosx/controls.m:755
-#: modules/gui/macosx/controls.m:766 modules/gui/macosx/intf.m:568
+#: modules/gui/macosx/controls.m:320 modules/gui/macosx/controls.m:761
+#: modules/gui/macosx/controls.m:772 modules/gui/macosx/intf.m:574
 msgid "Float on Top"
 msgstr "悬浮在最顶端"
 
-#: modules/gui/macosx/controls.m:316 modules/gui/macosx/controls.m:752
-#: modules/gui/macosx/intf.m:566
+#: modules/gui/macosx/controls.m:322 modules/gui/macosx/controls.m:758
+#: modules/gui/macosx/intf.m:572
 msgid "Fit to Screen"
 msgstr "缩放至屏幕"
 
-#: modules/gui/macosx/controls.m:712 modules/gui/macosx/intf.m:536
-#: modules/gui/macosx/playlist.m:449
+#: modules/gui/macosx/controls.m:718 modules/gui/macosx/intf.m:542
+#: modules/gui/macosx/playlist.m:447
 msgid "Random"
 msgstr "随机"
 
-#: modules/gui/macosx/controls.m:733 modules/gui/macosx/intf.m:539
+#: modules/gui/macosx/controls.m:739 modules/gui/macosx/intf.m:545
 msgid "Step Forward"
 msgstr "向前"
 
-#: modules/gui/macosx/controls.m:734 modules/gui/macosx/intf.m:540
+#: modules/gui/macosx/controls.m:740 modules/gui/macosx/intf.m:546
 msgid "Step Backward"
 msgstr "向后"
 
-#: modules/gui/macosx/embeddedwindow.m:42 modules/gui/macosx/intf.m:486
+#: modules/gui/macosx/embeddedwindow.m:42 modules/gui/macosx/intf.m:492
 #: modules/gui/pda/pda_interface.c:238 modules/gui/pda/pda_interface.c:239
 msgid "Rewind"
 msgstr "回卷"
 
-#: modules/gui/macosx/embeddedwindow.m:43 modules/gui/macosx/intf.m:489
+#: modules/gui/macosx/embeddedwindow.m:43 modules/gui/macosx/intf.m:495
 msgid "Fast Forward"
 msgstr "快速向前"
 
-#: modules/gui/macosx/embeddedwindow.m:45
-#: modules/gui/macosx/embeddedwindow.m:72 modules/gui/macosx/intf.m:487
-#: modules/gui/macosx/intf.m:530 modules/gui/macosx/intf.m:608
-#: modules/gui/macosx/intf.m:1343 modules/gui/macosx/intf.m:1344
-#: modules/gui/macosx/intf.m:1345 modules/gui/macosx/playlist.m:437
-#: modules/gui/pda/pda_interface.c:262 modules/gui/pda/pda_interface.c:263
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:281
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:290
-#: modules/gui/wxwidgets/interface.cpp:674
-#: modules/gui/wxwidgets/interface.cpp:685
-#: modules/gui/wxwidgets/interface.cpp:1213
-#: modules/gui/wxwidgets/menus.cpp:263 modules/gui/wxwidgets/menus.cpp:274
-msgid "Play"
-msgstr "播放"
-
-#: modules/gui/macosx/embeddedwindow.m:66 modules/gui/macosx/intf.m:1335
-#: modules/gui/macosx/intf.m:1336 modules/gui/macosx/intf.m:1337
-#: modules/gui/pda/pda_interface.c:250 modules/gui/pda/pda_interface.c:251
-#: modules/gui/wxwidgets/interface.cpp:675
-#: modules/gui/wxwidgets/interface.cpp:686
-#: modules/gui/wxwidgets/interface.cpp:1207
-#: modules/gui/wxwidgets/menus.cpp:265 modules/visualization/xosd.c:242
+#: modules/gui/macosx/embeddedwindow.m:66 modules/gui/macosx/intf.m:1394
+#: modules/gui/macosx/intf.m:1395 modules/gui/macosx/intf.m:1396
+#: modules/gui/macosx/intf.m:1397 modules/gui/pda/pda_interface.c:250
+#: modules/gui/pda/pda_interface.c:251 modules/gui/wxwidgets/interface.cpp:678
+#: modules/gui/wxwidgets/interface.cpp:689
+#: modules/gui/wxwidgets/interface.cpp:1210
+#: modules/gui/wxwidgets/menus.cpp:266 modules/visualization/xosd.c:242
 msgid "Pause"
 msgstr "暂停"
 
@@ -9832,109 +10413,124 @@ msgstr "影像调整"
 msgid "More Info"
 msgstr "更多信息"
 
-#: modules/gui/macosx/extended.m:86 modules/gui/wxwidgets/extrapanel.cpp:151
-msgid "Blurring"
-msgstr "模糊"
+#: modules/gui/macosx/extended.m:86 modules/video_filter/wave.c:51
+msgid "Wave"
+msgstr ""
 
-#: modules/gui/macosx/extended.m:87 modules/gui/wxwidgets/extrapanel.cpp:151
-msgid "Adds motion blurring to the image"
+#: modules/gui/macosx/extended.m:87 modules/video_filter/ripple.c:51
+msgid "Ripple"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:88 modules/gui/wxwidgets/extrapanel.cpp:149
-#: modules/video_filter/distort.c:82
-msgid "Distortion"
+#: modules/gui/macosx/extended.m:89 modules/video_filter/gradient.c:68
+#: modules/video_filter/gradient.c:74
+msgid "Gradient"
+msgstr "灰度"
+
+#: modules/gui/macosx/extended.m:90
+#, fuzzy
+msgid "General editing filters"
+msgstr "一般音频设置"
+
+#: modules/gui/macosx/extended.m:91
+#, fuzzy
+msgid "Distortion filters"
 msgstr "畸变"
 
-#: modules/gui/macosx/extended.m:89 modules/gui/wxwidgets/extrapanel.cpp:149
-msgid "Adds distortion effects"
-msgstr "增加畸变效果"
+#: modules/gui/macosx/extended.m:92
+#, fuzzy
+msgid "Blur"
+msgstr "蓝色"
+
+#: modules/gui/macosx/extended.m:93 modules/gui/wxwidgets/extrapanel.cpp:151
+msgid "Adds motion blurring to the image"
+msgstr ""
 
-#: modules/gui/macosx/extended.m:90 modules/gui/wxwidgets/extrapanel.cpp:148
+#: modules/gui/macosx/extended.m:94 modules/gui/wxwidgets/extrapanel.cpp:148
 msgid "Image clone"
 msgstr "影像复制"
 
-#: modules/gui/macosx/extended.m:91
+#: modules/gui/macosx/extended.m:95
 msgid "Creates several copies of the Video output window"
 msgstr "建立数个视频输出窗口的复制"
 
-#: modules/gui/macosx/extended.m:93
+#: modules/gui/macosx/extended.m:97
 msgid "Image cropping"
 msgstr "图像获取"
 
-#: modules/gui/macosx/extended.m:94
+#: modules/gui/macosx/extended.m:98
 msgid "Crops a defined part of the image"
 msgstr "修整图像的一个自定义的部分。"
 
-#: modules/gui/macosx/extended.m:95 modules/gui/wxwidgets/extrapanel.cpp:150
-msgid "Image inversion"
-msgstr "图像翻转"
+#: modules/gui/macosx/extended.m:99
+#, fuzzy
+msgid "Invert colors"
+msgstr "V-平面颜色"
 
-#: modules/gui/macosx/extended.m:96 modules/gui/wxwidgets/extrapanel.cpp:150
+#: modules/gui/macosx/extended.m:100 modules/gui/wxwidgets/extrapanel.cpp:150
 msgid "Inverts the colors of the image"
 msgstr "反转图像颜色"
 
-#: modules/gui/macosx/extended.m:97 modules/gui/wxwidgets/extrapanel.cpp:152
+#: modules/gui/macosx/extended.m:101 modules/gui/wxwidgets/extrapanel.cpp:152
 #: modules/video_filter/transform.c:67
 msgid "Transformation"
 msgstr "变换"
 
-#: modules/gui/macosx/extended.m:98 modules/gui/wxwidgets/extrapanel.cpp:152
+#: modules/gui/macosx/extended.m:102 modules/gui/wxwidgets/extrapanel.cpp:152
 msgid "Rotates or flips the image"
 msgstr "旋转或翻转影像"
 
-#: modules/gui/macosx/extended.m:99
+#: modules/gui/macosx/extended.m:103
 #, fuzzy
 msgid "Interactive Zoom"
 msgstr "界面"
 
-#: modules/gui/macosx/extended.m:100
+#: modules/gui/macosx/extended.m:104
 msgid "Enables an interactive Zoom feature"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:101 modules/gui/wxwidgets/extrapanel.cpp:401
+#: modules/gui/macosx/extended.m:105 modules/gui/wxwidgets/extrapanel.cpp:401
 msgid "Volume normalization"
 msgstr "音量正规化"
 
-#: modules/gui/macosx/extended.m:102
+#: modules/gui/macosx/extended.m:106
 msgid "Prevents the audio output from going over a predefined value."
 msgstr "阻止音频输出超过设定值."
 
-#: modules/gui/macosx/extended.m:104 modules/gui/wxwidgets/extrapanel.cpp:396
+#: modules/gui/macosx/extended.m:108 modules/gui/wxwidgets/extrapanel.cpp:396
 msgid "Headphone virtualization"
 msgstr "耳机虚拟化"
 
-#: modules/gui/macosx/extended.m:105 modules/gui/wxwidgets/extrapanel.cpp:397
+#: modules/gui/macosx/extended.m:109 modules/gui/wxwidgets/extrapanel.cpp:397
 msgid "Imitates the effect of surround sound when using headphones."
 msgstr ""
 
-#: modules/gui/macosx/extended.m:107 modules/gui/wxwidgets/extrapanel.cpp:406
+#: modules/gui/macosx/extended.m:111 modules/gui/wxwidgets/extrapanel.cpp:406
 msgid "Maximum level"
 msgstr "最大等级"
 
-#: modules/gui/macosx/extended.m:108 modules/gui/wxwidgets/extrapanel.cpp:221
+#: modules/gui/macosx/extended.m:112 modules/gui/wxwidgets/extrapanel.cpp:221
 #: modules/gui/wxwidgets/extrapanel.cpp:481
 msgid "Restore Defaults"
 msgstr "恢复默认值"
 
-#: modules/gui/macosx/extended.m:112 modules/gui/wxwidgets/extrapanel.cpp:244
+#: modules/gui/macosx/extended.m:116 modules/gui/wxwidgets/extrapanel.cpp:244
 msgid "Gamma"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:114 modules/gui/wxwidgets/extrapanel.cpp:239
+#: modules/gui/macosx/extended.m:118 modules/gui/wxwidgets/extrapanel.cpp:239
 msgid "Saturation"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:115 modules/gui/macosx/macosx.m:59
-#: modules/gui/macosx/sfilters.m:81 modules/gui/macosx/sfilters.m:90
-#: modules/gui/macosx/sfilters.m:100
+#: modules/gui/macosx/extended.m:119 modules/gui/macosx/macosx.m:59
+#: modules/gui/macosx/sfilters.m:79 modules/gui/macosx/sfilters.m:90
 msgid "Opaqueness"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:601 modules/gui/wxwidgets/extrapanel.cpp:1007
+#: modules/gui/macosx/extended.m:620 modules/gui/wxwidgets/extrapanel.cpp:1007
 msgid "More Information"
 msgstr "更多信息"
 
-#: modules/gui/macosx/extended.m:602
+#: modules/gui/macosx/extended.m:621
 msgid ""
 "This panel allows to select video effects filters to apply.\n"
 "The filters can be configured individually in the Preferences, in the "
@@ -9943,223 +10539,205 @@ msgid ""
 "can be set in the Preferences, Video / Filters section."
 msgstr ""
 
-#: modules/gui/macosx/interaction.m:122
+#: modules/gui/macosx/interaction.m:130
 #, fuzzy
 msgid "Login:"
 msgstr "登录"
 
-#: modules/gui/macosx/interaction.m:123
+#: modules/gui/macosx/interaction.m:131
 #, fuzzy
 msgid "Password:"
 msgstr "密码"
 
-#: modules/gui/macosx/interaction.m:172
+#: modules/gui/macosx/interaction.m:139
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:81
+msgid "Error"
+msgstr "错误"
+
+#: modules/gui/macosx/interaction.m:219 modules/gui/macosx/interaction.m:285
+#, c-format
+msgid "Remaining time: %i seconds"
+msgstr ""
+
+#: modules/gui/macosx/interaction.m:389 modules/gui/macosx/intf.m:601
+msgid "Errors and Warnings"
+msgstr ""
+
+#: modules/gui/macosx/interaction.m:390
 #, fuzzy
-msgid "Yes"
-msgstr "是"
+msgid "Clean up"
+msgstr " 清除 "
 
-#: modules/gui/macosx/interaction.m:172
+#: modules/gui/macosx/interaction.m:391
 #, fuzzy
-msgid "No"
-msgstr "æ\97 "
+msgid "Show Details"
+msgstr "æ\98¾ç¤ºå\85¨é\83¨"
 
-#: modules/gui/macosx/intf.m:481
+#: modules/gui/macosx/intf.m:487
 msgid "VLC - Controller"
 msgstr "VLC - 控制器"
 
-#: modules/gui/macosx/intf.m:482 modules/gui/macosx/intf.m:922
-#: modules/gui/macosx/intf.m:1244 modules/gui/pda/pda_interface.c:212
-#: modules/gui/pda/pda_interface.c:1355
+#: modules/gui/macosx/intf.m:488 modules/gui/macosx/intf.m:999
+#: modules/gui/macosx/intf.m:1321 modules/gui/pda/pda_interface.c:212
+#: modules/gui/pda/pda_interface.c:1355 modules/gui/qt4/main_interface.cpp:54
 msgid "VLC media player"
 msgstr "VLC多媒体播放程序"
 
-#: modules/gui/macosx/intf.m:498
+#: modules/gui/macosx/intf.m:504
 msgid "Open CrashLog"
 msgstr "开启崩溃纪录"
 
-#: modules/gui/macosx/intf.m:503
+#: modules/gui/macosx/intf.m:509
 msgid "Check for Update..."
 msgstr "检查更新..."
 
-#: modules/gui/macosx/intf.m:504
+#: modules/gui/macosx/intf.m:510
 msgid "Preferences..."
 msgstr "偏好设置..."
 
-#: modules/gui/macosx/intf.m:507
+#: modules/gui/macosx/intf.m:513
 msgid "Services"
 msgstr "服务"
 
-#: modules/gui/macosx/intf.m:508
+#: modules/gui/macosx/intf.m:514
 msgid "Hide VLC"
 msgstr "隐藏VLC"
 
-#: modules/gui/macosx/intf.m:509
+#: modules/gui/macosx/intf.m:515
 msgid "Hide Others"
 msgstr "隐藏其它"
 
-#: modules/gui/macosx/intf.m:510
+#: modules/gui/macosx/intf.m:516
 msgid "Show All"
 msgstr "显示全部"
 
-#: modules/gui/macosx/intf.m:511 modules/gui/wxwidgets/interface.cpp:1485
+#: modules/gui/macosx/intf.m:517 modules/gui/wxwidgets/interface.cpp:1502
 msgid "Quit VLC"
 msgstr "退出VLC"
 
-#: modules/gui/macosx/intf.m:513
+#: modules/gui/macosx/intf.m:519
 msgid "1:File"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:514
+#: modules/gui/macosx/intf.m:520
 msgid "Open File..."
 msgstr "打开文件..."
 
-#: modules/gui/macosx/intf.m:515
+#: modules/gui/macosx/intf.m:521
 msgid "Quick Open File..."
 msgstr "快速打开文件..."
 
-#: modules/gui/macosx/intf.m:516
+#: modules/gui/macosx/intf.m:522
 msgid "Open Disc..."
 msgstr "打开光盘..."
 
-#: modules/gui/macosx/intf.m:517
+#: modules/gui/macosx/intf.m:523
 msgid "Open Network..."
 msgstr "打开网络..."
 
-#: modules/gui/macosx/intf.m:518
+#: modules/gui/macosx/intf.m:524
 msgid "Open Recent"
 msgstr "打开最近的文件"
 
-#: modules/gui/macosx/intf.m:519 modules/gui/macosx/intf.m:1899
+#: modules/gui/macosx/intf.m:525 modules/gui/macosx/intf.m:1957
 msgid "Clear Menu"
 msgstr "清除菜单"
 
-#: modules/gui/macosx/intf.m:520
+#: modules/gui/macosx/intf.m:526
 msgid "Streaming/Exporting Wizard..."
 msgstr "串流/导出向导"
 
-#: modules/gui/macosx/intf.m:523
+#: modules/gui/macosx/intf.m:529
 msgid "Cut"
 msgstr "剪切"
 
-#: modules/gui/macosx/intf.m:524
+#: modules/gui/macosx/intf.m:530
 msgid "Copy"
 msgstr "复制"
 
-#: modules/gui/macosx/intf.m:525
+#: modules/gui/macosx/intf.m:531
 msgid "Paste"
 msgstr "粘贴"
 
-#: modules/gui/macosx/intf.m:529
+#: modules/gui/macosx/intf.m:535
 msgid "Playback"
 msgstr "回放"
 
-#: modules/gui/macosx/intf.m:550
+#: modules/gui/macosx/intf.m:556 modules/gui/macosx/intf.m:626
 msgid "Volume Up"
 msgstr "增加音量"
 
-#: modules/gui/macosx/intf.m:551
+#: modules/gui/macosx/intf.m:557 modules/gui/macosx/intf.m:627
 msgid "Volume Down"
 msgstr "减低音量"
 
-#: modules/gui/macosx/intf.m:576 modules/gui/macosx/intf.m:577
+#: modules/gui/macosx/intf.m:582 modules/gui/macosx/intf.m:583
 #: modules/gui/macosx/vout.m:193
 msgid "Video Device"
 msgstr "视频装置"
 
-#: modules/gui/macosx/intf.m:586
+#: modules/gui/macosx/intf.m:592
 msgid "Minimize Window"
 msgstr "最小化窗口"
 
-#: modules/gui/macosx/intf.m:587
+#: modules/gui/macosx/intf.m:593
 msgid "Close Window"
 msgstr "关闭窗口"
 
-#: modules/gui/macosx/intf.m:588
+#: modules/gui/macosx/intf.m:594
 msgid "Controller"
 msgstr "控制器"
 
-#: modules/gui/macosx/intf.m:590
+#: modules/gui/macosx/intf.m:596
 msgid "Extended Controls"
 msgstr "扩展控制"
 
-#: modules/gui/macosx/intf.m:593 modules/gui/macosx/intf.m:624
-#: modules/gui/macosx/playlist.m:441 modules/gui/macosx/playlistinfo.m:55
-#: modules/gui/macosx/playlistinfo.m:365
-msgid "Information"
-msgstr "信息"
-
-#: modules/gui/macosx/intf.m:596
+#: modules/gui/macosx/intf.m:603
 msgid "Bring All to Front"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:598
+#: modules/gui/macosx/intf.m:605
 msgid "Help"
 msgstr "帮助"
 
-#: modules/gui/macosx/intf.m:599
+#: modules/gui/macosx/intf.m:606
 msgid "ReadMe..."
 msgstr "读我..."
 
-#: modules/gui/macosx/intf.m:600
+#: modules/gui/macosx/intf.m:607
 msgid "Online Documentation"
 msgstr "在线文件"
 
-#: modules/gui/macosx/intf.m:601
+#: modules/gui/macosx/intf.m:608
 msgid "Report a Bug"
 msgstr "错误回报"
 
-#: modules/gui/macosx/intf.m:602
+#: modules/gui/macosx/intf.m:609
 msgid "VideoLAN Website"
 msgstr "VideoLAN 网站"
 
-#: modules/gui/macosx/intf.m:603
+#: modules/gui/macosx/intf.m:610
 msgid "License"
 msgstr "授权"
 
-#: modules/gui/macosx/intf.m:604
+#: modules/gui/macosx/intf.m:611
 msgid "Make a donation"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:605
+#: modules/gui/macosx/intf.m:612
 msgid "Online Forum"
 msgstr "在线论坛"
 
-#: modules/gui/macosx/intf.m:615 modules/gui/wxwidgets/dialogs/wizard.cpp:81
-msgid "Error"
-msgstr "错误"
-
-#: modules/gui/macosx/intf.m:616
-msgid ""
-"An error has occurred which probably prevented the proper execution of the "
-"program:"
-msgstr ""
-
-#: modules/gui/macosx/intf.m:618
-msgid "If you believe that it is a bug, please follow the instructions at:"
-msgstr ""
-
-#: modules/gui/macosx/intf.m:620
-msgid "Open Messages Window"
-msgstr "开启讯息窗口"
-
-#: modules/gui/macosx/intf.m:621
-msgid "Dismiss"
-msgstr ""
-
-#: modules/gui/macosx/intf.m:622
-msgid "Do not display further errors"
-msgstr ""
-
-#: modules/gui/macosx/intf.m:1099
+#: modules/gui/macosx/intf.m:1176
 #, c-format
 msgid "Volume: %d%%"
 msgstr "音量: %d%%"
 
-#: modules/gui/macosx/intf.m:1766
+#: modules/gui/macosx/intf.m:1814
 msgid "No CrashLog found"
 msgstr "没有发现当机纪录"
 
-#: modules/gui/macosx/intf.m:1766
+#: modules/gui/macosx/intf.m:1814
 msgid "Couldn't find any trace of a previous crash."
 msgstr ""
 
@@ -10267,10 +10845,6 @@ msgstr "浏览..."
 msgid "Treat as a pipe rather than as a file"
 msgstr ""
 
-#: modules/gui/macosx/open.m:167 modules/gui/wxwidgets/dialogs/open.cpp:723
-msgid "Device name"
-msgstr "装置名称"
-
 #: modules/gui/macosx/open.m:171
 msgid "Use DVD menus"
 msgstr "使用DVD选单"
@@ -10438,91 +11012,84 @@ msgstr "SDP URL"
 msgid "Save File"
 msgstr "储存文件"
 
-#: modules/gui/macosx/playlist.m:436
+#: modules/gui/macosx/playlist.m:434
 msgid "Save Playlist..."
 msgstr "储存播放列表..."
 
-#: modules/gui/macosx/playlist.m:438 modules/gui/pda/pda_interface.c:1254
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:285
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:292
-#: modules/gui/wxwidgets/dialogs/vlm/vlm_streampanel.cpp:105
-msgid "Delete"
-msgstr "删除"
-
-#: modules/gui/macosx/playlist.m:439
+#: modules/gui/macosx/playlist.m:437
 msgid "Expand Node"
 msgstr "展开结点"
 
-#: modules/gui/macosx/playlist.m:442
+#: modules/gui/macosx/playlist.m:440
 msgid "Get Stream Information"
 msgstr "获取串流信息"
 
-#: modules/gui/macosx/playlist.m:443
+#: modules/gui/macosx/playlist.m:441
 msgid "Sort Node by Name"
 msgstr "依名称排序节点"
 
-#: modules/gui/macosx/playlist.m:444
+#: modules/gui/macosx/playlist.m:442
 msgid "Sort Node by Author"
 msgstr "依制作人排序节点"
 
-#: modules/gui/macosx/playlist.m:447 modules/gui/macosx/playlist.m:497
-#: modules/gui/macosx/playlist.m:1523
+#: modules/gui/macosx/playlist.m:445 modules/gui/macosx/playlist.m:495
+#: modules/gui/macosx/playlist.m:1520
 msgid "No items in the playlist"
 msgstr "播放列表中没有项目"
 
-#: modules/gui/macosx/playlist.m:451
+#: modules/gui/macosx/playlist.m:449
 #: modules/gui/wxwidgets/dialogs/playlist.cpp:330
 msgid "Search"
 msgstr "搜索"
 
-#: modules/gui/macosx/playlist.m:453
+#: modules/gui/macosx/playlist.m:451
 msgid "Search in Playlist"
 msgstr "搜索播放列表"
 
-#: modules/gui/macosx/playlist.m:454
+#: modules/gui/macosx/playlist.m:452
 msgid "Standard Play"
 msgstr "标准播放"
 
-#: modules/gui/macosx/playlist.m:457
+#: modules/gui/macosx/playlist.m:455
 msgid "Add Folder to Playlist"
 msgstr "增加文件夹至播放列表"
 
-#: modules/gui/macosx/playlist.m:459
+#: modules/gui/macosx/playlist.m:457
 msgid "File Format:"
 msgstr "文件格式:"
 
-#: modules/gui/macosx/playlist.m:460
+#: modules/gui/macosx/playlist.m:458
 msgid "Extended M3U"
 msgstr "扩展 M3U"
 
-#: modules/gui/macosx/playlist.m:461
+#: modules/gui/macosx/playlist.m:459
 msgid "XML Shareable Playlist Format (XSPF)"
 msgstr ""
 
-#: modules/gui/macosx/playlist.m:491 modules/gui/macosx/playlist.m:1517
+#: modules/gui/macosx/playlist.m:489 modules/gui/macosx/playlist.m:1514
 #, c-format
 msgid "%i items in the playlist"
 msgstr "播放列表中有 %i 个项目"
 
-#: modules/gui/macosx/playlist.m:501 modules/gui/macosx/playlist.m:1527
+#: modules/gui/macosx/playlist.m:499 modules/gui/macosx/playlist.m:1524
 msgid "1 item in the playlist"
 msgstr "播放列表中有 1 个项目"
 
-#: modules/gui/macosx/playlist.m:706
+#: modules/gui/macosx/playlist.m:703
 msgid "Save Playlist"
 msgstr "储存播放列表"
 
-#: modules/gui/macosx/playlist.m:1486
+#: modules/gui/macosx/playlist.m:1483
 #, fuzzy
 msgid "New Node"
 msgstr "新节点"
 
-#: modules/gui/macosx/playlist.m:1487
+#: modules/gui/macosx/playlist.m:1484
 #, fuzzy
 msgid "Please enter a name for the new node."
 msgstr "请输入节点编号"
 
-#: modules/gui/macosx/playlist.m:1492
+#: modules/gui/macosx/playlist.m:1489
 msgid "Empty Folder"
 msgstr "空文件夹"
 
@@ -10613,7 +11180,7 @@ msgstr ""
 "注意: 这将复位您的 VLC media player 设置。\n"
 "是否确定要继续?"
 
-#: modules/gui/macosx/prefs.m:715
+#: modules/gui/macosx/prefs.m:719
 msgid "Some options are hidden. Check \"Advanced\" to display them."
 msgstr "除了这些选项之外, 还有一些已被隐藏的选项。单击 \"高级\" 可以看到它们。"
 
@@ -10637,8 +11204,7 @@ msgstr "子画面过滤器"
 msgid "Logo"
 msgstr "Logo"
 
-#: modules/gui/macosx/sfilters.m:73 modules/gui/macosx/sfilters.m:98
-#: modules/video_filter/marq.c:115
+#: modules/gui/macosx/sfilters.m:73 modules/video_filter/marq.c:115
 msgid "Marquee"
 msgstr "字幕"
 
@@ -10646,169 +11212,157 @@ msgstr "字幕"
 msgid "Save settings"
 msgstr "保存设置"
 
-#: modules/gui/macosx/sfilters.m:76 modules/gui/macosx/sfilters.m:83
-#: modules/gui/macosx/sfilters.m:95
+#: modules/gui/macosx/sfilters.m:76 modules/gui/macosx/sfilters.m:80
+#: modules/gui/macosx/sfilters.m:87
 #: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:399
 msgid "Enabled"
 msgstr "启用"
 
 #: modules/gui/macosx/sfilters.m:77
-msgid "Image"
+#, fuzzy
+msgid "Image:"
 msgstr "图像"
 
-#: modules/gui/macosx/sfilters.m:84
-msgid "Timestamp"
+#: modules/gui/macosx/sfilters.m:78 modules/gui/macosx/sfilters.m:85
+#: modules/gui/macosx/sfilters.m:93
+#, fuzzy
+msgid "Position:"
+msgstr "位置"
+
+#: modules/gui/macosx/sfilters.m:81
+#, fuzzy
+msgid "Timestamp:"
 msgstr "时间戳"
 
-#: modules/gui/macosx/sfilters.m:86 modules/gui/macosx/sfilters.m:107
-#: modules/gui/pda/pda.c:232
-msgid "Size"
-msgstr "大小"
+#: modules/gui/macosx/sfilters.m:82 modules/gui/macosx/sfilters.m:94
+#: modules/gui/pda/pda_interface.c:611
+msgid "Size:"
+msgstr "大小:"
+
+#: modules/gui/macosx/sfilters.m:83 modules/gui/macosx/sfilters.m:88
+#, fuzzy
+msgid "Color:"
+msgstr "色彩"
+
+#: modules/gui/macosx/sfilters.m:84
+#, fuzzy
+msgid "Opaqueness:"
+msgstr "打开:"
 
-#: modules/gui/macosx/sfilters.m:94 modules/gui/macosx/sfilters.m:109
+#: modules/gui/macosx/sfilters.m:86 modules/gui/macosx/sfilters.m:95
 msgid "(in pixels)"
 msgstr "(像素)"
 
-#: modules/gui/macosx/sfilters.m:102 modules/video_filter/marq.c:82
-msgid "Timeout"
+#: modules/gui/macosx/sfilters.m:89
+#, fuzzy
+msgid "Marquee:"
+msgstr "字幕"
+
+#: modules/gui/macosx/sfilters.m:91
+#, fuzzy
+msgid "Timeout:"
 msgstr "超时"
 
-#: modules/gui/macosx/sfilters.m:104
+#: modules/gui/macosx/sfilters.m:92
 msgid "ms"
 msgstr "ms"
 
-#: modules/gui/macosx/sfilters.m:135 modules/misc/freetype.c:129
+#: modules/gui/macosx/sfilters.m:121 modules/misc/freetype.c:127
 #: modules/misc/win32text.c:85 modules/video_filter/marq.c:52
 #: modules/video_filter/rss.c:63 modules/video_filter/time.c:52
 msgid "Black"
 msgstr "黑色"
 
-#: modules/gui/macosx/sfilters.m:136 modules/misc/freetype.c:129
+#: modules/gui/macosx/sfilters.m:122 modules/misc/freetype.c:127
 #: modules/misc/win32text.c:85 modules/video_filter/marq.c:53
 #: modules/video_filter/rss.c:64 modules/video_filter/time.c:53
 msgid "Gray"
 msgstr "灰色"
 
-#: modules/gui/macosx/sfilters.m:137 modules/misc/freetype.c:129
+#: modules/gui/macosx/sfilters.m:123 modules/misc/freetype.c:127
 #: modules/misc/win32text.c:85 modules/video_filter/marq.c:53
 #: modules/video_filter/rss.c:64 modules/video_filter/time.c:53
 msgid "Silver"
 msgstr "银色"
 
-#: modules/gui/macosx/sfilters.m:138 modules/misc/freetype.c:129
+#: modules/gui/macosx/sfilters.m:124 modules/misc/freetype.c:127
 #: modules/misc/win32text.c:85 modules/video_filter/marq.c:53
 #: modules/video_filter/rss.c:64 modules/video_filter/time.c:53
 msgid "White"
 msgstr "白色"
 
-#: modules/gui/macosx/sfilters.m:139 modules/misc/freetype.c:129
+#: modules/gui/macosx/sfilters.m:125 modules/misc/freetype.c:127
 #: modules/misc/win32text.c:85 modules/video_filter/marq.c:53
 #: modules/video_filter/rss.c:64 modules/video_filter/time.c:53
 msgid "Maroon"
 msgstr "栗色"
 
-#: modules/gui/macosx/sfilters.m:140 modules/misc/freetype.c:130
+#: modules/gui/macosx/sfilters.m:126 modules/misc/freetype.c:128
 #: modules/misc/win32text.c:86 modules/video_filter/marq.c:53
 #: modules/video_filter/rss.c:64 modules/video_filter/time.c:53
 msgid "Red"
 msgstr "红色"
 
-#: modules/gui/macosx/sfilters.m:141 modules/misc/freetype.c:130
+#: modules/gui/macosx/sfilters.m:127 modules/misc/freetype.c:128
 #: modules/misc/win32text.c:86 modules/video_filter/marq.c:54
 #: modules/video_filter/rss.c:65 modules/video_filter/time.c:54
 msgid "Fuchsia"
 msgstr "紫红色"
 
-#: modules/gui/macosx/sfilters.m:142 modules/misc/freetype.c:130
+#: modules/gui/macosx/sfilters.m:128 modules/misc/freetype.c:128
 #: modules/misc/win32text.c:86 modules/video_filter/marq.c:54
 #: modules/video_filter/rss.c:65 modules/video_filter/time.c:54
 msgid "Yellow"
 msgstr "黄色"
 
-#: modules/gui/macosx/sfilters.m:143 modules/misc/freetype.c:130
+#: modules/gui/macosx/sfilters.m:129 modules/misc/freetype.c:128
 #: modules/misc/win32text.c:86 modules/video_filter/marq.c:54
 #: modules/video_filter/rss.c:65 modules/video_filter/time.c:54
 msgid "Olive"
 msgstr "橄榄色"
 
-#: modules/gui/macosx/sfilters.m:144 modules/misc/freetype.c:130
+#: modules/gui/macosx/sfilters.m:130 modules/misc/freetype.c:128
 #: modules/misc/win32text.c:86 modules/video_filter/marq.c:54
 #: modules/video_filter/rss.c:65 modules/video_filter/time.c:54
 msgid "Green"
 msgstr "绿色"
 
-#: modules/gui/macosx/sfilters.m:145 modules/misc/freetype.c:130
+#: modules/gui/macosx/sfilters.m:131 modules/misc/freetype.c:128
 #: modules/misc/win32text.c:86 modules/video_filter/marq.c:55
 #: modules/video_filter/rss.c:66 modules/video_filter/time.c:55
 msgid "Teal"
 msgstr "蓝绿色"
 
-#: modules/gui/macosx/sfilters.m:146 modules/misc/freetype.c:131
+#: modules/gui/macosx/sfilters.m:132 modules/misc/freetype.c:129
 #: modules/misc/win32text.c:87 modules/video_filter/marq.c:55
 #: modules/video_filter/rss.c:66 modules/video_filter/time.c:55
 msgid "Lime"
 msgstr "柠檬色"
 
-#: modules/gui/macosx/sfilters.m:147 modules/misc/freetype.c:131
+#: modules/gui/macosx/sfilters.m:133 modules/misc/freetype.c:129
 #: modules/misc/win32text.c:87 modules/video_filter/marq.c:55
 #: modules/video_filter/rss.c:66 modules/video_filter/time.c:55
 msgid "Purple"
 msgstr "紫色"
 
-#: modules/gui/macosx/sfilters.m:148 modules/misc/freetype.c:131
+#: modules/gui/macosx/sfilters.m:134 modules/misc/freetype.c:129
 #: modules/misc/win32text.c:87 modules/video_filter/marq.c:55
 #: modules/video_filter/rss.c:66 modules/video_filter/time.c:55
 msgid "Navy"
 msgstr "藏青色"
 
-#: modules/gui/macosx/sfilters.m:149 modules/misc/freetype.c:131
+#: modules/gui/macosx/sfilters.m:135 modules/misc/freetype.c:129
 #: modules/misc/win32text.c:87 modules/video_filter/marq.c:55
 #: modules/video_filter/rss.c:66 modules/video_filter/time.c:55
 msgid "Blue"
 msgstr "蓝色"
 
-#: modules/gui/macosx/sfilters.m:150 modules/misc/freetype.c:131
+#: modules/gui/macosx/sfilters.m:136 modules/misc/freetype.c:129
 #: modules/misc/win32text.c:87 modules/video_filter/marq.c:56
 #: modules/video_filter/rss.c:67 modules/video_filter/time.c:56
 msgid "Aqua"
 msgstr "浅绿色"
 
-#: modules/gui/macosx/sfilters.m:190
-msgid "Center-Center"
-msgstr "居中"
-
-#: modules/gui/macosx/sfilters.m:191
-msgid "Left-Center"
-msgstr "左中"
-
-#: modules/gui/macosx/sfilters.m:192
-msgid "Right-Center"
-msgstr "右中"
-
-#: modules/gui/macosx/sfilters.m:193
-msgid "Center-Top"
-msgstr "中上方"
-
-#: modules/gui/macosx/sfilters.m:194
-msgid "Left-Top"
-msgstr "左上方"
-
-#: modules/gui/macosx/sfilters.m:195
-msgid "Right-Top"
-msgstr "右上方"
-
-#: modules/gui/macosx/sfilters.m:196
-msgid "Center-Bottom"
-msgstr "中下方"
-
-#: modules/gui/macosx/sfilters.m:197
-msgid "Left-Bottom"
-msgstr "左下方"
-
-#: modules/gui/macosx/sfilters.m:198
-msgid "Right-Bottom"
-msgstr "右下方"
-
 #: modules/gui/macosx/update.m:84
 msgid "Check for Updates"
 msgstr "检查更新"
@@ -11042,12 +11596,12 @@ msgstr ""
 "特性."
 
 #: modules/gui/macosx/wizard.m:377 modules/gui/macosx/wizard.m:525
-#: modules/gui/macosx/wizard.m:1659
+#: modules/gui/macosx/wizard.m:1660
 #: modules/gui/wxwidgets/dialogs/wizard.cpp:88
 msgid "Stream to network"
 msgstr "串流至网络"
 
-#: modules/gui/macosx/wizard.m:379 modules/gui/macosx/wizard.m:1667
+#: modules/gui/macosx/wizard.m:379 modules/gui/macosx/wizard.m:1668
 #: modules/gui/wxwidgets/dialogs/wizard.cpp:90
 msgid "Transcode/Save to file"
 msgstr "转码/储存至文件"
@@ -11061,7 +11615,7 @@ msgid "Choose here your input stream."
 msgstr "在这选择你的输入串流"
 
 #: modules/gui/macosx/wizard.m:386 modules/gui/macosx/wizard.m:563
-#: modules/gui/macosx/wizard.m:1700
+#: modules/gui/macosx/wizard.m:1701
 #: modules/gui/wxwidgets/dialogs/wizard.cpp:109
 msgid "Select a stream"
 msgstr "选择串流"
@@ -11126,7 +11680,7 @@ msgstr "UDP组播"
 
 #: modules/gui/macosx/wizard.m:417 modules/gui/pda/pda_interface.c:1221
 #: modules/gui/wxwidgets/dialogs/wizard.cpp:125
-#: modules/stream_out/transcode.c:186
+#: modules/stream_out/transcode.c:190
 msgid "Transcode"
 msgstr "转码"
 
@@ -11146,13 +11700,13 @@ msgstr "音频转码"
 msgid "Transcode video"
 msgstr "视频转码"
 
-#: modules/gui/macosx/wizard.m:427 modules/gui/macosx/wizard.m:1802
+#: modules/gui/macosx/wizard.m:427 modules/gui/macosx/wizard.m:1803
 msgid ""
 "Enabling this allows to transcode the audio track if one is present in the "
 "stream."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:429 modules/gui/macosx/wizard.m:1819
+#: modules/gui/macosx/wizard.m:429 modules/gui/macosx/wizard.m:1820
 msgid ""
 "Enabling this allows to transcode the video track if one is present in the "
 "stream."
@@ -11179,13 +11733,13 @@ msgid "In this page, a few additional streaming parameters can be set."
 msgstr "在这一页，你可以为串流定义一些附加的参数。"
 
 #: modules/gui/macosx/wizard.m:444 modules/gui/macosx/wizard.m:470
-#: modules/gui/macosx/wizard.m:1858
+#: modules/gui/macosx/wizard.m:1859
 #: modules/gui/wxwidgets/dialogs/wizard.cpp:1348
 msgid "SAP Announce"
 msgstr "SAP 通告"
 
 #: modules/gui/macosx/wizard.m:446 modules/gui/macosx/wizard.m:455
-#: modules/gui/macosx/wizard.m:480 modules/gui/macosx/wizard.m:1871
+#: modules/gui/macosx/wizard.m:480 modules/gui/macosx/wizard.m:1872
 msgid "Local playback"
 msgstr "本地播放"
 
@@ -11289,40 +11843,40 @@ msgid ""
 "Enter either a valid path or use the \"Choose\" button to select a location."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:1372
+#: modules/gui/macosx/wizard.m:1373
 msgid "Finish"
 msgstr "完成"
 
-#: modules/gui/macosx/wizard.m:1377
+#: modules/gui/macosx/wizard.m:1378
 #, c-format
 msgid "%i items"
 msgstr "%i 项"
 
-#: modules/gui/macosx/wizard.m:1385 modules/gui/macosx/wizard.m:1439
+#: modules/gui/macosx/wizard.m:1386 modules/gui/macosx/wizard.m:1440
 msgid "yes"
 msgstr "是"
 
-#: modules/gui/macosx/wizard.m:1387 modules/gui/macosx/wizard.m:1397
-#: modules/gui/macosx/wizard.m:1410 modules/gui/macosx/wizard.m:1422
-#: modules/gui/macosx/wizard.m:1442
+#: modules/gui/macosx/wizard.m:1388 modules/gui/macosx/wizard.m:1398
+#: modules/gui/macosx/wizard.m:1411 modules/gui/macosx/wizard.m:1423
+#: modules/gui/macosx/wizard.m:1443
 msgid "no"
 msgstr "否"
 
-#: modules/gui/macosx/wizard.m:1393
+#: modules/gui/macosx/wizard.m:1394
 #, objc-format
 msgid "yes: from %@ to %@ secs"
 msgstr "yes: 从 %@ 到 %@ 秒"
 
-#: modules/gui/macosx/wizard.m:1403 modules/gui/macosx/wizard.m:1415
+#: modules/gui/macosx/wizard.m:1404 modules/gui/macosx/wizard.m:1416
 #, objc-format
 msgid "yes: %@ @ %@ kb/s"
 msgstr "yes: %@ @ %@ kb/s"
 
-#: modules/gui/macosx/wizard.m:1661
+#: modules/gui/macosx/wizard.m:1662
 msgid "This allows to stream on a network."
 msgstr "用此选项串流至网络"
 
-#: modules/gui/macosx/wizard.m:1669
+#: modules/gui/macosx/wizard.m:1670
 msgid ""
 "This allows to save a stream to a file. The can be reencoded on the fly. "
 "Whatever VLC can read can be saved.\n"
@@ -11334,15 +11888,15 @@ msgstr ""
 "请注意，VLC 可能不是很适合于文件到文件的转码。您应该使用它的转码功能来保存一"
 "些其它的东西，诸如网络流。"
 
-#: modules/gui/macosx/wizard.m:1797
+#: modules/gui/macosx/wizard.m:1798
 msgid "Select your audio codec. Click one to get more information."
 msgstr "选择你的音频编码器，点击以显示更多信息"
 
-#: modules/gui/macosx/wizard.m:1814
+#: modules/gui/macosx/wizard.m:1815
 msgid "Select your video codec. Click one to get more information."
 msgstr "选择你的视频编码器，点击以显示更多信息"
 
-#: modules/gui/macosx/wizard.m:1849
+#: modules/gui/macosx/wizard.m:1850
 msgid ""
 "This allows to define the TTL (Time-To-Live) of the stream. This parameter "
 "is the maximum number of routers your stream can go through. If you don't "
@@ -11350,7 +11904,7 @@ msgid ""
 "leave this setting to 1."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:1860
+#: modules/gui/macosx/wizard.m:1861
 msgid ""
 "When streaming using UDP, the streams can be announced using the SAP/SDP "
 "announcing protocol. This way, the clients won't have to type in the "
@@ -11360,7 +11914,7 @@ msgid ""
 "name will be used."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:1873
+#: modules/gui/macosx/wizard.m:1874
 msgid ""
 "When this option is enabled, the stream will be both played and transcoded/"
 "streamed.\n"
@@ -11404,6 +11958,10 @@ msgstr "文件名称"
 msgid "Permissions"
 msgstr "权限"
 
+#: modules/gui/pda/pda.c:232
+msgid "Size"
+msgstr "大小"
+
 #: modules/gui/pda/pda.c:238
 msgid "Owner"
 msgstr "拥有者"
@@ -11515,10 +12073,6 @@ msgstr "频道:"
 msgid "Norm:"
 msgstr "规范:"
 
-#: modules/gui/pda/pda_interface.c:611
-msgid "Size:"
-msgstr "大小:"
-
 #: modules/gui/pda/pda_interface.c:620
 msgid "Frequency:"
 msgstr "频率:"
@@ -11771,55 +12325,168 @@ msgstr "SLP 通告:"
 msgid "Announce Channel:"
 msgstr "通告频道:"
 
-#: modules/gui/pda/pda_interface.c:1249
-msgid "Update"
-msgstr "更新"
+#: modules/gui/pda/pda_interface.c:1249
+msgid "Update"
+msgstr "更新"
+
+#: modules/gui/pda/pda_interface.c:1259
+msgid " Clear "
+msgstr " 清除 "
+
+#: modules/gui/pda/pda_interface.c:1290
+msgid " Save "
+msgstr " 保存 "
+
+#: modules/gui/pda/pda_interface.c:1295
+msgid " Apply "
+msgstr " 应用 "
+
+#: modules/gui/pda/pda_interface.c:1300
+msgid " Cancel "
+msgstr " 取消 "
+
+#: modules/gui/pda/pda_interface.c:1305
+msgid "Preference"
+msgstr "个人设置"
+
+#: modules/gui/pda/pda_interface.c:1333
+msgid ""
+"VLC media player is an MPEG, MPEG 2, MP3 and DivX player that accepts input "
+"from local or network sources and is licensed under the GPL (http://www.gnu."
+"org/copyleft/gpl.html)."
+msgstr ""
+"VLC media player 是一个可以从本地或网络上接受输入的、在 GPL (http://www.gnu."
+"org/copyleft/gpl.html) 许可下发行的 MPEG, MPEG 2, MP3 和 DivX 的播放器。"
+
+#: modules/gui/pda/pda_interface.c:1341
+msgid "Authors: the VideoLAN Team, http://www.videolan.org/team/"
+msgstr "作者: the VideoLAN Team, http://www.videolan.org/team/"
+
+#: modules/gui/pda/pda_interface.c:1349
+msgid "(c) 1996-2004 the the VideoLAN team team"
+msgstr "(c) 1996-2004 VideoLAN 开发小组"
+
+#: modules/gui/pda/pda_support.c:90 modules/gui/pda/pda_support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "无法找到 pixmap 文件: %s"
+
+#: modules/gui/qnx/qnx.c:44
+msgid "QNX RTOS video and audio output"
+msgstr "QNX RTOS视频及音频输出"
+
+#: modules/gui/qt4/dialogs/errors.cpp:37
+msgid "Errors"
+msgstr "错误"
+
+#: modules/gui/qt4/dialogs/streaminfo.cpp:35
+#, fuzzy
+msgid "Stream information"
+msgstr "获取串流信息"
+
+#: modules/gui/qt4/dialogs_provider.cpp:235
+#: modules/gui/qt4/dialogs_provider.cpp:246
+#, fuzzy
+msgid "Open directory"
+msgstr "打开目录(&I)..."
+
+#: modules/gui/qt4/qt4.cpp:45
+#, fuzzy
+msgid "QT interface"
+msgstr "显示界面"
+
+#: modules/gui/qt4/zep.cpp:9 modules/gui/wxwidgets/dialogs/playlist.cpp:243
+msgid "&Simple Add File..."
+msgstr "增加文件(&S)..."
+
+#: modules/gui/qt4/zep.cpp:10 modules/gui/wxwidgets/dialogs/playlist.cpp:244
+msgid "Add &Directory..."
+msgstr "增加目录(&D)..."
+
+#: modules/gui/qt4/zep.cpp:11 modules/gui/wxwidgets/dialogs/playlist.cpp:245
+msgid "&Add URL..."
+msgstr "增加 URL(&A)..."
+
+#: modules/gui/qt4/zep.cpp:13 modules/gui/wxwidgets/dialogs/playlist.cpp:247
+msgid "Services Discovery"
+msgstr "服务探索"
+
+#: modules/gui/qt4/zep.cpp:16 modules/gui/wxwidgets/dialogs/playlist.cpp:250
+msgid "&Open Playlist..."
+msgstr "打开播放列表(&O)..."
+
+#: modules/gui/qt4/zep.cpp:17 modules/gui/wxwidgets/dialogs/playlist.cpp:251
+msgid "&Save Playlist..."
+msgstr "储存播放列表(&S)..."
+
+#: modules/gui/qt4/zep.cpp:19
+#: modules/gui/wxwidgets/dialogs/interaction.cpp:188
+#: modules/gui/wxwidgets/dialogs/messages.cpp:72
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:253
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:76
+msgid "&Close"
+msgstr "关闭(&C)"
+
+#: modules/gui/qt4/zep.cpp:23 modules/gui/wxwidgets/dialogs/playlist.cpp:264
+msgid "D&elete"
+msgstr "删除(&D)"
+
+#: modules/gui/qt4/zep.cpp:27 modules/gui/wxwidgets/dialogs/playlist.cpp:271
+msgid "&Manage"
+msgstr "管理(&M)"
+
+#: modules/gui/qt4/zep.cpp:28 modules/gui/wxwidgets/dialogs/playlist.cpp:272
+msgid "S&ort"
+msgstr "排序(&S)"
+
+#: modules/gui/qt4/zep.cpp:29 modules/gui/wxwidgets/dialogs/playlist.cpp:273
+msgid "&Selection"
+msgstr "选择(&S)"
 
-#: modules/gui/pda/pda_interface.c:1259
-msgid " Clear "
-msgstr " 清除 "
+#: modules/gui/qt4/zep.cpp:30 modules/gui/wxwidgets/dialogs/playlist.cpp:274
+msgid "&View items"
+msgstr "查看项目(&V)"
 
-#: modules/gui/pda/pda_interface.c:1290
-msgid " Save "
-msgstr " 保存 "
+#: modules/gui/qt4/zep.cpp:110 modules/gui/wxwidgets/dialogs/playlist.cpp:936
+msgid "XSPF playlist"
+msgstr "XSPF 播放列表"
 
-#: modules/gui/pda/pda_interface.c:1295
-msgid " Apply "
-msgstr " 应用 "
+#: modules/gui/qt4/zep.cpp:117 modules/gui/wxwidgets/dialogs/playlist.cpp:943
+msgid "Playlist is empty"
+msgstr "播放列表是空的"
 
-#: modules/gui/pda/pda_interface.c:1300
-msgid " Cancel "
-msgstr " 取消 "
+#: modules/gui/qt4/zep.cpp:117 modules/gui/wxwidgets/dialogs/playlist.cpp:943
+msgid "Can't save"
+msgstr "无法储存"
 
-#: modules/gui/pda/pda_interface.c:1305
-msgid "Preference"
-msgstr "个人设置"
+#: modules/gui/qt4/zep.cpp:129 modules/gui/skins2/src/dialogs.cpp:240
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:955
+msgid "Save playlist"
+msgstr "储存播放列表"
 
-#: modules/gui/pda/pda_interface.c:1333
-msgid ""
-"VLC media player is an MPEG, MPEG 2, MP3 and DivX player that accepts input "
-"from local or network sources and is licensed under the GPL (http://www.gnu."
-"org/copyleft/gpl.html)."
-msgstr ""
-"VLC media player 是一个可以从本地或网络上接受输入的、在 GPL (http://www.gnu."
-"org/copyleft/gpl.html) 许可下发行的 MPEG, MPEG 2, MP3 和 DivX 的播放器。"
+#: modules/gui/qt4/zep.cpp:150 modules/gui/skins2/src/dialogs.cpp:230
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:976
+msgid "Open playlist"
+msgstr "打开播放列表"
 
-#: modules/gui/pda/pda_interface.c:1341
-msgid "Authors: the VideoLAN Team, http://www.videolan.org/team/"
-msgstr "作者: the VideoLAN Team, http://www.videolan.org/team/"
+#: modules/gui/qt4/zep.cpp:421 modules/gui/wxwidgets/dialogs/playlist.cpp:1417
+#: modules/gui/wxwidgets/wxwidgets.cpp:114 modules/misc/freetype.c:105
+#: modules/misc/win32text.c:77
+msgid "Normal"
+msgstr "正常"
 
-#: modules/gui/pda/pda_interface.c:1349
-msgid "(c) 1996-2004 the the VideoLAN team team"
-msgstr "(c) 1996-2004 VideoLAN 开发小组"
+#: modules/gui/qt4/zep.cpp:422 modules/gui/wxwidgets/dialogs/playlist.cpp:1418
+#, fuzzy
+msgid "One level"
+msgstr "最大等级"
 
-#: modules/gui/pda/pda_support.c:90 modules/gui/pda/pda_support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "无法找到 pixmap 文件: %s"
+#: modules/gui/qt4/zep.cpp:504 modules/gui/wxwidgets/dialogs/playlist.cpp:1614
+msgid "Please enter node name"
+msgstr "请输入节点编号"
 
-#: modules/gui/qnx/qnx.c:44
-msgid "QNX RTOS video and audio output"
-msgstr "QNX RTOS视频及音频输出"
+#: modules/gui/qt4/zep.cpp:505 modules/gui/wxwidgets/dialogs/playlist.cpp:1615
+msgid "New node"
+msgstr "新节点"
 
 #: modules/gui/skins2/src/dialogs.cpp:222
 msgid "Open a skin file"
@@ -11829,11 +12496,6 @@ msgstr "打开面板文件"
 msgid "Skin files (*.vlt;*.wsz)|*.vlt;*.wsz|Skin files (*.xml)|*.xml"
 msgstr "皮肤文件 (*.vlt;*.wsz)|*.vlt;*.wsz|皮肤文件 (*.xml)|*.xml"
 
-#: modules/gui/skins2/src/dialogs.cpp:230
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:973
-msgid "Open playlist"
-msgstr "打开播放列表"
-
 #: modules/gui/skins2/src/dialogs.cpp:231
 msgid ""
 "All playlists|*.pls;*.m3u;*.asx;*.b4s;*.xspf|M3U files|*.m3u|XSPF playlist|*."
@@ -11842,68 +12504,63 @@ msgstr ""
 "所有播放列表|*.pls;*.m3u;*.asx;*.b4s;*.xspf|M3U 文件|*.m3u|XSPF 播放列表|*."
 "xspf"
 
-#: modules/gui/skins2/src/dialogs.cpp:240
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:955
-msgid "Save playlist"
-msgstr "储存播放列表"
-
 #: modules/gui/skins2/src/dialogs.cpp:240
 msgid "M3U file|*.m3u|XSPF playlist|*.xspf"
 msgstr ""
 
-#: modules/gui/skins2/src/skin_main.cpp:418
+#: modules/gui/skins2/src/skin_main.cpp:426
 msgid "Skin to use"
 msgstr "要使用的皮肤"
 
-#: modules/gui/skins2/src/skin_main.cpp:419
+#: modules/gui/skins2/src/skin_main.cpp:427
 msgid "Path to the skin to use."
 msgstr "要使用的皮肤文件完整路径"
 
-#: modules/gui/skins2/src/skin_main.cpp:420
+#: modules/gui/skins2/src/skin_main.cpp:428
 msgid "Config of last used skin"
 msgstr "组态上一次使用的面板"
 
-#: modules/gui/skins2/src/skin_main.cpp:421
+#: modules/gui/skins2/src/skin_main.cpp:429
 msgid ""
 "Windows configuration of the last skin used. This option is updated "
 "automatically, do not touch it."
 msgstr ""
 
-#: modules/gui/skins2/src/skin_main.cpp:423
+#: modules/gui/skins2/src/skin_main.cpp:431
 #: modules/gui/wxwidgets/wxwidgets.cpp:101
 msgid "Systray icon"
 msgstr "托盘图标"
 
-#: modules/gui/skins2/src/skin_main.cpp:424
+#: modules/gui/skins2/src/skin_main.cpp:432
 #: modules/gui/wxwidgets/wxwidgets.cpp:102
 msgid "Show a systray icon for VLC"
 msgstr "显示 VLC 托盘图标。"
 
-#: modules/gui/skins2/src/skin_main.cpp:425
-#: modules/gui/skins2/src/skin_main.cpp:426
+#: modules/gui/skins2/src/skin_main.cpp:433
+#: modules/gui/skins2/src/skin_main.cpp:434
 #: modules/gui/wxwidgets/wxwidgets.cpp:95
 msgid "Show VLC on the taskbar"
 msgstr "在任务栏上显示 VLC"
 
-#: modules/gui/skins2/src/skin_main.cpp:427
+#: modules/gui/skins2/src/skin_main.cpp:435
 msgid "Enable transparency effects"
 msgstr "启用透明效果"
 
-#: modules/gui/skins2/src/skin_main.cpp:428
+#: modules/gui/skins2/src/skin_main.cpp:436
 msgid ""
 "You can disable all transparency effects if you want. This is mainly useful "
 "when moving windows does not behave correctly."
 msgstr ""
 
-#: modules/gui/skins2/src/skin_main.cpp:452
+#: modules/gui/skins2/src/skin_main.cpp:461
 msgid "Skins"
 msgstr "皮肤"
 
-#: modules/gui/skins2/src/skin_main.cpp:453
+#: modules/gui/skins2/src/skin_main.cpp:462
 msgid "Skinnable Interface"
 msgstr "可面板化界面"
 
-#: modules/gui/skins2/src/skin_main.cpp:460
+#: modules/gui/skins2/src/skin_main.cpp:469
 msgid "Skins loader demux"
 msgstr "面板载入器解多任务"
 
@@ -11925,7 +12582,7 @@ msgstr ""
 "(WinCE界面)\n"
 "\n"
 
-#: modules/gui/wince/interface.cpp:497 modules/gui/wxwidgets/interface.cpp:937
+#: modules/gui/wince/interface.cpp:497 modules/gui/wxwidgets/interface.cpp:940
 msgid ""
 "(c) 1996-2006 - the VideoLAN Team\n"
 "\n"
@@ -11933,15 +12590,15 @@ msgstr ""
 "(c) 1996-2006 - VideoLAN 开发小组\n"
 "\n"
 
-#: modules/gui/wince/interface.cpp:498 modules/gui/wxwidgets/interface.cpp:938
+#: modules/gui/wince/interface.cpp:498 modules/gui/wxwidgets/interface.cpp:941
 msgid "Compiled by "
 msgstr "编译者 "
 
-#: modules/gui/wince/interface.cpp:500 modules/gui/wxwidgets/interface.cpp:940
+#: modules/gui/wince/interface.cpp:500 modules/gui/wxwidgets/interface.cpp:943
 msgid "Compiler: "
 msgstr "编译器: "
 
-#: modules/gui/wince/interface.cpp:502 modules/gui/wxwidgets/interface.cpp:942
+#: modules/gui/wince/interface.cpp:502 modules/gui/wxwidgets/interface.cpp:945
 msgid "Based on SVN revision: "
 msgstr "基于 SVN 版本:"
 
@@ -11991,6 +12648,11 @@ msgstr "WinCE 界面模块"
 msgid "WinCE dialogs provider"
 msgstr "Wince 对话提供商"
 
+#: modules/gui/wxwidgets/dialogs.cpp:433
+#: modules/gui/wxwidgets/dialogs/open.cpp:1265
+msgid "All Files (*.*)|*|Sound Files (*.mp3, *.ogg, etc.)|"
+msgstr ""
+
 #: modules/gui/wxwidgets/dialogs/bookmarks.cpp:75
 msgid "Edit bookmark"
 msgstr "编辑书签"
@@ -12001,7 +12663,6 @@ msgid "Bytes"
 msgstr "字节"
 
 #: modules/gui/wxwidgets/dialogs/bookmarks.cpp:105
-#: modules/gui/wxwidgets/dialogs/interaction.cpp:172
 #: modules/gui/wxwidgets/dialogs/iteminfo.cpp:78
 #: modules/gui/wxwidgets/dialogs/open.cpp:320
 #: modules/gui/wxwidgets/dialogs/open.cpp:490
@@ -12013,7 +12674,6 @@ msgstr "确定"
 
 #: modules/gui/wxwidgets/dialogs/bookmarks.cpp:108
 #: modules/gui/wxwidgets/dialogs/interaction.cpp:174
-#: modules/gui/wxwidgets/dialogs/interaction.cpp:185
 #: modules/gui/wxwidgets/dialogs/iteminfo.cpp:81
 #: modules/gui/wxwidgets/dialogs/open.cpp:323
 #: modules/gui/wxwidgets/dialogs/open.cpp:493
@@ -12030,7 +12690,7 @@ msgid "&Delete"
 msgstr "删除"
 
 #: modules/gui/wxwidgets/dialogs/bookmarks.cpp:163
-#: modules/gui/wxwidgets/dialogs/interaction.cpp:196
+#: modules/gui/wxwidgets/dialogs/interaction.cpp:186
 #: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:411
 #, fuzzy
 msgid "&Clear"
@@ -12067,31 +12727,24 @@ msgstr "串流及媒体信息"
 msgid "Advanced information"
 msgstr "高级选项"
 
-#: modules/gui/wxwidgets/dialogs/interaction.cpp:116
+#: modules/gui/wxwidgets/dialogs/interaction.cpp:114
 msgid ""
 "The following errors occurred. More details might be available in the "
 "Messages window."
 msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/interaction.cpp:181
+#: modules/gui/wxwidgets/dialogs/interaction.cpp:170
 msgid "&Yes"
 msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/interaction.cpp:183
+#: modules/gui/wxwidgets/dialogs/interaction.cpp:172
 msgid "&No"
 msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/interaction.cpp:193
+#: modules/gui/wxwidgets/dialogs/interaction.cpp:183
 msgid "Don't show further errors"
 msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/interaction.cpp:198
-#: modules/gui/wxwidgets/dialogs/messages.cpp:72
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:253
-#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:76
-msgid "&Close"
-msgstr "关闭(&C)"
-
 #: modules/gui/wxwidgets/dialogs/iteminfo.cpp:58
 msgid "Playlist item info"
 msgstr "播放列表项目信息"
@@ -12218,55 +12871,55 @@ msgid ""
 "will scan for a CD-ROM with an audio CD in it."
 msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/open.cpp:1291
+#: modules/gui/wxwidgets/dialogs/open.cpp:1295
 msgid "Open subtitles file"
 msgstr "打开字幕文件"
 
-#: modules/gui/wxwidgets/dialogs/open.cpp:1668
+#: modules/gui/wxwidgets/dialogs/open.cpp:1672
 msgid "Title number."
 msgstr "标题数目."
 
-#: modules/gui/wxwidgets/dialogs/open.cpp:1671
+#: modules/gui/wxwidgets/dialogs/open.cpp:1675
 msgid ""
 "DVD's can have up to 32 subtitles numbered 0..31. Note this is not the same "
 "thing as a subtitle name (e.g. 'en'). If a value -1 is used, no subtitle "
 "will be shown."
 msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/open.cpp:1675
+#: modules/gui/wxwidgets/dialogs/open.cpp:1679
 msgid "Audio track number. DVD's can have up to 8 audio tracks numbered 0..7."
 msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/open.cpp:1696
+#: modules/gui/wxwidgets/dialogs/open.cpp:1700
 msgid "Playback control (PBC) usually starts with number 1."
 msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/open.cpp:1702
+#: modules/gui/wxwidgets/dialogs/open.cpp:1706
 msgid "The first entry (the beginning of the first MPEG track) is 0."
 msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/open.cpp:1707
+#: modules/gui/wxwidgets/dialogs/open.cpp:1711
 msgid "Track number."
 msgstr "轨道编号。"
 
-#: modules/gui/wxwidgets/dialogs/open.cpp:1714
+#: modules/gui/wxwidgets/dialogs/open.cpp:1718
 msgid ""
 "SVCD's can have up to 4 subtitles numbered 0..3. If a value -1 is used, no "
 "subtitle will be shown."
 msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/open.cpp:1717
+#: modules/gui/wxwidgets/dialogs/open.cpp:1721
 msgid ""
 "Audio track number. VCD's can have up to 2 audio tracks numbered 0 or 1. "
 msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/open.cpp:1729
+#: modules/gui/wxwidgets/dialogs/open.cpp:1733
 msgid ""
 "Audio CDs can have up to 100 tracks, the first track is usually 1. If 0 is "
 "given, then all tracks are played."
 msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/open.cpp:1733
+#: modules/gui/wxwidgets/dialogs/open.cpp:1737
 msgid "Audio CDs can have up to 100 tracks, the first track is usually 1."
 msgstr ""
 
@@ -12274,30 +12927,6 @@ msgstr ""
 msgid "Shuffle"
 msgstr "打乱顺序"
 
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:243
-msgid "&Simple Add File..."
-msgstr "增加文件(&S)..."
-
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:244
-msgid "Add &Directory..."
-msgstr "增加目录(&D)..."
-
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:245
-msgid "&Add URL..."
-msgstr "增加 URL(&A)..."
-
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:247
-msgid "Services Discovery"
-msgstr "服务探索"
-
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:250
-msgid "&Open Playlist..."
-msgstr "打开播放列表(&O)..."
-
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:251
-msgid "&Save Playlist..."
-msgstr "储存播放列表(&S)..."
-
 #: modules/gui/wxwidgets/dialogs/playlist.cpp:257
 msgid "Sort by &Title"
 msgstr "依标题排序(&T)"
@@ -12310,26 +12939,6 @@ msgstr "依标题反向排序(&R)"
 msgid "&Shuffle"
 msgstr "乱化(&S)"
 
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:264
-msgid "D&elete"
-msgstr "删除(&D)"
-
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:271
-msgid "&Manage"
-msgstr "管理(&M)"
-
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:272
-msgid "S&ort"
-msgstr "排序(&S)"
-
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:273
-msgid "&Selection"
-msgstr "选择(&S)"
-
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:274
-msgid "&View items"
-msgstr "查看项目(&V)"
-
 #: modules/gui/wxwidgets/dialogs/playlist.cpp:282
 msgid "Play this Branch"
 msgstr "播放该分支"
@@ -12364,45 +12973,6 @@ msgstr "根"
 msgid "%i items in playlist"
 msgstr "%i个项目在播放列表中"
 
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:935
-msgid "M3U file"
-msgstr "M3U文件"
-
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:936
-msgid "XSPF playlist"
-msgstr "XSPF 播放列表"
-
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:943
-msgid "Playlist is empty"
-msgstr "播放列表是空的"
-
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:943
-msgid "Can't save"
-msgstr "无法储存"
-
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:1413
-#: modules/gui/wxwidgets/wxwidgets.cpp:114 modules/misc/freetype.c:106
-#: modules/misc/win32text.c:77
-msgid "Normal"
-msgstr "正常"
-
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:1414
-#, fuzzy
-msgid "One level"
-msgstr "最大等级"
-
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:1629
-msgid "Please enter node name"
-msgstr "请输入节点编号"
-
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:1630
-msgid "Add node"
-msgstr "添加节点"
-
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:1630
-msgid "New node"
-msgstr "新节点"
-
 #: modules/gui/wxwidgets/dialogs/preferences.cpp:208
 #: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:79
 #, fuzzy
@@ -12417,12 +12987,6 @@ msgstr ""
 "注意: 这将复位您的 VLC media player 设置。\n"
 "是否确定要继续?"
 
-#: modules/gui/wxwidgets/dialogs/preferences.cpp:1025
-msgid ""
-"Some options are available but hidden. Check \"Advanced options\" to see "
-"them."
-msgstr "除了这些选项之外, 还有一些已被隐藏的选项。单击 \"高级\" 可以看到它们。"
-
 #: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:196
 msgid "Alt"
 msgstr "Alt"
@@ -12554,6 +13118,10 @@ msgstr "保存文件..."
 msgid "Broadcasts"
 msgstr "广播"
 
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:78
+msgid "Load"
+msgstr "读取"
+
 #: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:217
 msgid "Load Configuration"
 msgstr "读取设置文件"
@@ -12580,10 +13148,6 @@ msgstr "输出"
 msgid "Loop"
 msgstr "循环"
 
-#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:415
-msgid "Create"
-msgstr "建立"
-
 #: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:560
 msgid "VLM stream"
 msgstr "VLM 流"
@@ -12658,10 +13222,6 @@ msgid ""
 "about it."
 msgstr "选择目标视频编码器，点击以显示更多信息。"
 
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:134
-msgid "Transcode audio (if available)"
-msgstr "音频转码 (如果可用)"
-
 #: modules/gui/wxwidgets/dialogs/wizard.cpp:135
 msgid ""
 "Select the target audio codec. Choose a codec to display more information "
@@ -12724,6 +13284,10 @@ msgstr "更多信息"
 msgid "Save to file"
 msgstr "保存到文件"
 
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:134
+msgid "Transcode audio (if available)"
+msgstr "音频转码 (如果可用)"
+
 #: modules/gui/wxwidgets/extrapanel.cpp:41
 msgid ""
 "Controls the blending of equalizer bands. The higher this value is, the more "
@@ -12734,6 +13298,22 @@ msgstr ""
 msgid "Creates several clones of the image"
 msgstr "建立数个影像复制"
 
+#: modules/gui/wxwidgets/extrapanel.cpp:149
+msgid "Distortion"
+msgstr "畸变"
+
+#: modules/gui/wxwidgets/extrapanel.cpp:149
+msgid "Adds distortion effects"
+msgstr "增加畸变效果"
+
+#: modules/gui/wxwidgets/extrapanel.cpp:150
+msgid "Image inversion"
+msgstr "图像翻转"
+
+#: modules/gui/wxwidgets/extrapanel.cpp:151
+msgid "Blurring"
+msgstr "模糊"
+
 #: modules/gui/wxwidgets/extrapanel.cpp:153 modules/video_filter/magnify.c:60
 msgid "Magnify"
 msgstr "放大镜"
@@ -12774,148 +13354,148 @@ msgid ""
 "Video Filter Module inside the preferences."
 msgstr ""
 
-#: modules/gui/wxwidgets/input_manager.cpp:181
+#: modules/gui/wxwidgets/input_manager.cpp:185
 msgid "Stopped"
 msgstr "已停止"
 
-#: modules/gui/wxwidgets/input_manager.cpp:206
+#: modules/gui/wxwidgets/input_manager.cpp:210
 msgid "Paused"
 msgstr "暂停"
 
-#: modules/gui/wxwidgets/input_manager.cpp:206
+#: modules/gui/wxwidgets/input_manager.cpp:210
 msgid "Playing"
 msgstr "正在播放"
 
-#: modules/gui/wxwidgets/input_manager.cpp:221
+#: modules/gui/wxwidgets/input_manager.cpp:225
 msgid "Menu"
 msgstr "选单"
 
-#: modules/gui/wxwidgets/input_manager.cpp:224
+#: modules/gui/wxwidgets/input_manager.cpp:228
 msgid "Previous track"
 msgstr "上一轨"
 
-#: modules/gui/wxwidgets/input_manager.cpp:225
+#: modules/gui/wxwidgets/input_manager.cpp:229
 msgid "Next track"
 msgstr "下一轨"
 
-#: modules/gui/wxwidgets/interface.cpp:568
+#: modules/gui/wxwidgets/interface.cpp:571
 msgid "Quick &Open File...\tCtrl-O"
 msgstr "快速打开文件...\tCtrl-O"
 
-#: modules/gui/wxwidgets/interface.cpp:571
+#: modules/gui/wxwidgets/interface.cpp:574
 msgid "Open &File...\tCtrl-F"
 msgstr "打开文件(&F)...\tCtrl-F"
 
-#: modules/gui/wxwidgets/interface.cpp:572
+#: modules/gui/wxwidgets/interface.cpp:575
 msgid "Open Dir&ectory...\tCtrl-E"
 msgstr "打开目录(&E)...\tCtrl-E"
 
-#: modules/gui/wxwidgets/interface.cpp:573
+#: modules/gui/wxwidgets/interface.cpp:576
 msgid "Open &Disc...\tCtrl-D"
 msgstr "打开光盘(&D)...\tCtrl-D"
 
-#: modules/gui/wxwidgets/interface.cpp:575
+#: modules/gui/wxwidgets/interface.cpp:578
 msgid "Open &Network Stream...\tCtrl-N"
 msgstr "打开网络串流(&N)...\tCtrl-N"
 
-#: modules/gui/wxwidgets/interface.cpp:577
+#: modules/gui/wxwidgets/interface.cpp:580
 msgid "Open C&apture Device...\tCtrl-A"
 msgstr "打开获取设备(&A)...\tCtrl-A"
 
-#: modules/gui/wxwidgets/interface.cpp:580
+#: modules/gui/wxwidgets/interface.cpp:583
 msgid "&Wizard...\tCtrl-W"
 msgstr "向导(W)...\tCtrl-W"
 
-#: modules/gui/wxwidgets/interface.cpp:583
+#: modules/gui/wxwidgets/interface.cpp:586
 msgid "E&xit\tCtrl-X"
 msgstr "退出(&X)\tCtrl-X"
 
-#: modules/gui/wxwidgets/interface.cpp:589
+#: modules/gui/wxwidgets/interface.cpp:592
 msgid "&Playlist...\tCtrl-P"
 msgstr "播放列表(&P)\tCtrl-P"
 
-#: modules/gui/wxwidgets/interface.cpp:591
+#: modules/gui/wxwidgets/interface.cpp:594
 msgid "&Messages...\tCtrl-M"
 msgstr "信息(&M)...\tCtrl-M"
 
-#: modules/gui/wxwidgets/interface.cpp:593
+#: modules/gui/wxwidgets/interface.cpp:596
 msgid "Stream and Media &Info...\tCtrl-I"
 msgstr "串流及媒体信息(&I)...\tCtrl-I"
 
-#: modules/gui/wxwidgets/interface.cpp:595
+#: modules/gui/wxwidgets/interface.cpp:598
 msgid "VLM Control...\tCtrl-V"
 msgstr "VLM 控制...\tCtrl-V"
 
-#: modules/gui/wxwidgets/interface.cpp:605
+#: modules/gui/wxwidgets/interface.cpp:608
 msgid "About..."
 msgstr "关于..."
 
-#: modules/gui/wxwidgets/interface.cpp:607
+#: modules/gui/wxwidgets/interface.cpp:610
 msgid "Check for Updates..."
 msgstr "检查更新..."
 
-#: modules/gui/wxwidgets/interface.cpp:611
+#: modules/gui/wxwidgets/interface.cpp:614
 msgid "&File"
 msgstr "文件(&F)"
 
-#: modules/gui/wxwidgets/interface.cpp:612
+#: modules/gui/wxwidgets/interface.cpp:615
 msgid "&View"
 msgstr "查看(&V)"
 
-#: modules/gui/wxwidgets/interface.cpp:613
+#: modules/gui/wxwidgets/interface.cpp:616
 msgid "&Settings"
 msgstr "设置(&S)"
 
-#: modules/gui/wxwidgets/interface.cpp:614
+#: modules/gui/wxwidgets/interface.cpp:617
 msgid "&Audio"
 msgstr "音频(&A)"
 
-#: modules/gui/wxwidgets/interface.cpp:615
+#: modules/gui/wxwidgets/interface.cpp:618
 msgid "&Video"
 msgstr "视频(&V)"
 
-#: modules/gui/wxwidgets/interface.cpp:616
+#: modules/gui/wxwidgets/interface.cpp:619
 msgid "&Navigation"
 msgstr "导航(&N)"
 
-#: modules/gui/wxwidgets/interface.cpp:617
+#: modules/gui/wxwidgets/interface.cpp:620
 msgid "&Help"
 msgstr "帮助(&H)"
 
-#: modules/gui/wxwidgets/interface.cpp:677
-#: modules/gui/wxwidgets/interface.cpp:688
+#: modules/gui/wxwidgets/interface.cpp:680
+#: modules/gui/wxwidgets/interface.cpp:691
 msgid "Embedded playlist"
 msgstr "嵌入播放列表"
 
-#: modules/gui/wxwidgets/interface.cpp:678
+#: modules/gui/wxwidgets/interface.cpp:681
 msgid "Previous playlist item"
 msgstr "前一个播放列表项目"
 
-#: modules/gui/wxwidgets/interface.cpp:679
+#: modules/gui/wxwidgets/interface.cpp:682
 msgid "Next playlist item"
 msgstr "下一个播放列表项目"
 
-#: modules/gui/wxwidgets/interface.cpp:680
+#: modules/gui/wxwidgets/interface.cpp:683
 msgid "Play slower"
 msgstr "慢速播放"
 
-#: modules/gui/wxwidgets/interface.cpp:681
+#: modules/gui/wxwidgets/interface.cpp:684
 msgid "Play faster"
 msgstr "快速播放"
 
-#: modules/gui/wxwidgets/interface.cpp:878
+#: modules/gui/wxwidgets/interface.cpp:881
 msgid "Extended &GUI\tCtrl-G"
 msgstr "扩展用户界面(&G)"
 
-#: modules/gui/wxwidgets/interface.cpp:881
+#: modules/gui/wxwidgets/interface.cpp:884
 msgid "&Bookmarks...\tCtrl-B"
 msgstr "书签(&B)"
 
-#: modules/gui/wxwidgets/interface.cpp:883
+#: modules/gui/wxwidgets/interface.cpp:886
 msgid "Preference&s...\tCtrl-S"
 msgstr "选项(&S)...\tCtrl-S"
 
-#: modules/gui/wxwidgets/interface.cpp:936
+#: modules/gui/wxwidgets/interface.cpp:939
 msgid ""
 " (wxWidgets interface)\n"
 "\n"
@@ -12923,7 +13503,7 @@ msgstr ""
 " (wxWindows界面)\n"
 "\n"
 
-#: modules/gui/wxwidgets/interface.cpp:949
+#: modules/gui/wxwidgets/interface.cpp:952
 msgid ""
 "The VideoLAN team <videolan@videolan.org>\n"
 "http://www.videolan.org/\n"
@@ -12933,52 +13513,52 @@ msgstr ""
 "http://www.videolan.org/\n"
 "\n"
 
-#: modules/gui/wxwidgets/interface.cpp:952
+#: modules/gui/wxwidgets/interface.cpp:955
 #, c-format
 msgid "About %s"
 msgstr "关于 %s"
 
-#: modules/gui/wxwidgets/interface.cpp:1496
+#: modules/gui/wxwidgets/interface.cpp:1513
 msgid "Show/Hide Interface"
 msgstr "显示/隐藏界面"
 
-#: modules/gui/wxwidgets/menus.cpp:125
+#: modules/gui/wxwidgets/menus.cpp:124
 msgid "Quick &Open File..."
 msgstr "快速打开文件(&O)"
 
-#: modules/gui/wxwidgets/menus.cpp:126
+#: modules/gui/wxwidgets/menus.cpp:125
 msgid "Open &File..."
 msgstr "打开文件(&F)"
 
-#: modules/gui/wxwidgets/menus.cpp:127
+#: modules/gui/wxwidgets/menus.cpp:126
 msgid "Open D&irectory..."
 msgstr "打开目录(&I)..."
 
-#: modules/gui/wxwidgets/menus.cpp:128
+#: modules/gui/wxwidgets/menus.cpp:127
 msgid "Open &Disc..."
 msgstr "打开光盘(&D)"
 
-#: modules/gui/wxwidgets/menus.cpp:129
+#: modules/gui/wxwidgets/menus.cpp:128
 msgid "Open &Network Stream..."
 msgstr "打开网络串流(&N)"
 
-#: modules/gui/wxwidgets/menus.cpp:130
+#: modules/gui/wxwidgets/menus.cpp:129
 msgid "Open &Capture Device..."
 msgstr "打开获取装置(&C)"
 
-#: modules/gui/wxwidgets/menus.cpp:137
+#: modules/gui/wxwidgets/menus.cpp:136
 msgid "Media &Info..."
 msgstr "媒体信息(&I)"
 
-#: modules/gui/wxwidgets/menus.cpp:138
+#: modules/gui/wxwidgets/menus.cpp:137
 msgid "&Messages..."
 msgstr "讯息(&M)"
 
-#: modules/gui/wxwidgets/menus.cpp:139
+#: modules/gui/wxwidgets/menus.cpp:138
 msgid "&Preferences..."
 msgstr "偏好设置(&P)"
 
-#: modules/gui/wxwidgets/menus.cpp:571 modules/gui/wxwidgets/menus.cpp:598
+#: modules/gui/wxwidgets/menus.cpp:573 modules/gui/wxwidgets/menus.cpp:600
 msgid "Empty"
 msgstr "无项目"
 
@@ -13128,7 +13708,7 @@ msgstr "两个"
 msgid "wxWidgets interface module"
 msgstr "wxWindows界面模块"
 
-#: modules/gui/wxwidgets/wxwidgets.cpp:170
+#: modules/gui/wxwidgets/wxwidgets.cpp:171
 msgid "wxWidgets dialogs provider"
 msgstr "wxWidgets dialogs 提供者"
 
@@ -13217,30 +13797,32 @@ msgstr "您想使用的字体文件的文件名"
 msgid "Font size in pixels"
 msgstr "字体大小 (像素)"
 
-#: modules/misc/freetype.c:87 modules/misc/win32text.c:58
+#: modules/misc/freetype.c:86
+#, fuzzy
 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 "
-"font size. "
+"font size."
 msgstr ""
+"这是将被在视频上渲染的文字的相对字号。如果设置了绝对字号，相对字号将被忽略。"
 
-#: modules/misc/freetype.c:91 modules/misc/win32text.c:62
+#: modules/misc/freetype.c:90 modules/misc/win32text.c:62
 #: modules/video_filter/marq.c:86 modules/video_filter/rss.c:138
 #: modules/video_filter/time.c:77
 msgid "Opacity"
 msgstr "不透明"
 
-#: modules/misc/freetype.c:92 modules/misc/win32text.c:63
+#: modules/misc/freetype.c:91 modules/misc/win32text.c:63
 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:95 modules/misc/win32text.c:66
+#: modules/misc/freetype.c:94 modules/misc/win32text.c:66
 msgid "Text default color"
 msgstr "文字默认颜色"
 
-#: modules/misc/freetype.c:96 modules/misc/win32text.c:67
+#: modules/misc/freetype.c:95 modules/misc/win32text.c:67
 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, "
@@ -13251,70 +13833,70 @@ msgstr ""
 "是红色，然后是绿色，然后是蓝色。#000000 = 黑, #FF0000 = 红, #00FF00 = 绿, "
 "#FFFF00 = 黄 (红 + 绿), #FFFFFF = 白"
 
-#: modules/misc/freetype.c:100 modules/misc/win32text.c:71
+#: modules/misc/freetype.c:99 modules/misc/win32text.c:71
 msgid "Relative font size"
 msgstr "相对字号"
 
-#: modules/misc/freetype.c:101 modules/misc/win32text.c:72
+#: modules/misc/freetype.c:100 modules/misc/win32text.c:72
 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:106 modules/misc/win32text.c:77
+#: modules/misc/freetype.c:105 modules/misc/win32text.c:77
 msgid "Smaller"
 msgstr "更小"
 
-#: modules/misc/freetype.c:106 modules/misc/win32text.c:77
+#: modules/misc/freetype.c:105 modules/misc/win32text.c:77
 msgid "Small"
 msgstr "小"
 
-#: modules/misc/freetype.c:107 modules/misc/win32text.c:78
+#: modules/misc/freetype.c:106 modules/misc/win32text.c:78
 msgid "Large"
 msgstr "大"
 
-#: modules/misc/freetype.c:107 modules/misc/win32text.c:78
+#: modules/misc/freetype.c:106 modules/misc/win32text.c:78
 msgid "Larger"
 msgstr "更大"
 
-#: modules/misc/freetype.c:108
+#: modules/misc/freetype.c:107
 msgid "Use YUVP renderer"
 msgstr "使用 YUVP 渲染"
 
-#: modules/misc/freetype.c:109
+#: modules/misc/freetype.c:108
 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:111
+#: modules/misc/freetype.c:110
 msgid "Font Effect"
 msgstr "字体效果"
 
-#: modules/misc/freetype.c:113
+#: modules/misc/freetype.c:111
 msgid ""
-"It is possible to apply effects to the renderedtext to improve its "
+"It is possible to apply effects to the rendered text to improve its "
 "readability."
 msgstr ""
 
-#: modules/misc/freetype.c:121
+#: modules/misc/freetype.c:119
 msgid "Background"
 msgstr "背景"
 
-#: modules/misc/freetype.c:121
+#: modules/misc/freetype.c:119
 msgid "Outline"
 msgstr "大纲"
 
-#: modules/misc/freetype.c:122
+#: modules/misc/freetype.c:120
 msgid "Fat Outline"
 msgstr ""
 
-#: modules/misc/freetype.c:134 modules/misc/win32text.c:90
+#: modules/misc/freetype.c:132 modules/misc/win32text.c:90
 msgid "Text renderer"
 msgstr "字体渲染"
 
-#: modules/misc/freetype.c:135
+#: modules/misc/freetype.c:133
 msgid "Freetype2 font renderer"
 msgstr "Freetype2 字体渲染器"
 
@@ -13405,7 +13987,7 @@ msgstr "Growl"
 msgid "Growl Notification Plugin"
 msgstr "Growl 通知插件"
 
-#: modules/misc/growl.c:172 modules/misc/msn.c:202
+#: modules/misc/growl.c:172 modules/misc/msn.c:202 modules/misc/notify.c:163
 msgid "(no title)"
 msgstr "(无标题)"
 
@@ -13509,9 +14091,37 @@ msgstr "MSN 正在播放"
 msgid "UDP/IPv4 network abstraction layer"
 msgstr "UDP/IPv4网络抽象层"
 
-#: modules/misc/network/ipv6.c:89
-msgid "UDP/IPv6 network abstraction layer"
-msgstr "UDP/IPv6网络抽象层"
+#: modules/misc/network/ipv6.c:81
+msgid "UDP/IPv6 network abstraction layer"
+msgstr "UDP/IPv6网络抽象层"
+
+#: modules/misc/notify.c:55
+#, fuzzy
+msgid "Timeout (ms)"
+msgstr "超时"
+
+#: modules/misc/notify.c:56
+msgid "How long the notification will be displayed "
+msgstr ""
+
+#: modules/misc/notify.c:61
+msgid "Notify"
+msgstr ""
+
+#: modules/misc/notify.c:62
+#, fuzzy
+msgid "LibNotify Notification Plugin"
+msgstr "Growl 通知插件"
+
+#: modules/misc/notify.c:158
+#, fuzzy
+msgid "no artist"
+msgstr "(无艺术家)"
+
+#: modules/misc/notify.c:161
+#, fuzzy
+msgid "no album"
+msgstr "(无专辑)"
 
 #: modules/misc/playlist/export.c:44
 msgid "M3U playlist exporter"
@@ -13525,6 +14135,10 @@ msgstr "旧的列表导出器"
 msgid "XSPF playlist export"
 msgstr "XSPF 列表导出器"
 
+#: modules/misc/probe/hal.c:52 modules/services_discovery/hal.c:63
+msgid "HAL devices detection"
+msgstr "HAL 设备检测"
+
 #: modules/misc/qte_main.cpp:66
 msgid "Run as standalone Qt/Embedded GUI Server"
 msgstr "作为单独的 Qt/Embedded GUI 服务器运行."
@@ -13581,11 +14195,11 @@ msgstr "RTSP VoD 服务器"
 msgid "X Screensaver disabler"
 msgstr "X 屏幕保护程序禁用器"
 
-#: modules/misc/svg.c:65
+#: modules/misc/svg.c:66
 msgid "SVG template file"
 msgstr "AVG暂存档"
 
-#: modules/misc/svg.c:66
+#: modules/misc/svg.c:67
 msgid ""
 "Location of a file holding a SVG template for automatic string conversion"
 msgstr ""
@@ -13602,6 +14216,13 @@ msgstr "不起作用的C模块"
 msgid "Miscellaneous stress tests"
 msgstr "杂项着重测试"
 
+#: modules/misc/win32text.c:58
+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 "
+"font size. "
+msgstr ""
+
 #: modules/misc/win32text.c:91
 msgid "Win32 font renderer"
 msgstr "Win32 字体渲染器"
@@ -13650,7 +14271,7 @@ msgstr "ASF包大小 -- 默认为4096字节."
 msgid "ASF muxer"
 msgstr "ASF复用器"
 
-#: modules/mux/asf.c:535
+#: modules/mux/asf.c:540
 msgid "Unknown Video"
 msgstr "未知的视频"
 
@@ -13796,8 +14417,8 @@ msgstr "数据对齐"
 
 #: modules/mux/mpeg/ts.c:115
 msgid ""
-"Enforces alignment of all access units on PES boundaries. This is a waste of "
-"bandwidth."
+"Enforces alignment of all access units on PES boundaries. Disabling this "
+"might save some bandwidth but introduce incompatibilities."
 msgstr ""
 
 #: modules/mux/mpeg/ts.c:118
@@ -13926,7 +14547,7 @@ msgstr "H.264 视频封包器"
 msgid "MPEG4 audio packetizer"
 msgstr "MPEG4音频封包器"
 
-#: modules/packetizer/mpeg4video.c:47
+#: modules/packetizer/mpeg4video.c:48
 msgid "MPEG4 video packetizer"
 msgstr "MPEG4视频封包器"
 
@@ -13960,10 +14581,6 @@ msgstr "DAAP 共享"
 msgid "DAAP access"
 msgstr "DAAP存取"
 
-#: modules/services_discovery/hal.c:63
-msgid "HAL devices detection"
-msgstr "HAL 设备检测"
-
 #: modules/services_discovery/hal.c:130
 msgid "Devices"
 msgstr "装置"
@@ -13980,8 +14597,8 @@ msgstr ""
 msgid "Podcasts"
 msgstr "Podcast"
 
-#: modules/services_discovery/podcast.c:154
-#: modules/services_discovery/podcast.c:156
+#: modules/services_discovery/podcast.c:153
+#: modules/services_discovery/podcast.c:155
 msgid "Podcast"
 msgstr "Podcast"
 
@@ -14072,20 +14689,20 @@ msgstr "SAP 通告"
 msgid "SDP file parser for UDP"
 msgstr "UDP的SDP文件解析器"
 
-#: modules/services_discovery/sap.c:322
+#: modules/services_discovery/sap.c:316
 #, fuzzy
 msgid "SAP sessions"
 msgstr "部分"
 
-#: modules/services_discovery/sap.c:821 modules/services_discovery/sap.c:825
+#: modules/services_discovery/sap.c:843 modules/services_discovery/sap.c:847
 msgid "Session"
 msgstr "部分"
 
-#: modules/services_discovery/sap.c:821
+#: modules/services_discovery/sap.c:843
 msgid "Tool"
 msgstr "工具"
 
-#: modules/services_discovery/sap.c:826
+#: modules/services_discovery/sap.c:848
 msgid "User"
 msgstr "用户"
 
@@ -14101,6 +14718,11 @@ msgstr "Shoutcast TV 列表"
 msgid "Shoutcast TV"
 msgstr "Shoutcast TV"
 
+#: modules/services_discovery/shout.c:206
+#, fuzzy
+msgid "Connecting..."
+msgstr "设置..."
+
 #: modules/services_discovery/upnp_cc.cpp:58
 msgid "Universal Plug'n'Play discovery"
 msgstr "通用即插即用探索"
@@ -14117,9 +14739,9 @@ msgstr ""
 
 #: modules/stream_out/bridge.c:42
 msgid ""
-"Pictures coming from the picture video outputs will be delayed accord to thi "
-"value (in milliseconds, should be >= 100 ms). For high values, you will need "
-"to raise caching values."
+"Pictures coming from the picture video outputs will be delayed according to "
+"this value (in milliseconds, should be >= 100 ms). For high values, you will "
+"need to raise caching values."
 msgstr ""
 
 #: modules/stream_out/bridge.c:46
@@ -14176,82 +14798,87 @@ msgstr "显示串流输出"
 msgid "Duplicate stream output"
 msgstr "双工串流输出"
 
-#: modules/stream_out/es.c:37 modules/stream_out/standard.c:39
+#: modules/stream_out/es.c:38 modules/stream_out/standard.c:39
 msgid "Output access method"
 msgstr "输出存取方式"
 
-#: modules/stream_out/es.c:39
+#: modules/stream_out/es.c:40
 msgid "This is the default output access method that will be used."
 msgstr "将要使用的默认的输出存取方法。"
 
-#: modules/stream_out/es.c:41
+#: modules/stream_out/es.c:42
 msgid "Audio output access method"
 msgstr "音频输出存取方式"
 
-#: modules/stream_out/es.c:43
+#: modules/stream_out/es.c:44
 msgid "This is the output access method that will be used for audio."
 msgstr "音频串流输出的输出存取方法"
 
-#: modules/stream_out/es.c:44
+#: modules/stream_out/es.c:45
 msgid "Video output access method"
 msgstr "视频输出存取方式"
 
-#: modules/stream_out/es.c:46
+#: modules/stream_out/es.c:47
 msgid "This is the output access method that will be used for video."
 msgstr "视频串流输出的输出存取方法"
 
-#: modules/stream_out/es.c:48 modules/stream_out/standard.c:43
+#: modules/stream_out/es.c:49 modules/stream_out/standard.c:43
 msgid "Output muxer"
 msgstr "输出复用器"
 
-#: modules/stream_out/es.c:50
+#: modules/stream_out/es.c:51
 msgid "This is the default muxer method that will be used."
 msgstr "要使用的默认的多任务器方法。"
 
-#: modules/stream_out/es.c:51
+#: modules/stream_out/es.c:52
 msgid "Audio output muxer"
 msgstr "音频输出多任务器"
 
-#: modules/stream_out/es.c:53
+#: modules/stream_out/es.c:54
 msgid "This is the muxer that will be used for audio."
 msgstr "这是将被用于音频的多任务器。"
 
-#: modules/stream_out/es.c:54
+#: modules/stream_out/es.c:55
 msgid "Video output muxer"
 msgstr "视频输出多任务器"
 
-#: modules/stream_out/es.c:56
+#: modules/stream_out/es.c:57
 msgid "This is the muxer that will be used for video."
 msgstr "这是将被用于视频的多任务器。"
 
-#: modules/stream_out/es.c:58
+#: modules/stream_out/es.c:59
 msgid "Output URL"
 msgstr "输出URL"
 
-#: modules/stream_out/es.c:60
+#: modules/stream_out/es.c:61
 msgid "This is the default output URI."
 msgstr "这是默认的输出 URI."
 
-#: modules/stream_out/es.c:61
+#: modules/stream_out/es.c:62
 msgid "Audio output URL"
 msgstr "音频输出URL"
 
-#: modules/stream_out/es.c:63
+#: modules/stream_out/es.c:64
 msgid "This is the output URI that will be used for audio."
 msgstr "这是将被用于音频的输出 URI."
 
-#: modules/stream_out/es.c:64
+#: modules/stream_out/es.c:65
 msgid "Video output URL"
 msgstr "视频输出URL"
 
-#: modules/stream_out/es.c:66
+#: modules/stream_out/es.c:67
 msgid "This is the output URI that will be used for video."
 msgstr "这是将被用于视频的输出 URI."
 
-#: modules/stream_out/es.c:75
+#: modules/stream_out/es.c:76
 msgid "Elementary stream output"
 msgstr "个体流输出"
 
+#: modules/stream_out/es.c:366 modules/stream_out/es.c:380
+#, c-format
+msgid "There is no suitable stream-output access module for \"%s/%s://%s\"."
+msgstr ""
+
 #: modules/stream_out/gather.c:40
 msgid "Gathering stream output"
 msgstr "集合流输出"
@@ -14429,71 +15056,71 @@ msgstr "标准"
 msgid "Standard stream output"
 msgstr "标准串流输出"
 
-#: modules/stream_out/switcher.c:82
+#: modules/stream_out/switcher.c:81
 msgid "Files"
 msgstr "文件"
 
-#: modules/stream_out/switcher.c:84
+#: modules/stream_out/switcher.c:83
 msgid "Full paths of the files separated by colons."
 msgstr "文件完整路径, 以逗号分隔"
 
-#: modules/stream_out/switcher.c:85
+#: modules/stream_out/switcher.c:84
 msgid "Sizes"
 msgstr "大小"
 
-#: modules/stream_out/switcher.c:87
+#: modules/stream_out/switcher.c:86
 msgid "List of sizes separated by colons (720x576:480x576)."
 msgstr "以冒号分隔的大小列表 (720x576:480x576)."
 
-#: modules/stream_out/switcher.c:88
+#: modules/stream_out/switcher.c:87
 msgid "Aspect ratio"
 msgstr "纵横比"
 
-#: modules/stream_out/switcher.c:90
+#: modules/stream_out/switcher.c:89
 msgid "Aspect ratio (4:3, 16:9)."
 msgstr "纵横比 (4:3, 16:9)."
 
-#: modules/stream_out/switcher.c:91
+#: modules/stream_out/switcher.c:90
 msgid "Command UDP port"
 msgstr "UDP 指令端口"
 
-#: modules/stream_out/switcher.c:93
+#: modules/stream_out/switcher.c:92
 msgid "UDP port to listen to for commands."
 msgstr "从哪个 UDP 端口来监听命令"
 
-#: modules/stream_out/switcher.c:94
+#: modules/stream_out/switcher.c:93
 msgid "Command"
 msgstr "命令"
 
-#: modules/stream_out/switcher.c:96
+#: modules/stream_out/switcher.c:95
 msgid "Initial command to execute."
 msgstr "要执行的初始命令"
 
-#: modules/stream_out/switcher.c:97
+#: modules/stream_out/switcher.c:96
 msgid "GOP size"
 msgstr "GOP 大小"
 
-#: modules/stream_out/switcher.c:99
+#: modules/stream_out/switcher.c:98
 msgid "Number of P frames between two I frames."
 msgstr "两个 I 帧之间的 P 帧的数目"
 
-#: modules/stream_out/switcher.c:100
+#: modules/stream_out/switcher.c:99
 msgid "Quantizer scale"
 msgstr "量化尺寸"
 
-#: modules/stream_out/switcher.c:102
+#: modules/stream_out/switcher.c:101
 msgid "Fixed quantizer scale to use."
 msgstr "设定使用的量化尺寸"
 
-#: modules/stream_out/switcher.c:103
+#: modules/stream_out/switcher.c:102
 msgid "Mute audio"
 msgstr "静音"
 
-#: modules/stream_out/switcher.c:105
+#: modules/stream_out/switcher.c:104
 msgid "Mute audio when command is not 0."
 msgstr ""
 
-#: modules/stream_out/switcher.c:108
+#: modules/stream_out/switcher.c:107
 msgid "MPEG2 video switcher stream output"
 msgstr "MPEG2 视频切换器串流输出"
 
@@ -14706,25 +15333,36 @@ msgstr "音频频道"
 msgid "Number of audio channels in the transcoded streams."
 msgstr ""
 
-#: modules/stream_out/transcode.c:139
+#: modules/stream_out/transcode.c:138
+#, fuzzy
+msgid "Audio filter"
+msgstr "音频滤波器"
+
+#: modules/stream_out/transcode.c:140
+msgid ""
+"Audio filters will be applied to the audio streams (after conversion filters "
+"are applied). You must enter a comma-separated list of filters."
+msgstr ""
+
+#: modules/stream_out/transcode.c:143
 msgid "Subtitles encoder"
 msgstr "字幕编码器"
 
-#: modules/stream_out/transcode.c:141
+#: modules/stream_out/transcode.c:145
 msgid ""
 "This is the subtitles encoder module that will be used (and its associated "
 "options)."
 msgstr "将要使用的字幕编码器 (及其相关选项)。"
 
-#: modules/stream_out/transcode.c:143
+#: modules/stream_out/transcode.c:147
 msgid "Destination subtitles codec"
 msgstr "目的字幕编码器"
 
-#: modules/stream_out/transcode.c:145
+#: modules/stream_out/transcode.c:149
 msgid "This is the subtitles coded that will be used."
 msgstr ""
 
-#: modules/stream_out/transcode.c:149
+#: modules/stream_out/transcode.c:153
 msgid ""
 "This allows you to add overlays (also known as \"subpictures\" on the "
 "transcoded video stream. The subpictures produced by the filters will be "
@@ -14732,53 +15370,53 @@ msgid ""
 "of subpicture modules"
 msgstr ""
 
-#: modules/stream_out/transcode.c:154 modules/video_filter/osdmenu.c:119
+#: modules/stream_out/transcode.c:158 modules/video_filter/osdmenu.c:119
 msgid "OSD menu"
 msgstr "OSD 菜单"
 
-#: modules/stream_out/transcode.c:156
+#: modules/stream_out/transcode.c:160
 msgid ""
 "Stream the On Screen Display menu (using the osdmenu subpicture module)."
 msgstr ""
 
-#: modules/stream_out/transcode.c:158
+#: modules/stream_out/transcode.c:162
 msgid "Number of threads"
 msgstr "线程数量"
 
-#: modules/stream_out/transcode.c:160
+#: modules/stream_out/transcode.c:164
 msgid "Number of threads used for the transcoding."
 msgstr ""
 
-#: modules/stream_out/transcode.c:161
+#: modules/stream_out/transcode.c:165
 msgid "High priority"
 msgstr "高优先级"
 
-#: modules/stream_out/transcode.c:163
+#: modules/stream_out/transcode.c:167
 msgid ""
 "Runs the optional encoder thread at the OUTPUT priority instead of VIDEO."
 msgstr ""
 
-#: modules/stream_out/transcode.c:166
+#: modules/stream_out/transcode.c:170
 msgid "Synchronise on audio track"
 msgstr ""
 
-#: modules/stream_out/transcode.c:168
+#: modules/stream_out/transcode.c:172
 msgid ""
 "This option will drop/duplicate video frames to synchronise the video track "
 "on the audio track."
 msgstr ""
 
-#: modules/stream_out/transcode.c:172
+#: modules/stream_out/transcode.c:176
 msgid ""
 "The transcoder will drop frames if your CPU can't keep up with the encoding "
 "rate."
 msgstr ""
 
-#: modules/stream_out/transcode.c:187
+#: modules/stream_out/transcode.c:191
 msgid "Transcode stream output"
 msgstr "转码串流输出"
 
-#: modules/stream_out/transcode.c:263
+#: modules/stream_out/transcode.c:270
 msgid "Overlays/Subtitles"
 msgstr "覆盖/字幕"
 
@@ -14799,13 +15437,6 @@ msgstr ""
 msgid "Conversions from "
 msgstr ""
 
-#: modules/video_chroma/i420_ymga.c:48 modules/video_chroma/i420_ymga.c:51
-#: modules/video_chroma/i420_yuy2.c:75 modules/video_chroma/i420_yuy2.c:78
-#: modules/video_chroma/i420_yuy2.c:86 modules/video_chroma/i422_yuy2.c:63
-#: modules/video_chroma/i422_yuy2.c:66
-msgid " to "
-msgstr "到 "
-
 #: modules/video_chroma/i420_ymga.c:51 modules/video_chroma/i420_yuy2.c:78
 #: modules/video_chroma/i422_yuy2.c:66
 msgid "MMX conversions from "
@@ -14815,61 +15446,61 @@ msgstr ""
 msgid "AltiVec conversions from "
 msgstr ""
 
-#: modules/video_filter/adjust.c:60
+#: modules/video_filter/adjust.c:57
 msgid "Brightness threshold"
 msgstr "亮度阈值"
 
-#: modules/video_filter/adjust.c:61
+#: modules/video_filter/adjust.c:58
 msgid ""
 "When this mode is enabled, pixels will be shown as black or white. The "
 "threshold value will be the brighness defined below."
 msgstr ""
 
-#: modules/video_filter/adjust.c:64
+#: modules/video_filter/adjust.c:61
 msgid "Image contrast (0-2)"
 msgstr "影像对比(0-2)"
 
-#: modules/video_filter/adjust.c:65
+#: modules/video_filter/adjust.c:62
 msgid "Set the image contrast, between 0 and 2. Defaults to 1."
 msgstr "设置影像的对比，介于0和2之间，默认值为1"
 
-#: modules/video_filter/adjust.c:66
+#: modules/video_filter/adjust.c:63
 msgid "Image hue (0-360)"
 msgstr "影像色调(0-360)"
 
-#: modules/video_filter/adjust.c:67
+#: modules/video_filter/adjust.c:64
 msgid "Set the image hue, between 0 and 360. Defaults to 0."
 msgstr "设置影像的色调，介于0和360之间，默认值为0"
 
-#: modules/video_filter/adjust.c:68
+#: modules/video_filter/adjust.c:65
 msgid "Image saturation (0-3)"
 msgstr "影像饱和度(0-3)"
 
-#: modules/video_filter/adjust.c:69
+#: modules/video_filter/adjust.c:66
 msgid "Set the image saturation, between 0 and 3. Defaults to 1."
 msgstr "设置影像的饱和度，介于0和3之间，默认值为1"
 
-#: modules/video_filter/adjust.c:70
+#: modules/video_filter/adjust.c:67
 msgid "Image brightness (0-2)"
 msgstr "影像亮度(0-2)"
 
-#: modules/video_filter/adjust.c:71
+#: modules/video_filter/adjust.c:68
 msgid "Set the image brightness, between 0 and 2. Defaults to 1."
 msgstr "设置影像的亮度，介于0和2之间，默认值为1"
 
-#: modules/video_filter/adjust.c:72
+#: modules/video_filter/adjust.c:69
 msgid "Image gamma (0-10)"
 msgstr "影像反差系数(0-10)"
 
-#: modules/video_filter/adjust.c:73
+#: modules/video_filter/adjust.c:70
 msgid "Set the image gamma, between 0.01 and 10. Defaults to 1."
 msgstr "设置影像的反差系数，介于0.01和10之间，默认值为1"
 
-#: modules/video_filter/adjust.c:77
+#: modules/video_filter/adjust.c:73
 msgid "Image properties filter"
 msgstr "图像属性过滤器"
 
-#: modules/video_filter/adjust.c:78
+#: modules/video_filter/adjust.c:74
 msgid "Image adjust"
 msgstr "影像调整"
 
@@ -14903,28 +15534,38 @@ msgstr "复制视频过滤器"
 msgid "Clone"
 msgstr "复制"
 
-#: modules/video_filter/crop.c:54
+#: modules/video_filter/crop.c:55
 msgid "Crop geometry (pixels)"
 msgstr ""
 
-#: modules/video_filter/crop.c:55
+#: modules/video_filter/crop.c:56
 msgid ""
 "Set the geometry of the zone to crop. This is set as <width> x <height> + "
 "<left offset> + <top offset>."
 msgstr ""
 
-#: modules/video_filter/crop.c:57
+#: modules/video_filter/crop.c:58
 msgid "Automatic cropping"
 msgstr "自动修整"
 
-#: modules/video_filter/crop.c:58
+#: modules/video_filter/crop.c:59
 msgid "Automatic black border cropping."
 msgstr "自动黑边修整。"
 
-#: modules/video_filter/crop.c:61
+#: modules/video_filter/crop.c:62
 msgid "Crop video filter"
 msgstr "修整视频过滤器"
 
+#: modules/video_filter/crop.c:267 modules/video_filter/crop.c:346
+#, fuzzy
+msgid "Cropping failed"
+msgstr "修整视频过滤器"
+
+#: modules/video_filter/crop.c:268 modules/video_filter/crop.c:347
+#, fuzzy
+msgid "VLC could not open the video output module."
+msgstr "视频输入色彩."
+
 #: modules/video_filter/deinterlace.c:108
 msgid "Deinterlace mode"
 msgstr "解除交错模式"
@@ -14945,63 +15586,50 @@ msgstr "在串流时所使用的解除交错模式。"
 msgid "Deinterlacing video filter"
 msgstr "解除交错视频过滤器"
 
-#: modules/video_filter/distort.c:64
+#: modules/video_filter/gradient.c:56
 msgid "Distort mode"
 msgstr ""
 
-#: modules/video_filter/distort.c:65
-msgid ""
-"Distort mode, one of \"wave\", \"ripple\", \"gradient\", \"edge\", \"hough\" "
-"and \"psychedelic\"."
+#: modules/video_filter/gradient.c:57
+msgid "Distort mode, one of \"gradient\", \"edge\" and \"hough\"."
 msgstr ""
 
-#: modules/video_filter/distort.c:67
+#: modules/video_filter/gradient.c:59
 msgid "Gradient image type"
 msgstr "灰度图像类型"
 
-#: modules/video_filter/distort.c:68
+#: modules/video_filter/gradient.c:60
 msgid ""
 "Gradient image type (0 or 1). 0 will turn the image to white while 1 will "
 "keep colors."
 msgstr "灰度图像类型 (0 或 1)。0 会将图像转换为白色，1 将保持颜色。"
 
-#: modules/video_filter/distort.c:71
+#: modules/video_filter/gradient.c:63
 msgid "Apply cartoon effect"
 msgstr "应用动画效果"
 
-#: modules/video_filter/distort.c:72
+#: modules/video_filter/gradient.c:64
 msgid "Apply cartoon effect. It is only used by \"gradient\" and \"edge\"."
 msgstr "应用动画效果。它只能被 \"gradient\" 和 \"edge\" 使用。"
 
-#: modules/video_filter/distort.c:77
-msgid "Wave"
-msgstr ""
-
-#: modules/video_filter/distort.c:77
-msgid "Ripple"
-msgstr ""
-
-#: modules/video_filter/distort.c:77
-msgid "Gradient"
-msgstr "灰度"
-
-#: modules/video_filter/distort.c:78
+#: modules/video_filter/gradient.c:68
 msgid "Edge"
 msgstr ""
 
-#: modules/video_filter/distort.c:78
+#: modules/video_filter/gradient.c:68
 msgid "Hough"
 msgstr ""
 
-#: modules/video_filter/distort.c:81
-msgid "Distort video filter"
-msgstr ""
+#: modules/video_filter/gradient.c:73
+#, fuzzy
+msgid "Gradient video filter"
+msgstr "修整视频过滤器"
 
-#: modules/video_filter/invert.c:52
+#: modules/video_filter/invert.c:47
 msgid "Invert video filter"
 msgstr ""
 
-#: modules/video_filter/invert.c:53
+#: modules/video_filter/invert.c:48
 msgid "Color inversion"
 msgstr "色彩反向"
 
@@ -15021,7 +15649,7 @@ msgid "Logo animation # of loops"
 msgstr "Logo 循环的动画编号"
 
 #: modules/video_filter/logo.c:73
-msgid "Number of loops for the logo animation.1 = continuous, 0 = disabled"
+msgid "Number of loops for the logo animation.-1 = continuous, 0 = disabled"
 msgstr ""
 
 #: modules/video_filter/logo.c:75
@@ -15106,6 +15734,10 @@ msgstr "Y 偏移量"
 msgid "Y offset, down from the top."
 msgstr "Y 偏移量，从上往下"
 
+#: modules/video_filter/marq.c:82
+msgid "Timeout"
+msgstr "超时"
+
 #: modules/video_filter/marq.c:83
 msgid ""
 "Number of milliseconds the marquee must remain displayed. Default value is 0 "
@@ -15447,6 +16079,16 @@ msgstr ""
 msgid "On Screen Display menu"
 msgstr "画面上显示 (OSD)"
 
+#: modules/video_filter/psychedelic.c:51
+#, fuzzy
+msgid "Psychedelic video filter"
+msgstr "墙视频过滤器"
+
+#: modules/video_filter/ripple.c:50
+#, fuzzy
+msgid "Ripple video filter"
+msgstr "复制视频过滤器"
+
 #: modules/video_filter/rss.c:121
 msgid "Feed URLs"
 msgstr "Feed URL"
@@ -15667,6 +16309,11 @@ msgstr "墙视频过滤器"
 msgid "Image wall"
 msgstr "图片墙"
 
+#: modules/video_filter/wave.c:50
+#, fuzzy
+msgid "Wave video filter"
+msgstr "墙视频过滤器"
+
 #: modules/video_output/aa.c:55
 msgid "ASCII Art"
 msgstr "ASCII 图片"
@@ -15675,7 +16322,7 @@ msgstr "ASCII 图片"
 msgid "ASCII-art video output"
 msgstr "ASCII-art 视频输出"
 
-#: modules/video_output/caca.c:57
+#: modules/video_output/caca.c:80
 msgid "Color ASCII art video output"
 msgstr "彩色 ASCII 图片视频输出"
 
@@ -15683,21 +16330,26 @@ msgstr "彩色 ASCII 图片视频输出"
 msgid "DirectFB video output http://www.directfb.org/"
 msgstr "DirectFB 视频输出 http://www.directfb.org"
 
-#: modules/video_output/directx/directx.c:112
+#: modules/video_output/directx/direct3d.c:88
+#, fuzzy
+msgid "DirectX 3D video output"
+msgstr "DirectX视频输出"
+
+#: modules/video_output/directx/directx.c:125
 msgid "Use hardware YUV->RGB conversions"
 msgstr "使用硬件 YUV->RGB 转换"
 
-#: modules/video_output/directx/directx.c:114
+#: modules/video_output/directx/directx.c:127
 msgid ""
 "Try to use hardware acceleration for YUV->RGB conversions. This option "
 "doesn't have any effect when using overlays."
 msgstr ""
 
-#: modules/video_output/directx/directx.c:117
+#: modules/video_output/directx/directx.c:130
 msgid "Use video buffers in system memory"
 msgstr "在系统内存中使用视频缓冲区"
 
-#: modules/video_output/directx/directx.c:119
+#: modules/video_output/directx/directx.c:132
 msgid ""
 "Create video buffers in system memory instead of video memory. This isn't "
 "recommended as usually using video memory allows to benefit from more "
@@ -15705,11 +16357,11 @@ msgid ""
 "doesn't have any effect when using overlays."
 msgstr ""
 
-#: modules/video_output/directx/directx.c:124
+#: modules/video_output/directx/directx.c:137
 msgid "Use triple buffering for overlays"
 msgstr "在 overlay 中使用三重缓存"
 
-#: modules/video_output/directx/directx.c:126
+#: modules/video_output/directx/directx.c:139
 msgid ""
 "Try to use triple buffering when using YUV overlays. That results in much "
 "better video quality (no flickering)."
@@ -15717,11 +16369,11 @@ msgstr ""
 "在使用 YUV Overlay 时，试图使用三重缓存。那将导致大大增强的视频质量。(没有闪"
 "烁)。"
 
-#: modules/video_output/directx/directx.c:129
+#: modules/video_output/directx/directx.c:142
 msgid "Name of desired display device"
 msgstr "所要使用的显示设备"
 
-#: modules/video_output/directx/directx.c:130
+#: modules/video_output/directx/directx.c:143
 msgid ""
 "In a multiple monitor configuration, you can specify the Windows device name "
 "of the display that you want the video window to open on. For example, \"\\"
@@ -15730,11 +16382,11 @@ msgstr ""
 "在多显示器的配置中，您可以指定您要视频窗口显示在哪个显示器中 (使用Windows 设"
 "备名)。例如，\"\\\\.\\DISPLAY1\" or \"\\\\.\\DISPLAY2\"."
 
-#: modules/video_output/directx/directx.c:135
+#: modules/video_output/directx/directx.c:148
 msgid "Enable wallpaper mode "
 msgstr "打开壁纸模式"
 
-#: modules/video_output/directx/directx.c:137
+#: modules/video_output/directx/directx.c:150
 msgid ""
 "The wallpaper mode allows you to display the video as the desktop "
 "background. Note that this feature only works in overlay mode and the "
@@ -15743,16 +16395,15 @@ msgstr ""
 "壁纸模式允许您在桌面背景上显示视频。注: 此功能仅能在 overlay 模式中使用并且桌"
 "面必须没有设定壁纸。"
 
-#: modules/video_output/directx/directx.c:163
+#: modules/video_output/directx/directx.c:176
 msgid "DirectX video output"
 msgstr "DirectX视频输出"
 
-#: modules/video_output/directx/directx.c:303
+#: modules/video_output/directx/directx.c:316
 msgid "Wallpaper"
 msgstr "壁纸"
 
-#: modules/video_output/directx/glwin32.c:65 modules/video_output/opengl.c:135
-#: modules/video_output/x11/glx.c:115
+#: modules/video_output/directx/glwin32.c:65 modules/video_output/opengl.c:180
 msgid "OpenGL video output"
 msgstr "OpenGL视频输出"
 
@@ -15797,35 +16448,59 @@ msgid "Format of the output images (png or jpg)."
 msgstr "设置输出影像格式 (png 获 jpg)。"
 
 #: modules/video_output/image.c:51
+#, fuzzy
+msgid "Image width"
+msgstr "影像调整"
+
+#: modules/video_output/image.c:52
+#, fuzzy
+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:56
+#, fuzzy
+msgid "Image height"
+msgstr "峰值高度"
+
+#: modules/video_output/image.c:57
+#, fuzzy
+msgid ""
+"You can enforce the image height. By default (-1) VLC will adapt to the "
+"video characteristics."
+msgstr "您可以强制视频高度。默认值 (-1) 下 VLC 将会适应视频特征。"
+
+#: modules/video_output/image.c:61
 msgid "Recording ratio"
 msgstr "录制比率"
 
-#: modules/video_output/image.c:52
+#: modules/video_output/image.c:62
 msgid ""
 "Ratio of images to record. 3 means that one image out of three is recorded."
 msgstr "设定要被录制的图像的比率。3 即表示三个图像中有一个被录制。"
 
-#: modules/video_output/image.c:55
+#: modules/video_output/image.c:65
 msgid "Filename prefix"
 msgstr "文件名称前缀"
 
-#: modules/video_output/image.c:56
+#: modules/video_output/image.c:66
 msgid ""
 "Prefix of the output images filenames. Output filenames will have the "
 "\"prefixNUMBER.format\" form."
 msgstr "设置文件名称的前缀。输出的文件名将会是 \"前缀 数字.格式\" 的形式。"
 
-#: modules/video_output/image.c:60
+#: modules/video_output/image.c:70
 msgid "Always write to the same file"
 msgstr "总是写到相同的文件"
 
-#: modules/video_output/image.c:61
+#: modules/video_output/image.c:71
 msgid ""
 "Always write to the same file instead of creating one file per image. In "
 "this case, the number is not appended to the filename."
 msgstr ""
 
-#: modules/video_output/image.c:70
+#: modules/video_output/image.c:80
 msgid "Image video output"
 msgstr "影像视频输出"
 
@@ -15833,30 +16508,115 @@ msgstr "影像视频输出"
 msgid "Matrox Graphic Array video output"
 msgstr "Matrox 图像阵列视频显示"
 
-#: modules/video_output/opengl.c:114 modules/video_output/opengl.c:118
+#: modules/video_output/opengl.c:122 modules/video_output/opengl.c:173
+msgid "Cube"
+msgstr "立方体"
+
+#: modules/video_output/opengl.c:122 modules/video_output/opengl.c:173
+msgid "Transparent Cube"
+msgstr "透明的立方体"
+
+#: modules/video_output/opengl.c:123
+#, fuzzy
+msgid "Cylinder"
+msgstr "双线性"
+
+#: modules/video_output/opengl.c:123
+msgid "Torus"
+msgstr ""
+
+#: modules/video_output/opengl.c:123
+#, fuzzy
+msgid "Sphere"
+msgstr "速度"
+
+#: modules/video_output/opengl.c:123
+msgid "SQUAREXY"
+msgstr ""
+
+#: modules/video_output/opengl.c:123
+msgid "SQUARER"
+msgstr ""
+
+#: modules/video_output/opengl.c:123
+msgid "ASINXY"
+msgstr ""
+
+#: modules/video_output/opengl.c:123
+msgid "ASINR"
+msgstr ""
+
+#: modules/video_output/opengl.c:123
+msgid "SINEXY"
+msgstr ""
+
+#: modules/video_output/opengl.c:123
+msgid "SINER"
+msgstr ""
+
+#: modules/video_output/opengl.c:148
+msgid "OpenGL sampling accuracy "
+msgstr ""
+
+#: modules/video_output/opengl.c:149
+msgid "Select the accuracy of 3D object sampling(1 = min and 10 = max)"
+msgstr ""
+
+#: modules/video_output/opengl.c:150
+msgid "OpenGL Cylinder radius"
+msgstr ""
+
+#: modules/video_output/opengl.c:151
+#, fuzzy
+msgid "Radius of the OpenGL cylinder effect, if enabled"
+msgstr "OpenGL cube 效果的转动速度，如果打开的话。"
+
+#: modules/video_output/opengl.c:152
+#, fuzzy
+msgid "Point of view x-coordinate"
+msgstr "解码 X 坐标"
+
+#: modules/video_output/opengl.c:153
+#, fuzzy
+msgid "Point of view (X coordinate) of the cube/cylinder effect, if enabled."
+msgstr "OpenGL cube 效果的转动速度，如果打开的话。"
+
+#: modules/video_output/opengl.c:155
+#, fuzzy
+msgid "Point of view y-coordinate"
+msgstr "解码 X 坐标"
+
+#: modules/video_output/opengl.c:156
+#, fuzzy
+msgid "Point of view (Y coordinate) of the cube/cylinder effect, if enabled."
+msgstr "OpenGL cube 效果的转动速度，如果打开的话。"
+
+#: modules/video_output/opengl.c:158
+#, fuzzy
+msgid "Point of view z-coordinate"
+msgstr "解码 X 坐标"
+
+#: modules/video_output/opengl.c:159
+#, fuzzy
+msgid "Point of view (Z coordinate) of the cube/cylinder effect, if enabled."
+msgstr "OpenGL cube 效果的转动速度，如果打开的话。"
+
+#: modules/video_output/opengl.c:162
 msgid "OpenGL cube rotation speed"
 msgstr "OpenGL 立方体旋转速度"
 
-#: modules/video_output/opengl.c:119
+#: modules/video_output/opengl.c:163
 msgid "Rotation speed of the OpenGL cube effect, if enabled."
 msgstr "OpenGL cube 效果的转动速度，如果打开的话。"
 
-#: modules/video_output/opengl.c:122
+#: modules/video_output/opengl.c:165
 msgid "Effect"
 msgstr "效果"
 
-#: modules/video_output/opengl.c:124
+#: modules/video_output/opengl.c:167
 msgid "Several visual OpenGL effects are available."
 msgstr "有一些 OpenGL 视觉效果可用。"
 
-#: modules/video_output/opengl.c:129
-msgid "Cube"
-msgstr "立方体"
-
-#: modules/video_output/opengl.c:129
-msgid "Transparent Cube"
-msgstr "透明的立方体"
-
 #: modules/video_output/qte/qte.cpp:79
 msgid "QT Embedded display"
 msgstr "QT Embedded 显示"
@@ -15980,6 +16740,10 @@ msgstr ""
 "选择您所要在全屏模式下所使用的屏幕。例如，将它设为 0 可以使用第一个屏幕，1 为"
 "第二个。"
 
+#: modules/video_output/x11/glx.c:115
+msgid "OpenGL(GLX) provider"
+msgstr ""
+
 #: modules/video_output/x11/x11.c:57 modules/video_output/x11/xvideo.c:68
 msgid "Use shared memory"
 msgstr "使用共享内存"
@@ -16232,6 +16996,117 @@ msgstr "在 xosd 输出中显示文字时所使用的字体颜色"
 msgid "XOSD interface"
 msgstr "XOSD 界面"
 
+#~ msgid "Create"
+#~ msgstr "建立"
+
+#~ msgid " to "
+#~ msgstr "到 "
+
+#, fuzzy
+#~ msgid "Yes"
+#~ msgstr "是"
+
+#, fuzzy
+#~ msgid "No"
+#~ msgstr "无"
+
+#~ msgid "Open Messages Window"
+#~ msgstr "开启讯息窗口"
+
+#, fuzzy
+#~ msgid "Form"
+#~ msgstr "规范"
+
+#, fuzzy
+#~ msgid "Browse"
+#~ msgstr "浏览..."
+
+#, fuzzy
+#~ msgid "Justification"
+#~ msgstr "放大率"
+
+#, fuzzy
+#~ msgid "Send bitrate"
+#~ msgstr "发送率"
+
+#, fuzzy
+#~ msgid "Login"
+#~ msgstr "登录"
+
+#~ msgid "Podcast Link"
+#~ msgstr "Podcast 连接"
+
+#~ msgid "Podcast Copyright"
+#~ msgstr "Podcast 版权"
+
+#~ msgid "Podcast Category"
+#~ msgstr "Podcast 分类"
+
+#~ msgid "Podcast Keywords"
+#~ msgstr "Podcast 关键词"
+
+#~ msgid "Podcast Subtitle"
+#~ msgstr "Podcast 字幕"
+
+#~ msgid "Podcast Publication Date"
+#~ msgstr "Podcast 出版目期"
+
+#~ msgid "Podcast Author"
+#~ msgstr "Podcast 作者"
+
+#~ msgid "Podcast Subcategory"
+#~ msgstr "Podcast 子类别"
+
+#~ msgid "Podcast Duration"
+#~ msgstr "Podcast 长度"
+
+#~ msgid "Podcast Type"
+#~ msgstr "Podcast 类别"
+
+#, fuzzy
+#~ msgid "Dummy video filter"
+#~ msgstr "ffmpeg 视频过滤器"
+
+#~ msgid "Creating AVI Index ..."
+#~ msgstr "建立 AVI 索引 ..."
+
+#, fuzzy
+#~ msgid "Mime type"
+#~ msgstr "光盘类型"
+
+#~ msgid "Listeners"
+#~ msgstr "监听者"
+
+#~ msgid "Center-Center"
+#~ msgstr "居中"
+
+#~ msgid "Left-Center"
+#~ msgstr "左中"
+
+#~ msgid "Right-Center"
+#~ msgstr "右中"
+
+#~ msgid "Center-Top"
+#~ msgstr "中上方"
+
+#~ msgid "Left-Top"
+#~ msgstr "左上方"
+
+#~ msgid "Right-Top"
+#~ msgstr "右上方"
+
+#~ msgid "Center-Bottom"
+#~ msgstr "中下方"
+
+#~ msgid "Left-Bottom"
+#~ msgstr "左下方"
+
+#~ msgid "Right-Bottom"
+#~ msgstr "右下方"
+
+#~ msgid "M3U file"
+#~ msgstr "M3U文件"
+
 #~ msgid "CDDB Artist"
 #~ msgstr "CDDB 艺术家"