iIgnore version.c in pofiles generation

[vlc] / po / zh_CN.po

diff --git a/po/zh_CN.po b/po/zh_CN.po
index d860cf70210afbf8faf8e7e8d50b951f2959dd81..f3cbcd8edb93983ea0e8d5df618965848380b3b2 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,14 +5,14 @@
 # \r
 # Wei Mingzhi <whistler_wmz@users.sourceforge.net>, 2005.\r
 # \r
-#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:313
-#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:318
-#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:327
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:371
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:377
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:387
 msgid ""
 msgstr ""
 "Project-Id-Version: vlc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-14 11:48+0100\n"
+"POT-Creation-Date: 2005-11-28 17:14+0100\n"
 "PO-Revision-Date: 2005-02-12 12:14+0100\n"
 "Last-Translator: Wei Mingzhi <whistler_wmz@users.sourceforge.net>\n"
 "Language-Team: zh_CN\n"
@@ -35,7 +35,7 @@ msgstr "单击\"高级选项\"查看所有选项。"
 msgid "General"
 msgstr "一般"
 
-#: include/vlc_config_cat.h:39 src/libvlc.h:1328 modules/misc/dummy/dummy.c:67
+#: include/vlc_config_cat.h:39 src/libvlc.h:1348 modules/misc/dummy/dummy.c:67
 msgid "Interface"
 msgstr "界面"
 
@@ -59,11 +59,11 @@ msgstr "控制界面设置"
 msgid "Hotkeys settings"
 msgstr "热键设置"
 
-#: include/vlc_config_cat.h:51 src/input/es_out.c:1546 src/libvlc.h:964
+#: include/vlc_config_cat.h:51 src/input/es_out.c:1546 src/libvlc.h:984
 #: modules/gui/beos/InterfaceWindow.cpp:280 modules/gui/macosx/extended.m:81
 #: modules/gui/macosx/intf.m:505 modules/gui/macosx/output.m:170
 #: modules/gui/macosx/wizard.m:404
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:842
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:855
 #: modules/gui/wxwidgets/extrapanel.cpp:180 modules/stream_out/transcode.c:214
 msgid "Audio"
 msgstr "音频"
@@ -102,8 +102,8 @@ msgstr "输出模块"
 msgid "These are general settings for audio output modules."
 msgstr "音频输出模块的一般设置"
 
-#: include/vlc_config_cat.h:68 src/libvlc.h:1259 src/libvlc.h:1297
-#: src/libvlc.h:1339 modules/gui/wxwidgets/menus.cpp:311
+#: include/vlc_config_cat.h:68 src/libvlc.h:1279 src/libvlc.h:1317
+#: src/libvlc.h:1359 modules/gui/wxwidgets/menus.cpp:311
 #: modules/stream_out/transcode.c:243
 msgid "Miscellaneous"
 msgstr "杂项"
@@ -112,10 +112,10 @@ msgstr "杂项"
 msgid "Miscellaneous audio settings and modules"
 msgstr "模块及音频杂项设置"
 
-#: include/vlc_config_cat.h:72 src/input/es_out.c:1568 src/libvlc.h:999
+#: include/vlc_config_cat.h:72 src/input/es_out.c:1568 src/libvlc.h:1019
 #: modules/gui/macosx/extended.m:80 modules/gui/macosx/intf.m:518
 #: modules/gui/macosx/output.m:160 modules/gui/macosx/wizard.m:405
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:803
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:816
 #: modules/gui/wxwidgets/extrapanel.cpp:178 modules/misc/dummy/dummy.c:97
 #: modules/stream_out/transcode.c:174
 msgid "Video"
@@ -230,7 +230,7 @@ msgstr "设置音频+视频、杂项编码及译码器"
 msgid "General input settings. Use with care."
 msgstr "高级输入设置，请注意。"
 
-#: include/vlc_config_cat.h:126 src/libvlc.h:1207
+#: include/vlc_config_cat.h:126 src/libvlc.h:1227
 #: modules/gui/wxwidgets/dialogs/open.cpp:448
 #: modules/gui/wxwidgets/dialogs/streamout.cpp:152
 msgid "Stream output"
@@ -308,7 +308,7 @@ msgid ""
 msgstr ""
 
 #: include/vlc_config_cat.h:167
-#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:58
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:66
 msgid "VOD"
 msgstr ""
 
@@ -316,13 +316,13 @@ msgstr ""
 msgid "VLC's implementation of Video On Demand"
 msgstr ""
 
-#: include/vlc_config_cat.h:172 src/libvlc.h:1309
+#: include/vlc_config_cat.h:172 src/libvlc.h:1329
 #: modules/demux/playlist/playlist.c:48 modules/demux/playlist/playlist.c:49
 #: modules/gui/beos/InterfaceWindow.cpp:230
 #: modules/gui/beos/InterfaceWindow.cpp:322 modules/gui/macosx/intf.m:450
 #: modules/gui/macosx/intf.m:544 modules/gui/pda/pda_interface.c:1264
 #: modules/gui/wxwidgets/dialogs/playlist.cpp:195
-#: modules/gui/wxwidgets/interface.cpp:545
+#: modules/gui/wxwidgets/interface.cpp:556
 msgid "Playlist"
 msgstr "播放列表"
 
@@ -348,7 +348,7 @@ msgid ""
 "playlist"
 msgstr ""
 
-#: include/vlc_config_cat.h:180 src/libvlc.h:1171
+#: include/vlc_config_cat.h:180 src/libvlc.h:1191
 #: modules/gui/macosx/prefs.m:124
 msgid "Advanced"
 msgstr "高级选项"
@@ -446,18 +446,6 @@ msgid ""
 "the directory where you installed VLC and run \"vlc -I wxwin\"\n"
 msgstr ""
 
-#: include/vlc_interface.h:167
-msgid ""
-"VLC is an open-source and cross-platform multimedia player for various audio "
-"and video formats (MPEG-1, MPEG-2, MPEG-4, DivX, mp3, Ogg, etc.) as well as "
-"DVDs, VCDs, CD audio, and various streaming protocols.\n"
-"\n"
-"VLC is also a streaming server with transcoding capabilities (UDP unicast "
-"and multicast, HTTP, etc.) mainly designed for high-bandwidth networks.\n"
-"\n"
-"For more information, have a look at the web site."
-msgstr ""
-
 #: include/vlc_meta.h:28 src/input/var.c:136 modules/demux/mpc.c:53
 #: modules/gui/beos/MediaControlView.cpp:1233 modules/gui/macosx/intf.m:500
 #: modules/gui/macosx/intf.m:501 modules/gui/macosx/open.m:168
@@ -468,7 +456,7 @@ msgid "Title"
 msgstr "标题"
 
 #: include/vlc_meta.h:29 src/input/input.c:1869
-#: modules/gui/macosx/playlist.m:133 modules/gui/macosx/playlistinfo.m:56
+#: modules/gui/macosx/playlistinfo.m:56 modules/gui/macosx/playlist.m:133
 #: modules/gui/macosx/wizard.m:376 modules/gui/wince/playlist.cpp:674
 #: modules/mux/asf.c:51
 msgid "Author"
@@ -476,9 +464,9 @@ msgstr "作者"
 
 #: include/vlc_meta.h:30 src/playlist/sort.c:190 src/playlist/sort.c:193
 #: src/playlist/sort.c:328 modules/codec/vorbis.c:624
-#: modules/demux/playlist/m3u.c:210 modules/gui/macosx/playlist.m:316
-#: modules/gui/macosx/playlist.m:1245 modules/gui/macosx/playlistinfo.m:118
-#: modules/gui/macosx/playlistinfo.m:152
+#: modules/demux/playlist/m3u.c:210 modules/gui/macosx/playlistinfo.m:118
+#: modules/gui/macosx/playlistinfo.m:152 modules/gui/macosx/playlist.m:316
+#: modules/gui/macosx/playlist.m:1245
 #: modules/gui/wxwidgets/dialogs/playlist.cpp:496
 #: modules/misc/playlist/m3u.c:68 modules/services_discovery/daap.c:608
 msgid "Artist"
@@ -611,6 +599,14 @@ msgstr "编码器名称"
 msgid "Codec Description"
 msgstr "编码器描述"
 
+#: include/vlc/vlc.h:576
+msgid ""
+"This program comes with NO WARRANTY, to the extent permitted by law.\n"
+"You may redistribute it under the terms of the GNU General Public License;\n"
+"see the file named COPYING for details.\n"
+"Written by the VideoLAN team; see the AUTHORS file.\n"
+msgstr ""
+
 #: src/audio_output/input.c:80 src/audio_output/input.c:126
 #: src/input/es_out.c:355 src/libvlc.h:337 src/video_output/video_output.c:374
 #: modules/codec/ffmpeg/postprocess.c:94
@@ -649,10 +645,10 @@ 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:476
+#: modules/audio_output/alsa.c:222 modules/audio_output/directx.c:467
 #: modules/audio_output/oss.c:205 modules/audio_output/portaudio.c:408
 #: modules/audio_output/sdl.c:184 modules/audio_output/sdl.c:201
-#: modules/audio_output/waveout.c:403 modules/codec/twolame.c:66
+#: modules/audio_output/waveout.c:420 modules/codec/twolame.c:66
 msgid "Stereo"
 msgstr "立体声"
 
@@ -769,8 +765,8 @@ msgstr "程序"
 #: modules/demux/playlist/podcast.c:396 modules/demux/playlist/podcast.c:404
 #: modules/demux/playlist/podcast.c:412 modules/demux/playlist/podcast.c:420
 #: modules/demux/playlist/podcast.c:428 modules/demux/playlist/podcast.c:436
-#: modules/gui/macosx/playlist.m:316 modules/gui/macosx/playlist.m:1245
 #: modules/gui/macosx/playlistinfo.m:118 modules/gui/macosx/playlistinfo.m:152
+#: modules/gui/macosx/playlist.m:316 modules/gui/macosx/playlist.m:1245
 #: modules/gui/wxwidgets/dialogs/playlist.cpp:495
 #: modules/gui/wxwidgets/main_slider_manager.cpp:72
 #: modules/misc/playlist/m3u.c:68 modules/services_discovery/daap.c:607
@@ -784,8 +780,8 @@ msgid "Stream %d"
 msgstr "串流 %d"
 
 #: src/input/es_out.c:1535 modules/gui/macosx/wizard.m:409
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:812
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:852
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:825
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:865
 msgid "Codec"
 msgstr "编码器"
 
@@ -812,7 +808,7 @@ msgstr ""
 msgid "Bits per sample"
 msgstr ""
 
-#: src/input/es_out.c:1562 modules/access/pvr/pvr.c:80
+#: src/input/es_out.c:1562 modules/access/pvr/pvr.c:83
 #: modules/demux/playlist/b4s.c:349
 msgid "Bitrate"
 msgstr "位率"
@@ -930,55 +926,46 @@ msgstr ""
 msgid "Help options"
 msgstr "说明选项"
 
-#: src/libvlc.c:2201 src/misc/configuration.c:1265
+#: src/libvlc.c:2205 src/misc/configuration.c:1265
 msgid "string"
 msgstr ""
 
-#: src/libvlc.c:2218 src/misc/configuration.c:1229
+#: src/libvlc.c:2222 src/misc/configuration.c:1229
 msgid "integer"
 msgstr ""
 
-#: src/libvlc.c:2236 src/misc/configuration.c:1254
+#: src/libvlc.c:2240 src/misc/configuration.c:1254
 msgid "float"
 msgstr ""
 
-#: src/libvlc.c:2242
+#: src/libvlc.c:2246
 msgid " (default enabled)"
 msgstr " (预设开启)"
 
-#: src/libvlc.c:2243
+#: src/libvlc.c:2247
 msgid " (default disabled)"
 msgstr " (预设关闭)"
 
-#: src/libvlc.c:2425
+#: src/libvlc.c:2429
 #, fuzzy, c-format
 msgid "VLC version %s\n"
 msgstr "色彩反向"
 
-#: src/libvlc.c:2426
+#: src/libvlc.c:2430
 #, c-format
 msgid "Compiled by %s@%s.%s\n"
 msgstr ""
 
-#: src/libvlc.c:2428
+#: src/libvlc.c:2432
 #, c-format
 msgid "Compiler: %s\n"
 msgstr ""
 
-#: src/libvlc.c:2430
+#: src/libvlc.c:2434
 #, c-format
 msgid "Based upon svn changeset [%s]\n"
 msgstr ""
 
-#: src/libvlc.c:2433
-#, c-format
-msgid ""
-"This program comes with NO WARRANTY, to the extent permitted by law.\n"
-"You may redistribute it under the terms of the GNU General Public License;\n"
-"see the file named COPYING for details.\n"
-"Written by the VideoLAN team; see the AUTHORS file.\n"
-msgstr ""
-
 #: src/libvlc.c:2465
 #, c-format
 msgid ""
@@ -1072,7 +1059,7 @@ msgid ""
 "various related options."
 msgstr ""
 
-#: src/libvlc.h:51 src/libvlc.h:1329
+#: src/libvlc.h:51 src/libvlc.h:1349
 msgid "Interface module"
 msgstr "接口模块"
 
@@ -1082,7 +1069,7 @@ msgid ""
 "The default behavior is to automatically select the best module available."
 msgstr ""
 
-#: src/libvlc.h:57 src/libvlc.h:1334 modules/control/ntservice.c:53
+#: src/libvlc.h:57 src/libvlc.h:1354 modules/control/ntservice.c:53
 msgid "Extra interface modules"
 msgstr "额外接口模块"
 
@@ -1338,7 +1325,7 @@ msgid ""
 msgstr ""
 
 #: src/libvlc.h:201 modules/codec/fake.c:47
-#: modules/stream_out/mosaic_bridge.c:104 modules/stream_out/transcode.c:70
+#: modules/stream_out/mosaic_bridge.c:107 modules/stream_out/transcode.c:70
 #: modules/visualization/visual/visual.c:43
 msgid "Video width"
 msgstr "视频宽度"
@@ -1350,7 +1337,7 @@ msgid ""
 msgstr ""
 
 #: src/libvlc.h:206 modules/codec/fake.c:50
-#: modules/stream_out/mosaic_bridge.c:107 modules/stream_out/transcode.c:73
+#: modules/stream_out/mosaic_bridge.c:110 modules/stream_out/transcode.c:73
 #: modules/visualization/visual/visual.c:47
 msgid "Video height"
 msgstr "视频高度"
@@ -1650,7 +1637,7 @@ msgstr "预设"
 
 #: src/libvlc.h:337 modules/gui/macosx/equalizer.m:144
 #: modules/gui/macosx/extended.m:106 modules/gui/macosx/wizard.m:378
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:622
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:624
 #: modules/gui/wxwidgets/extrapanel.cpp:218
 #: modules/gui/wxwidgets/extrapanel.cpp:467
 msgid "Enable"
@@ -1817,7 +1804,7 @@ msgid ""
 "over the movie. Try several positions."
 msgstr ""
 
-#: src/libvlc.h:422 src/libvlc.h:1061 src/misc/iso-639_def.h:143
+#: src/libvlc.h:422 src/libvlc.h:1081 src/misc/iso-639_def.h:143
 #: modules/stream_out/transcode.c:239
 msgid "On Screen Display"
 msgstr "画面上显示(OSD)"
@@ -2518,7 +2505,7 @@ msgid "Select the hotkey to use to swap fullscreen state."
 msgstr "选择热键以切换全屏幕状态"
 
 #: src/libvlc.h:792 modules/gui/wxwidgets/dialogs/vlm/vlm_streampanel.cpp:81
-#: modules/gui/wxwidgets/interface.cpp:1502
+#: modules/gui/wxwidgets/interface.cpp:1545
 msgid "Play/Pause"
 msgstr "播放/暂停"
 
@@ -2542,7 +2529,7 @@ msgstr "仅播放"
 msgid "Select the hotkey to use to play."
 msgstr "选择热键以播放"
 
-#: src/libvlc.h:798 modules/control/hotkeys.c:565
+#: src/libvlc.h:798 modules/control/hotkeys.c:563
 #: modules/gui/macosx/controls.m:558 modules/gui/macosx/intf.m:488
 msgid "Faster"
 msgstr "加快"
@@ -2551,7 +2538,7 @@ msgstr "加快"
 msgid "Select the hotkey to use for fast forward playback."
 msgstr "选择热键以快速回放"
 
-#: src/libvlc.h:800 modules/control/hotkeys.c:572
+#: src/libvlc.h:800 modules/control/hotkeys.c:570
 #: modules/gui/macosx/controls.m:559 modules/gui/macosx/intf.m:489
 msgid "Slower"
 msgstr "放慢"
@@ -2560,11 +2547,11 @@ msgstr "放慢"
 msgid "Select the hotkey to use for slow motion playback."
 msgstr "选择热键以慢速回放"
 
-#: src/libvlc.h:802 modules/control/hotkeys.c:534
+#: src/libvlc.h:802 modules/control/hotkeys.c:532
 #: modules/gui/macosx/controls.m:579 modules/gui/macosx/intf.m:446
 #: modules/gui/macosx/intf.m:491 modules/gui/macosx/intf.m:562
 #: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:348
-#: modules/gui/macosx/wizard.m:1398 modules/gui/wxwidgets/interface.cpp:1507
+#: modules/gui/macosx/wizard.m:1398 modules/gui/wxwidgets/interface.cpp:1550
 #: modules/gui/wxwidgets/menus.cpp:287
 msgid "Next"
 msgstr "下一项"
@@ -2573,10 +2560,10 @@ msgstr "下一项"
 msgid "Select the hotkey to use to skip to the next item in the playlist."
 msgstr "选择热键以播放清单中的下一个项目"
 
-#: src/libvlc.h:804 modules/control/hotkeys.c:545
+#: src/libvlc.h:804 modules/control/hotkeys.c:543
 #: modules/gui/macosx/controls.m:578 modules/gui/macosx/intf.m:441
 #: modules/gui/macosx/intf.m:490 modules/gui/macosx/intf.m:563
-#: modules/gui/wxwidgets/interface.cpp:1506
+#: modules/gui/wxwidgets/interface.cpp:1549
 #: modules/gui/wxwidgets/menus.cpp:286
 msgid "Previous"
 msgstr "上一项"
@@ -2590,11 +2577,9 @@ msgstr "选择热键以播放清单中的上一个项目"
 #: modules/gui/macosx/intf.m:561 modules/gui/pda/pda_interface.c:274
 #: modules/gui/pda/pda_interface.c:275
 #: modules/gui/wxwidgets/dialogs/vlm/vlm_streampanel.cpp:86
-#: modules/gui/wxwidgets/interface.cpp:542
-#: modules/gui/wxwidgets/interface.cpp:1508
+#: modules/gui/wxwidgets/interface.cpp:553
+#: modules/gui/wxwidgets/interface.cpp:1551
 #: modules/gui/wxwidgets/menus.cpp:285 modules/visualization/xosd.c:235
-#: modules/visualization/xosd.c:236
-#, c-format
 msgid "Stop"
 msgstr "停止"
 
@@ -2612,384 +2597,421 @@ msgid "Select the hotkey to display the position."
 msgstr "选择热键以显示位置"
 
 #: src/libvlc.h:811
-#, fuzzy
-msgid "Jump 3 seconds backwards"
-msgstr "向后10秒钟"
-
-#: src/libvlc.h:812
-#, fuzzy
-msgid "Select the hotkey to jump 3 seconds backwards."
-msgstr "选择热键以向后10秒钟"
+msgid "Very short backwards jump"
+msgstr ""
 
 #: src/libvlc.h:813
-msgid "Jump 10 seconds backwards"
-msgstr "向后10秒钟"
+#, fuzzy
+msgid "Select the hotkey to make a very short backwards jump."
+msgstr "选择热键以向后5分钟"
 
 #: src/libvlc.h:814
-msgid "Select the hotkey to jump 10 seconds backwards."
-msgstr "选择热键以向后10秒钟"
+msgid "Short backwards jump"
+msgstr ""
 
 #: src/libvlc.h:816
-msgid "Jump 1 minute backwards"
-msgstr "向后1分钟"
-
-#: src/libvlc.h:817
-msgid "Select the hotkey to jump 1 minute backwards."
-msgstr "选择热键以向后1分钟"
+#, fuzzy
+msgid "Select the hotkey to make a short backwards jump."
+msgstr "选择热键以向后10秒钟"
 
 #: src/libvlc.h:818
-msgid "Jump 5 minutes backwards"
-msgstr "向后5分钟"
+msgid "Medium backwards jump"
+msgstr ""
 
-#: src/libvlc.h:819
-msgid "Select the hotkey to jump 5 minutes backwards."
-msgstr "选择热键以向后5分钟"
+#: src/libvlc.h:820
+#, fuzzy
+msgid "Select the hotkey to make a medium backwards jump."
+msgstr "选择热键以向后1分钟"
 
 #: src/libvlc.h:821
+msgid "Long backwards jump"
+msgstr ""
+
+#: src/libvlc.h:823
 #, fuzzy
-msgid "Jump 3 seconds forward"
-msgstr "向前10秒钟"
+msgid "Select the hotkey to make a long backwards jump."
+msgstr "选择热键以向后10秒钟"
+
+#: src/libvlc.h:825
+msgid "Very short forward jump"
+msgstr ""
 
-#: src/libvlc.h:822
+#: src/libvlc.h:827
 #, fuzzy
-msgid "Select the hotkey to jump 3 seconds forward."
-msgstr "é\80\89æ\8b©ç\83­é\94®ä»¥å\90\91å\89\8d10ç§\92é\92\9f"
+msgid "Select the hotkey to make a very short forward jump."
+msgstr "é\80\89æ\8b©ç\83­é\94®ä»¥å¿«é\80\9få\9b\9eæ\94¾"
 
-#: src/libvlc.h:823
-msgid "Jump 10 seconds forward"
-msgstr "向前10秒钟"
+#: src/libvlc.h:828
+msgid "Short forward jump"
+msgstr ""
 
-#: src/libvlc.h:824
-msgid "Select the hotkey to jump 10 seconds forward."
+#: src/libvlc.h:830
+#, fuzzy
+msgid "Select the hotkey to make a short forward jump."
 msgstr "选择热键以向前10秒钟"
 
-#: src/libvlc.h:826
-msgid "Jump 1 minute forward"
-msgstr "向前1分钟"
+#: src/libvlc.h:832
+msgid "Medium forward jump"
+msgstr ""
 
-#: src/libvlc.h:827
-msgid "Select the hotkey to jump 1 minute forward."
+#: src/libvlc.h:834
+#, fuzzy
+msgid "Select the hotkey to make a medium forward jump."
 msgstr "选择热键以向前1分钟"
 
-#: src/libvlc.h:828
-msgid "Jump 5 minutes forward"
-msgstr "向后5分钟"
+#: src/libvlc.h:835
+msgid "Long forward jump"
+msgstr ""
 
-#: src/libvlc.h:829
-msgid "Select the hotkey to jump 5 minutes forward."
-msgstr "选择热键以向后5分钟"
+#: src/libvlc.h:837
+#, fuzzy
+msgid "Select the hotkey to make a long forward jump."
+msgstr "选择热键以向前10秒钟"
+
+#: src/libvlc.h:839
+msgid "Very short jump size"
+msgstr ""
+
+#: src/libvlc.h:840
+msgid "Very short jump \"size\", in seconds"
+msgstr ""
+
+#: src/libvlc.h:841
+msgid "Short jump size"
+msgstr ""
+
+#: src/libvlc.h:842
+msgid "Short jump \"size\", in seconds"
+msgstr ""
 
-#: src/libvlc.h:831 modules/control/hotkeys.c:271
+#: src/libvlc.h:843
+msgid "Medium jump size"
+msgstr ""
+
+#: src/libvlc.h:844
+msgid "Medium jump \"size\", in seconds"
+msgstr ""
+
+#: src/libvlc.h:845
+#, fuzzy
+msgid "Long jump size"
+msgstr "字号"
+
+#: src/libvlc.h:846
+msgid "Long jump \"size\", in seconds"
+msgstr ""
+
+#: src/libvlc.h:851 modules/control/hotkeys.c:275
 #: modules/gui/beos/InterfaceWindow.cpp:274
 msgid "Quit"
 msgstr "离开"
 
-#: src/libvlc.h:832
+#: src/libvlc.h:852
 msgid "Select the hotkey to quit the application."
 msgstr "选择热键以离开应用程序"
 
-#: src/libvlc.h:833
+#: src/libvlc.h:853
 msgid "Navigate up"
 msgstr "向上导览"
 
-#: src/libvlc.h:834
+#: src/libvlc.h:854
 msgid "Select the key to move the selector up in DVD menus."
 msgstr "选择按键以向上移动DVD选单中的选择器"
 
-#: src/libvlc.h:835
+#: src/libvlc.h:855
 msgid "Navigate down"
 msgstr "向下导览"
 
-#: src/libvlc.h:836
+#: src/libvlc.h:856
 msgid "Select the key to move the selector down in DVD menus."
 msgstr "选择按键以向下移动DVD选单中的选择器"
 
-#: src/libvlc.h:837
+#: src/libvlc.h:857
 msgid "Navigate left"
 msgstr "向左导览"
 
-#: src/libvlc.h:838
+#: src/libvlc.h:858
 msgid "Select the key to move the selector left in DVD menus."
 msgstr "选择按键以向左移动DVD选单中的选择器"
 
-#: src/libvlc.h:839
+#: src/libvlc.h:859
 msgid "Navigate right"
 msgstr "向右导览"
 
-#: src/libvlc.h:840
+#: src/libvlc.h:860
 msgid "Select the key to move the selector right in DVD menus."
 msgstr "选择按键以向右移动DVD选单中的选择器"
 
-#: src/libvlc.h:841
+#: src/libvlc.h:861
 msgid "Activate"
 msgstr "启动"
 
-#: src/libvlc.h:842
+#: src/libvlc.h:862
 msgid "Select the key to activate selected item in DVD menus."
 msgstr "选择热键以启动所选择的DVD选单项目"
 
-#: src/libvlc.h:843
+#: src/libvlc.h:863
 #, fuzzy
 msgid "Go to the DVD menu"
 msgstr "使用DVD选单"
 
-#: src/libvlc.h:844
+#: src/libvlc.h:864
 #, fuzzy
 msgid "Select the key to take you to the DVD menu"
 msgstr "选择热键以启动所选择的DVD选单项目"
 
-#: src/libvlc.h:845
+#: src/libvlc.h:865
 #, fuzzy
 msgid "Select previous DVD title"
 msgstr "选择上一个标题"
 
-#: src/libvlc.h:846
+#: src/libvlc.h:866
 #, fuzzy
 msgid "Select the key to choose the previous title from the DVD"
 msgstr "选择热键以播放清单中的上一个项目"
 
-#: src/libvlc.h:847
+#: src/libvlc.h:867
 #, fuzzy
 msgid "Select next DVD title"
 msgstr "选择下一个章节"
 
-#: src/libvlc.h:848
+#: src/libvlc.h:868
 #, fuzzy
 msgid "Select the key to choose the next title from the DVD"
 msgstr "选择按键以向左移动DVD选单中的选择器"
 
-#: src/libvlc.h:849 src/libvlc.h:851
+#: src/libvlc.h:869 src/libvlc.h:871
 #, fuzzy
 msgid "Select prev DVD chapter"
 msgstr "选择上一个章节"
 
-#: src/libvlc.h:850
+#: src/libvlc.h:870
 #, fuzzy
 msgid "Select the key to choose the previous chapter from the DVD"
 msgstr "选择热键以播放清单中的上一个项目"
 
-#: src/libvlc.h:852
+#: src/libvlc.h:872
 #, fuzzy
 msgid "Select the key to choose the next chapter from the DVD"
 msgstr "选择按键以向左移动DVD选单中的选择器"
 
-#: src/libvlc.h:853
+#: src/libvlc.h:873
 msgid "Volume up"
 msgstr "增加音量"
 
-#: src/libvlc.h:854
+#: src/libvlc.h:874
 msgid "Select the key to increase audio volume."
 msgstr "选择按键以增加音量"
 
-#: src/libvlc.h:855
+#: src/libvlc.h:875
 msgid "Volume down"
 msgstr "减低音量"
 
-#: src/libvlc.h:856
+#: src/libvlc.h:876
 msgid "Select the key to decrease audio volume."
 msgstr "选择按键以减低音量"
 
-#: src/libvlc.h:857 modules/gui/macosx/controls.m:613
+#: src/libvlc.h:877 modules/gui/macosx/controls.m:613
 #: modules/gui/macosx/intf.m:508 modules/gui/macosx/intf.m:564
 msgid "Mute"
 msgstr "静音"
 
-#: src/libvlc.h:858
+#: src/libvlc.h:878
 msgid "Select the key to turn off audio volume."
 msgstr "选择按键以关闭音频音量"
 
-#: src/libvlc.h:859
+#: src/libvlc.h:879
 msgid "Subtitle delay up"
 msgstr "增加字幕延迟"
 
-#: src/libvlc.h:860
+#: src/libvlc.h:880
 msgid "Select the key to increase the subtitle delay."
 msgstr "选择按键以增加字幕延迟"
 
-#: src/libvlc.h:861
+#: src/libvlc.h:881
 msgid "Subtitle delay down"
 msgstr "减少字幕延迟"
 
-#: src/libvlc.h:862
+#: src/libvlc.h:882
 msgid "Select the key to decrease the subtitle delay."
 msgstr "选择按键以减少字幕延迟"
 
-#: src/libvlc.h:863
+#: src/libvlc.h:883
 msgid "Audio delay up"
 msgstr "增加音频延迟"
 
-#: src/libvlc.h:864
+#: src/libvlc.h:884
 msgid "Select the key to increase the audio delay."
 msgstr "选择按键以增加音频延迟"
 
-#: src/libvlc.h:865
+#: src/libvlc.h:885
 msgid "Audio delay down"
 msgstr "减少音频延迟"
 
-#: src/libvlc.h:866
+#: src/libvlc.h:886
 msgid "Select the key to decrease the audio delay."
 msgstr "选择按键以减少音频延迟"
 
-#: src/libvlc.h:867
+#: src/libvlc.h:887
 msgid "Play playlist bookmark 1"
 msgstr "播放播放清单书签 1"
 
-#: src/libvlc.h:868
+#: src/libvlc.h:888
 msgid "Play playlist bookmark 2"
 msgstr "播放播放清单书签 2"
 
-#: src/libvlc.h:869
+#: src/libvlc.h:889
 msgid "Play playlist bookmark 3"
 msgstr "播放播放清单书签 3"
 
-#: src/libvlc.h:870
+#: src/libvlc.h:890
 msgid "Play playlist bookmark 4"
 msgstr "播放播放清单书签 4"
 
-#: src/libvlc.h:871
+#: src/libvlc.h:891
 msgid "Play playlist bookmark 5"
 msgstr "播放播放清单书签 5"
 
-#: src/libvlc.h:872
+#: src/libvlc.h:892
 msgid "Play playlist bookmark 6"
 msgstr "播放播放清单书签 6"
 
-#: src/libvlc.h:873
+#: src/libvlc.h:893
 msgid "Play playlist bookmark 7"
 msgstr "播放播放清单书签 7"
 
-#: src/libvlc.h:874
+#: src/libvlc.h:894
 msgid "Play playlist bookmark 8"
 msgstr "播放播放清单书签 8"
 
-#: src/libvlc.h:875
+#: src/libvlc.h:895
 msgid "Play playlist bookmark 9"
 msgstr "播放播放清单书签 9"
 
-#: src/libvlc.h:876
+#: src/libvlc.h:896
 msgid "Play playlist bookmark 10"
 msgstr "播放播放清单书签 10"
 
-#: src/libvlc.h:877
+#: src/libvlc.h:897
 msgid "Select the key to play this bookmark."
 msgstr "选择按键以播放该书签"
 
-#: src/libvlc.h:878
+#: src/libvlc.h:898
 msgid "Set playlist bookmark 1"
 msgstr "设置播放清单书签 1"
 
-#: src/libvlc.h:879
+#: src/libvlc.h:899
 msgid "Set playlist bookmark 2"
 msgstr "设置播放清单书签 2"
 
-#: src/libvlc.h:880
+#: src/libvlc.h:900
 msgid "Set playlist bookmark 3"
 msgstr "设置播放清单书签 3"
 
-#: src/libvlc.h:881
+#: src/libvlc.h:901
 msgid "Set playlist bookmark 4"
 msgstr "设置播放清单书签 4"
 
-#: src/libvlc.h:882
+#: src/libvlc.h:902
 msgid "Set playlist bookmark 5"
 msgstr "设置播放清单书签 5"
 
-#: src/libvlc.h:883
+#: src/libvlc.h:903
 msgid "Set playlist bookmark 6"
 msgstr "设置播放清单书签 6"
 
-#: src/libvlc.h:884
+#: src/libvlc.h:904
 msgid "Set playlist bookmark 7"
 msgstr "设置播放清单书签 7"
 
-#: src/libvlc.h:885
+#: src/libvlc.h:905
 msgid "Set playlist bookmark 8"
 msgstr "设置播放清单书签 8"
 
-#: src/libvlc.h:886
+#: src/libvlc.h:906
 msgid "Set playlist bookmark 9"
 msgstr "设置播放清单书签 9"
 
-#: src/libvlc.h:887
+#: src/libvlc.h:907
 msgid "Set playlist bookmark 10"
 msgstr "设置播放清单书签 10"
 
-#: src/libvlc.h:888
+#: src/libvlc.h:908
 msgid "Select the key to set this playlist bookmark."
 msgstr "选择按键以设置该播放清单书签"
 
-#: src/libvlc.h:890
+#: src/libvlc.h:910
 msgid "Go back in browsing history"
 msgstr ""
 
-#: src/libvlc.h:891
+#: src/libvlc.h:911
 msgid ""
 "Select the key to go back (to the previous media item) in the browsing "
 "history."
 msgstr ""
 
-#: src/libvlc.h:892
+#: src/libvlc.h:912
 msgid "Go forward in browsing history"
 msgstr ""
 
-#: src/libvlc.h:893
+#: src/libvlc.h:913
 msgid ""
 "Select the key to go forward (to the next media item) in the browsing "
 "history."
 msgstr ""
 
-#: src/libvlc.h:895
+#: src/libvlc.h:915
 msgid "Cycle audio track"
 msgstr "循环音轨"
 
-#: src/libvlc.h:896
+#: src/libvlc.h:916
 msgid "Cycle through the available audio tracks(languages)"
 msgstr ""
 
-#: src/libvlc.h:897
+#: src/libvlc.h:917
 msgid "Cycle subtitle track"
 msgstr "循环字幕轨"
 
-#: src/libvlc.h:898
+#: src/libvlc.h:918
 msgid "Cycle through the available subtitle tracks"
 msgstr ""
 
-#: src/libvlc.h:899
+#: src/libvlc.h:919
 msgid "Show interface"
 msgstr "显示接口"
 
-#: src/libvlc.h:900
+#: src/libvlc.h:920
 msgid "Raise the interface above all other windows"
 msgstr ""
 
-#: src/libvlc.h:901
+#: src/libvlc.h:921
 #, fuzzy
 msgid "Hide interface"
 msgstr "显示接口"
 
-#: src/libvlc.h:902
+#: src/libvlc.h:922
 msgid "Lower the interface below all other windows"
 msgstr ""
 
-#: src/libvlc.h:903
+#: src/libvlc.h:923
 msgid "Take video snapshot"
 msgstr "撷取视频快照"
 
-#: src/libvlc.h:904
+#: src/libvlc.h:924
 msgid "Takes a video snapshot and writes it to disk."
 msgstr "撷取视频快照并写入磁盘"
 
-#: src/libvlc.h:906 modules/access_filter/record.c:50
+#: src/libvlc.h:926 modules/access_filter/record.c:50
 #: modules/access_filter/record.c:51
 #, fuzzy
 msgid "Record"
 msgstr "回卷"
 
-#: src/libvlc.h:907
+#: src/libvlc.h:927
 msgid "Record access filter start/stop."
 msgstr ""
 
-#: src/libvlc.h:911
+#: src/libvlc.h:931
 #, c-format
 msgid ""
 "Usage: %s [options] [playlistitems] ...\n"
@@ -3027,134 +3049,134 @@ msgid ""
 "  vlc:quit                       Special item to quit VLC\n"
 msgstr ""
 
-#: src/libvlc.h:1019 src/video_output/vout_intf.c:337
+#: src/libvlc.h:1039 src/video_output/vout_intf.c:337
 #: modules/gui/macosx/controls.m:288 modules/gui/macosx/controls.m:622
 #: modules/gui/macosx/intf.m:525 modules/video_output/snapshot.c:75
 msgid "Snapshot"
 msgstr "快照"
 
-#: src/libvlc.h:1026
+#: src/libvlc.h:1046
 #, fuzzy
 msgid "Window properties"
 msgstr "字型设置"
 
-#: src/libvlc.h:1062
+#: src/libvlc.h:1082
 #, fuzzy
 msgid "Subpictures"
 msgstr "字幕"
 
-#: src/libvlc.h:1065 modules/codec/subsdec.c:92 modules/demux/subtitle.c:61
+#: src/libvlc.h:1085 modules/codec/subsdec.c:92 modules/demux/subtitle.c:61
 #: modules/gui/beos/InterfaceWindow.cpp:277
 msgid "Subtitles"
 msgstr "字幕"
 
-#: src/libvlc.h:1082
+#: src/libvlc.h:1102
 msgid "Overlays"
 msgstr ""
 
-#: src/libvlc.h:1090
+#: src/libvlc.h:1110
 #, fuzzy
 msgid "Track settings"
 msgstr "轨道设置"
 
-#: src/libvlc.h:1108
+#: src/libvlc.h:1128
 msgid "Playback control"
 msgstr "回放控制"
 
-#: src/libvlc.h:1123
+#: src/libvlc.h:1143
 msgid "Default devices"
 msgstr "预设装置"
 
-#: src/libvlc.h:1132
+#: src/libvlc.h:1152
 msgid "Network settings"
 msgstr "网络设置"
 
-#: src/libvlc.h:1144
+#: src/libvlc.h:1164
 msgid "Socks proxy"
 msgstr ""
 
-#: src/libvlc.h:1153
+#: src/libvlc.h:1173
 msgid "Metadata"
 msgstr ""
 
-#: src/libvlc.h:1180
+#: src/libvlc.h:1200
 msgid "Decoders"
 msgstr "译码器"
 
-#: src/libvlc.h:1187 modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:317
+#: src/libvlc.h:1207 modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:375
 #, fuzzy
 msgid "Input"
 msgstr "输入清单"
 
-#: src/libvlc.h:1243
+#: src/libvlc.h:1263
 msgid "CPU"
 msgstr ""
 
-#: src/libvlc.h:1258
+#: src/libvlc.h:1278
 #, fuzzy
 msgid "Special modules"
 msgstr "输出模块"
 
-#: src/libvlc.h:1264
+#: src/libvlc.h:1284
 msgid "Plugins"
 msgstr "外挂"
 
-#: src/libvlc.h:1270
+#: src/libvlc.h:1290
 #, fuzzy
 msgid "Performance options"
 msgstr "转码选项"
 
-#: src/libvlc.h:1358
+#: src/libvlc.h:1378
 msgid "Hot keys"
 msgstr "热键"
 
-#: src/libvlc.h:1660
+#: src/libvlc.h:1689
 msgid "main program"
 msgstr "主程序"
 
-#: src/libvlc.h:1667
+#: src/libvlc.h:1696
 msgid "print help for VLC (can be combined with --advanced)"
 msgstr ""
 
-#: src/libvlc.h:1669
+#: src/libvlc.h:1698
 msgid ""
 "print help for VLC and all it's modules (can be combined with --advanced)"
 msgstr ""
 
-#: src/libvlc.h:1671
+#: src/libvlc.h:1700
 #, fuzzy
 msgid "print help for the advanced options"
 msgstr "显示进阶选项"
 
-#: src/libvlc.h:1673
+#: src/libvlc.h:1702
 msgid "ask for extra verbosity when displaying help"
 msgstr ""
 
-#: src/libvlc.h:1675
+#: src/libvlc.h:1704
 msgid "print a list of available modules"
 msgstr ""
 
-#: src/libvlc.h:1677
+#: src/libvlc.h:1706
 msgid "print help on a specific module (can be combined with --advanced)"
 msgstr ""
 
-#: src/libvlc.h:1679
+#: src/libvlc.h:1708
 msgid "save the current command line options in the config"
 msgstr ""
 
-#: src/libvlc.h:1681
+#: src/libvlc.h:1710
 msgid "reset the current config to the default values"
 msgstr ""
 
-#: src/libvlc.h:1683
+#: src/libvlc.h:1712
 msgid "use alternate config file"
 msgstr "使用替代的组态档"
 
-#: src/libvlc.h:1685
+#: src/libvlc.h:1714
 msgid "resets the current plugins cache"
 msgstr "重置目前外挂快取"
 
-#: src/libvlc.h:1687
+#: src/libvlc.h:1716
 msgid "print version information"
 msgstr ""
 
@@ -3774,7 +3796,7 @@ msgstr ""
 msgid "Zulu"
 msgstr ""
 
-#: src/misc/iso_lang.c:70 modules/gui/wxwidgets/dialogs/preferences.cpp:958
+#: src/misc/iso_lang.c:70 modules/gui/wxwidgets/dialogs/preferences.cpp:960
 msgid "Unknown"
 msgstr "未知"
 
@@ -3853,14 +3875,14 @@ msgid "Aspect-ratio"
 msgstr "采样率"
 
 #: modules/access/cdda.c:42 modules/access/dshow/dshow.cpp:79
-#: modules/access/dvb/access.c:67 modules/access/dvdnav.c:63
-#: modules/access/dvdread.c:61 modules/access/fake.c:40
-#: modules/access/file.c:80 modules/access/ftp.c:48
+#: modules/access/dvb/access.c:67 modules/access/dv.c:68
+#: modules/access/dvdnav.c:63 modules/access/dvdread.c:61
+#: modules/access/fake.c:40 modules/access/file.c:80 modules/access/ftp.c:48
 #: modules/access/gnomevfs.c:44 modules/access/http.c:51
 #: modules/access/mms/mms.c:46 modules/access/pvr/pvr.c:46
-#: modules/access/pvr/pvr.c:97 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/vcd/vcd.c:40
+#: 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/vcd/vcd.c:40
 msgid "Caching value in ms"
 msgstr "快取值(ms)"
 
@@ -3895,7 +3917,7 @@ msgid "Audio CD - Track %i"
 msgstr "音频轨"
 
 #: modules/access/cdda/cdda.c:42 modules/access/directory.c:77
-#: modules/codec/x264.c:125
+#: modules/codec/x264.c:156
 msgid "none"
 msgstr ""
 
@@ -4472,6 +4494,20 @@ msgstr ""
 msgid "DVB input with v4l2 support"
 msgstr ""
 
+#: modules/access/dv.c:70 modules/access/file.c:82
+msgid ""
+"Allows you to modify the default caching value for file streams. This value "
+"should be set in millisecond units."
+msgstr ""
+
+#: modules/access/dv.c:74
+msgid "Digital Video (Firewire/ieee1394)  input"
+msgstr ""
+
+#: modules/access/dv.c:75
+msgid "dv"
+msgstr ""
+
 #: modules/access/dvdnav.c:59 modules/access/dvdread.c:57
 msgid "DVD angle"
 msgstr ""
@@ -4552,7 +4588,7 @@ msgid ""
 "should be set in millisecond units."
 msgstr ""
 
-#: modules/access/fake.c:44 modules/access/pvr/pvr.c:69
+#: modules/access/fake.c:44 modules/access/pvr/pvr.c:72
 #: modules/access/v4l/v4l.c:136
 msgid "Framerate"
 msgstr ""
@@ -4562,7 +4598,7 @@ msgid "Specifies the number of frames per second (eg. 24, 25, 29.97, 30)."
 msgstr ""
 
 #: modules/access/fake.c:47 modules/stream_out/bridge.c:36
-#: modules/stream_out/mosaic_bridge.c:100
+#: modules/stream_out/mosaic_bridge.c:103
 msgid "ID"
 msgstr ""
 
@@ -4592,12 +4628,6 @@ msgstr ""
 msgid "Fake input"
 msgstr "没有输入"
 
-#: modules/access/file.c:82
-msgid ""
-"Allows you to modify the default caching value for file streams. This value "
-"should be set in millisecond units."
-msgstr ""
-
 #: modules/access/file.c:84
 msgid "Concatenate with additional files"
 msgstr ""
@@ -4624,6 +4654,39 @@ msgstr "标准文件系统文件输入"
 msgid "File"
 msgstr "文件"
 
+#: modules/access_filter/record.c:42
+#, fuzzy
+msgid "Record directory"
+msgstr "选择一个文件或目录"
+
+#: modules/access_filter/record.c:44
+#, fuzzy
+msgid "Allows you to specify the directory where the record will be stored"
+msgstr "允许你指定视频快照的存放目录"
+
+#: modules/access_filter/timeshift.c:42
+#, fuzzy
+msgid "Timeshift granularity"
+msgstr "时间"
+
+#: modules/access_filter/timeshift.c:43
+msgid "Size of the temporary files use to store the timeshifted stream."
+msgstr ""
+
+#: modules/access_filter/timeshift.c:45
+#, fuzzy
+msgid "Timeshift directory"
+msgstr "视频快照目录"
+
+#: modules/access_filter/timeshift.c:46
+msgid "Directory used to store the timeshift temporary files."
+msgstr ""
+
+#: modules/access_filter/timeshift.c:50 modules/access_filter/timeshift.c:51
+#, fuzzy
+msgid "Timeshift"
+msgstr "时间"
+
 #: modules/access/ftp.c:50
 msgid ""
 "Allows you to modify the default caching value for FTP streams. This value "
@@ -4711,16 +4774,17 @@ msgstr ""
 
 #: modules/access/http.c:65
 msgid ""
-"Enable this option to read a file that is being constantly updated (for "
-"example, a JPG file on a server)"
+"This allows you to read a file that is being constantly updated (for "
+"example, a JPG file on a server).You should not globally enable this option "
+"as it will break all other types of HTTP streams."
 msgstr ""
 
-#: modules/access/http.c:69
+#: modules/access/http.c:71
 msgid "HTTP input"
 msgstr "HTTP输入"
 
-#: modules/access/http.c:71
-msgid "HTTP/HTTPS"
+#: modules/access/http.c:73
+msgid "HTTP(S)"
 msgstr ""
 
 #: modules/access/mms/mms.c:48
@@ -4748,9 +4812,185 @@ msgstr ""
 msgid "Microsoft Media Server (MMS) input"
 msgstr "Microsoft Media Server (MMS)输入"
 
-#: modules/access/pvr/pvr.c:48 modules/access/pvr/pvr.c:99
-msgid ""
-"Allows you to modify the default caching value for pvr streams. This value "
+#: modules/access_output/dummy.c:40 modules/stream_out/dummy.c:47
+msgid "Dummy stream output"
+msgstr "虚拟串流输出"
+
+#: modules/access_output/dummy.c:41 modules/misc/dummy/dummy.c:58
+msgid "Dummy"
+msgstr "虚拟"
+
+#: modules/access_output/file.c:65
+msgid "Append to file"
+msgstr ""
+
+#: modules/access_output/file.c:66
+msgid "Append to file if it exists instead of replacing it."
+msgstr ""
+
+#: modules/access_output/file.c:70
+msgid "File stream output"
+msgstr "文件串流输出"
+
+#: modules/access_output/http.c:60
+msgid "Username"
+msgstr ""
+
+#: modules/access_output/http.c:61
+msgid ""
+"Allows you to give a user name that will be requested to access the stream."
+msgstr ""
+
+#: modules/access_output/http.c:63
+msgid "Password"
+msgstr ""
+
+#: modules/access_output/http.c:64
+msgid ""
+"Allows you to give a password that will be requested to access the stream."
+msgstr ""
+
+#: modules/access_output/http.c:66
+msgid "Mime"
+msgstr ""
+
+#: modules/access_output/http.c:67
+msgid "Allows you to give the mime returned by the server."
+msgstr ""
+
+#: modules/access_output/http.c:69 modules/control/http/http.c:46
+msgid "Certificate file"
+msgstr ""
+
+#: modules/access_output/http.c:70
+msgid ""
+"Path to the x509 PEM certificate file that will be used by the HTTP/SSL "
+"stream output"
+msgstr ""
+
+#: modules/access_output/http.c:72 modules/control/http/http.c:49
+msgid "Private key file"
+msgstr ""
+
+#: modules/access_output/http.c:73
+msgid ""
+"Path to the x509 PEM private key file that will  be used by the HTTP/SSL "
+"stream output. Leave empty if you don't have one."
+msgstr ""
+
+#: modules/access_output/http.c:76 modules/control/http/http.c:51
+msgid "Root CA file"
+msgstr ""
+
+#: modules/access_output/http.c:77
+msgid ""
+"Path to the x509 PEM trusted root CA certificates (certificate authority) "
+"file that will be used by the HTTP/SSL stream output. Leave empty if you "
+"don't have one."
+msgstr ""
+
+#: modules/access_output/http.c:81 modules/control/http/http.c:54
+msgid "CRL file"
+msgstr "CRL文件"
+
+#: modules/access_output/http.c:82
+msgid ""
+"Path to the x509 PEM Certificates Revocation List file that will be HTTP/SSL "
+"stream output. Leave empty if you don't have one."
+msgstr ""
+
+#: modules/access_output/http.c:87
+msgid "HTTP stream output"
+msgstr ""
+
+#: modules/access_output/http.c:89 modules/control/http/http.c:58
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:473
+msgid "HTTP"
+msgstr ""
+
+#: modules/access_output/shout.c:58
+#, fuzzy
+msgid "Stream-name"
+msgstr "串流"
+
+#: modules/access_output/shout.c:59
+msgid "The name this stream/channel will get on the icecast server."
+msgstr ""
+
+#: modules/access_output/shout.c:61
+#, fuzzy
+msgid "Stream-description"
+msgstr "描述"
+
+#: modules/access_output/shout.c:62
+msgid "A description of the stream content. (Information about your channel)."
+msgstr ""
+
+#: modules/access_output/shout.c:65
+#, fuzzy
+msgid "Stream MP3"
+msgstr "串流"
+
+#: modules/access_output/shout.c:66
+msgid ""
+"Normally you have to feed the shoutcast module with Ogg streams. This option "
+"allows you to feed MP3 streams instead, so you can forward MP3 streams to "
+"the icecast server."
+msgstr ""
+
+#: modules/access_output/shout.c:71
+msgid "libshout (icecast) output"
+msgstr ""
+
+#: modules/access_output/udp.c:75 modules/access/rtsp/access.c:40
+#: modules/demux/livedotcom.cpp:61
+msgid "Caching value (ms)"
+msgstr "快取值(ms)"
+
+#: modules/access_output/udp.c:77 modules/access/udp.c:44
+msgid ""
+"Allows you to modify the default caching value for UDP streams. This value "
+"should be set in millisecond units."
+msgstr ""
+
+#: modules/access_output/udp.c:81
+msgid "Allows you to define the time to live of the outgoing stream."
+msgstr ""
+
+#: modules/access_output/udp.c:84
+msgid "Group packets"
+msgstr ""
+
+#: modules/access_output/udp.c:85
+msgid ""
+"Packets can be sent one by one at the right time or by groups. This allows "
+"you to give the number of packets that will be sent at a time. It helps "
+"reducing the scheduling load on heavily-loaded systems."
+msgstr ""
+
+#: modules/access_output/udp.c:90
+msgid "Raw write"
+msgstr ""
+
+#: modules/access_output/udp.c:91
+msgid ""
+"If you enable this option, packets will be sent directly, without trying to "
+"fill the MTU (ie, without trying to make the biggest possible packets in "
+"order to improve streaming)."
+msgstr ""
+
+#: modules/access_output/udp.c:97
+msgid "UDP stream output"
+msgstr "UDP串流输出"
+
+#: modules/access_output/udp.c:98
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:476
+msgid "UDP"
+msgstr ""
+
+#: modules/access/pvr/pvr.c:48
+msgid ""
+"Allows you to modify the default caching value for pvr streams. This value "
 "should be set in millisecond units."
 msgstr ""
 
@@ -4762,136 +5002,150 @@ msgstr "装置"
 msgid "PVR video device"
 msgstr "PVR视频装置"
 
-#: modules/access/pvr/pvr.c:54 modules/access/v4l/v4l.c:96
+#: modules/access/pvr/pvr.c:54
+#, fuzzy
+msgid "Radio device"
+msgstr "音频装置"
+
+#: modules/access/pvr/pvr.c:55
+#, fuzzy
+msgid "PVR radio device"
+msgstr "PVR视频装置"
+
+#: modules/access/pvr/pvr.c:57 modules/access/v4l/v4l.c:96
 msgid "Norm"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:55 modules/access/v4l/v4l.c:98
+#: modules/access/pvr/pvr.c:58 modules/access/v4l/v4l.c:98
 msgid "Defines the norm of the stream (Automatic, SECAM, PAL, or NTSC)"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:58 modules/access/v4l/v4l.c:102
+#: modules/access/pvr/pvr.c:61 modules/access/v4l/v4l.c:102
 msgid "Width"
 msgstr "宽度"
 
-#: modules/access/pvr/pvr.c:59 modules/access/v4l/v4l.c:103
+#: modules/access/pvr/pvr.c:62 modules/access/v4l/v4l.c:103
 msgid "Width of the stream to capture (-1 for autodetect)"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:62 modules/access/v4l/v4l.c:105
+#: modules/access/pvr/pvr.c:65 modules/access/v4l/v4l.c:105
 msgid "Height"
 msgstr "高度"
 
-#: modules/access/pvr/pvr.c:63 modules/access/v4l/v4l.c:106
+#: modules/access/pvr/pvr.c:66 modules/access/v4l/v4l.c:106
 msgid "Height of the stream to capture (-1 for autodetect)"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:66 modules/access/v4l/v4l.c:89
+#: modules/access/pvr/pvr.c:69 modules/access/v4l/v4l.c:89
 msgid "Frequency"
 msgstr "频率"
 
-#: modules/access/pvr/pvr.c:67 modules/access/v4l/v4l.c:91
+#: modules/access/pvr/pvr.c:70 modules/access/v4l/v4l.c:91
 msgid "Frequency to capture (in kHz), if applicable"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:70 modules/access/v4l/v4l.c:137
+#: modules/access/pvr/pvr.c:73 modules/access/v4l/v4l.c:137
 msgid "Framerate to capture, if applicable (-1 for autodetect)"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:73
+#: modules/access/pvr/pvr.c:76
 msgid "Key interval"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:74
+#: modules/access/pvr/pvr.c:77
 msgid "Interval between keyframes (-1 for autodetect)"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:76
+#: modules/access/pvr/pvr.c:79
 msgid "B Frames"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:77
+#: modules/access/pvr/pvr.c:80
 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:81
+#: modules/access/pvr/pvr.c:84
 msgid "Bitrate to use (-1 for default)"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:83
+#: modules/access/pvr/pvr.c:86
 msgid "Bitrate peak"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:84
+#: modules/access/pvr/pvr.c:87
 msgid "Peak bitrate in VBR mode"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:86
+#: modules/access/pvr/pvr.c:89
 msgid "Bitrate mode (vbr or cbr)"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:87
+#: modules/access/pvr/pvr.c:90
 msgid "Bitrate mode to use"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:89
+#: modules/access/pvr/pvr.c:92
 msgid "Audio bitmask"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:90
+#: modules/access/pvr/pvr.c:93
 msgid ""
 "This option allows setting of bitmask that will get used by the audio part "
 "of the card."
 msgstr ""
 
-#: modules/access/pvr/pvr.c:93 modules/access/v4l/v4l.c:92
+#: modules/access/pvr/pvr.c:96 modules/access/vcdx/info.c:97
+#: modules/gui/macosx/intf.m:448 modules/gui/wxwidgets/interface.cpp:1423
+msgid "Volume"
+msgstr ""
+
+#: modules/access/pvr/pvr.c:97
+msgid "This option allows setting of the audio volume (0-65535)."
+msgstr ""
+
+#: modules/access/pvr/pvr.c:100 modules/access/v4l/v4l.c:92
 msgid "Channel"
 msgstr "频道"
 
-#: modules/access/pvr/pvr.c:94 modules/access/v4l/v4l.c:94
+#: modules/access/pvr/pvr.c:101 modules/access/v4l/v4l.c:94
 msgid ""
 "Channel of the card to use (Usually, 0 = tuner, 1 = composite, 2 = svideo)"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:105 modules/access/v4l/v4l.c:143
+#: modules/access/pvr/pvr.c:107 modules/access/v4l/v4l.c:143
 msgid "Automatic"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:105 modules/access/v4l/v4l.c:143
+#: modules/access/pvr/pvr.c:107 modules/access/v4l/v4l.c:143
 msgid "SECAM"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:105 modules/access/v4l/v4l.c:143
+#: modules/access/pvr/pvr.c:107 modules/access/v4l/v4l.c:143
 msgid "PAL"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:105 modules/access/v4l/v4l.c:143
+#: modules/access/pvr/pvr.c:107 modules/access/v4l/v4l.c:143
 msgid "NTSC"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:108
+#: modules/access/pvr/pvr.c:110
 msgid "vbr"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:108
+#: modules/access/pvr/pvr.c:110
 msgid "cbr"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:111
+#: modules/access/pvr/pvr.c:115
 msgid "PVR"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:112
+#: modules/access/pvr/pvr.c:116
 msgid "MPEG Encoding cards input (with ivtv drivers)"
 msgstr ""
 
-#: modules/access/rtsp/access.c:40 modules/access_output/udp.c:75
-#: modules/demux/livedotcom.cpp:61
-msgid "Caching value (ms)"
-msgstr "快取值(ms)"
-
 #: modules/access/rtsp/access.c:42 modules/demux/livedotcom.cpp:63
 msgid ""
 "Allows you to modify the default caching value for RTSP streams. This value "
@@ -4972,12 +5226,6 @@ msgstr ""
 msgid "TCP input"
 msgstr "TCP输入"
 
-#: modules/access/udp.c:44 modules/access_output/udp.c:77
-msgid ""
-"Allows you to modify the default caching value for UDP streams. This value "
-"should be set in millisecond units."
-msgstr ""
-
 #: modules/access/udp.c:47
 msgid "Autodetection of MTU"
 msgstr ""
@@ -5198,315 +5446,112 @@ msgstr ""
 msgid "Volume Set"
 msgstr ""
 
-#: modules/access/vcdx/info.c:97 modules/gui/macosx/intf.m:448
-#: modules/gui/wxwidgets/interface.cpp:1380
-msgid "Volume"
-msgstr ""
-
 #: modules/access/vcdx/info.c:98
-msgid "Publisher"
-msgstr ""
-
-#: modules/access/vcdx/info.c:99
-msgid "System Id"
-msgstr ""
-
-#: modules/access/vcdx/info.c:101
-msgid "Entries"
-msgstr ""
-
-#: modules/access/vcdx/info.c:122
-msgid "First Entry Point"
-msgstr ""
-
-#: modules/access/vcdx/info.c:126
-msgid "Last Entry Point"
-msgstr ""
-
-#: modules/access/vcdx/info.c:127
-msgid "Track size (in sectors)"
-msgstr ""
-
-#: modules/access/vcdx/info.c:139 modules/access/vcdx/info.c:142
-#: modules/access/vcdx/info.c:151 modules/access/vcdx/info.c:166
-msgid "type"
-msgstr ""
-
-#: modules/access/vcdx/info.c:139
-msgid "end"
-msgstr ""
-
-#: modules/access/vcdx/info.c:142
-msgid "play list"
-msgstr ""
-
-#: modules/access/vcdx/info.c:153
-msgid "extended selection list"
-msgstr ""
-
-#: modules/access/vcdx/info.c:154
-msgid "selection list"
-msgstr "选择清单"
-
-#: modules/access/vcdx/info.c:166
-msgid "unknown type"
-msgstr "未知类型"
-
-#: modules/access/vcdx/info.c:298 modules/access/vcdx/info.c:299
-#: modules/access/vcdx/info.c:316
-msgid "List ID"
-msgstr ""
-
-#: modules/access/vcdx/vcd.c:95
-msgid "(Super) Video CD"
-msgstr ""
-
-#: modules/access/vcdx/vcd.c:96
-msgid "Video CD (VCD 1.0, 1.1, 2.0, SVCD, HQVCD) input"
-msgstr ""
-
-#: modules/access/vcdx/vcd.c:97
-msgid "vcdx://[device-or-file][@{P,S,T}num]"
-msgstr ""
-
-#: modules/access/vcdx/vcd.c:111 modules/access/vcdx/vcd.c:112
-msgid "Number of CD blocks to get in a single read."
-msgstr ""
-
-#: modules/access/vcdx/vcd.c:116
-msgid "Use playback control?"
-msgstr "使用回放控制"
-
-#: modules/access/vcdx/vcd.c:117
-msgid ""
-"If VCD is authored with playback control, use it. Otherwise we play by "
-"tracks."
-msgstr ""
-
-#: modules/access/vcdx/vcd.c:123
-msgid "Use track length as maximum unit in seek?"
-msgstr ""
-
-#: modules/access/vcdx/vcd.c:124
-msgid ""
-"If set, the length of the seek bar is the track rather than the length of an "
-"entry."
-msgstr ""
-
-#: modules/access/vcdx/vcd.c:129
-msgid "Show extended VCD info?"
-msgstr ""
-
-#: modules/access/vcdx/vcd.c:130
-msgid ""
-"Show the maximum amount of information under Stream and Media Info. Shows "
-"for example playback control navigation."
-msgstr ""
-
-#: modules/access/vcdx/vcd.c:137
-msgid "Format to use in the playlist's \"author\" field."
-msgstr ""
-
-#: modules/access/vcdx/vcd.c:143
-msgid "Format to use in the playlist's \"title\" field."
-msgstr ""
-
-#: modules/access_filter/record.c:42
-#, fuzzy
-msgid "Record directory"
-msgstr "选择一个文件或目录"
-
-#: modules/access_filter/record.c:44
-#, fuzzy
-msgid "Allows you to specify the directory where the record will be stored"
-msgstr "允许你指定视频快照的存放目录"
-
-#: modules/access_filter/timeshift.c:42
-#, fuzzy
-msgid "Timeshift granularity"
-msgstr "时间"
-
-#: modules/access_filter/timeshift.c:43
-msgid "Size of the temporary files use to store the timeshifted stream."
-msgstr ""
-
-#: modules/access_filter/timeshift.c:45
-#, fuzzy
-msgid "Timeshift directory"
-msgstr "视频快照目录"
-
-#: modules/access_filter/timeshift.c:46
-msgid "Directory used to store the timeshift temporary files."
-msgstr ""
-
-#: modules/access_filter/timeshift.c:50 modules/access_filter/timeshift.c:51
-#, fuzzy
-msgid "Timeshift"
-msgstr "时间"
-
-#: modules/access_output/dummy.c:40 modules/stream_out/dummy.c:47
-msgid "Dummy stream output"
-msgstr "虚拟串流输出"
-
-#: modules/access_output/dummy.c:41 modules/misc/dummy/dummy.c:58
-msgid "Dummy"
-msgstr "虚拟"
-
-#: modules/access_output/file.c:65
-msgid "Append to file"
-msgstr ""
-
-#: modules/access_output/file.c:66
-msgid "Append to file if it exists instead of replacing it."
-msgstr ""
-
-#: modules/access_output/file.c:70
-msgid "File stream output"
-msgstr "文件串流输出"
-
-#: modules/access_output/http.c:60
-msgid "Username"
-msgstr ""
-
-#: modules/access_output/http.c:61
-msgid ""
-"Allows you to give a user name that will be requested to access the stream."
-msgstr ""
-
-#: modules/access_output/http.c:63
-msgid "Password"
-msgstr ""
-
-#: modules/access_output/http.c:64
-msgid ""
-"Allows you to give a password that will be requested to access the stream."
-msgstr ""
-
-#: modules/access_output/http.c:66
-msgid "Mime"
-msgstr ""
-
-#: modules/access_output/http.c:67
-msgid "Allows you to give the mime returned by the server."
-msgstr ""
-
-#: modules/access_output/http.c:69 modules/control/http/http.c:46
-msgid "Certificate file"
+msgid "Publisher"
 msgstr ""
 
-#: modules/access_output/http.c:70
-msgid ""
-"Path to the x509 PEM certificate file that will be used by the HTTP/SSL "
-"stream output"
+#: modules/access/vcdx/info.c:99
+msgid "System Id"
 msgstr ""
 
-#: modules/access_output/http.c:72 modules/control/http/http.c:49
-msgid "Private key file"
+#: modules/access/vcdx/info.c:101
+msgid "Entries"
 msgstr ""
 
-#: modules/access_output/http.c:73
-msgid ""
-"Path to the x509 PEM private key file that will  be used by the HTTP/SSL "
-"stream output. Leave empty if you don't have one."
+#: modules/access/vcdx/info.c:122
+msgid "First Entry Point"
 msgstr ""
 
-#: modules/access_output/http.c:76 modules/control/http/http.c:51
-msgid "Root CA file"
+#: modules/access/vcdx/info.c:126
+msgid "Last Entry Point"
 msgstr ""
 
-#: modules/access_output/http.c:77
-msgid ""
-"Path to the x509 PEM trusted root CA certificates (certificate authority) "
-"file that will be used by the HTTP/SSL stream output. Leave empty if you "
-"don't have one."
+#: modules/access/vcdx/info.c:127
+msgid "Track size (in sectors)"
 msgstr ""
 
-#: modules/access_output/http.c:81 modules/control/http/http.c:54
-msgid "CRL file"
-msgstr "CRL文件"
+#: modules/access/vcdx/info.c:139 modules/access/vcdx/info.c:142
+#: modules/access/vcdx/info.c:151 modules/access/vcdx/info.c:166
+msgid "type"
+msgstr ""
 
-#: modules/access_output/http.c:82
-msgid ""
-"Path to the x509 PEM Certificates Revocation List file that will be HTTP/SSL "
-"stream output. Leave empty if you don't have one."
+#: modules/access/vcdx/info.c:139
+msgid "end"
 msgstr ""
 
-#: modules/access_output/http.c:87
-msgid "HTTP stream output"
+#: modules/access/vcdx/info.c:142
+msgid "play list"
 msgstr ""
 
-#: modules/access_output/http.c:89 modules/control/http/http.c:58
-#: modules/gui/wxwidgets/dialogs/streamout.cpp:473
-msgid "HTTP"
+#: modules/access/vcdx/info.c:153
+msgid "extended selection list"
 msgstr ""
 
-#: modules/access_output/shout.c:58
-#, fuzzy
-msgid "Stream-name"
-msgstr "串流"
+#: modules/access/vcdx/info.c:154
+msgid "selection list"
+msgstr "选择清单"
 
-#: modules/access_output/shout.c:59
-msgid "The name this stream/channel will get on the icecast server."
-msgstr ""
+#: modules/access/vcdx/info.c:166
+msgid "unknown type"
+msgstr "未知类型"
 
-#: modules/access_output/shout.c:61
-#, fuzzy
-msgid "Stream-description"
-msgstr "描述"
+#: modules/access/vcdx/info.c:298 modules/access/vcdx/info.c:299
+#: modules/access/vcdx/info.c:316
+msgid "List ID"
+msgstr ""
 
-#: modules/access_output/shout.c:62
-msgid "A description of the stream content. (Information about your channel)."
+#: modules/access/vcdx/vcd.c:95
+msgid "(Super) Video CD"
 msgstr ""
 
-#: modules/access_output/shout.c:65
-#, fuzzy
-msgid "Stream MP3"
-msgstr "串流"
+#: modules/access/vcdx/vcd.c:96
+msgid "Video CD (VCD 1.0, 1.1, 2.0, SVCD, HQVCD) input"
+msgstr ""
 
-#: modules/access_output/shout.c:66
-msgid ""
-"Normally you have to feed the shoutcast module with Ogg streams. This option "
-"allows you to feed MP3 streams instead, so you can forward MP3 streams to "
-"the icecast server."
+#: modules/access/vcdx/vcd.c:97
+msgid "vcdx://[device-or-file][@{P,S,T}num]"
 msgstr ""
 
-#: modules/access_output/shout.c:71
-msgid "libshout (icecast) output"
+#: modules/access/vcdx/vcd.c:111 modules/access/vcdx/vcd.c:112
+msgid "Number of CD blocks to get in a single read."
 msgstr ""
 
-#: modules/access_output/udp.c:81
-msgid "Allows you to define the time to live of the outgoing stream."
+#: modules/access/vcdx/vcd.c:116
+msgid "Use playback control?"
+msgstr "使用回放控制"
+
+#: modules/access/vcdx/vcd.c:117
+msgid ""
+"If VCD is authored with playback control, use it. Otherwise we play by "
+"tracks."
 msgstr ""
 
-#: modules/access_output/udp.c:84
-msgid "Group packets"
+#: modules/access/vcdx/vcd.c:123
+msgid "Use track length as maximum unit in seek?"
 msgstr ""
 
-#: modules/access_output/udp.c:85
+#: modules/access/vcdx/vcd.c:124
 msgid ""
-"Packets can be sent one by one at the right time or by groups. This allows "
-"you to give the number of packets that will be sent at a time. It helps "
-"reducing the scheduling load on heavily-loaded systems."
+"If set, the length of the seek bar is the track rather than the length of an "
+"entry."
 msgstr ""
 
-#: modules/access_output/udp.c:90
-msgid "Raw write"
+#: modules/access/vcdx/vcd.c:129
+msgid "Show extended VCD info?"
 msgstr ""
 
-#: modules/access_output/udp.c:91
+#: modules/access/vcdx/vcd.c:130
 msgid ""
-"If you enable this option, packets will be sent directly, without trying to "
-"fill the MTU (ie, without trying to make the biggest possible packets in "
-"order to improve streaming)."
+"Show the maximum amount of information under Stream and Media Info. Shows "
+"for example playback control navigation."
 msgstr ""
 
-#: modules/access_output/udp.c:97
-msgid "UDP stream output"
-msgstr "UDP串流输出"
+#: modules/access/vcdx/vcd.c:137
+msgid "Format to use in the playlist's \"author\" field."
+msgstr ""
 
-#: modules/access_output/udp.c:98
-#: modules/gui/wxwidgets/dialogs/streamout.cpp:476
-msgid "UDP"
+#: modules/access/vcdx/vcd.c:143
+msgid "Format to use in the playlist's \"title\" field."
 msgstr ""
 
 #: modules/audio_filter/channel_mixer/dolby.c:47
@@ -5847,7 +5892,8 @@ msgstr "虚拟S/PDIF音频混音器"
 msgid "Trivial audio mixer"
 msgstr ""
 
-#: modules/audio_output/alsa.c:84 modules/codec/x264.c:124
+#: modules/audio_output/alsa.c:84 modules/codec/x264.c:149
+#: modules/codec/x264.c:155
 msgid "default"
 msgstr "预设"
 
@@ -5861,34 +5907,34 @@ msgstr "ALSA装置名称"
 
 #: modules/audio_output/alsa.c:128 modules/audio_output/auhal.c:95
 #: modules/audio_output/auhal.c:565 modules/audio_output/coreaudio.c:217
-#: modules/audio_output/directx.c:412 modules/audio_output/oss.c:132
+#: modules/audio_output/directx.c:403 modules/audio_output/oss.c:132
 #: modules/audio_output/portaudio.c:394 modules/audio_output/sdl.c:179
-#: modules/audio_output/sdl.c:197 modules/audio_output/waveout.c:354
+#: modules/audio_output/sdl.c:197 modules/audio_output/waveout.c:371
 #: modules/gui/macosx/intf.m:513 modules/gui/macosx/intf.m:514
 msgid "Audio Device"
 msgstr "音频装置"
 
-#: modules/audio_output/alsa.c:185 modules/audio_output/directx.c:489
+#: modules/audio_output/alsa.c:185 modules/audio_output/directx.c:480
 #: modules/audio_output/oss.c:225 modules/audio_output/portaudio.c:400
 #: modules/audio_output/sdl.c:185 modules/audio_output/sdl.c:204
-#: modules/audio_output/waveout.c:416
+#: modules/audio_output/waveout.c:433
 msgid "Mono"
 msgstr ""
 
-#: modules/audio_output/alsa.c:198 modules/audio_output/directx.c:462
+#: modules/audio_output/alsa.c:198 modules/audio_output/directx.c:453
 #: modules/audio_output/oss.c:181 modules/audio_output/portaudio.c:419
-#: modules/audio_output/waveout.c:388
+#: modules/audio_output/waveout.c:405
 msgid "2 Front 2 Rear"
 msgstr ""
 
-#: modules/audio_output/alsa.c:204 modules/audio_output/directx.c:426
+#: modules/audio_output/alsa.c:204 modules/audio_output/directx.c:417
 #: modules/audio_output/oss.c:170 modules/audio_output/portaudio.c:435
-#: modules/audio_output/waveout.c:369
+#: modules/audio_output/waveout.c:386
 msgid "5.1"
 msgstr ""
 
-#: modules/audio_output/alsa.c:246 modules/audio_output/directx.c:535
-#: modules/audio_output/oss.c:249 modules/audio_output/waveout.c:432
+#: modules/audio_output/alsa.c:246 modules/audio_output/directx.c:526
+#: modules/audio_output/oss.c:249 modules/audio_output/waveout.c:449
 msgid "A/52 over S/PDIF"
 msgstr ""
 
@@ -5916,31 +5962,31 @@ msgstr "ALSA音频输出"
 msgid "CoreAudio output"
 msgstr "CoreAudio输出"
 
-#: modules/audio_output/directx.c:213 modules/audio_output/portaudio.c:107
+#: modules/audio_output/directx.c:207 modules/audio_output/portaudio.c:107
 msgid "Output device"
 msgstr "输出装置"
 
-#: modules/audio_output/directx.c:215
+#: modules/audio_output/directx.c:209
 msgid ""
 "DirectX device number: 0 default device, 1..N device by number(Note that the "
 "default device appears as 0 AND another number)."
 msgstr ""
 
-#: modules/audio_output/directx.c:217 modules/audio_output/waveout.c:133
+#: modules/audio_output/directx.c:211 modules/audio_output/waveout.c:137
 msgid "Use float32 output"
 msgstr "使用float32输出"
 
-#: modules/audio_output/directx.c:219 modules/audio_output/waveout.c:135
+#: modules/audio_output/directx.c:213 modules/audio_output/waveout.c:139
 msgid ""
 "The option allows you to enable or disable the high-quality float32 audio "
 "output mode (which is not well supported by some soundcards)."
 msgstr ""
 
-#: modules/audio_output/directx.c:223
+#: modules/audio_output/directx.c:217
 msgid "DirectX audio output"
 msgstr "DirectX音频输出"
 
-#: modules/audio_output/directx.c:444 modules/audio_output/portaudio.c:427
+#: modules/audio_output/directx.c:435 modules/audio_output/portaudio.c:427
 msgid "3 Front 2 Rear"
 msgstr ""
 
@@ -6028,7 +6074,7 @@ msgstr "PORTAUDIO音频输出"
 msgid "Simple DirectMedia Layer audio output"
 msgstr ""
 
-#: modules/audio_output/waveout.c:140
+#: modules/audio_output/waveout.c:144
 msgid "Win32 waveOut extension output"
 msgstr ""
 
@@ -6165,12 +6211,12 @@ msgstr "影像复制"
 msgid "Path of the image file when using the fake input."
 msgstr ""
 
-#: modules/codec/fake.c:49 modules/stream_out/mosaic_bridge.c:106
+#: modules/codec/fake.c:49 modules/stream_out/mosaic_bridge.c:109
 #: modules/stream_out/transcode.c:72
 msgid "Allows you to specify the output video width."
 msgstr "允许你指定输出视频宽度"
 
-#: modules/codec/fake.c:52 modules/stream_out/mosaic_bridge.c:109
+#: modules/codec/fake.c:52 modules/stream_out/mosaic_bridge.c:112
 #: modules/stream_out/transcode.c:75
 msgid "Allows you to specify the output video height."
 msgstr "允许你指定输出视频高度"
@@ -7024,24 +7070,92 @@ msgid ""
 "quality)."
 msgstr ""
 
-#: modules/codec/x264.c:124
+#: modules/codec/x264.c:121
+msgid "Motion estimation algorithm."
+msgstr ""
+
+#: modules/codec/x264.c:122
+msgid ""
+"Selects the motion estimation algorithm:  dia - diamond (fastest) \n"
+" hex - hexagon (default setting) \n"
+" umh - uneven multi-hexagon (better but slower) \n"
+" esa - exhaustive search (extremely slow, primarily for testing) "
+msgstr ""
+
+#: modules/codec/x264.c:128
+msgid "Motion estimation search range."
+msgstr ""
+
+#: modules/codec/x264.c:129
+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."
+msgstr ""
+
+#: modules/codec/x264.c:133
+msgid "Disable PSNR calculation."
+msgstr ""
+
+#: modules/codec/x264.c:134
+msgid ""
+"This has no effect on actual encoding quality, it just prevents the stats "
+"from being calculated (for speed)."
+msgstr ""
+
+#: modules/codec/x264.c:137
+msgid "Disable adaptive B-frames."
+msgstr ""
+
+#: modules/codec/x264.c:138
+msgid ""
+"If this is on, the specified number of consequtive B-frames will always be "
+"used, except possibly before an I-frame. "
+msgstr ""
+
+#: modules/codec/x264.c:141
+msgid "Bias the choice to use B-frames."
+msgstr ""
+
+#: modules/codec/x264.c:142
+msgid ""
+"Positive values cause more= B-frames, negative values cause less B-frames. "
+msgstr ""
+
+#: modules/codec/x264.c:149
+msgid "dia"
+msgstr ""
+
+#: modules/codec/x264.c:149
+msgid "hex"
+msgstr ""
+
+#: modules/codec/x264.c:149
+msgid "umh"
+msgstr ""
+
+#: modules/codec/x264.c:149
+msgid "esa"
+msgstr ""
+
+#: modules/codec/x264.c:155
 msgid "all"
 msgstr "全部"
 
-#: modules/codec/x264.c:124
+#: modules/codec/x264.c:155
 #, fuzzy
 msgid "slow"
 msgstr "慢速"
 
-#: modules/codec/x264.c:124
+#: modules/codec/x264.c:155
 msgid "normal"
 msgstr "正常"
 
-#: modules/codec/x264.c:125
+#: modules/codec/x264.c:156
 msgid "fast"
 msgstr "快速"
 
-#: modules/codec/x264.c:128
+#: modules/codec/x264.c:159
 msgid "H264 encoder (using x264 library)"
 msgstr ""
 
@@ -7127,20 +7241,25 @@ msgid "This option allows you to define playlist bookmarks."
 msgstr "这个选项允许你定义播放清单书签"
 
 #: modules/control/hotkeys.c:98
+#, fuzzy
+msgid "Hotkeys"
+msgstr "热键"
+
+#: modules/control/hotkeys.c:99
 msgid "Hotkeys management interface"
 msgstr "热键管理接口"
 
-#: modules/control/hotkeys.c:483
+#: modules/control/hotkeys.c:481
 #, c-format
 msgid "Audio track: %s"
 msgstr "音轨: %s"
 
-#: modules/control/hotkeys.c:497 modules/control/hotkeys.c:525
+#: modules/control/hotkeys.c:495 modules/control/hotkeys.c:523
 #, c-format
 msgid "Subtitle track: %s"
 msgstr "字幕轨: %s"
 
-#: modules/control/hotkeys.c:497
+#: modules/control/hotkeys.c:495
 msgid "N/A"
 msgstr ""
 
@@ -8530,7 +8649,7 @@ 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:541
+#: modules/gui/macosx/open.m:784 modules/gui/wxwidgets/interface.cpp:552
 #: modules/gui/wxwidgets/menus.cpp:315
 msgid "Open"
 msgstr "开启"
@@ -8631,13 +8750,14 @@ msgstr "播放清单"
 
 #: modules/gui/beos/PlayListWindow.cpp:96
 #: modules/gui/wxwidgets/dialogs/messages.cpp:78
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:74
 msgid "Close"
 msgstr "关闭"
 
 #: modules/gui/beos/PlayListWindow.cpp:101 modules/gui/macosx/bookmarks.m:95
 #: modules/gui/macosx/intf.m:478
 #: modules/gui/wxwidgets/dialogs/bookmarks.cpp:165
-#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:337
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:397
 #: modules/gui/wxwidgets/dialogs/vlm/vlm_streampanel.cpp:99
 msgid "Edit"
 msgstr "编辑"
@@ -8688,7 +8808,7 @@ msgstr "路径"
 #: modules/gui/macosx/playlist.m:132
 #: modules/gui/wxwidgets/dialogs/bookmarks.cpp:97
 #: modules/gui/wxwidgets/dialogs/iteminfo.cpp:135
-#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:312
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:369
 #: modules/gui/wxwidgets/dialogs/wizard.cpp:583
 msgid "Name"
 msgstr "名称"
@@ -8700,6 +8820,7 @@ msgstr "应用"
 #: modules/gui/beos/PreferencesWindow.cpp:254 modules/gui/macosx/output.m:538
 #: modules/gui/macosx/playlist.m:766 modules/gui/macosx/prefs.m:121
 #: modules/gui/wxwidgets/dialogs/preferences.cpp:206
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:77
 msgid "Save"
 msgstr "储存"
 
@@ -8740,7 +8861,7 @@ msgid "Take Screen Shot"
 msgstr "撷取画面快照"
 
 #: modules/gui/macosx/about.m:73 modules/gui/macosx/intf.m:457
-#: modules/gui/wxwidgets/interface.cpp:466
+#: modules/gui/wxwidgets/interface.cpp:485
 msgid "About VLC media player"
 msgstr "关于VLC多媒体播放程序"
 
@@ -8762,7 +8883,7 @@ msgstr "增加"
 #: modules/gui/macosx/bookmarks.m:94 modules/gui/macosx/intf.m:482
 #: modules/gui/wxwidgets/dialogs/bookmarks.cpp:163
 #: modules/gui/wxwidgets/dialogs/messages.cpp:83
-#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:339
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:399
 msgid "Clear"
 msgstr "清除"
 
@@ -9072,8 +9193,8 @@ msgstr "回卷"
 #: modules/gui/pda/pda_interface.c:263
 #: modules/gui/wxwidgets/dialogs/playlist.cpp:267
 #: modules/gui/wxwidgets/dialogs/playlist.cpp:275
-#: modules/gui/wxwidgets/interface.cpp:543
-#: modules/gui/wxwidgets/interface.cpp:1228
+#: modules/gui/wxwidgets/interface.cpp:554
+#: modules/gui/wxwidgets/interface.cpp:1271
 #: modules/gui/wxwidgets/menus.cpp:292 modules/gui/wxwidgets/menus.cpp:306
 msgid "Play"
 msgstr "播放"
@@ -9106,7 +9227,7 @@ msgstr "隐藏其它"
 msgid "Show All"
 msgstr "显示全部"
 
-#: modules/gui/macosx/intf.m:467 modules/gui/wxwidgets/interface.cpp:1500
+#: modules/gui/macosx/intf.m:467 modules/gui/wxwidgets/interface.cpp:1543
 msgid "Quit VLC"
 msgstr "离开VLC"
 
@@ -9266,11 +9387,9 @@ msgstr "减低音量"
 
 #: modules/gui/macosx/intf.m:1252 modules/gui/macosx/intf.m:1253
 #: modules/gui/macosx/intf.m:1254 modules/gui/pda/pda_interface.c:250
-#: modules/gui/pda/pda_interface.c:251 modules/gui/wxwidgets/interface.cpp:544
-#: modules/gui/wxwidgets/interface.cpp:1222
-#: modules/gui/wxwidgets/menus.cpp:294 modules/visualization/xosd.c:241
-#: modules/visualization/xosd.c:242
-#, c-format
+#: modules/gui/pda/pda_interface.c:251 modules/gui/wxwidgets/interface.cpp:555
+#: modules/gui/wxwidgets/interface.cpp:1265
+#: modules/gui/wxwidgets/menus.cpp:294 modules/visualization/xosd.c:240
 msgid "Pause"
 msgstr "暂停"
 
@@ -9486,8 +9605,8 @@ msgstr "转码选项"
 #: modules/gui/macosx/wizard.m:408
 #: modules/gui/wxwidgets/dialogs/streamout.cpp:774
 #: modules/gui/wxwidgets/dialogs/streamout.cpp:849
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:826
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:865
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:839
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:878
 msgid "Bitrate (kb/s)"
 msgstr ""
 
@@ -9533,6 +9652,16 @@ msgstr ""
 msgid "Save File"
 msgstr "储存档案"
 
+#: modules/gui/macosx/playlistinfo.m:53 modules/gui/macosx/playlist.m:504
+msgid "Properties"
+msgstr ""
+
+#: modules/gui/macosx/playlistinfo.m:54
+#: modules/gui/wxwidgets/dialogs/iteminfo.cpp:124
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:584
+msgid "URI"
+msgstr ""
+
 #: modules/gui/macosx/playlist.m:499
 msgid "Save Playlist..."
 msgstr "储存播放清单..."
@@ -9548,10 +9677,6 @@ msgstr "删除"
 msgid "Expand Node"
 msgstr ""
 
-#: modules/gui/macosx/playlist.m:504 modules/gui/macosx/playlistinfo.m:53
-msgid "Properties"
-msgstr ""
-
 #: modules/gui/macosx/playlist.m:505
 #: modules/gui/wxwidgets/dialogs/playlist.cpp:269
 #: modules/gui/wxwidgets/dialogs/playlist.cpp:276
@@ -9600,12 +9725,6 @@ msgstr "播放清单中有 %i 个项目"
 msgid "1 item in the playlist"
 msgstr "播放清单中有 1 个项目"
 
-#: modules/gui/macosx/playlistinfo.m:54
-#: modules/gui/wxwidgets/dialogs/iteminfo.cpp:124
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:584
-msgid "URI"
-msgstr ""
-
 #: modules/gui/macosx/prefs.m:123
 #: modules/gui/wxwidgets/dialogs/preferences.cpp:208
 msgid "Reset All"
@@ -9627,7 +9746,7 @@ msgid ""
 "Are you sure you want to continue?"
 msgstr ""
 
-#: modules/gui/macosx/prefs.m:703
+#: modules/gui/macosx/prefs.m:705
 msgid "Some options are available but hidden. Check \"Advanced\" to see them."
 msgstr ""
 
@@ -9822,7 +9941,7 @@ msgstr ""
 #: modules/gui/macosx/wizard.m:1143
 #: modules/gui/wxwidgets/dialogs/wizard.cpp:81
 #: modules/gui/wxwidgets/dialogs/wizard.cpp:84
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:1387
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:1400
 msgid "Streaming/Transcoding Wizard"
 msgstr "串流/转码向导"
 
@@ -9877,7 +9996,7 @@ msgid "Choose..."
 msgstr "选择..."
 
 #: modules/gui/macosx/wizard.m:377 modules/gui/macosx/wizard.m:451
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:616
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:618
 msgid "Partial Extract"
 msgstr ""
 
@@ -9889,12 +10008,12 @@ msgid ""
 msgstr ""
 
 #: modules/gui/macosx/wizard.m:383
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:627
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:629
 msgid "From"
 msgstr "从"
 
 #: modules/gui/macosx/wizard.m:384
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:632
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:634
 msgid "To"
 msgstr "到"
 
@@ -9910,12 +10029,12 @@ msgid "In this page, you will select how your input stream will be sent."
 msgstr "在这一页，你可以选择你的输入串流的传送方式"
 
 #: modules/gui/macosx/wizard.m:390 modules/gui/macosx/wizard.m:445
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:1032 modules/stream_out/rtp.c:44
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:1045 modules/stream_out/rtp.c:44
 msgid "Destination"
 msgstr "目标"
 
 #: modules/gui/macosx/wizard.m:391 modules/gui/macosx/wizard.m:457
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:1018
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:1031
 msgid "Streaming method"
 msgstr "串流方式"
 
@@ -9942,12 +10061,12 @@ msgid ""
 msgstr ""
 
 #: modules/gui/macosx/wizard.m:406 modules/gui/macosx/wizard.m:459
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:848
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:861
 msgid "Transcode audio"
 msgstr "音频转码"
 
 #: modules/gui/macosx/wizard.m:407 modules/gui/macosx/wizard.m:461
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:809
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:822
 msgid "Transcode video"
 msgstr "视频转码"
 
@@ -9986,13 +10105,13 @@ msgstr "在这一页，你可以选择你的输入串流的传送方式"
 
 #: modules/gui/macosx/wizard.m:425 modules/gui/macosx/wizard.m:1641
 #: modules/gui/wxwidgets/dialogs/streamout.cpp:607
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:1319
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:1332
 msgid "Time-To-Live (TTL)"
 msgstr "有效时间(TTL)"
 
 #: modules/gui/macosx/wizard.m:427 modules/gui/macosx/wizard.m:453
 #: modules/gui/macosx/wizard.m:1656
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:1327
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:1340
 msgid "SAP Announce"
 msgstr ""
 
@@ -10015,7 +10134,7 @@ msgid ""
 msgstr "在这一页，你可以选择你的输入串流的传送方式"
 
 #: modules/gui/macosx/wizard.m:436
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:1251
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:1264
 msgid "Select the file to save to"
 msgstr "选择文件以保存到"
 
@@ -10717,18 +10836,30 @@ msgstr ""
 "(WinCE界面)\n"
 "\n"
 
-#: modules/gui/wince/interface.cpp:497 modules/gui/wxwidgets/interface.cpp:922
+#: modules/gui/wince/interface.cpp:497 modules/gui/wxwidgets/interface.cpp:949
 msgid ""
 "(c) 1996-2005 - the VideoLAN Team\n"
 "\n"
 msgstr ""
 
-#: modules/gui/wince/interface.cpp:498 modules/gui/wxwidgets/interface.cpp:932
+#: modules/gui/wince/interface.cpp:498 modules/gui/wxwidgets/interface.cpp:950
+msgid "Compiled by "
+msgstr ""
+
+#: modules/gui/wince/interface.cpp:500 modules/gui/wxwidgets/interface.cpp:952
+msgid "Compiler: "
+msgstr ""
+
+#: modules/gui/wince/interface.cpp:501 modules/gui/wxwidgets/interface.cpp:953
+msgid "Based on SVN revision: "
+msgstr ""
+
+#: modules/gui/wince/interface.cpp:502
+#, fuzzy
 msgid ""
 "The VideoLAN team <videolan@videolan.org>\n"
-"http://www.videolan.org/\n"
-"\n"
-msgstr ""
+"http://www.videolan.org/"
+msgstr "作者: the VideoLAN Team, http://www.videolan.org/team/"
 
 #: modules/gui/wince/open.cpp:134 modules/gui/wxwidgets/dialogs/open.cpp:425
 msgid "Open:"
@@ -11059,22 +11190,22 @@ msgstr "逼放清单是空的"
 msgid "Can't save"
 msgstr "无法储存"
 
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:1229 modules/misc/freetype.c:100
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:1231 modules/misc/freetype.c:100
 #: modules/misc/win32text.c:71
 msgid "Normal"
 msgstr "正常"
 
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:1231
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:1233
 #, fuzzy
 msgid "Sorted by artist"
 msgstr "依制作人排序"
 
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:1233
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:1235
 #, fuzzy
 msgid "Sorted by Album"
 msgstr "依名称排序"
 
-#: modules/gui/wxwidgets/dialogs/preferences.cpp:1007
+#: modules/gui/wxwidgets/dialogs/preferences.cpp:1009
 msgid ""
 "Some options are available but hidden. Check \"Advanced options\" to see "
 "them."
@@ -11197,7 +11328,7 @@ msgid "Open file"
 msgstr "打开文件"
 
 #: modules/gui/wxwidgets/dialogs/updatevlc.cpp:101
-#: modules/gui/wxwidgets/interface.cpp:468
+#: modules/gui/wxwidgets/interface.cpp:487
 msgid "Check for updates ..."
 msgstr ""
 
@@ -11237,45 +11368,59 @@ msgstr "保存文件..."
 msgid "Downloading..."
 msgstr "正在下载..."
 
-#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:57
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:65
 msgid "Broadcasts"
 msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:198
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:76
+msgid "Load"
+msgstr ""
+
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:215
+#, fuzzy
+msgid "Load configuration"
+msgstr "VLM设置档"
+
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:229
+#, fuzzy
+msgid "Save configuration"
+msgstr "VLM设置档"
+
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:245
 msgid "New broadcast"
 msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:321
-#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:331
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:380
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:391
 #: modules/gui/wxwidgets/dialogs/wizard.cpp:115
 msgid "Choose"
 msgstr "选择"
 
-#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:326
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:385
 #, fuzzy
 msgid "Output"
 msgstr "输出URL"
 
-#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:337
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:397
 #, fuzzy
 msgid "Create"
 msgstr "置中"
 
-#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:342
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:402
 #, fuzzy
 msgid "Enabled"
 msgstr "启动"
 
-#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:347
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:407
 msgid "Loop"
 msgstr "循环"
 
-#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:430
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:510
 #, fuzzy
 msgid "VLM configuration"
 msgstr "VLM设置档"
 
-#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:464
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:544
 #, fuzzy
 msgid "VLM stream"
 msgstr "播放串流"
@@ -11341,7 +11486,7 @@ msgid ""
 "name will be used"
 msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:1270
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:1283
 #, fuzzy
 msgid "Save to file"
 msgstr "储存档案"
@@ -11381,120 +11526,120 @@ msgid ""
 "effect will be sharper."
 msgstr ""
 
-#: modules/gui/wxwidgets/interface.cpp:429
+#: modules/gui/wxwidgets/interface.cpp:448
 msgid "Quick &Open File...\tCtrl-O"
 msgstr "快速打开文件...\tCtrl-O"
 
-#: modules/gui/wxwidgets/interface.cpp:432
+#: modules/gui/wxwidgets/interface.cpp:451
 msgid "Open &File...\tCtrl-F"
 msgstr "打开文件(&F)...\tCtrl-F"
 
-#: modules/gui/wxwidgets/interface.cpp:433
+#: modules/gui/wxwidgets/interface.cpp:452
 #, fuzzy
 msgid "Open Dir&ectory...\tCtrl-E"
 msgstr "打开文件(&F)...\tCtrl-F"
 
-#: modules/gui/wxwidgets/interface.cpp:434
+#: modules/gui/wxwidgets/interface.cpp:453
 msgid "Open &Disc...\tCtrl-D"
 msgstr "打开光盘(&D)...\tCtrl-D"
 
-#: modules/gui/wxwidgets/interface.cpp:436
+#: modules/gui/wxwidgets/interface.cpp:455
 msgid "Open &Network Stream...\tCtrl-N"
 msgstr "打开网络串流(&N)...\tCtrl-N"
 
-#: modules/gui/wxwidgets/interface.cpp:438
+#: modules/gui/wxwidgets/interface.cpp:457
 #, fuzzy
 msgid "Open C&apture Device...\tCtrl-A"
 msgstr "打开获取装置(&C)...\tCtrl-C"
 
-#: modules/gui/wxwidgets/interface.cpp:441
+#: modules/gui/wxwidgets/interface.cpp:460
 msgid "&Wizard...\tCtrl-W"
 msgstr "向导(W)...\tCtrl-W"
 
-#: modules/gui/wxwidgets/interface.cpp:444
+#: modules/gui/wxwidgets/interface.cpp:463
 msgid "E&xit\tCtrl-X"
 msgstr "退出(&X)\tCtrl-X"
 
-#: modules/gui/wxwidgets/interface.cpp:450
+#: modules/gui/wxwidgets/interface.cpp:469
 msgid "&Playlist...\tCtrl-P"
 msgstr "播放清单(&P)\tCtrl-P"
 
-#: modules/gui/wxwidgets/interface.cpp:452
+#: modules/gui/wxwidgets/interface.cpp:471
 msgid "&Messages...\tCtrl-M"
 msgstr "信息(&M)...\tCtrl-M"
 
-#: modules/gui/wxwidgets/interface.cpp:454
+#: modules/gui/wxwidgets/interface.cpp:473
 msgid "Stream and Media &info...\tCtrl-I"
 msgstr "串流及媒体信息(&I)...\tCtrl-I"
 
-#: modules/gui/wxwidgets/interface.cpp:456
-msgid "VLM Control...\tCtrl-I"
+#: modules/gui/wxwidgets/interface.cpp:475
+msgid "VLM Control...\tCtrl-V"
 msgstr ""
 
-#: modules/gui/wxwidgets/interface.cpp:472
+#: modules/gui/wxwidgets/interface.cpp:491
 msgid "&File"
 msgstr "文件(&F)"
 
-#: modules/gui/wxwidgets/interface.cpp:473
+#: modules/gui/wxwidgets/interface.cpp:492
 msgid "&View"
 msgstr "查看(&V)"
 
-#: modules/gui/wxwidgets/interface.cpp:474
+#: modules/gui/wxwidgets/interface.cpp:493
 msgid "&Settings"
 msgstr "设置(&S)"
 
-#: modules/gui/wxwidgets/interface.cpp:475
+#: modules/gui/wxwidgets/interface.cpp:494
 msgid "&Audio"
 msgstr "音频(&A)"
 
-#: modules/gui/wxwidgets/interface.cpp:476
+#: modules/gui/wxwidgets/interface.cpp:495
 msgid "&Video"
 msgstr "视频(&V)"
 
-#: modules/gui/wxwidgets/interface.cpp:477
+#: modules/gui/wxwidgets/interface.cpp:496
 msgid "&Navigation"
 msgstr "导航(&N)"
 
-#: modules/gui/wxwidgets/interface.cpp:478
+#: modules/gui/wxwidgets/interface.cpp:497
 msgid "&Help"
 msgstr "辅助说明(&H)"
 
-#: modules/gui/wxwidgets/interface.cpp:546
+#: modules/gui/wxwidgets/interface.cpp:557
 msgid "Previous playlist item"
 msgstr "前一个播放清单项目"
 
-#: modules/gui/wxwidgets/interface.cpp:547
+#: modules/gui/wxwidgets/interface.cpp:558
 msgid "Next playlist item"
 msgstr "下一个播放清单项目"
 
-#: modules/gui/wxwidgets/interface.cpp:548
+#: modules/gui/wxwidgets/interface.cpp:559
 msgid "Play slower"
 msgstr "慢速播放"
 
-#: modules/gui/wxwidgets/interface.cpp:549
+#: modules/gui/wxwidgets/interface.cpp:560
 msgid "Play faster"
 msgstr "快速播放"
 
-#: modules/gui/wxwidgets/interface.cpp:858
+#: modules/gui/wxwidgets/interface.cpp:885
 #, fuzzy
 msgid "Extended &GUI\tCtrl-G"
 msgstr "扩展用户界面(&E)"
 
-#: modules/gui/wxwidgets/interface.cpp:862
+#: modules/gui/wxwidgets/interface.cpp:889
 msgid "&Undock Ext. GUI"
 msgstr ""
 
-#: modules/gui/wxwidgets/interface.cpp:866
+#: modules/gui/wxwidgets/interface.cpp:893
 #, fuzzy
 msgid "&Bookmarks...\tCtrl-B"
 msgstr "书签(&B)"
 
-#: modules/gui/wxwidgets/interface.cpp:868
+#: modules/gui/wxwidgets/interface.cpp:895
 #, fuzzy
 msgid "Preference&s...\tCtrl-S"
 msgstr "偏好设置..."
 
-#: modules/gui/wxwidgets/interface.cpp:921
+#: modules/gui/wxwidgets/interface.cpp:948
 #, fuzzy
 msgid ""
 " (wxWidgets interface)\n"
@@ -11503,24 +11648,19 @@ msgstr ""
 " (wxWindows界面)\n"
 "\n"
 
-#: modules/gui/wxwidgets/interface.cpp:923
-msgid "Compiled by "
-msgstr ""
-
-#: modules/gui/wxwidgets/interface.cpp:925
-msgid "Compiler: "
-msgstr ""
-
-#: modules/gui/wxwidgets/interface.cpp:926
-msgid "Based on SVN revision: "
+#: modules/gui/wxwidgets/interface.cpp:959
+msgid ""
+"The VideoLAN team <videolan@videolan.org>\n"
+"http://www.videolan.org/\n"
+"\n"
 msgstr ""
 
-#: modules/gui/wxwidgets/interface.cpp:935
+#: modules/gui/wxwidgets/interface.cpp:962
 #, c-format
 msgid "About %s"
 msgstr "关于 %s"
 
-#: modules/gui/wxwidgets/interface.cpp:1511
+#: modules/gui/wxwidgets/interface.cpp:1554
 #, fuzzy
 msgid "Show/Hide interface"
 msgstr "显示/隐藏界面"
@@ -12022,6 +12162,10 @@ msgstr "记录文件文件名"
 msgid "Specify the log filename."
 msgstr ""
 
+#: modules/misc/memcpy/memcpyaltivec.c:56
+msgid "AltiVec memcpy"
+msgstr ""
+
 #: modules/misc/memcpy/memcpy.c:83
 msgid "libc memcpy"
 msgstr ""
@@ -12038,10 +12182,6 @@ msgstr ""
 msgid "MMX EXT memcpy"
 msgstr ""
 
-#: modules/misc/memcpy/memcpyaltivec.c:56
-msgid "AltiVec memcpy"
-msgstr ""
-
 #: modules/misc/msn.c:67
 msgid "MSN Title format string"
 msgstr ""
@@ -12509,7 +12649,7 @@ msgstr "DAAP存取"
 msgid "HAL device detection"
 msgstr "HAL装置侦测"
 
-#: modules/services_discovery/hal.c:135
+#: modules/services_discovery/hal.c:153
 msgid "Devices"
 msgstr "装置"
 
@@ -12804,25 +12944,25 @@ msgstr ""
 msgid "Gathering stream output"
 msgstr ""
 
-#: modules/stream_out/mosaic_bridge.c:102
+#: modules/stream_out/mosaic_bridge.c:105
 msgid "Specify an identifier string for this subpicture"
 msgstr ""
 
-#: modules/stream_out/mosaic_bridge.c:110
+#: modules/stream_out/mosaic_bridge.c:113
 #, fuzzy
 msgid "Sample aspect ratio"
 msgstr "采样率"
 
-#: modules/stream_out/mosaic_bridge.c:112
+#: modules/stream_out/mosaic_bridge.c:115
 msgid "Sample aspect ratio of the destination (1:1, 3:4, 2:3)."
 msgstr ""
 
-#: modules/stream_out/mosaic_bridge.c:117
+#: modules/stream_out/mosaic_bridge.c:120
 #, fuzzy
 msgid "Mosaic bridge"
 msgstr "视频对齐"
 
-#: modules/stream_out/mosaic_bridge.c:118
+#: modules/stream_out/mosaic_bridge.c:121
 #, fuzzy
 msgid "Mosaic bridge stream output"
 msgstr "文件串流输出"
@@ -14536,6 +14676,41 @@ msgstr ""
 msgid "XOSD interface"
 msgstr "XOSD界面"
 
+#, fuzzy
+#~ msgid "Jump 3 seconds backwards"
+#~ msgstr "向后10秒钟"
+
+#~ msgid "Jump 10 seconds backwards"
+#~ msgstr "向后10秒钟"
+
+#~ msgid "Select the hotkey to jump 10 seconds backwards."
+#~ msgstr "选择热键以向后10秒钟"
+
+#~ msgid "Jump 1 minute backwards"
+#~ msgstr "向后1分钟"
+
+#~ msgid "Jump 5 minutes backwards"
+#~ msgstr "向后5分钟"
+
+#, fuzzy
+#~ msgid "Jump 3 seconds forward"
+#~ msgstr "向前10秒钟"
+
+#~ msgid "Jump 10 seconds forward"
+#~ msgstr "向前10秒钟"
+
+#~ msgid "Select the hotkey to jump 10 seconds forward."
+#~ msgstr "选择热键以向前10秒钟"
+
+#~ msgid "Jump 1 minute forward"
+#~ msgstr "向前1分钟"
+
+#~ msgid "Jump 5 minutes forward"
+#~ msgstr "向后5分钟"
+
+#~ msgid "Select the hotkey to jump 5 minutes forward."
+#~ msgstr "选择热键以向后5分钟"
+
 #, fuzzy
 #~ msgid "Shout"
 #~ msgstr "快照"