The Debian packaging data have been moved to svn.v.o/pkg-multimedia

[vlc] / po / zh_TW.po

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 3553f9e68a62c360255a51688a09ad800e7e4d1d..1c7e467b10563dcd511320886a38cedbc99450b9 100644 (file)
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vlc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-26 16:46+0200\n"
+"POT-Creation-Date: 2006-04-02 13:53+0200\n"
 "PO-Revision-Date: 2005-02-12 12:14+0100\n"
 "Last-Translator: Frank Chao <frank0624@gmail.com>\n"
 "Language-Team: zh_TW\n"
@@ -17,218 +17,241 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: include/vlc/vlc.h:578
+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 ""
+
 #: include/vlc_config_cat.h:32
 msgid "VLC preferences"
 msgstr "偏好設定"
 
 #: include/vlc_config_cat.h:34
-msgid "Click on \"Advanced Options\" to see all options."
+#, fuzzy
+msgid "Select \"Advanced Options\" to see all options."
 msgstr "點選\"進階選項\"檢視所有選項"
 
-#: include/vlc_config_cat.h:36 src/input/input.c:1820 src/input/input.c:1880
-#: src/playlist/item.c:366 src/playlist/playlist.c:164
+#: include/vlc_config_cat.h:36 include/vlc_config_cat.h:127
+#: src/input/input.c:1906 src/input/input.c:1966 src/playlist/item.c:369
+#: src/playlist/playlist.c:163 modules/gui/macosx/playlistinfo.m:62
 #: modules/gui/wince/playlist.cpp:674
-#: modules/visualization/visual/visual.c:111
+#: modules/gui/wxwidgets/dialogs/fileinfo.cpp:82
+#: modules/visualization/visual/visual.c:113
 msgid "General"
 msgstr "一般"
 
-#: include/vlc_config_cat.h:39 src/libvlc.h:1313 modules/misc/dummy/dummy.c:67
+#: include/vlc_config_cat.h:39 modules/misc/dummy/dummy.c:65
 msgid "Interface"
 msgstr "介面"
 
 #: include/vlc_config_cat.h:40
-msgid "Settings for VLC interfaces"
+#, fuzzy
+msgid "Settings for VLC's interfaces"
 msgstr "VLC介面設定"
 
 #: include/vlc_config_cat.h:42
 msgid "General interface setttings"
 msgstr "一般介面設定"
 
-#: include/vlc_config_cat.h:44 src/libvlc.h:64
+#: include/vlc_config_cat.h:44
+#, fuzzy
+msgid "Main interfaces"
+msgstr "可面板化介面"
+
+#: include/vlc_config_cat.h:45
+#, fuzzy
+msgid "Settings for the main interface"
+msgstr "VLC介面設定"
+
+#: include/vlc_config_cat.h:47 src/libvlc.h:75
 msgid "Control interfaces"
 msgstr "控制介面"
 
-#: include/vlc_config_cat.h:45
-msgid "Control interface settings"
-msgstr "控制介面設定"
+#: include/vlc_config_cat.h:48
+#, fuzzy
+msgid "Settings for VLC's control interfaces"
+msgstr "VLC介面設定"
 
-#: include/vlc_config_cat.h:47 include/vlc_config_cat.h:48
+#: include/vlc_config_cat.h:50 include/vlc_config_cat.h:51
 msgid "Hotkeys settings"
 msgstr "熱鍵設定"
 
-#: include/vlc_config_cat.h:51 src/input/es_out.c:1546 src/libvlc.h:949
-#: modules/gui/beos/InterfaceWindow.cpp:263 modules/gui/macosx/extended.m:81
-#: modules/gui/macosx/intf.m:516 modules/gui/macosx/output.m:170
-#: modules/gui/macosx/wizard.m:400 modules/gui/wxwidgets/extrapanel.cpp:180
-#: modules/gui/wxwidgets/wizard.cpp:849 modules/stream_out/transcode.c:214
+#: include/vlc_config_cat.h:54 src/input/es_out.c:1592 src/libvlc.h:1113
+#: modules/gui/beos/InterfaceWindow.cpp:280 modules/gui/macosx/extended.m:81
+#: modules/gui/macosx/intf.m:535 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:862
+#: modules/gui/wxwidgets/extrapanel.cpp:178 modules/stream_out/transcode.c:249
 msgid "Audio"
 msgstr "音訊"
 
-#: include/vlc_config_cat.h:52
+#: include/vlc_config_cat.h:55
 msgid "Audio settings"
 msgstr "音訊設定"
 
-#: include/vlc_config_cat.h:54 include/vlc_config_cat.h:55
+#: include/vlc_config_cat.h:57 include/vlc_config_cat.h:58
 msgid "General audio settings"
 msgstr "一般音訊設定"
 
-#: include/vlc_config_cat.h:57 include/vlc_config_cat.h:82
-#: src/video_output/video_output.c:462
+#: include/vlc_config_cat.h:60 include/vlc_config_cat.h:85
+#: src/video_output/video_output.c:403
 msgid "Filters"
 msgstr "濾波器"
 
-#: include/vlc_config_cat.h:59
-msgid "Audio filters are used to postprocess the audio stream"
-msgstr ""
+#: include/vlc_config_cat.h:62
+#, fuzzy
+msgid "Audio filters are used to postprocess the audio stream."
+msgstr "解多工器是用來分離音訊和視訊串流"
 
-#: include/vlc_config_cat.h:61 src/audio_output/input.c:77
-#: modules/gui/macosx/intf.m:526 modules/gui/macosx/intf.m:527
+#: include/vlc_config_cat.h:64 src/audio_output/input.c:78
+#: modules/gui/macosx/intf.m:545 modules/gui/macosx/intf.m:546
 msgid "Visualizations"
 msgstr "視覺效果"
 
-#: include/vlc_config_cat.h:63 src/audio_output/input.c:151
+#: include/vlc_config_cat.h:66 src/audio_output/input.c:152
 msgid "Audio visualizations"
 msgstr "音訊視覺效果"
 
-#: include/vlc_config_cat.h:65 include/vlc_config_cat.h:78
+#: include/vlc_config_cat.h:68 include/vlc_config_cat.h:81
 msgid "Output modules"
 msgstr "輸出模組"
 
-#: include/vlc_config_cat.h:66
+#: include/vlc_config_cat.h:69
 msgid "These are general settings for audio output modules."
 msgstr "音訊輸出模組的一般設定"
 
-#: include/vlc_config_cat.h:68 src/libvlc.h:1244 src/libvlc.h:1282
-#: src/libvlc.h:1324 modules/gui/wxwidgets/menus.cpp:310
-#: modules/stream_out/transcode.c:243
+#: include/vlc_config_cat.h:71 src/libvlc.h:1433
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:578
+#: modules/gui/wxwidgets/menus.cpp:313 modules/stream_out/transcode.c:278
 msgid "Miscellaneous"
 msgstr "雜項"
 
-#: include/vlc_config_cat.h:69
-msgid "Miscellaneous audio settings and modules"
+#: include/vlc_config_cat.h:72
+#, fuzzy
+msgid "Miscellaneous audio settings and modules."
 msgstr "模組及音訊雜項設定"
 
-#: include/vlc_config_cat.h:72 src/input/es_out.c:1568 src/libvlc.h:984
-#: modules/gui/macosx/extended.m:80 modules/gui/macosx/intf.m:529
-#: modules/gui/macosx/output.m:160 modules/gui/macosx/wizard.m:401
-#: modules/gui/wxwidgets/extrapanel.cpp:178
-#: modules/gui/wxwidgets/wizard.cpp:810 modules/misc/dummy/dummy.c:97
-#: modules/stream_out/transcode.c:174
+#: include/vlc_config_cat.h:75 src/input/es_out.c:1614 src/libvlc.h:1148
+#: modules/gui/macosx/extended.m:80 modules/gui/macosx/intf.m:548
+#: 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:823
+#: modules/gui/wxwidgets/extrapanel.cpp:176 modules/misc/dummy/dummy.c:95
+#: modules/stream_out/transcode.c:193
 msgid "Video"
 msgstr "視訊"
 
-#: include/vlc_config_cat.h:73
+#: include/vlc_config_cat.h:76
 msgid "Video settings"
 msgstr "視訊設定"
 
-#: include/vlc_config_cat.h:75 include/vlc_config_cat.h:76
+#: include/vlc_config_cat.h:78 include/vlc_config_cat.h:79
 msgid "General video settings"
 msgstr "一般視訊設定"
 
-#: include/vlc_config_cat.h:80
+#: include/vlc_config_cat.h:83
 msgid "Choose your preferred video output and configure it here."
 msgstr "選擇你所偏好的視訊輸出模組並設定"
 
-#: include/vlc_config_cat.h:84
-msgid "Video filters are used to postprocess the video stream"
-msgstr ""
-
-#: include/vlc_config_cat.h:86
-msgid "Subtitles/OSD"
-msgstr "字幕/OSD"
-
 #: include/vlc_config_cat.h:87
-msgid ""
-"Miscellaneous settings related to On Screen Display, subtitles and overlay "
-"subpictures"
-msgstr ""
+#, fuzzy
+msgid "Video filters are used to postprocess the video stream."
+msgstr "解多工器是用來分離音訊和視訊串流"
 
 #: include/vlc_config_cat.h:89
-msgid "Text rendering"
-msgstr "字體表現"
+msgid "Subtitles/OSD"
+msgstr "字幕/OSD"
 
-#: include/vlc_config_cat.h:91
+#: include/vlc_config_cat.h:90
 msgid ""
-"Use the settings of the \"freetype\" module to choose the font you  want VLC "
-"to use for text rendering (to display subtitles for example)."
+"Miscellaneous settings related to On-Screen-Display, subtitles and \"overlay "
+"subpictures\"."
 msgstr ""
 
-#: include/vlc_config_cat.h:95
+#: include/vlc_config_cat.h:99
 msgid "Input / Codecs"
 msgstr "輸入 / 編碼器"
 
-#: include/vlc_config_cat.h:96
+#: include/vlc_config_cat.h:100
 msgid ""
 "These are the settings for the input, demultiplexing and decoding parts of "
-"VLC. Encoder settings can also be found here"
+"VLC. Encoder settings can also be found here."
 msgstr ""
 
-#: include/vlc_config_cat.h:98
+#: include/vlc_config_cat.h:103
 msgid "Access modules"
 msgstr "存取模組"
 
-#: include/vlc_config_cat.h:100
+#: include/vlc_config_cat.h:105
 msgid ""
-"Settings related to the various access methods used by VLC.\n"
-"Common settings you may want to alter are HTTP proxy or caching settings."
+"Settings related to the various access methods used by VLC. Common settings "
+"you may want to alter are HTTP proxy or caching settings."
 msgstr ""
 
-#: include/vlc_config_cat.h:104
+#: include/vlc_config_cat.h:109
 #, fuzzy
-msgid "Access filter modules"
+msgid "Access filters"
 msgstr "存取模組"
 
-#: include/vlc_config_cat.h:106
-msgid "Settings related to the various access filter used by VLC.\n"
+#: include/vlc_config_cat.h:111
+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 "
+"you are doing."
 msgstr ""
 
-#: include/vlc_config_cat.h:108
+#: include/vlc_config_cat.h:115
 msgid "Demuxers"
 msgstr "解多工器"
 
-#: include/vlc_config_cat.h:109
-msgid "Demuxers are used to separate audio and video streams"
+#: include/vlc_config_cat.h:116
+#, fuzzy
+msgid "Demuxers are used to separate audio and video streams."
 msgstr "解多工器是用來分離音訊和視訊串流"
 
-#: include/vlc_config_cat.h:111
+#: include/vlc_config_cat.h:118
 msgid "Video codecs"
 msgstr "視訊編碼器"
 
-#: include/vlc_config_cat.h:112
-msgid "Settings for the video-only decoders and encoders"
+#: include/vlc_config_cat.h:119
+#, fuzzy
+msgid "Settings for the video-only decoders and encoders."
 msgstr "設定純視訊編碼及解碼器"
 
-#: include/vlc_config_cat.h:114
+#: include/vlc_config_cat.h:121
 msgid "Audio codecs"
 msgstr "音訊編碼器"
 
-#: include/vlc_config_cat.h:115
-msgid "Settings for the audio-only decoders and encoders"
+#: include/vlc_config_cat.h:122
+#, fuzzy
+msgid "Settings for the audio-only decoders and encoders."
 msgstr "設定純音訊編碼及解碼器"
 
-#: include/vlc_config_cat.h:117
+#: include/vlc_config_cat.h:124
 msgid "Other codecs"
 msgstr "其他編碼器"
 
-#: include/vlc_config_cat.h:118
-msgid "Settings for audio+video and miscellaneous decoders and encoders"
+#: include/vlc_config_cat.h:125
+#, fuzzy
+msgid "Settings for audio+video and miscellaneous decoders and encoders."
 msgstr "設定音訊+視訊、雜項編碼及解碼器"
 
-#: include/vlc_config_cat.h:120 include/vlc_config_cat.h:178 src/libvlc.h:1173
-#: modules/gui/macosx/prefs.m:124
-msgid "Advanced"
-msgstr "進階"
-
-#: include/vlc_config_cat.h:121
-msgid "Advanced input settings. Use with care."
+#: include/vlc_config_cat.h:128
+#, fuzzy
+msgid "General input settings. Use with care."
 msgstr "進階輸入設定，請注意。"
 
-#: include/vlc_config_cat.h:124 src/libvlc.h:1192
-#: modules/gui/wxwidgets/open.cpp:453 modules/gui/wxwidgets/streamout.cpp:158
+#: include/vlc_config_cat.h:131 src/libvlc.h:1370
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:152
 msgid "Stream output"
 msgstr "串流輸出"
 
-#: include/vlc_config_cat.h:126
+#: include/vlc_config_cat.h:133
 msgid ""
 "Stream output is what allows VLC to act as a streaming server or to save "
 "incoming streams.\n"
@@ -236,41 +259,42 @@ msgid ""
 "that can either save the stream to a file, or stream it (UDP, HTTP, RTP/"
 "RTSP).\n"
 "Sout streams modules allow advanced stream processing (transcoding, "
-"duplicating, ..."
+"duplicating...)."
 msgstr ""
 
-#: include/vlc_config_cat.h:134
+#: include/vlc_config_cat.h:141
 msgid "General stream output settings"
 msgstr "一般串流輸出設定"
 
-#: include/vlc_config_cat.h:136
+#: include/vlc_config_cat.h:143
 msgid "Muxers"
 msgstr "多工器"
 
-#: include/vlc_config_cat.h:137
+#: include/vlc_config_cat.h:145
 msgid ""
-"Muxers are the encapsulation formats that are used to put all the elementary "
-"streams (video, audio, ...) together. This setting allows you to always "
-"force a muxer. You should probably not do that.\n"
+"Muxers create the encapsulation formats that are used to put all the "
+"elementary streams (video, audio, ...) together. This setting allows you to "
+"always force a specific muxer. You should probably not do that.\n"
 "You can also set default parameters for each muxer."
 msgstr ""
 
-#: include/vlc_config_cat.h:142
+#: include/vlc_config_cat.h:151
 msgid "Access output"
 msgstr "存取輸出"
 
-#: include/vlc_config_cat.h:143
+#: include/vlc_config_cat.h:153
 msgid ""
-"Access output are the ways the muxed streams are sent. This setting allows "
-"you to always force an access output. You should probably not do that.\n"
+"Access output modules control the ways the muxed streams are sent. This "
+"setting allows you to always force a specific access output method. You "
+"should probably not do that.\n"
 "You can also set default parameters for each access output."
 msgstr ""
 
-#: include/vlc_config_cat.h:148
+#: include/vlc_config_cat.h:158
 msgid "Packetizers"
 msgstr "封包器"
 
-#: include/vlc_config_cat.h:149
+#: include/vlc_config_cat.h:160
 msgid ""
 "Packetizers are used to \"preprocess\" the elementary streams before muxing. "
 "This setting allows you to always force a packetizer. You should probably "
@@ -278,385 +302,391 @@ msgid ""
 "You can also set default parameters for each packetizer."
 msgstr ""
 
-#: include/vlc_config_cat.h:155
+#: include/vlc_config_cat.h:166
 msgid "Sout stream"
 msgstr ""
 
-#: include/vlc_config_cat.h:156
+#: include/vlc_config_cat.h:167
 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:161 modules/services_discovery/sap.c:118
-#: modules/services_discovery/sap.c:338
+#: include/vlc_config_cat.h:172 modules/services_discovery/sap.c:123
 msgid "SAP"
 msgstr ""
 
-#: include/vlc_config_cat.h:162
+#: include/vlc_config_cat.h:174
 msgid ""
 "SAP is a way to publically announce streams that are being sent using "
 "multicast UDP or RTP."
 msgstr ""
 
-#: include/vlc_config_cat.h:165
+#: include/vlc_config_cat.h:177
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:69
 msgid "VOD"
 msgstr ""
 
-#: include/vlc_config_cat.h:166
+#: include/vlc_config_cat.h:178
 msgid "VLC's implementation of Video On Demand"
 msgstr ""
 
-#: include/vlc_config_cat.h:170 src/libvlc.h:1294
-#: modules/demux/playlist/playlist.c:48
-#: modules/gui/beos/InterfaceWindow.cpp:213
-#: modules/gui/beos/InterfaceWindow.cpp:305 modules/gui/macosx/intf.m:461
-#: modules/gui/macosx/intf.m:555 modules/gui/pda/pda_interface.c:1264
-#: modules/gui/wxwidgets/interface.cpp:492
-#: modules/gui/wxwidgets/playlist.cpp:196
+#: include/vlc_config_cat.h:182 src/libvlc.h:1474
+#: 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:480
+#: modules/gui/macosx/intf.m:578 modules/gui/pda/pda_interface.c:1264
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:202
+#: modules/gui/wxwidgets/interface.cpp:676
+#: modules/gui/wxwidgets/interface.cpp:687
 msgid "Playlist"
 msgstr "播放清單"
 
-#: include/vlc_config_cat.h:171
+#: include/vlc_config_cat.h:183
 msgid ""
-"Settings related to playlist behaviour (playback mode, for example) and to "
-"modules that automatically add items to the playlist ('service discovery "
-"modules'"
+"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:173
+#: include/vlc_config_cat.h:187
 msgid "General playlist behaviour"
 msgstr ""
 
-#: include/vlc_config_cat.h:174 modules/gui/macosx/playlist.m:508
-#: modules/gui/wxwidgets/playlist.cpp:233
+#: include/vlc_config_cat.h:188 modules/gui/macosx/playlist.m:488
 msgid "Services discovery"
 msgstr ""
 
-#: include/vlc_config_cat.h:175
+#: include/vlc_config_cat.h:189
 msgid ""
-"Services discovery modules are modules that automatically add items to "
-"playlist"
+"Services discovery modules are facilities that automatically add items to "
+"playlist."
 msgstr ""
 
-#: include/vlc_config_cat.h:179
+#: include/vlc_config_cat.h:193 src/libvlc.h:1331
+#: modules/gui/macosx/prefs.m:124
+msgid "Advanced"
+msgstr "進階"
+
+#: include/vlc_config_cat.h:194
 msgid "Advanced settings. Use with care."
 msgstr "進階設定，請小心設定。"
 
-#: include/vlc_config_cat.h:181
+#: include/vlc_config_cat.h:196
 msgid "CPU features"
 msgstr "CPU功能"
 
-#: include/vlc_config_cat.h:182
+#: include/vlc_config_cat.h:197
 msgid ""
-"From here you can choose to disable some CPU accelerations. You should "
-"probably not touch that."
+"You can choose to disable some CPU accelerations here. You should probably "
+"not change these settings."
 msgstr ""
 
-#: include/vlc_config_cat.h:184 modules/demux/util/id3genres.h:40
-msgid "Other"
-msgstr "其他"
+#: include/vlc_config_cat.h:200
+#, fuzzy
+msgid "Advanced settings"
+msgstr "進階選項..."
 
-#: include/vlc_config_cat.h:185
+#: include/vlc_config_cat.h:201
 msgid "Other advanced settings"
 msgstr "其他進階設定"
 
-#: include/vlc_config_cat.h:187 modules/gui/macosx/open.m:162
+#: include/vlc_config_cat.h:203 modules/gui/macosx/open.m:162
 #: modules/gui/macosx/open.m:379 modules/gui/pda/pda_interface.c:548
-#: modules/gui/wxwidgets/open.cpp:511
+#: modules/gui/wxwidgets/dialogs/open.cpp:505
 msgid "Network"
 msgstr "網路"
 
-#: include/vlc_config_cat.h:188
-msgid "These modules provide network functions to all other parts of VLC"
+#: include/vlc_config_cat.h:204
+#, fuzzy
+msgid "These modules provide network functions to all other parts of VLC."
 msgstr "本模組對VLC其他部分提供網路的功能"
 
-#: include/vlc_config_cat.h:193
+#: include/vlc_config_cat.h:209
 msgid "Chroma modules settings"
 msgstr "彩度模組設定"
 
-#: include/vlc_config_cat.h:194
+#: include/vlc_config_cat.h:210
 msgid "These settings affect chroma transformation modules."
 msgstr "這個設定會影響彩度轉換模組"
 
-#: include/vlc_config_cat.h:196
+#: include/vlc_config_cat.h:212
 msgid "Packetizer modules settings"
 msgstr "封包器模組設定"
 
-#: include/vlc_config_cat.h:197 include/vlc_config_cat.h:215
-msgid " "
-msgstr " "
-
-#: include/vlc_config_cat.h:199
+#: include/vlc_config_cat.h:216
 msgid "Encoders settings"
 msgstr "編碼器設定"
 
-#: include/vlc_config_cat.h:201
+#: include/vlc_config_cat.h:218
 msgid "These are general settings for video/audio/subtitles encoding modules."
 msgstr "視訊/音訊/字幕編碼模組的一般設定"
 
-#: include/vlc_config_cat.h:205
+#: include/vlc_config_cat.h:221
 msgid "Dialog providers settings"
 msgstr ""
 
-#: include/vlc_config_cat.h:207
+#: include/vlc_config_cat.h:223
 msgid "Dialog providers can be configured here."
 msgstr ""
 
-#: include/vlc_config_cat.h:209
+#: include/vlc_config_cat.h:225
 msgid "Subtitle demuxer settings"
 msgstr "字幕解多工器設定"
 
-#: include/vlc_config_cat.h:211
+#: include/vlc_config_cat.h:227
 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:214
+#: include/vlc_config_cat.h:230
 msgid "Video filters settings"
 msgstr "視訊濾波器設定"
 
-#: include/vlc_config_cat.h:221
+#: include/vlc_config_cat.h:237
 msgid "No help available"
 msgstr "尚無可用的說明檔"
 
-#: include/vlc_config_cat.h:222
-msgid "No help is available for these modules"
+#: include/vlc_config_cat.h:238
+#, fuzzy
+msgid "There is no help available for these modules."
 msgstr "本模組尚無可用的說明檔"
 
-#: include/vlc_interface.h:129
+#: include/vlc_interface.h:137
 msgid ""
 "\n"
-"Warning: if you can't access the GUI anymore, open a dos command box, go to "
-"the directory where you installed VLC and run \"vlc -I wxwin\"\n"
+"Warning: if you can't access the GUI anymore, open a command-line window, go "
+"to the directory where you installed VLC and run \"vlc -I wx\"\n"
 msgstr ""
 
-#: include/vlc_interface.h:166
-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."
+#: include/vlc_meta.h:28 modules/gui/macosx/playlist.m:317
+#: modules/gui/macosx/playlist.m:1229 modules/gui/macosx/playlistinfo.m:205
+#: modules/gui/macosx/playlistinfo.m:310 modules/misc/growl.c:161
+#: modules/misc/growl.c:164
+msgid "Meta-information"
 msgstr ""
 
-#: include/vlc_meta.h:28 src/input/var.c:140
-#: modules/gui/beos/MediaControlView.cpp:1233 modules/gui/macosx/intf.m:511
-#: modules/gui/macosx/intf.m:512 modules/gui/macosx/open.m:168
-#: modules/gui/macosx/playlistinfo.m:55 modules/gui/macosx/wizard.m:370
-#: modules/gui/wxwidgets/open.cpp:740 modules/gui/wxwidgets/open.cpp:1599
-#: modules/mux/asf.c:48
+#: 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:530
+#: modules/gui/macosx/intf.m:531 modules/gui/macosx/open.m:168
+#: modules/gui/macosx/playlistinfo.m:57 modules/gui/macosx/wizard.m:391
+#: modules/gui/wxwidgets/dialogs/open.cpp:759
+#: modules/gui/wxwidgets/dialogs/open.cpp:1656 modules/mux/asf.c:48
 msgid "Title"
 msgstr "標題"
 
-#: include/vlc_meta.h:29 src/input/input.c:1821
-#: modules/gui/macosx/playlistinfo.m:56 modules/gui/macosx/playlist.m:133
-#: modules/gui/macosx/wizard.m:372 modules/gui/wince/playlist.cpp:674
-#: modules/mux/asf.c:51
+#: include/vlc_meta.h:30 modules/gui/macosx/playlist.m:134
+#: modules/gui/macosx/playlistinfo.m:58 modules/gui/macosx/wizard.m:393
+#: modules/gui/wince/playlist.cpp:674 modules/mux/asf.c:50
 msgid "Author"
 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/playlistinfo.m:118
-#: modules/gui/macosx/playlistinfo.m:152 modules/gui/macosx/playlist.m:316
-#: modules/gui/macosx/playlist.m:1245 modules/gui/wxwidgets/playlist.cpp:492
-#: modules/misc/playlist/m3u.c:68 modules/services_discovery/daap.c:608
+#: include/vlc_meta.h:31 modules/gui/macosx/playlist.m:317
+#: modules/gui/macosx/playlist.m:1229 modules/gui/macosx/playlistinfo.m:205
+#: modules/gui/macosx/playlistinfo.m:310
 msgid "Artist"
 msgstr "藝人"
 
-#: include/vlc_meta.h:31 src/playlist/sort.c:338
+#: include/vlc_meta.h:32
 msgid "Genre"
 msgstr "類型"
 
-#: include/vlc_meta.h:32 modules/mux/asf.c:54
+#: include/vlc_meta.h:33 modules/mux/asf.c:52
 msgid "Copyright"
 msgstr "著作權"
 
-#: include/vlc_meta.h:33 modules/gui/macosx/bookmarks.m:99
-#: modules/gui/wxwidgets/bookmarks.cpp:257
+#: include/vlc_meta.h:34 modules/misc/growl.c:165
+msgid "Album/movie/show title"
+msgstr ""
+
+#: include/vlc_meta.h:35
+msgid "Track number/position in set"
+msgstr ""
+
+#: include/vlc_meta.h:36 modules/gui/macosx/bookmarks.m:99
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:195
 msgid "Description"
 msgstr "描述"
 
-#: include/vlc_meta.h:34 modules/mux/asf.c:60
+#: include/vlc_meta.h:37 modules/mux/asf.c:56
 msgid "Rating"
 msgstr "評分"
 
-#: include/vlc_meta.h:35
+#: include/vlc_meta.h:38
 msgid "Date"
 msgstr "日期"
 
-#: include/vlc_meta.h:36
+#: include/vlc_meta.h:39
 msgid "Setting"
 msgstr "設定"
 
-#: include/vlc_meta.h:37 modules/gui/macosx/open.m:181
-#: modules/gui/wxwidgets/open.cpp:854
+#: include/vlc_meta.h:40 modules/gui/macosx/open.m:181
+#: modules/gui/wxwidgets/dialogs/open.cpp:873
 msgid "URL"
 msgstr "網址"
 
-#: include/vlc_meta.h:38 src/input/es_out.c:1538 src/libvlc.h:81
-#: modules/gui/beos/InterfaceWindow.cpp:259
+#: include/vlc_meta.h:41 src/input/es_out.c:1584 src/libvlc.h:92
+#: modules/gui/beos/InterfaceWindow.cpp:276
 msgid "Language"
 msgstr "語言"
 
-#: include/vlc_meta.h:39
+#: include/vlc_meta.h:42
 msgid "Now Playing"
 msgstr ""
 
-#: include/vlc_meta.h:41
+#: include/vlc_meta.h:43 modules/access/vcdx/info.c:98
+msgid "Publisher"
+msgstr ""
+
+#: include/vlc_meta.h:45
 msgid "CDDB Artist"
 msgstr ""
 
-#: include/vlc_meta.h:42
+#: include/vlc_meta.h:46
 msgid "CDDB Category"
 msgstr "CDDB分類"
 
-#: include/vlc_meta.h:43
+#: include/vlc_meta.h:47
 msgid "CDDB Disc ID"
 msgstr "CDDB光碟ID"
 
-#: include/vlc_meta.h:44
+#: include/vlc_meta.h:48
 msgid "CDDB Extended Data"
 msgstr ""
 
-#: include/vlc_meta.h:45
+#: include/vlc_meta.h:49
 msgid "CDDB Genre"
 msgstr ""
 
-#: include/vlc_meta.h:46
+#: include/vlc_meta.h:50
 msgid "CDDB Year"
 msgstr "CDDB年份"
 
-#: include/vlc_meta.h:47
+#: include/vlc_meta.h:51
 msgid "CDDB Title"
 msgstr "CDDB標題"
 
-#: include/vlc_meta.h:49
+#: include/vlc_meta.h:53
 msgid "CD-Text Arranger"
 msgstr ""
 
-#: include/vlc_meta.h:50
+#: include/vlc_meta.h:54
 msgid "CD-Text Composer"
 msgstr ""
 
-#: include/vlc_meta.h:51
+#: include/vlc_meta.h:55
 msgid "CD-Text Disc ID"
 msgstr ""
 
-#: include/vlc_meta.h:52
+#: include/vlc_meta.h:56
 msgid "CD-Text Genre"
 msgstr ""
 
-#: include/vlc_meta.h:53
+#: include/vlc_meta.h:57
 msgid "CD-Text Message"
 msgstr ""
 
-#: include/vlc_meta.h:54
+#: include/vlc_meta.h:58
 msgid "CD-Text Songwriter"
 msgstr ""
 
-#: include/vlc_meta.h:55
+#: include/vlc_meta.h:59
 msgid "CD-Text Performer"
 msgstr ""
 
-#: include/vlc_meta.h:56
+#: include/vlc_meta.h:60
 msgid "CD-Text Title"
 msgstr ""
 
-#: include/vlc_meta.h:58
+#: include/vlc_meta.h:62
 msgid "ISO-9660 Application ID"
 msgstr ""
 
-#: include/vlc_meta.h:59
+#: include/vlc_meta.h:63
 msgid "ISO-9660 Preparer"
 msgstr ""
 
-#: include/vlc_meta.h:60
+#: include/vlc_meta.h:64
 msgid "ISO-9660 Publisher"
 msgstr ""
 
-#: include/vlc_meta.h:61
+#: include/vlc_meta.h:65
 msgid "ISO-9660 Volume"
 msgstr ""
 
-#: include/vlc_meta.h:62
+#: include/vlc_meta.h:66
 msgid "ISO-9660 Volume Set"
 msgstr ""
 
-#: include/vlc_meta.h:64
+#: include/vlc_meta.h:68
 msgid "Codec Name"
 msgstr "編碼器名稱"
 
-#: include/vlc_meta.h:65
+#: include/vlc_meta.h:69
 msgid "Codec Description"
 msgstr "編碼器描述"
 
-#: src/audio_output/input.c:79 src/audio_output/input.c:125
-#: src/input/es_out.c:355 src/libvlc.h:320 src/video_output/video_output.c:438
+#: src/audio_output/input.c:80 src/audio_output/input.c:126
+#: src/input/es_out.c:361 src/libvlc.h:380 src/video_output/video_output.c:379
 #: modules/codec/ffmpeg/postprocess.c:94
 msgid "Disable"
 msgstr "關閉"
 
-#: src/audio_output/input.c:81 modules/visualization/visual/visual.c:127
+#: src/audio_output/input.c:82 modules/visualization/visual/visual.c:129
 #, fuzzy
 msgid "Spectrometer"
 msgstr "頻譜"
 
-#: src/audio_output/input.c:83
+#: src/audio_output/input.c:84
 msgid "Scope"
 msgstr "示波器"
 
-#: src/audio_output/input.c:85
+#: src/audio_output/input.c:86
 msgid "Spectrum"
 msgstr "頻譜"
 
-#: src/audio_output/input.c:122 modules/audio_filter/equalizer.c:66
+#: src/audio_output/input.c:123 modules/audio_filter/equalizer.c:70
 #: modules/gui/macosx/equalizer.m:140 modules/gui/macosx/equalizer.m:154
-#: modules/gui/macosx/intf.m:552 modules/gui/wxwidgets/extrapanel.cpp:179
+#: modules/gui/macosx/intf.m:575 modules/gui/wxwidgets/extrapanel.cpp:177
 msgid "Equalizer"
 msgstr "等化器"
 
-#: src/audio_output/input.c:144 src/libvlc.h:170
-#: modules/gui/macosx/extended.m:82 modules/gui/wxwidgets/extrapanel.cpp:392
+#: src/audio_output/input.c:145 src/libvlc.h:195
+#: 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:522
-#: modules/gui/macosx/intf.m:523
+#: modules/access/vcdx/info.c:118 modules/gui/macosx/intf.m:541
+#: modules/gui/macosx/intf.m:542
 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:190
-#: modules/audio_output/alsa.c:221 modules/audio_output/directx.c:476
+#: 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/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/audio_output/sdl.c:182 modules/audio_output/sdl.c:199
+#: modules/audio_output/waveout.c:420 modules/codec/twolame.c:66
 msgid "Stereo"
 msgstr "立體聲"
 
 #: src/audio_output/output.c:107 src/audio_output/output.c:143
-#: src/libvlc.h:229 modules/codec/dvbsub.c:70 modules/codec/subsdec.c:84
-#: modules/control/gestures.c:87 modules/video_filter/logo.c:85
-#: modules/video_filter/marq.c:106 modules/video_filter/mosaic.c:120
-#: modules/video_filter/osdmenu.c:76 modules/video_filter/rss.c:144
-#: modules/video_filter/time.c:96
+#: src/libvlc.h:258 modules/codec/dvbsub.c:70 modules/codec/subsdec.c:104
+#: modules/control/gestures.c:86 modules/video_filter/logo.c:95
+#: modules/video_filter/marq.c:107 modules/video_filter/mosaic.c:171
+#: modules/video_filter/osdmenu.c:77 modules/video_filter/rss.c:160
+#: modules/video_filter/time.c:99
 msgid "Left"
 msgstr "左"
 
 #: src/audio_output/output.c:109 src/audio_output/output.c:145
-#: src/libvlc.h:229 modules/codec/dvbsub.c:70 modules/codec/subsdec.c:84
-#: modules/control/gestures.c:87 modules/video_filter/logo.c:85
-#: modules/video_filter/marq.c:106 modules/video_filter/mosaic.c:120
-#: modules/video_filter/osdmenu.c:76 modules/video_filter/rss.c:144
-#: modules/video_filter/time.c:96
+#: src/libvlc.h:258 modules/codec/dvbsub.c:70 modules/codec/subsdec.c:104
+#: modules/control/gestures.c:86 modules/video_filter/logo.c:95
+#: modules/video_filter/marq.c:107 modules/video_filter/mosaic.c:171
+#: modules/video_filter/osdmenu.c:77 modules/video_filter/rss.c:160
+#: modules/video_filter/time.c:99
 msgid "Right"
 msgstr "右"
 
@@ -728,557 +758,574 @@ msgstr ""
 msgid "Bookmark %i"
 msgstr "書籤 %i"
 
-#: src/input/es_out.c:375 src/input/es_out.c:376 src/input/es_out.c:382
-#: src/input/es_out.c:383 modules/access/cdda.c:164
-#: modules/access/cdda/info.c:975 modules/access/cdda/info.c:1008
+#: 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:593
+#: modules/access/cdda/info.c:978 modules/access/cdda/info.c:1011
 #, c-format
 msgid "Track %i"
 msgstr "音軌 %i"
 
-#: src/input/es_out.c:456 src/input/es_out.c:458 src/input/es_out.c:558
-#: src/input/es_out.c:565 src/input/var.c:129 modules/gui/macosx/intf.m:509
-#: modules/gui/macosx/intf.m:510
+#: 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:406
+#: modules/gui/macosx/intf.m:528 modules/gui/macosx/intf.m:529
 msgid "Program"
 msgstr "程式"
 
-#: src/input/es_out.c:459 src/input/es_out.c:627 src/input/input.c:222
-#: src/input/input.c:1823 src/playlist/sort.c:190 src/playlist/sort.c:193
-#: src/playlist/sort.c:233 src/playlist/sort.c:236 src/playlist/sort.c:328
-#: src/playlist/sort.c:333 src/playlist/sort.c:338 modules/codec/vorbis.c:623
-#: modules/demux/playlist/b4s.c:324 modules/demux/playlist/b4s.c:332
-#: modules/demux/playlist/b4s.c:340 modules/demux/playlist/b4s.c:348
-#: modules/demux/playlist/m3u.c:209 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/playlist.cpp:491
-#: modules/gui/wxwidgets/timer.cpp:138 modules/gui/wxwidgets/timer.cpp:201
-#: modules/misc/playlist/m3u.c:68 modules/services_discovery/daap.c:607
-#: modules/services_discovery/daap.c:609
-msgid "Meta-information"
-msgstr ""
-
-#: src/input/es_out.c:1533
+#: src/input/es_out.c:1579
 #, c-format
 msgid "Stream %d"
 msgstr "串流 %d"
 
-#: src/input/es_out.c:1535 modules/gui/macosx/wizard.m:405
-#: modules/gui/wxwidgets/wizard.cpp:819 modules/gui/wxwidgets/wizard.cpp:859
+#: src/input/es_out.c:1581 modules/gui/macosx/wizard.m:426
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:832
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:872
 msgid "Codec"
 msgstr "編碼器"
 
-#: src/input/es_out.c:1546 src/input/es_out.c:1568 src/input/es_out.c:1591
+#: src/input/es_out.c:1592 src/input/es_out.c:1614 src/input/es_out.c:1641
 #: modules/gui/macosx/output.m:153
 msgid "Type"
 msgstr "類型"
 
-#: src/input/es_out.c:1549 modules/gui/macosx/output.m:176
-#: modules/gui/wxwidgets/streamout.cpp:821
+#: src/input/es_out.c:1595 modules/gui/macosx/output.m:176
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:857
 msgid "Channels"
 msgstr "頻道"
 
-#: src/input/es_out.c:1553
+#: src/input/es_out.c:1599
 msgid "Sample rate"
 msgstr "採樣率"
 
-#: src/input/es_out.c:1554
+#: src/input/es_out.c:1600
 #, c-format
 msgid "%d Hz"
 msgstr ""
 
-#: src/input/es_out.c:1558
+#: src/input/es_out.c:1604
 msgid "Bits per sample"
 msgstr ""
 
-#: src/input/es_out.c:1562 modules/access/pvr/pvr.c:80
+#: src/input/es_out.c:1608 modules/access/pvr/pvr.c:83
 #: modules/demux/playlist/b4s.c:349
 msgid "Bitrate"
 msgstr "位元率"
 
-#: src/input/es_out.c:1563
+#: src/input/es_out.c:1609
 #, c-format
 msgid "%d kb/s"
 msgstr ""
 
-#: src/input/es_out.c:1572
+#: src/input/es_out.c:1618
 msgid "Resolution"
 msgstr "解析度"
 
-#: src/input/es_out.c:1578
+#: src/input/es_out.c:1624
 msgid "Display resolution"
 msgstr "顯示解析度"
 
-#: src/input/es_out.c:1584 modules/access/screen/screen.c:41
+#: src/input/es_out.c:1634 modules/access/screen/screen.c:41
 msgid "Frame rate"
 msgstr ""
 
-#: src/input/es_out.c:1591
+#: src/input/es_out.c:1641
 msgid "Subtitle"
 msgstr "字幕"
 
-#: src/input/input.c:1834 src/input/input.c:1838
-#: modules/gui/macosx/output.m:143 modules/gui/macosx/output.m:253
-#: modules/gui/macosx/output.m:395
+#: src/input/input.c:1920 src/input/input.c:1924
+#: modules/gui/macosx/output.m:143 modules/gui/macosx/output.m:251
+#: modules/gui/macosx/output.m:391
 msgid "Stream"
 msgstr "串流"
 
-#: src/input/input.c:1880 src/playlist/item.c:366
-#: modules/access/cdda/info.c:325 modules/access/cdda/info.c:393
-#: modules/gui/macosx/playlist.m:134
+#: src/input/input.c:1966 src/playlist/item.c:369
+#: modules/access/cdda/info.c:326 modules/access/cdda/info.c:394
+#: modules/gui/macosx/playlist.m:135
 msgid "Duration"
 msgstr ""
 
-#: src/input/var.c:118
+#: src/input/input.c:2145 src/input/input.c:2215
+#, fuzzy
+msgid "Errors"
+msgstr "錯誤"
+
+#: src/input/var.c:115
 msgid "Bookmark"
 msgstr "書籤"
 
-#: src/input/var.c:135
+#: src/input/var.c:131 src/libvlc.h:412
 msgid "Programs"
 msgstr "程式"
 
-#: src/input/var.c:146 modules/gui/beos/MediaControlView.cpp:1234
-#: modules/gui/macosx/intf.m:513 modules/gui/macosx/intf.m:514
-#: modules/gui/macosx/open.m:169 modules/gui/wxwidgets/open.cpp:745
+#: src/input/var.c:142 modules/gui/beos/MediaControlView.cpp:1234
+#: modules/gui/macosx/intf.m:532 modules/gui/macosx/intf.m:533
+#: modules/gui/macosx/open.m:169 modules/gui/wxwidgets/dialogs/open.cpp:764
 msgid "Chapter"
 msgstr "章節"
 
-#: src/input/var.c:152 modules/access/vcdx/info.c:302
-#: modules/access/vcdx/info.c:303 modules/gui/beos/InterfaceWindow.cpp:274
+#: src/input/var.c:148 modules/access/vcdx/info.c:302
+#: modules/access/vcdx/info.c:303 modules/gui/beos/InterfaceWindow.cpp:291
 msgid "Navigation"
 msgstr "導覽"
 
-#: src/input/var.c:168 modules/gui/macosx/intf.m:537
-#: modules/gui/macosx/intf.m:538
+#: src/input/var.c:163 modules/gui/macosx/intf.m:556
+#: modules/gui/macosx/intf.m:557
 msgid "Video Track"
 msgstr "視訊軌"
 
-#: src/input/var.c:174 modules/gui/macosx/intf.m:520
-#: modules/gui/macosx/intf.m:521
+#: src/input/var.c:169 modules/gui/macosx/intf.m:539
+#: modules/gui/macosx/intf.m:540
 msgid "Audio Track"
 msgstr "音訊軌"
 
-#: src/input/var.c:180 modules/gui/macosx/intf.m:541
-#: modules/gui/macosx/intf.m:542
+#: src/input/var.c:175 modules/gui/macosx/intf.m:564
+#: modules/gui/macosx/intf.m:565
 msgid "Subtitles Track"
 msgstr "字幕軌"
 
-#: src/input/var.c:263
+#: src/input/var.c:256
 msgid "Next title"
 msgstr "下一個標題"
 
-#: src/input/var.c:268
+#: src/input/var.c:261
 msgid "Previous title"
 msgstr "上一個標題"
 
-#: src/input/var.c:291
+#: src/input/var.c:284
 #, c-format
 msgid "Title %i"
 msgstr "標題 %i"
 
-#: src/input/var.c:314 src/input/var.c:374
+#: src/input/var.c:307 src/input/var.c:367
 #, c-format
 msgid "Chapter %i"
 msgstr "章節 %i"
 
-#: src/input/var.c:353 modules/gui/beos/InterfaceWindow.cpp:271
-#: modules/gui/wxwidgets/timer.cpp:225
+#: src/input/var.c:346 modules/gui/beos/InterfaceWindow.cpp:288
+#: modules/gui/wxwidgets/input_manager.cpp:222
 msgid "Next chapter"
 msgstr "下一個章節"
 
-#: src/input/var.c:358 modules/gui/beos/InterfaceWindow.cpp:270
-#: modules/gui/wxwidgets/timer.cpp:224
+#: src/input/var.c:351 modules/gui/beos/InterfaceWindow.cpp:287
+#: modules/gui/wxwidgets/input_manager.cpp:221
 msgid "Previous chapter"
 msgstr "上一個章節"
 
-#: src/interface/interface.c:326
+#: src/interface/interaction.c:429
+#, fuzzy
+msgid "Login"
+msgstr "循環"
+
+#: src/interface/interaction.c:437 modules/access_output/http.c:63
+#: modules/control/telnet.c:81
+msgid "Password"
+msgstr ""
+
+#: src/interface/interface.c:346
 msgid "Switch interface"
 msgstr "切換介面"
 
-#: src/interface/interface.c:353 modules/gui/macosx/intf.m:472
-#: modules/gui/macosx/intf.m:473
+#: src/interface/interface.c:373 modules/gui/macosx/intf.m:491
+#: modules/gui/macosx/intf.m:492
 msgid "Add Interface"
 msgstr "新增介面"
 
-#: src/libvlc.c:324 src/libvlc.c:471 src/misc/modules.c:1677
-#: src/misc/modules.c:1981
+#: src/libvlc.c:329 src/libvlc.c:484 src/misc/modules.c:1683
+#: src/misc/modules.c:1987
 msgid "C"
 msgstr ""
 
-#: src/libvlc.c:341
+#: src/libvlc.c:346
 msgid "Help options"
 msgstr "說明選項"
 
-#: src/libvlc.c:2193 src/misc/configuration.c:1265
+#: src/libvlc.c:2221 src/misc/configuration.c:1248
 msgid "string"
 msgstr ""
 
-#: src/libvlc.c:2210 src/misc/configuration.c:1229
+#: src/libvlc.c:2238 src/misc/configuration.c:1212
 msgid "integer"
 msgstr ""
 
-#: src/libvlc.c:2228 src/misc/configuration.c:1254
+#: src/libvlc.c:2256 src/misc/configuration.c:1237
 msgid "float"
 msgstr ""
 
-#: src/libvlc.c:2234
+#: src/libvlc.c:2262
 msgid " (default enabled)"
 msgstr " (預設開啟)"
 
-#: src/libvlc.c:2235
+#: src/libvlc.c:2263
 msgid " (default disabled)"
 msgstr " (預設關閉)"
 
-#: src/libvlc.c:2417
+#: src/libvlc.c:2445
 #, fuzzy, c-format
 msgid "VLC version %s\n"
 msgstr "色彩反向"
 
-#: src/libvlc.c:2418
+#: src/libvlc.c:2446
 #, c-format
 msgid "Compiled by %s@%s.%s\n"
 msgstr ""
 
-#: src/libvlc.c:2420
+#: src/libvlc.c:2448
 #, c-format
 msgid "Compiler: %s\n"
 msgstr ""
 
-#: src/libvlc.c:2422
+#: src/libvlc.c:2451
 #, c-format
 msgid "Based upon svn changeset [%s]\n"
 msgstr ""
 
-#: src/libvlc.c:2425
-#, 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:2454
-#, c-format
+#: src/libvlc.c:2483
 msgid ""
 "\n"
 "Dumped content to vlc-help.txt file.\n"
 msgstr ""
 
-#: src/libvlc.c:2478
-#, c-format
+#: src/libvlc.c:2504
 msgid ""
 "\n"
 "Press the RETURN key to continue...\n"
 msgstr ""
 
-#: src/libvlc.h:34 src/libvlc.h:167
+#: src/libvlc.h:35 src/libvlc.h:192
 msgid "Auto"
 msgstr "自動"
 
-#: src/libvlc.h:34
+#: src/libvlc.h:35
 msgid "American English"
 msgstr ""
 
-#: src/libvlc.h:34
+#: src/libvlc.h:35
 msgid "British English"
 msgstr ""
 
-#: src/libvlc.h:34 src/misc/iso-639_def.h:59
+#: src/libvlc.h:36 src/misc/iso-639_def.h:59
 msgid "Catalan"
 msgstr ""
 
-#: src/libvlc.h:34 src/misc/iso-639_def.h:68
+#: src/libvlc.h:36 src/misc/iso-639_def.h:68
 msgid "Danish"
 msgstr ""
 
-#: src/libvlc.h:34 src/misc/iso-639_def.h:80
+#: src/libvlc.h:36 src/misc/iso-639_def.h:80
 msgid "German"
 msgstr ""
 
-#: src/libvlc.h:34 src/misc/iso-639_def.h:169
+#: src/libvlc.h:36 src/misc/iso-639_def.h:169
 msgid "Spanish"
 msgstr ""
 
-#: src/libvlc.h:34 src/misc/iso-639_def.h:77
+#: src/libvlc.h:36 src/misc/iso-639_def.h:77
 msgid "French"
 msgstr ""
 
-#: src/libvlc.h:34 src/misc/iso-639_def.h:99
+#: src/libvlc.h:37 src/misc/iso-639_def.h:99
 msgid "Italian"
 msgstr ""
 
-#: src/libvlc.h:34 src/misc/iso-639_def.h:101
+#: src/libvlc.h:37 src/misc/iso-639_def.h:101
 msgid "Japanese"
 msgstr ""
 
-#: src/libvlc.h:34 src/misc/iso-639_def.h:111
+#: src/libvlc.h:37 src/misc/iso-639_def.h:79
+msgid "Georgian"
+msgstr ""
+
+#: src/libvlc.h:37 src/misc/iso-639_def.h:111
 msgid "Korean"
 msgstr ""
 
-#: src/libvlc.h:34 src/misc/iso-639_def.h:69
+#: src/libvlc.h:38 src/misc/iso-639_def.h:69
 msgid "Dutch"
 msgstr ""
 
-#: src/libvlc.h:34
+#: src/libvlc.h:38
+msgid "Occitan"
+msgstr ""
+
+#: src/libvlc.h:38
 msgid "Brazilian Portuguese"
 msgstr ""
 
-#: src/libvlc.h:34 src/misc/iso-639_def.h:153
+#: src/libvlc.h:38 src/misc/iso-639_def.h:153
 msgid "Romanian"
 msgstr ""
 
-#: src/libvlc.h:34 src/misc/iso-639_def.h:155
+#: src/libvlc.h:39 src/misc/iso-639_def.h:155
 msgid "Russian"
 msgstr ""
 
-#: src/libvlc.h:34 src/misc/iso-639_def.h:187
+#: src/libvlc.h:39 src/misc/iso-639_def.h:187
 msgid "Turkish"
 msgstr ""
 
-#: src/libvlc.h:34
+#: src/libvlc.h:39
+msgid "Simplified Chinese"
+msgstr ""
+
+#: src/libvlc.h:40
 msgid "Chinese Traditional"
 msgstr ""
 
-#: src/libvlc.h:47
+#: src/libvlc.h:58
 msgid ""
-"These options allow you to configure the interfaces used by VLC.\n"
-"You can select the main interface, additional interface modules, and define "
-"various related options."
+"These options allow you to configure the interfaces used by VLC. You can "
+"select the main interface, additional interface modules, and define various "
+"related options."
 msgstr ""
 
-#: src/libvlc.h:51 src/libvlc.h:1314
+#: src/libvlc.h:62
 msgid "Interface module"
 msgstr "介面模組"
 
-#: src/libvlc.h:53
+#: src/libvlc.h:64
 msgid ""
-"This option allows you to select the interface used by VLC.\n"
-"The default behavior is to automatically select the best module available."
+"This is the main interface used by VLC. The default behavior is to "
+"automatically select the best module available."
 msgstr ""
 
-#: src/libvlc.h:57 src/libvlc.h:1319 modules/control/ntservice.c:53
+#: src/libvlc.h:68 modules/control/ntservice.c:53
 msgid "Extra interface modules"
 msgstr "額外介面模組"
 
-#: src/libvlc.h:59
+#: src/libvlc.h:70
 msgid ""
-"This option allows you to select additional interfaces used by VLC. They "
-"will be launched in the background in addition to the default interface. Use "
-"a comma separated list of interface modules. (common values are logger, "
-"gestures, sap, rc, http or screensaver)"
+"You can select \"additional interfaces\" for VLC. They will be launched in "
+"the background in addition to the default interface. Use a comma separated "
+"list of interface modules. (common values are \"rc\" (remote control), \"http"
+"\", \"gestures\" ...)"
 msgstr ""
 
-#: src/libvlc.h:66
-msgid "This option allows you to select control interfaces. "
+#: src/libvlc.h:77
+#, fuzzy
+msgid "You can select control interfaces for VLC."
 msgstr "這個選項允許你選擇控制介面"
 
-#: src/libvlc.h:68
+#: src/libvlc.h:79
 msgid "Verbosity (0,1,2)"
 msgstr ""
 
-#: src/libvlc.h:70
+#: src/libvlc.h:81
 msgid ""
-"This option sets the verbosity level (0=only errors and standard messages, "
+"This is the verbosity level (0=only errors and standard messages, "
 "1=warnings, 2=debug)."
 msgstr ""
 
-#: src/libvlc.h:73
+#: src/libvlc.h:84
 msgid "Be quiet"
 msgstr "安靜"
 
-#: src/libvlc.h:75
+#: src/libvlc.h:86
 #, fuzzy
-msgid "This option turns off all warning and information messages."
+msgid "Turn off all warning and information messages."
 msgstr "這個選項會關閉所有緊告及資訊訊息"
 
-#: src/libvlc.h:77
+#: src/libvlc.h:88
 #, fuzzy
-msgid "Open MRL"
-msgstr "é\96\8bå\95\9f"
+msgid "Default stream"
+msgstr "é \90設"
 
-#: src/libvlc.h:79
-#, fuzzy
-msgid "This option allows you to open a default MRL on start-up."
-msgstr "這個選項允許你定義播放清單書籤"
+#: src/libvlc.h:90
+msgid "This stream will always be opened at VLC startup."
+msgstr ""
 
-#: src/libvlc.h:82
+#: src/libvlc.h:93
 msgid ""
-"This option allows you to set the language of the interface. The system "
-"language is auto-detected if \"auto\" is specified here."
+"You can manually select a language for the interface. The system language is "
+"auto-detected if \"auto\" is specified here."
 msgstr ""
 
-#: src/libvlc.h:86
+#: src/libvlc.h:97
 msgid "Color messages"
 msgstr "色彩化訊息"
 
-#: src/libvlc.h:88
+#: src/libvlc.h:99
 msgid ""
-"When this option is turned on, the messages sent to the console will be "
-"colorized. Your terminal needs Linux color support for this to work."
+"This enables colorization of the messages sent to the console Your terminal "
+"needs Linux color support for this to work."
 msgstr ""
 
-#: src/libvlc.h:91
+#: src/libvlc.h:102
 msgid "Show advanced options"
 msgstr "顯示進階選項"
 
-#: src/libvlc.h:93
+#: src/libvlc.h:104
+msgid ""
+"When this is enabled, the preferences and/or interfaces will show all "
+"available options, including those that most users should never touch."
+msgstr ""
+
+#: src/libvlc.h:108 modules/control/showintf.c:68
+#, fuzzy
+msgid "Show interface with mouse"
+msgstr "顯示介面"
+
+#: src/libvlc.h:110
 msgid ""
-"When this option is turned on, the preferences and/or interfaces  will show "
-"all the available options, including those that most users should never "
-"touch."
+"When this is enabled, the interface is shown when you move the mouse to the "
+"edge of the screen in fullscreen mode."
 msgstr ""
 
-#: src/libvlc.h:98
+#: src/libvlc.h:120
 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 "
-"(spectrum analyzer, etc.).\n"
-"Enable these filters here, and configure them in the \"audio filters\" "
-"modules section."
+"(spectrum analyzer, etc.). Enable these filters here, and configure them in "
+"the \"audio filters\" modules section."
 msgstr ""
 
-#: src/libvlc.h:104
+#: src/libvlc.h:126
 msgid "Audio output module"
 msgstr "音訊輸出模組"
 
-#: src/libvlc.h:106
+#: src/libvlc.h:128
 msgid ""
-"This option allows you to select the audio output method used by VLC. The "
-"default behavior is to automatically select the best method available."
+"This is the audio output method used by VLC. The default behavior is to "
+"automatically select the best method available."
 msgstr ""
 
-#: src/libvlc.h:110 modules/stream_out/display.c:37
+#: src/libvlc.h:132 modules/stream_out/display.c:37
 msgid "Enable audio"
 msgstr "啟動音訊"
 
-#: src/libvlc.h:112
+#: src/libvlc.h:134
 msgid ""
-"You can completely disable the audio output. In this case, the audio "
-"decoding stage will not take place, thus saving some processing power."
+"You can completely disable the audio output. The audio decoding stage will "
+"not take place, thus saving some processing power."
 msgstr ""
 
-#: src/libvlc.h:115
+#: src/libvlc.h:137
 msgid "Force mono audio"
 msgstr "強制使用單聲道"
 
-#: src/libvlc.h:116
+#: src/libvlc.h:138
 msgid "This will force a mono audio output."
 msgstr "強制使用單聲道輸出"
 
-#: src/libvlc.h:118
-msgid "Audio output volume"
-msgstr "輸出音量"
+#: src/libvlc.h:140
+#, fuzzy
+msgid "Default audio volume"
+msgstr "預設裝置"
 
-#: src/libvlc.h:120
+#: src/libvlc.h:142
 msgid ""
 "You can set the default audio output volume here, in a range from 0 to 1024."
 msgstr "你可以在這裡設定預設的音訊輸出音量，範圍從0到1024"
 
-#: src/libvlc.h:123
+#: src/libvlc.h:145
 msgid "Audio output saved volume"
 msgstr "已儲存的音訊輸出音量"
 
-#: src/libvlc.h:125
-msgid "This saves the audio output volume when you select mute."
+#: src/libvlc.h:147
+msgid ""
+"This saves the audio output volume when you use the mute function. You "
+"should not change this option manually."
 msgstr ""
 
-#: src/libvlc.h:127
+#: src/libvlc.h:150
 #, fuzzy
 msgid "Audio output volume step"
 msgstr "輸出音量"
 
-#: src/libvlc.h:129
+#: src/libvlc.h:152
 #, fuzzy
 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:132
+#: src/libvlc.h:155
 msgid "Audio output frequency (Hz)"
 msgstr "音訊輸出頻率(Hz)"
 
-#: src/libvlc.h:134
+#: src/libvlc.h:157
 msgid ""
 "You can force the audio output frequency here. Common values are -1 "
 "(default), 48000, 44100, 32000, 22050, 16000, 11025, 8000."
 msgstr ""
 
-#: src/libvlc.h:138
+#: src/libvlc.h:161
 msgid "High quality audio resampling"
 msgstr "高品質音訊採樣"
 
-#: src/libvlc.h:140
+#: src/libvlc.h:163
 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:145
+#: src/libvlc.h:168
 msgid "Audio desynchronization compensation"
 msgstr "音訊非同步校正"
 
-#: src/libvlc.h:147
+#: src/libvlc.h:170
 msgid ""
-"This option allows you to delay the audio output. You must give a number of "
-"milliseconds. This can be handy if you notice a lag between the video and "
-"the audio."
+"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:151
-msgid "Preferred audio output channels mode"
+#: src/libvlc.h:173
+#, fuzzy
+msgid "Audio output channels mode"
 msgstr "偏好的音訊輸出頻道模式"
 
-#: src/libvlc.h:153
+#: src/libvlc.h:175
 msgid ""
-"This option allows you to set 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)."
+"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:157
-msgid "Use the S/PDIF audio output when available"
+#: src/libvlc.h:179
+#, fuzzy
+msgid "Use S/PDIF when available"
 msgstr "使用S/PDIF音訊輸出"
 
-#: src/libvlc.h:159
+#: src/libvlc.h:181
 msgid ""
-"This option allows you to use the S/PDIF audio output by default when your "
-"hardware supports it as well as the audio stream being played."
+"S/PDIF can be used by default when your hardware supports it as well as the "
+"audio stream being played."
 msgstr ""
 
-#: src/libvlc.h:162
+#: src/libvlc.h:184
 msgid "Force detection of Dolby Surround"
 msgstr ""
 
-#: src/libvlc.h:164
+#: src/libvlc.h:186
 msgid ""
-"Use this when you know your stream is or is not encoded with Dolby Surround "
-"but fails to be detected as such."
+"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 "
+"actually encoded with Dolby Surround, turning on this option might enhance "
+"your experience, especially when combined with the Headphone Channel Mixer."
 msgstr ""
 
-#: src/libvlc.h:167
+#: src/libvlc.h:192
 #, fuzzy
 msgid "On"
 msgstr "開啟"
 
-#: src/libvlc.h:167
+#: src/libvlc.h:192
 msgid "Off"
 msgstr ""
 
-#: src/libvlc.h:172
-msgid ""
-"This allows you to add audio post processing filters, to modify the sound"
+#: src/libvlc.h:197
+msgid "This adds audio post processing filters, to modify the sound rendering."
 msgstr ""
 
-#: src/libvlc.h:175
+#: src/libvlc.h:200
 msgid "Audio visualizations "
 msgstr "音訊視覺效果"
 
-#: src/libvlc.h:177
-msgid "This allows you to add visualization modules (spectrum analyzer, etc.)."
+#: src/libvlc.h:202
+#, fuzzy
+msgid "This adds visualization modules (spectrum analyzer, etc.)."
 msgstr "允許你增加視覺效果模組(頻譜分析器、其他...)"
 
-#: src/libvlc.h:181
+#: src/libvlc.h:210
 msgid ""
 "These options allow you to modify the behavior of the video output "
 "subsystem. You can for example enable video filters (deinterlacing, image "
@@ -1287,471 +1334,560 @@ msgid ""
 "options."
 msgstr ""
 
-#: src/libvlc.h:187
+#: src/libvlc.h:216
 msgid "Video output module"
 msgstr "視訊輸出模組"
 
-#: src/libvlc.h:189
+#: src/libvlc.h:218
 msgid ""
-"This option allows you to select the video output method used by VLC. The "
-"default behavior is to automatically select the best method available."
+"This is the the video output method used by VLC. The default behavior is to "
+"automatically select the best method available."
 msgstr ""
 
-#: src/libvlc.h:193 modules/stream_out/display.c:39
+#: src/libvlc.h:221 modules/stream_out/display.c:39
 msgid "Enable video"
 msgstr "啟動視訊"
 
-#: src/libvlc.h:195
+#: src/libvlc.h:223
 msgid ""
-"You can completely disable the video output. In this case, the video "
-"decoding stage will not take place, thus saving some processing power."
+"You can completely disable the video output. The video decoding stage will "
+"not take place, thus saving some processing power."
 msgstr ""
 
-#: src/libvlc.h:198 modules/codec/fake.c:47
-#: modules/stream_out/mosaic_bridge.c:104 modules/stream_out/transcode.c:70
+#: src/libvlc.h:226 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:200
+#: src/libvlc.h:228
 msgid ""
-"You can enforce the video width here. By default (-1) VLC will adapt to the "
-"video characteristics."
+"You can enforce the video width. By default (-1) VLC will adapt to the video "
+"characteristics."
 msgstr ""
 
-#: src/libvlc.h:203 modules/codec/fake.c:50
-#: modules/stream_out/mosaic_bridge.c:107 modules/stream_out/transcode.c:73
+#: src/libvlc.h:231 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:205
+#: src/libvlc.h:233
 msgid ""
-"You can enforce the video height here. By default (-1) VLC will adapt to the "
+"You can enforce the video height. By default (-1) VLC will adapt to the "
 "video characteristics."
 msgstr ""
 
-#: src/libvlc.h:208
-msgid "Video x coordinate"
-msgstr "視訊x座標"
+#: src/libvlc.h:236
+#, fuzzy
+msgid "Video X coordinate"
+msgstr "視訊y座標"
 
-#: src/libvlc.h:210
+#: src/libvlc.h:238
 msgid ""
-"You can enforce the position of the top left corner of the video window here "
-"(x coordinate)."
+"You can enforce the position of the top left corner of the video window (X "
+"coordinate)."
 msgstr ""
 
-#: src/libvlc.h:213
-msgid "Video y coordinate"
+#: src/libvlc.h:241
+#, fuzzy
+msgid "Video Y coordinate"
 msgstr "視訊y座標"
 
-#: src/libvlc.h:215
+#: src/libvlc.h:243
 msgid ""
-"You can enforce the position of the top left corner of the video window here "
-"(y coordinate)."
+"You can enforce the position of the top left corner of the video window (Y "
+"coordinate)."
 msgstr ""
 
-#: src/libvlc.h:218
+#: src/libvlc.h:246
 msgid "Video title"
 msgstr "視訊標題"
 
-#: src/libvlc.h:220
-msgid "You can specify a custom video window title here."
-msgstr "你可以在這裡指定視訊視窗的標題"
+#: src/libvlc.h:248
+msgid ""
+"Custom title for the video window (in case the video is not embedded in the "
+"interface)."
+msgstr ""
 
-#: src/libvlc.h:222
+#: src/libvlc.h:251
 msgid "Video alignment"
 msgstr "視訊對齊"
 
-#: src/libvlc.h:224
+#: src/libvlc.h:253
 msgid ""
-"You can enforce the video alignment in its window. By default (0) it will be "
+"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)."
+"combinations of these values, like 6=4+2 meaning top-right)."
 msgstr ""
 
-#: src/libvlc.h:229 modules/codec/dvbsub.c:70 modules/codec/subsdec.c:84
-#: modules/video_filter/logo.c:85 modules/video_filter/marq.c:106
-#: modules/video_filter/mosaic.c:120 modules/video_filter/osdmenu.c:76
-#: modules/video_filter/rss.c:144 modules/video_filter/time.c:96
+#: src/libvlc.h:258 modules/codec/dvbsub.c:70 modules/codec/subsdec.c:104
+#: modules/video_filter/logo.c:95 modules/video_filter/marq.c:107
+#: modules/video_filter/mosaic.c:171 modules/video_filter/osdmenu.c:77
+#: modules/video_filter/rss.c:160 modules/video_filter/time.c:99
 msgid "Center"
 msgstr "置中"
 
-#: src/libvlc.h:229 modules/codec/dvbsub.c:70 modules/video_filter/logo.c:85
-#: modules/video_filter/marq.c:106 modules/video_filter/mosaic.c:120
-#: modules/video_filter/osdmenu.c:76 modules/video_filter/rss.c:144
-#: modules/video_filter/time.c:96
+#: src/libvlc.h:258 modules/codec/dvbsub.c:70 modules/video_filter/logo.c:95
+#: modules/video_filter/marq.c:107 modules/video_filter/mosaic.c:171
+#: modules/video_filter/osdmenu.c:77 modules/video_filter/rss.c:160
+#: modules/video_filter/time.c:99
 msgid "Top"
 msgstr "頂部"
 
-#: src/libvlc.h:229 modules/codec/dvbsub.c:70 modules/video_filter/logo.c:85
-#: modules/video_filter/marq.c:106 modules/video_filter/mosaic.c:120
-#: modules/video_filter/osdmenu.c:76 modules/video_filter/rss.c:144
-#: modules/video_filter/time.c:96
+#: src/libvlc.h:258 modules/codec/dvbsub.c:70 modules/video_filter/logo.c:95
+#: modules/video_filter/marq.c:107 modules/video_filter/mosaic.c:171
+#: modules/video_filter/osdmenu.c:77 modules/video_filter/rss.c:160
+#: modules/video_filter/time.c:99
 msgid "Bottom"
 msgstr "底部"
 
-#: src/libvlc.h:230 modules/codec/dvbsub.c:71 modules/video_filter/logo.c:86
-#: modules/video_filter/marq.c:107 modules/video_filter/mosaic.c:121
-#: modules/video_filter/osdmenu.c:77 modules/video_filter/rss.c:145
-#: modules/video_filter/time.c:97
+#: src/libvlc.h:259 modules/codec/dvbsub.c:71 modules/video_filter/logo.c:96
+#: modules/video_filter/marq.c:108 modules/video_filter/mosaic.c:172
+#: modules/video_filter/osdmenu.c:78 modules/video_filter/rss.c:161
+#: modules/video_filter/time.c:100
 msgid "Top-Left"
 msgstr "左上"
 
-#: src/libvlc.h:230 modules/codec/dvbsub.c:71 modules/video_filter/logo.c:86
-#: modules/video_filter/marq.c:107 modules/video_filter/mosaic.c:121
-#: modules/video_filter/osdmenu.c:77 modules/video_filter/rss.c:145
-#: modules/video_filter/time.c:97
+#: src/libvlc.h:259 modules/codec/dvbsub.c:71 modules/video_filter/logo.c:96
+#: modules/video_filter/marq.c:108 modules/video_filter/mosaic.c:172
+#: modules/video_filter/osdmenu.c:78 modules/video_filter/rss.c:161
+#: modules/video_filter/time.c:100
 msgid "Top-Right"
 msgstr "右上"
 
-#: src/libvlc.h:230 modules/codec/dvbsub.c:71 modules/video_filter/logo.c:86
-#: modules/video_filter/marq.c:107 modules/video_filter/mosaic.c:121
-#: modules/video_filter/osdmenu.c:77 modules/video_filter/rss.c:145
-#: modules/video_filter/time.c:97
+#: src/libvlc.h:259 modules/codec/dvbsub.c:71 modules/video_filter/logo.c:96
+#: modules/video_filter/marq.c:108 modules/video_filter/mosaic.c:172
+#: modules/video_filter/osdmenu.c:78 modules/video_filter/rss.c:161
+#: modules/video_filter/time.c:100
 msgid "Bottom-Left"
 msgstr "左下"
 
-#: src/libvlc.h:230 modules/codec/dvbsub.c:71 modules/video_filter/logo.c:86
-#: modules/video_filter/marq.c:107 modules/video_filter/mosaic.c:121
-#: modules/video_filter/osdmenu.c:77 modules/video_filter/rss.c:145
-#: modules/video_filter/time.c:97
+#: src/libvlc.h:259 modules/codec/dvbsub.c:71 modules/video_filter/logo.c:96
+#: modules/video_filter/marq.c:108 modules/video_filter/mosaic.c:172
+#: modules/video_filter/osdmenu.c:78 modules/video_filter/rss.c:161
+#: modules/video_filter/time.c:100
 msgid "Bottom-Right"
 msgstr "右下"
 
-#: src/libvlc.h:232
+#: src/libvlc.h:261
 msgid "Zoom video"
 msgstr "縮放視訊"
 
-#: src/libvlc.h:234
+#: src/libvlc.h:263
 msgid "You can zoom the video by the specified factor."
 msgstr ""
 
-#: src/libvlc.h:236
+#: src/libvlc.h:265
 msgid "Grayscale video output"
 msgstr "灰階視訊輸出"
 
-#: src/libvlc.h:238
+#: src/libvlc.h:267
 msgid ""
-"When enabled, the color information from the video won't be decoded (this "
-"can also allow you to save some processing power)."
+"Output video in grayscale. As the color information aren't decoded, this can "
+"save some processing power."
 msgstr ""
 
-#: src/libvlc.h:241
+#: src/libvlc.h:270
 msgid "Fullscreen video output"
 msgstr "全螢幕視訊輸出"
 
-#: src/libvlc.h:243
-msgid ""
-"If this option is enabled, VLC will always start a video in fullscreen mode."
-msgstr "如果該選項開啟，VLC會使用全螢幕模式開啟視訊"
+#: src/libvlc.h:272
+msgid "Start video in fullscreen mode"
+msgstr ""
 
-#: src/libvlc.h:246
+#: src/libvlc.h:274
 msgid "Overlay video output"
 msgstr ""
 
-#: src/libvlc.h:248
+#: src/libvlc.h:276
 msgid ""
-"If enabled, VLC will try to take advantage of the overlay capabilities of "
-"your graphics card (hardware acceleration)."
+"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:251 src/video_output/vout_intf.c:218
+#: src/libvlc.h:279 src/video_output/vout_intf.c:326
 msgid "Always on top"
 msgstr "永遠在最上層"
 
-#: src/libvlc.h:252
+#: src/libvlc.h:281
 msgid "Always place the video window on top of other windows."
 msgstr "永遠讓視訊視窗顯示在其他視窗之上"
 
-#: src/libvlc.h:255
+#: src/libvlc.h:283
 msgid "Disable screensaver"
 msgstr ""
 
-#: src/libvlc.h:256
+#: src/libvlc.h:284
 msgid "Disable the screensaver during video playback."
 msgstr ""
 
-#: src/libvlc.h:258
+#: src/libvlc.h:286
 msgid "Window decorations"
 msgstr ""
 
-#: src/libvlc.h:260
+#: src/libvlc.h:288
 #, fuzzy
 msgid ""
-"If this option is disabled, VLC will avoid creating window caption, frames, "
-"etc... around the video."
+"VLC can avoid creating window caption, frames, etc... around the video, "
+"giving a \"minimal\" window."
 msgstr "如果該選項開啟，VLC會使用全螢幕模式開啟視訊"
 
-#: src/libvlc.h:263
+#: src/libvlc.h:291
 msgid "Video filter module"
 msgstr "視訊過濾器模組"
 
-#: src/libvlc.h:265
+#: src/libvlc.h:293
 msgid ""
-"This will allow you to add a post-processing filter to enhance the picture "
-"quality, for instance deinterlacing, or to clone or distort the video window."
+"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:269
+#: src/libvlc.h:297
 msgid "Video snapshot directory"
 msgstr "視訊快照目錄"
 
-#: src/libvlc.h:271
-msgid ""
-"Allows you to specify the directory where the video snapshots will be stored."
+#: src/libvlc.h:299
+#, fuzzy
+msgid "Directory where the video snapshots will be stored."
 msgstr "允許你指定視訊快照的存放目錄"
 
-#: src/libvlc.h:274
+#: src/libvlc.h:301
 msgid "Video snapshot format"
 msgstr "視訊快照格式"
 
-#: src/libvlc.h:276
+#: src/libvlc.h:303
+msgid "Image format which will be used to store the video snapshots"
+msgstr ""
+
+#: src/libvlc.h:305
+#, fuzzy
+msgid "Display video snapshot preview"
+msgstr "擷取視訊快照"
+
+#: src/libvlc.h:307
+msgid "Display the snapshot preview in the screen's top-left corner."
+msgstr ""
+
+#: src/libvlc.h:309
+#, fuzzy
+msgid "Video cropping"
+msgstr "視訊修整(右方)"
+
+#: src/libvlc.h:311
 msgid ""
-"Allows you to specify the image format in which the video snapshots will be "
-"stored."
-msgstr "允許你指定視訊快照的影像格式"
+"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:279
+#: src/libvlc.h:315
 msgid "Source aspect ratio"
 msgstr ""
 
-#: src/libvlc.h:281
+#: src/libvlc.h:317
 msgid ""
-"This will force the source aspect ratio. For instance, some DVDs claim to be "
+"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 "
 "when a movie does not have aspect ratio information. Accepted formats are x:"
 "y (4:3, 16:9, etc.) expressing the global image aspect, or a float value "
 "(1.25, 1.3333, etc.) expressing pixel squareness."
 msgstr ""
 
-#: src/libvlc.h:288
+#: src/libvlc.h:324
+msgid "Fix HDTV height"
+msgstr ""
+
+#: src/libvlc.h:326
+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:331
 #, fuzzy
-msgid "Monitor aspect ratio"
+msgid "Monitor pixel aspect ratio"
 msgstr "採樣率"
 
-#: src/libvlc.h:290
+#: src/libvlc.h:333
 msgid ""
-"This will force the monitor aspect ratio. Most monitors have a 4:3.If you "
-"have a 16:9 screen, you will need to change this to 16:9 inorder to keep "
-"proportions."
+"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:294
+#: src/libvlc.h:337
 msgid "Skip frames"
 msgstr "略過頁面"
 
-#: src/libvlc.h:296
-msgid "Disable this option to disable frame drops on MPEG-2 streams."
+#: src/libvlc.h:339
+msgid ""
+"This option enables framedropping on MPEG2 stream. Framedropping occurs when "
+"your computer is not powerful enough"
+msgstr ""
+
+#: src/libvlc.h:342
+#, fuzzy
+msgid "Drop late frames"
+msgstr "略過頁面"
+
+#: src/libvlc.h:344
+msgid ""
+"This drops frames that are late (arrive to the video output after their "
+"intended display date)."
 msgstr ""
 
-#: src/libvlc.h:298
+#: src/libvlc.h:347
 msgid "Quiet synchro"
 msgstr ""
 
-#: src/libvlc.h:300
+#: src/libvlc.h:349
 msgid ""
-"Enable this option to avoid flooding the message log with debug output from "
-"the video output synchro."
+"This avoids flooding the message log with debug output from the video output "
+"synchronization mechanism."
 msgstr ""
 
-#: src/libvlc.h:304
+#: src/libvlc.h:358
 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:308
+#: src/libvlc.h:362
 msgid "Clock reference average counter"
 msgstr ""
 
-#: src/libvlc.h:310
+#: src/libvlc.h:364
 msgid ""
 "When using the PVR input (or a very irregular source), you should set this "
 "to 10000."
 msgstr ""
 
-#: src/libvlc.h:313
+#: src/libvlc.h:367
 msgid "Clock synchronisation"
 msgstr "時間同步"
 
-#: src/libvlc.h:315
+#: src/libvlc.h:369
+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:373 modules/control/netsync.c:69
+msgid "Network synchronisation"
+msgstr ""
+
+#: src/libvlc.h:374
 msgid ""
-"Allows you to enable/disable the input clock synchronisation for real-time "
-"sources."
+"This allows you to remotely synchronise clocks for server and client. The "
+"detailed settings are available in Advanced / Network Sync."
 msgstr ""
 
-#: src/libvlc.h:320 modules/access/dshow/dshow.cpp:72
+#: src/libvlc.h:380 src/video_output/vout_intf.c:236
+#: src/video_output/vout_intf.c:299 modules/access/dshow/dshow.cpp:72
 #: modules/access/dshow/dshow.cpp:74 modules/access/dshow/dshow.cpp:77
 #: modules/audio_output/alsa.c:101 modules/gui/macosx/prefs_widgets.m:1292
-#: modules/gui/macosx/vout.m:174
-#: modules/gui/wxwidgets/preferences_widgets.cpp:285
-#: modules/gui/wxwidgets/preferences_widgets.cpp:335
-#: modules/video_filter/marq.c:52 modules/video_filter/rss.c:55
-#: modules/video_filter/time.c:52 modules/video_output/directx/directx.c:141
+#: modules/gui/macosx/sfilters.m:134 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
 msgid "Default"
 msgstr "預設"
 
-#: src/libvlc.h:320 modules/gui/macosx/equalizer.m:144
-#: modules/gui/macosx/extended.m:106 modules/gui/macosx/wizard.m:374
-#: modules/gui/wxwidgets/extrapanel.cpp:218
-#: modules/gui/wxwidgets/extrapanel.cpp:467
-#: modules/gui/wxwidgets/wizard.cpp:629
+#: src/libvlc.h:380 modules/gui/macosx/equalizer.m:144
+#: modules/gui/macosx/extended.m:107 modules/gui/macosx/wizard.m:395
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:631
+#: modules/gui/wxwidgets/extrapanel.cpp:216
+#: modules/gui/wxwidgets/extrapanel.cpp:465
 msgid "Enable"
 msgstr "啟動"
 
-#: src/libvlc.h:322
+#: src/libvlc.h:382
 msgid "UDP port"
 msgstr ""
 
-#: src/libvlc.h:324
-msgid "This is the port used for UDP streams. By default, we chose 1234."
-msgstr ""
+#: src/libvlc.h:384
+#, fuzzy
+msgid "This is the default port used for UDP streams. Default is 1234."
+msgstr "預設的音樂CD裝置"
 
-#: src/libvlc.h:326
+#: src/libvlc.h:386
 msgid "MTU of the network interface"
 msgstr ""
 
-#: src/libvlc.h:328
+#: src/libvlc.h:388
 msgid ""
-"This is the typical size of UDP packets that we expect. On Ethernet it is "
-"usually 1500."
+"This is the maximum packet size that can be transmitted over the network "
+"interface. On Ethernet it is usually 1500 bytes."
 msgstr ""
 
-#: src/libvlc.h:331
-msgid "Network interface address"
-msgstr "網路介面位置"
+#: src/libvlc.h:391
+msgid "Hop limit (TTL)"
+msgstr ""
 
-#: src/libvlc.h:333
+#: src/libvlc.h:393
 msgid ""
-"If you have several interfaces on your machine and use the multicast "
-"solution, you will probably have to indicate the IP address of your "
-"multicasting interface here."
+"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:337 modules/access_output/udp.c:80 modules/stream_out/rtp.c:77
-msgid "Time To Live"
-msgstr "有效時間"
+#: src/libvlc.h:397
+#, fuzzy
+msgid "IPv6 multicast output interface"
+msgstr "搖桿控制介面"
 
-#: src/libvlc.h:339
-msgid ""
-"Indicate here the Time To Live of the multicast packets sent by the stream "
-"output."
+#: src/libvlc.h:399
+msgid "Default IPv6 multicast interface. This overrides the routing table."
 msgstr ""
 
-#: src/libvlc.h:342
-msgid "Choose program (SID)"
-msgstr "選擇程式(SID)"
+#: src/libvlc.h:401
+#, fuzzy
+msgid "IPv4 multicast output interface address"
+msgstr "搖桿控制介面"
 
-#: src/libvlc.h:344
+#: src/libvlc.h:403
 msgid ""
-"Choose the program to select by giving its Service ID.\n"
-"Only use this option if you want to read a multi-program stream (like DVB "
-"streams for example)."
+"IPv4 adress for the default multicast interface. This overrides the routing "
+"table."
 msgstr ""
 
-#: src/libvlc.h:348
-msgid "Choose programs"
-msgstr "選擇程式"
+#: src/libvlc.h:408
+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:350
+#: src/libvlc.h:414
 msgid ""
-"Choose the programs to select by giving a comma-separated list of SIDs.\n"
-"Only use this option if you want to read a multi-program stream (like DVB "
-"streams for example)."
+"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:355
+#: src/libvlc.h:420 modules/gui/wxwidgets/dialogs/open.cpp:778
 #, fuzzy
-msgid "Choose audio track"
-msgstr "循環音軌"
+msgid "Audio track"
+msgstr "音訊軌"
 
-#: src/libvlc.h:357
+#: src/libvlc.h:422
 #, fuzzy
-msgid "Give the stream number of the audio track you want to use(from 0 to n)."
+msgid "Stream number of the audio track to use (from 0 to n)."
 msgstr "設定你想使用的音訊頻道的串流數量(從0到n)"
 
-#: src/libvlc.h:360
-msgid "Choose subtitles track"
-msgstr "選擇字幕軌"
+#: src/libvlc.h:425 modules/gui/wxwidgets/dialogs/open.cpp:770
+msgid "Subtitles track"
+msgstr "字幕軌"
 
-#: src/libvlc.h:362
+#: src/libvlc.h:427
 #, fuzzy
-msgid ""
-"Give the stream number of the subtitle track you want to use (from 0 to n)."
+msgid "Stream number of the subtitle track to use (from 0 to n)."
 msgstr "設定你想使用的音訊頻道的串流數量(從0到n)"
 
-#: src/libvlc.h:365
-msgid "Choose audio language"
+#: src/libvlc.h:430
+#, fuzzy
+msgid "Audio language"
 msgstr "選擇音訊語言"
 
-#: src/libvlc.h:367
+#: src/libvlc.h:432
 #, fuzzy
 msgid ""
-"Give the language of the audio track you want to use (comma separted, two or "
-"tree letter country code)."
+"Language of the audio track you want to use (comma separated, two or three "
+"letter country code)."
 msgstr "設定你想使用的音訊頻道的串流數量(從0到n)"
 
-#: src/libvlc.h:370
+#: src/libvlc.h:435
 #, fuzzy
-msgid "Choose subtitle language"
+msgid "Subtitle language"
 msgstr "選擇音訊語言"
 
-#: src/libvlc.h:372
+#: src/libvlc.h:437
+#, fuzzy
 msgid ""
-"Give the language of the subtitle track you want to use (comma separted, two "
-"or tree letter country code)."
-msgstr ""
+"Language of the subtitle track you want to use (comma separated, two or tree "
+"letter country code)."
+msgstr "設定你想使用的音訊頻道的串流數量(從0到n)"
+
+#: src/libvlc.h:441
+#, fuzzy
+msgid "Audio track ID"
+msgstr "音訊軌"
+
+#: src/libvlc.h:443
+#, fuzzy
+msgid "Stream ID of the audio track to use."
+msgstr "設定你想使用的音訊頻道的串流數量(從0到n)"
+
+#: src/libvlc.h:445
+#, fuzzy
+msgid "Subtitles track ID"
+msgstr "字幕軌"
 
-#: src/libvlc.h:375
+#: src/libvlc.h:447
+#, fuzzy
+msgid "Stream ID of the subtitle track to use."
+msgstr "設定你想使用的音訊頻道的串流數量(從0到n)"
+
+#: src/libvlc.h:449
 msgid "Input repetitions"
 msgstr ""
 
-#: src/libvlc.h:376
+#: src/libvlc.h:451
 msgid "Number of time the same input will be repeated"
 msgstr ""
 
-#: src/libvlc.h:379 src/libvlc.h:380
-msgid "Input start time (seconds)"
-msgstr "輸入起始時間(秒)"
+#: src/libvlc.h:453
+msgid "Start time"
+msgstr ""
+
+#: src/libvlc.h:455
+msgid "The stream will start at this position (in seconds)."
+msgstr ""
 
-#: src/libvlc.h:382 src/libvlc.h:383
-msgid "Input stop time (seconds)"
-msgstr "輸入停止時間(秒)"
+#: src/libvlc.h:457
+#, fuzzy
+msgid "Stop time"
+msgstr "停止串流"
+
+#: src/libvlc.h:459
+msgid "The stream will stop at this position (in seconds)."
+msgstr ""
 
-#: src/libvlc.h:385
+#: src/libvlc.h:461
 msgid "Input list"
 msgstr "輸入清單"
 
-#: src/libvlc.h:386
+#: src/libvlc.h:463
 msgid ""
-"Allows you to specify a comma-separated list of inputs that will be "
-"concatenated."
+"You can give a comma-separated list of inputs that will be concatenated "
+"together after the normal one."
 msgstr ""
 
-#: src/libvlc.h:389
+#: src/libvlc.h:466
 msgid "Input slave (experimental)"
 msgstr ""
 
-#: src/libvlc.h:390
+#: src/libvlc.h:468
 msgid ""
-"Allows you to play from several files at the same time. This feature is "
-"experimental, not all formats are supported."
+"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 "
+"inputs."
 msgstr ""
 
-#: src/libvlc.h:394
+#: src/libvlc.h:472
 msgid "Bookmarks list for a stream"
 msgstr "串流書籤清單"
 
-#: src/libvlc.h:395
+#: src/libvlc.h:474
 msgid ""
-"You can specify a list of bookmarks for a stream in the form "
+"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:400
+#: src/libvlc.h:480
 msgid ""
 "These options allow you to modify the behavior of the subpictures subsystem. "
 "You can for example enable subpictures filters (logo, etc.). Enable these "
@@ -1759,54 +1895,66 @@ msgid ""
 "section. You can also set many miscellaneous subpictures options."
 msgstr ""
 
-#: src/libvlc.h:406
+#: src/libvlc.h:486
 #, fuzzy
 msgid "Force subtitle position"
 msgstr "強制SPU位置"
 
-#: src/libvlc.h:408
+#: src/libvlc.h:488
 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:411 src/libvlc.h:1044 src/misc/iso-639_def.h:143
-#: modules/stream_out/transcode.c:239
+#: src/libvlc.h:491
+#, fuzzy
+msgid "Enable sub-pictures"
+msgstr "字幕"
+
+#: src/libvlc.h:493
+msgid "You can completely disable the sub-picture processing."
+msgstr ""
+
+#: src/libvlc.h:495 src/libvlc.h:1215 src/misc/iso-639_def.h:143
+#: modules/stream_out/transcode.c:274
 msgid "On Screen Display"
 msgstr "畫面上顯示(OSD)"
 
-#: src/libvlc.h:413
+#: src/libvlc.h:497
+#, fuzzy
 msgid ""
 "VLC can display messages on the video. This is called OSD (On Screen "
-"Display). You can disable this feature here."
+"Display)."
 msgstr ""
 "VLC可以在視訊上顯示訊息，稱之為OSD(On Screen Display)，你可以在這裡關閉這項功"
 "能"
 
-#: src/libvlc.h:416
+#: src/libvlc.h:500
 msgid "Subpictures filter module"
 msgstr ""
 
-#: src/libvlc.h:418
+#: src/libvlc.h:502
 msgid ""
-"This will allow you to add a subpictures filter for instance to overlay a "
-"logo."
+"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:421
+#: src/libvlc.h:505
 msgid "Autodetect subtitle files"
 msgstr "自動偵測字幕檔"
 
-#: src/libvlc.h:423
+#: src/libvlc.h:507
+#, fuzzy
 msgid ""
-"Automatically detect a subtitle file, if no subtitle filename is specified."
+"Automatically detect a subtitle file, if no subtitle filename is specified "
+"(based on the filename of the movie)."
 msgstr "如果不指定字幕檔案名稱，就自動地偵測字幕檔"
 
-#: src/libvlc.h:426
+#: src/libvlc.h:510
 msgid "Subtitle autodetection fuzziness"
 msgstr "字幕自動偵測模糊化"
 
-#: src/libvlc.h:428
+#: src/libvlc.h:512
 msgid ""
 "This determines how fuzzy subtitle and movie filename matching will be. "
 "Options are:\n"
@@ -1823,509 +1971,469 @@ msgstr ""
 "3 = 字幕檔與電影名稱吻合並包含其他字元\n"
 "4 = 字幕檔與電影名稱完全吻合"
 
-#: src/libvlc.h:436
+#: src/libvlc.h:520
 msgid "Subtitle autodetection paths"
 msgstr "字幕自動偵測路徑"
 
-#: src/libvlc.h:438
+#: src/libvlc.h:522
 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:441
+#: src/libvlc.h:525
 msgid "Use subtitle file"
 msgstr "使用字幕檔"
 
-#: src/libvlc.h:443
+#: src/libvlc.h:527
 msgid ""
 "Load this subtitle file. To be used when autodetect cannot detect your "
 "subtitle file."
 msgstr "當自動偵測字幕檔無效的時候，載入這個字幕檔"
 
-#: src/libvlc.h:446
+#: src/libvlc.h:530
 msgid "DVD device"
 msgstr "DVD裝置"
 
-#: src/libvlc.h:449
+#: src/libvlc.h:533
 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:453
+#: src/libvlc.h:537
 msgid "This is the default DVD device to use."
 msgstr "預設的DVD裝置"
 
-#: src/libvlc.h:456
+#: src/libvlc.h:540
 msgid "VCD device"
 msgstr "VCD裝置"
 
-#: src/libvlc.h:459
+#: src/libvlc.h:543
 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:463
+#: src/libvlc.h:547
 msgid "This is the default VCD device to use."
 msgstr "預設的VCD裝置"
 
-#: src/libvlc.h:466
+#: src/libvlc.h:550
 msgid "Audio CD device"
 msgstr "音樂CD裝置"
 
-#: src/libvlc.h:469
+#: src/libvlc.h:553
 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:473
+#: src/libvlc.h:557
 msgid "This is the default Audio CD device to use."
 msgstr "預設的音樂CD裝置"
 
-#: src/libvlc.h:476 modules/gui/wxwidgets/open.cpp:821
+#: src/libvlc.h:560 modules/gui/wxwidgets/dialogs/open.cpp:840
 msgid "Force IPv6"
 msgstr "強制使用IPv6"
 
-#: src/libvlc.h:478
-msgid ""
-"If you check this box, IPv6 will be used by default for all UDP and HTTP "
-"connections."
+#: src/libvlc.h:562
+#, fuzzy
+msgid "IPv6 will be used by default for all connections."
 msgstr "選取這項功能，將會對所有的UDP及HTTP連線使用IPv6"
 
-#: src/libvlc.h:481
+#: src/libvlc.h:564
 msgid "Force IPv4"
 msgstr "強制使用IPv4"
 
-#: src/libvlc.h:483
-msgid ""
-"If you check this box, IPv4 will be used by default for all UDP and HTTP "
-"connections."
+#: src/libvlc.h:566
+#, fuzzy
+msgid "IPv4 will be used by default for all connections."
 msgstr "選取這項功能，將會對所有的UDP及HTTP連線使用IPv4"
 
-#: src/libvlc.h:486
-msgid "TCP connection timeout in ms"
+#: src/libvlc.h:568
+msgid "TCP connection timeout"
 msgstr ""
 
-#: src/libvlc.h:488
-msgid ""
-"Allows you to modify the default TCP connection timeout. This value should "
-"be set in millisecond units."
-msgstr ""
+#: src/libvlc.h:570
+#, fuzzy
+msgid "Default TCP connection timeout (in milliseconds). "
+msgstr "變更預設快取值(ms)"
 
-#: src/libvlc.h:491
+#: src/libvlc.h:572
 msgid "SOCKS server"
 msgstr "SOCKS伺服器"
 
-#: src/libvlc.h:493
+#: src/libvlc.h:574
 msgid ""
-"Allow you to specify a SOCKS server to use. It must be of the form address:"
-"port . It will be used for all TCP connections"
+"SOCKS proxy server to use. This must be of the form address:port. It will be "
+"used for all TCP connections"
 msgstr ""
 
-#: src/libvlc.h:496
+#: src/libvlc.h:577
 msgid "SOCKS user name"
 msgstr "SOCKS使用者名稱"
 
-#: src/libvlc.h:497
-msgid ""
-"Allows you to modify the user name that will be used for the connection to "
-"the SOCKS server."
+#: src/libvlc.h:579
+msgid "User name to be used for connection to the SOCKS proxy."
 msgstr ""
 
-#: src/libvlc.h:500
+#: src/libvlc.h:581
 msgid "SOCKS password"
 msgstr "SOCKS密碼"
 
-#: src/libvlc.h:501
-msgid ""
-"Allows you to modify the password that will be used for the connection to "
-"the SOCKS server."
+#: src/libvlc.h:583
+msgid "Password to be used for connection to the SOCKS proxy."
 msgstr ""
 
-#: src/libvlc.h:504
+#: src/libvlc.h:585
 msgid "Title metadata"
 msgstr ""
 
-#: src/libvlc.h:506
+#: src/libvlc.h:587
 msgid "Allows you to specify a \"title\" metadata for an input."
 msgstr ""
 
-#: src/libvlc.h:508
+#: src/libvlc.h:589
 msgid "Author metadata"
 msgstr ""
 
-#: src/libvlc.h:510
+#: src/libvlc.h:591
 msgid "Allows you to specify an \"author\" metadata for an input."
 msgstr ""
 
-#: src/libvlc.h:512
+#: src/libvlc.h:593
 msgid "Artist metadata"
 msgstr ""
 
-#: src/libvlc.h:514
+#: src/libvlc.h:595
 msgid "Allows you to specify an \"artist\" metadata for an input."
 msgstr ""
 
-#: src/libvlc.h:516
+#: src/libvlc.h:597
 msgid "Genre metadata"
 msgstr ""
 
-#: src/libvlc.h:518
+#: src/libvlc.h:599
 msgid "Allows you to specify a \"genre\" metadata for an input."
 msgstr ""
 
-#: src/libvlc.h:520
+#: src/libvlc.h:601
 msgid "Copyright metadata"
 msgstr ""
 
-#: src/libvlc.h:522
+#: src/libvlc.h:603
 msgid "Allows you to specify a \"copyright\" metadata for an input."
 msgstr ""
 
-#: src/libvlc.h:524
+#: src/libvlc.h:605
 msgid "Description metadata"
 msgstr ""
 
-#: src/libvlc.h:526
+#: src/libvlc.h:607
 msgid "Allows you to specify a \"description\" metadata for an input."
 msgstr ""
 
-#: src/libvlc.h:528
+#: src/libvlc.h:609
 msgid "Date metadata"
 msgstr ""
 
-#: src/libvlc.h:530
+#: src/libvlc.h:611
 msgid "Allows you to specify a \"date\" metadata for an input."
 msgstr ""
 
-#: src/libvlc.h:532
+#: src/libvlc.h:613
 msgid "URL metadata"
 msgstr ""
 
-#: src/libvlc.h:534
+#: src/libvlc.h:615
 msgid "Allows you to specify a \"url\" metadata for an input."
 msgstr ""
 
-#: src/libvlc.h:537
+#: src/libvlc.h:619
 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:541
-msgid "Preferred codecs list"
+#: src/libvlc.h:623
+#, fuzzy
+msgid "Preferred decoders list"
 msgstr "偏好的編碼器清單"
 
-#: src/libvlc.h:543
+#: src/libvlc.h:625
 msgid ""
-"This allows you to select a 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."
+"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:547
+#: src/libvlc.h:630
 msgid "Preferred encoders list"
 msgstr "偏好的編碼器清單"
 
-#: src/libvlc.h:549
+#: src/libvlc.h:632
+#, fuzzy
 msgid ""
-"This allows you to select a list of encoders that VLC will use in priority"
+"This allows you to select a list of encoders that VLC will use in priority."
 msgstr "允許你選擇編碼器清單，VLC會依照先後順序使用"
 
-#: src/libvlc.h:553
+#: src/libvlc.h:641
 msgid ""
 "These options allow you to set default global options for the stream output "
 "subsystem."
 msgstr ""
 
-#: src/libvlc.h:556
+#: src/libvlc.h:644
 #, fuzzy
 msgid "Default stream output chain"
 msgstr "雙工串流輸出"
 
-#: src/libvlc.h:558
+#: src/libvlc.h:646
 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:562
+#: src/libvlc.h:650
 msgid "Enable streaming of all ES"
 msgstr ""
 
-#: src/libvlc.h:564
-msgid "This allows you to stream all ES (video, audio and subtitles)"
+#: src/libvlc.h:652
+msgid "Stream all elementary streams (video, audio and subtitles)"
 msgstr ""
 
-#: src/libvlc.h:566
+#: src/libvlc.h:654
 msgid "Display while streaming"
 msgstr "串流時顯示"
 
-#: src/libvlc.h:568
-msgid "This allows you to play the stream while streaming it."
+#: src/libvlc.h:656
+#, fuzzy
+msgid "Play locally the stream while streaming it."
 msgstr "允許你在串流時播放該串流"
 
-#: src/libvlc.h:570
+#: src/libvlc.h:658
 msgid "Enable video stream output"
 msgstr "啟動視訊串流輸出"
 
-#: src/libvlc.h:572
+#: src/libvlc.h:660
 msgid ""
-"This allows you to choose if the video stream should be redirected to the "
-"stream output facility when this last one is enabled."
+"Choose whether the video stream should be redirected to the stream output "
+"facility when this last one is enabled."
 msgstr ""
 
-#: src/libvlc.h:575
+#: src/libvlc.h:663
 msgid "Enable audio stream output"
 msgstr "啟動音訊串流輸出"
 
-#: src/libvlc.h:577
+#: src/libvlc.h:665
 msgid ""
-"This allows you to choose if the audio stream should be redirected to the "
-"stream output facility when this last one is enabled."
+"Choose whether the audio stream should be redirected to the stream output "
+"facility when this last one is enabled."
 msgstr ""
 
-#: src/libvlc.h:580
+#: src/libvlc.h:668
+#, fuzzy
+msgid "Enable SPU stream output"
+msgstr "啟動音訊串流輸出"
+
+#: src/libvlc.h:670
+msgid ""
+"Choose whether the SPU streams should be redirected to the stream output "
+"facility when this last one is enabled."
+msgstr ""
+
+#: src/libvlc.h:673
 msgid "Keep stream output open"
 msgstr "持續開啟串流輸出"
 
-#: src/libvlc.h:582
+#: src/libvlc.h:675
 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:586
+#: src/libvlc.h:679
 msgid "Preferred packetizer list"
 msgstr "偏好的封包器清單"
 
-#: src/libvlc.h:588
+#: src/libvlc.h:681
 msgid ""
 "This allows you to select the order in which VLC will choose its packetizers."
 msgstr ""
 
-#: src/libvlc.h:591
+#: src/libvlc.h:684
 msgid "Mux module"
 msgstr "多工模組"
 
-#: src/libvlc.h:593
+#: src/libvlc.h:686
 msgid "This is a legacy entry to let you configure mux modules"
 msgstr ""
 
-#: src/libvlc.h:595
+#: src/libvlc.h:688
 msgid "Access output module"
 msgstr "存取輸出模組"
 
-#: src/libvlc.h:597
+#: src/libvlc.h:690
 msgid "This is a legacy entry to let you configure access output modules"
 msgstr ""
 
-#: src/libvlc.h:599
+#: src/libvlc.h:692
 msgid "Control SAP flow"
 msgstr "控制SAP流量"
 
-#: src/libvlc.h:600
+#: src/libvlc.h:694
 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"
+"controlled. This is needed if you want to make announcements on the MBone."
 msgstr ""
 
-#: src/libvlc.h:604
+#: src/libvlc.h:698
 msgid "SAP announcement interval"
 msgstr ""
 
-#: src/libvlc.h:605
+#: src/libvlc.h:700
 msgid ""
 "When the SAP flow control is disabled, this lets you set the fixed interval "
-"between SAP announcements"
+"between SAP announcements."
 msgstr ""
 
-#: src/libvlc.h:609
+#: src/libvlc.h:710
 msgid ""
-"These options allow you to enable special CPU optimizations.\n"
-"You should always leave all these enabled."
+"These options allow you to enable special CPU optimizations. You should "
+"always leave all these enabled."
 msgstr ""
 
-#: src/libvlc.h:612
+#: src/libvlc.h:713
 #, fuzzy
 msgid "Enable FPU support"
 msgstr "啟用CPU MMX支援"
 
-#: src/libvlc.h:614
+#: src/libvlc.h:715
 #, fuzzy
 msgid ""
 "If your processor has a floating point calculation unit, VLC can take "
 "advantage of it."
 msgstr "如果你的處裡器支援AltiVec指令集，VLC可以對它做最佳化"
 
-#: src/libvlc.h:617
+#: src/libvlc.h:718
 msgid "Enable CPU MMX support"
 msgstr "啟用CPU MMX支援"
 
-#: src/libvlc.h:619
+#: src/libvlc.h:720
 msgid ""
 "If your processor supports the MMX instructions set, VLC can take advantage "
 "of them."
 msgstr "如果你的處裡器支援MMX指令集，VLC可以對它做最佳化"
 
-#: src/libvlc.h:622
+#: src/libvlc.h:723
 msgid "Enable CPU 3D Now! support"
 msgstr "啟用CPU 3D Now!支援"
 
-#: src/libvlc.h:624
+#: src/libvlc.h:725
 msgid ""
 "If your processor supports the 3D Now! instructions set, VLC can take "
 "advantage of them."
 msgstr "如果你的處裡器支援3D Now!指令集，VLC可以對它做最佳化"
 
-#: src/libvlc.h:627
+#: src/libvlc.h:728
 msgid "Enable CPU MMX EXT support"
 msgstr "啟用CPU MMX EXT支援"
 
-#: src/libvlc.h:629
+#: src/libvlc.h:730
 msgid ""
 "If your processor supports the MMX EXT instructions set, VLC can take "
 "advantage of them."
 msgstr "如果你的處裡器支援MMX EXT指令集，VLC可以對它做最佳化"
 
-#: src/libvlc.h:632
+#: src/libvlc.h:733
 msgid "Enable CPU SSE support"
 msgstr "啟用CPU SSE支援"
 
-#: src/libvlc.h:634
+#: src/libvlc.h:735
 msgid ""
 "If your processor supports the SSE instructions set, VLC can take advantage "
 "of them."
 msgstr "如果你的處裡器支援SSE指令集，VLC可以對它做最佳化"
 
-#: src/libvlc.h:637
+#: src/libvlc.h:738
 msgid "Enable CPU SSE2 support"
 msgstr "啟用CPU SSE2支援"
 
-#: src/libvlc.h:639
+#: src/libvlc.h:740
 msgid ""
 "If your processor supports the SSE2 instructions set, VLC can take advantage "
 "of them."
 msgstr "如果你的處裡器支援SSE2指令集，VLC可以對它做最佳化"
 
-#: src/libvlc.h:642
+#: src/libvlc.h:743
 msgid "Enable CPU AltiVec support"
 msgstr "啟用CPU AltiVec支援"
 
-#: src/libvlc.h:644
+#: src/libvlc.h:745
 msgid ""
 "If your processor supports the AltiVec instructions set, VLC can take "
 "advantage of them."
 msgstr "如果你的處裡器支援AltiVec指令集，VLC可以對它做最佳化"
 
-#: src/libvlc.h:648
+#: src/libvlc.h:750
 msgid ""
-"These options define the behavior of the playlist. Some of them can be "
-"overridden in the playlist dialog box."
+"These options allow you to select default modules. Leave these alone unless "
+"you really know what you are doing."
 msgstr ""
 
-#: src/libvlc.h:651
-msgid "Services discovery modules"
-msgstr "服務探索模組"
+#: src/libvlc.h:753
+msgid "Memory copy module"
+msgstr "記憶體複製模組"
 
-#: src/libvlc.h:653
+#: src/libvlc.h:755
 msgid ""
-"Specifies the services discovery modules to load, separated by semi-colons. "
-"Typical values are sap, hal, ..."
+"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:656
-msgid "Play files randomly forever"
-msgstr "永遠隨機撥放檔案"
+#: src/libvlc.h:758
+msgid "Access module"
+msgstr "存取模組"
 
-#: src/libvlc.h:658
+#: src/libvlc.h:760
 msgid ""
-"When selected, VLC will randomly play files in the playlist until "
-"interrupted."
-msgstr "選擇後，VLC會隨機地播放清單中的檔案，直到中斷"
+"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 "
+"option unless you really know what you are doing."
+msgstr ""
 
-#: src/libvlc.h:661
+#: src/libvlc.h:764
 #, fuzzy
-msgid "Repeat all"
-msgstr "重複播放全部"
+msgid "Access filter module"
+msgstr "存取模組"
 
-#: src/libvlc.h:663
+#: src/libvlc.h:766
 msgid ""
-"If you want VLC to keep playing the playlist indefinitely then enable this "
-"option."
+"Access filters are used to modify the stream that is being read. This is "
+"used for instance for timeshifting."
 msgstr ""
 
-#: src/libvlc.h:666
-#, fuzzy
-msgid "Repeat current item"
-msgstr "重複播放目前項目"
+#: src/libvlc.h:769
+msgid "Demux module"
+msgstr "解多工模組"
 
-#: src/libvlc.h:668
+#: src/libvlc.h:771
 msgid ""
-"When this is active, VLC will keep playing the current playlist item over "
-"and over again."
-msgstr "啟動後，VLC會一遍又一遍地的播放目前播放清單中的項目"
-
-#: src/libvlc.h:671
-msgid "Play and stop"
-msgstr "播放和停止"
-
-#: src/libvlc.h:673
-msgid "Stop the playlist after each played playlist item. "
-msgstr ""
-
-#: src/libvlc.h:676
-msgid ""
-"These options allow you to select default modules. Leave these alone unless "
+"Demultiplexers are used to separate the \"elementary\" streams (like audio "
+"and video streams). You can use it if the correct demuxer is not "
+"automatically detected. You should not set this as a global option unless "
 "you really know what you are doing."
 msgstr ""
 
-#: src/libvlc.h:679
-msgid "Memory copy module"
-msgstr "記憶體複製模組"
-
-#: src/libvlc.h:681
-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:684
-msgid "Access module"
-msgstr "存取模組"
-
-#: src/libvlc.h:686
-msgid "This is a legacy entry to let you configure access modules."
-msgstr ""
-
-#: src/libvlc.h:688
-#, fuzzy
-msgid "Access filter module"
-msgstr "存取模組"
-
-#: src/libvlc.h:690
-msgid "This is a legacy entry to let you configure access filter modules."
-msgstr ""
-
-#: src/libvlc.h:692
-msgid "Demux module"
-msgstr "解多工模組"
-
-#: src/libvlc.h:694
-msgid "This is a legacy entry to let you configure demux modules."
-msgstr ""
-
-#: src/libvlc.h:696
+#: src/libvlc.h:776
 msgid "Allow real-time priority"
 msgstr "允許即時優先權"
 
-#: src/libvlc.h:698
+#: src/libvlc.h:778
 msgid ""
 "Running VLC in real-time priority will allow for much more precise "
 "scheduling and yield better, especially when streaming content. It can "
@@ -2333,116 +2441,127 @@ msgid ""
 "only activate this if you know what you're doing."
 msgstr ""
 
-#: src/libvlc.h:704
+#: src/libvlc.h:784
 msgid "Adjust VLC priority"
 msgstr "調整VLC優先權"
 
-#: src/libvlc.h:706
+#: src/libvlc.h:786
 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:710
+#: src/libvlc.h:790
 msgid "Minimize number of threads"
 msgstr "最小執行緒數量"
 
-#: src/libvlc.h:712
-msgid "This option minimizes the number of threads needed to run VLC"
+#: src/libvlc.h:792
+msgid "This option minimizes the number of threads needed to run VLC."
 msgstr ""
 
-#: src/libvlc.h:714
+#: src/libvlc.h:794
 msgid "Modules search path"
 msgstr "模組搜尋路徑"
 
-#: src/libvlc.h:716
-msgid ""
-"This option allows you to specify an additional path for VLC to look for its "
-"modules."
+#: src/libvlc.h:796
+#, fuzzy
+msgid "Additional path for VLC to look for its modules."
 msgstr "這個選項允許你指定其他的VLC模組搜尋路徑"
 
-#: src/libvlc.h:719
+#: src/libvlc.h:798
 msgid "VLM configuration file"
 msgstr "VLM設定檔"
 
-#: src/libvlc.h:721
-msgid ""
-"This option allows you to specify a VLM configuration file that will be read "
-"when VLM is launched."
+#: src/libvlc.h:800
+msgid "Read a VLM configuration file as soon as VLM is started."
 msgstr ""
 
-#: src/libvlc.h:724
+#: src/libvlc.h:802
 msgid "Use a plugins cache"
 msgstr "使用外掛快取"
 
-#: src/libvlc.h:726
-msgid ""
-"This option allows you to use a plugins cache which will greatly improve the "
-"start time of VLC."
+#: src/libvlc.h:804
+msgid "Use a plugins cache which will greatly improve the startup time of VLC."
+msgstr ""
+
+#: src/libvlc.h:806
+msgid "Collect statistics"
 msgstr ""
 
-#: src/libvlc.h:729
+#: src/libvlc.h:808
+#, fuzzy
+msgid "Collect miscellaneous statistics."
+msgstr "這個選項允許你選擇控制介面"
+
+#: src/libvlc.h:810
 msgid "Run as daemon process"
 msgstr "使用常駐程序執行"
 
-#: src/libvlc.h:731
+#: src/libvlc.h:812
 msgid "Runs VLC as a background daemon process."
 msgstr "使用背景常駐程序執行VLC"
 
-#: src/libvlc.h:733
-msgid "Allow only one running instance"
+#: src/libvlc.h:814
+#, fuzzy
+msgid "Log to file"
+msgstr "Logo檔名"
+
+#: src/libvlc.h:816
+msgid "Log all VLC messages to a text file."
 msgstr ""
 
-#: src/libvlc.h:735
-msgid ""
-"Allowing only one running instance of VLC can sometimes be useful, for "
-"instance if you associated VLC with some media types and you don't want a "
-"new instance of VLC to be opened each time you double-click on a file in the "
-"explorer. This option will allow you to play the file with the already "
-"running instance or enqueue it."
+#: src/libvlc.h:818
+msgid "Log to syslog"
 msgstr ""
 
-#: src/libvlc.h:742
-msgid "Enqueue items to playlist when in one instance mode"
+#: src/libvlc.h:820
+msgid "Log all VLC messages to syslog (UNIX systems)."
+msgstr ""
+
+#: src/libvlc.h:822
+msgid "Allow only one running instance"
 msgstr ""
 
-#: src/libvlc.h:744
+#: src/libvlc.h:824
 msgid ""
-"When using the one instance only option, enqueue items to playlist and keep "
-"playing current item."
+"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 "
+"instance of VLC to be opened each time you double-click on a file in the "
+"explorer. This option will allow you to play the file with the already "
+"running instance or enqueue it."
 msgstr ""
 
-#: src/libvlc.h:747
+#: src/libvlc.h:830
 msgid "Increase the priority of the process"
 msgstr "提高程序優先權"
 
-#: src/libvlc.h:749
+#: src/libvlc.h:832
 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 "
-"could otherwise take too much processor time.\n"
-"However be advised that in certain circumstances (bugs) VLC could take all "
-"the processor time and render the whole system unresponsive which might "
-"require a reboot of your machine."
+"could otherwise take too much processor time. However be advised that in "
+"certain circumstances (bugs) VLC could take all the processor time and "
+"render the whole system unresponsive which might require a reboot of your "
+"machine."
 msgstr ""
 
-#: src/libvlc.h:756
+#: src/libvlc.h:839
 msgid "Fast mutex on NT/2K/XP (developers only)"
 msgstr ""
 
-#: src/libvlc.h:758
+#: src/libvlc.h:841
 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:763
+#: src/libvlc.h:846
 msgid "Condition variables implementation for Win9x (developers only)"
 msgstr ""
 
-#: src/libvlc.h:766
+#: src/libvlc.h:849
 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 "
@@ -2451,498 +2570,709 @@ msgid ""
 "fastest but slightly incorrect), 1 (default) and 2."
 msgstr ""
 
-#: src/libvlc.h:774
+#: src/libvlc.h:858
+msgid "Enqueue items to playlist when in one instance mode"
+msgstr ""
+
+#: src/libvlc.h:860
+msgid ""
+"When using the one instance only option, enqueue items to playlist and keep "
+"playing current item."
+msgstr ""
+
+#: src/libvlc.h:869
+msgid ""
+"These options define the behavior of the playlist. Some of them can be "
+"overridden in the playlist dialog box."
+msgstr ""
+
+#: src/libvlc.h:872
+msgid "Automatically preparse files"
+msgstr ""
+
+#: src/libvlc.h:874
+msgid ""
+"Automatically preparse files added to the playlist (to retrieve some "
+"metadata)."
+msgstr ""
+
+#: src/libvlc.h:877
+msgid "Services discovery modules"
+msgstr "服務探索模組"
+
+#: src/libvlc.h:879
+msgid ""
+"Specifies the services discovery modules to load, separated by semi-colons. "
+"Typical values are sap, hal, ..."
+msgstr ""
+
+#: src/libvlc.h:882
+msgid "Play files randomly forever"
+msgstr "永遠隨機撥放檔案"
+
+#: src/libvlc.h:884
+#, fuzzy
+msgid "VLC will randomly play files in the playlist until interrupted."
+msgstr "選擇後，VLC會隨機地播放清單中的檔案，直到中斷"
+
+#: src/libvlc.h:886
+#, fuzzy
+msgid "Repeat all"
+msgstr "重複播放全部"
+
+#: src/libvlc.h:888
+#, fuzzy
+msgid "VLC will keep playing the playlist indefinitely."
+msgstr "啟動後，VLC會一遍又一遍地的播放目前播放清單中的項目"
+
+#: src/libvlc.h:890
+#, fuzzy
+msgid "Repeat current item"
+msgstr "重複播放目前項目"
+
+#: src/libvlc.h:892
+#, fuzzy
+msgid "VLC will keep playing the current playlist item."
+msgstr "啟動後，VLC會一遍又一遍地的播放目前播放清單中的項目"
+
+#: src/libvlc.h:894
+msgid "Play and stop"
+msgstr "播放和停止"
+
+#: src/libvlc.h:896
+msgid "Stop the playlist after each played playlist item."
+msgstr ""
+
+#: src/libvlc.h:903
 msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
 msgstr ""
 
-#: src/libvlc.h:777 src/video_output/vout_intf.c:227
+#: src/libvlc.h:906 src/video_output/vout_intf.c:335
 #: modules/gui/beos/VideoOutput.cpp:1057 modules/gui/macosx/applescript.m:121
-#: modules/gui/macosx/controls.m:306 modules/gui/macosx/controls.m:623
-#: modules/gui/macosx/controls.m:651 modules/gui/macosx/intf.m:458
-#: modules/gui/macosx/intf.m:534
+#: modules/gui/macosx/controls.m:330 modules/gui/macosx/controls.m:714
+#: modules/gui/macosx/controls.m:744 modules/gui/macosx/embeddedwindow.m:44
+#: modules/gui/macosx/intf.m:477 modules/gui/macosx/intf.m:553
 msgid "Fullscreen"
 msgstr "全螢幕"
 
-#: src/libvlc.h:778
+#: src/libvlc.h:907
 msgid "Select the hotkey to use to swap fullscreen state."
 msgstr "選擇熱鍵以切換全螢幕狀態"
 
-#: src/libvlc.h:779 modules/gui/wxwidgets/interface.cpp:1565
+#: src/libvlc.h:908 modules/gui/wxwidgets/dialogs/vlm/vlm_streampanel.cpp:81
+#: modules/gui/wxwidgets/interface.cpp:1487
 msgid "Play/Pause"
 msgstr "播放/暫停"
 
-#: src/libvlc.h:780
+#: src/libvlc.h:909
 msgid "Select the hotkey to use to swap paused state."
 msgstr "選擇熱鍵以切換暫停狀態"
 
-#: src/libvlc.h:781
+#: src/libvlc.h:910
 msgid "Pause only"
 msgstr "僅暫停"
 
-#: src/libvlc.h:782
+#: src/libvlc.h:911
 msgid "Select the hotkey to use to pause."
 msgstr "選擇熱鍵以暫停"
 
-#: src/libvlc.h:783
+#: src/libvlc.h:912
 msgid "Play only"
 msgstr "僅播放"
 
-#: src/libvlc.h:784
+#: src/libvlc.h:913
 msgid "Select the hotkey to use to play."
 msgstr "選擇熱鍵以播放"
 
-#: src/libvlc.h:785 modules/control/hotkeys.c:634
-#: modules/gui/macosx/controls.m:558 modules/gui/macosx/intf.m:499
+#: src/libvlc.h:914 modules/control/hotkeys.c:632
+#: modules/gui/macosx/controls.m:647 modules/gui/macosx/intf.m:518
+#: modules/gui/wxwidgets/interface.cpp:692
 msgid "Faster"
 msgstr "加快"
 
-#: src/libvlc.h:786
+#: src/libvlc.h:915
 msgid "Select the hotkey to use for fast forward playback."
 msgstr "選擇熱鍵以快速重播"
 
-#: src/libvlc.h:787 modules/control/hotkeys.c:641
-#: modules/gui/macosx/controls.m:559 modules/gui/macosx/intf.m:500
+#: src/libvlc.h:916 modules/control/hotkeys.c:640
+#: modules/gui/macosx/controls.m:648 modules/gui/macosx/intf.m:519
+#: modules/gui/wxwidgets/interface.cpp:691
 msgid "Slower"
 msgstr "放慢"
 
-#: src/libvlc.h:788
+#: src/libvlc.h:917
 msgid "Select the hotkey to use for slow motion playback."
 msgstr "選擇熱鍵以慢速重播"
 
-#: src/libvlc.h:789 modules/control/hotkeys.c:603
-#: modules/gui/macosx/controls.m:579 modules/gui/macosx/intf.m:457
-#: modules/gui/macosx/intf.m:502 modules/gui/macosx/intf.m:573
-#: modules/gui/macosx/wizard.m:302 modules/gui/macosx/wizard.m:344
-#: modules/gui/macosx/wizard.m:1344 modules/gui/wxwidgets/interface.cpp:1570
-#: modules/gui/wxwidgets/menus.cpp:286
+#: src/libvlc.h:918 modules/control/hotkeys.c:599
+#: modules/gui/macosx/controls.m:668 modules/gui/macosx/intf.m:476
+#: modules/gui/macosx/intf.m:521 modules/gui/macosx/intf.m:596
+#: 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:289
 msgid "Next"
 msgstr "下一項"
 
-#: src/libvlc.h:790
+#: src/libvlc.h:919
 msgid "Select the hotkey to use to skip to the next item in the playlist."
 msgstr "選擇熱鍵以播放清單中的下一個項目"
 
-#: src/libvlc.h:791 modules/control/hotkeys.c:614
-#: modules/gui/macosx/controls.m:578 modules/gui/macosx/intf.m:452
-#: modules/gui/macosx/intf.m:501 modules/gui/macosx/intf.m:574
-#: modules/gui/wxwidgets/interface.cpp:1569
-#: modules/gui/wxwidgets/menus.cpp:285
+#: src/libvlc.h:920 modules/control/hotkeys.c:611
+#: modules/gui/macosx/controls.m:667 modules/gui/macosx/intf.m:471
+#: modules/gui/macosx/intf.m:520 modules/gui/macosx/intf.m:597
+#: modules/gui/wxwidgets/interface.cpp:689
+#: modules/gui/wxwidgets/interface.cpp:1491
+#: modules/gui/wxwidgets/menus.cpp:288
 msgid "Previous"
 msgstr "上一項"
 
-#: src/libvlc.h:792
+#: src/libvlc.h:921
 msgid "Select the hotkey to use to skip to the previous item in the playlist."
 msgstr "選擇熱鍵以播放清單中的上一個項目"
 
-#: src/libvlc.h:793 modules/gui/macosx/controls.m:570
-#: modules/gui/macosx/intf.m:455 modules/gui/macosx/intf.m:498
-#: modules/gui/macosx/intf.m:572 modules/gui/pda/pda_interface.c:274
-#: modules/gui/pda/pda_interface.c:275 modules/gui/wxwidgets/interface.cpp:489
-#: modules/gui/wxwidgets/interface.cpp:1571
-#: modules/gui/wxwidgets/menus.cpp:284 modules/visualization/xosd.c:235
-#: modules/visualization/xosd.c:236
-#, c-format
+#: src/libvlc.h:922 modules/gui/macosx/controls.m:659
+#: modules/gui/macosx/intf.m:474 modules/gui/macosx/intf.m:517
+#: modules/gui/macosx/intf.m:595 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:673
+#: modules/gui/wxwidgets/interface.cpp:684
+#: modules/gui/wxwidgets/interface.cpp:1493
+#: modules/gui/wxwidgets/menus.cpp:287 modules/visualization/xosd.c:238
 msgid "Stop"
 msgstr "停止"
 
-#: src/libvlc.h:794
-msgid "Select the hotkey to stop the playback."
+#: src/libvlc.h:923
+#, fuzzy
+msgid "Select the hotkey to stop playback."
 msgstr "選擇熱鍵以停止重播"
 
-#: src/libvlc.h:795 modules/gui/macosx/intf.m:460
-#: modules/video_filter/marq.c:120 modules/video_filter/rss.c:158
+#: src/libvlc.h:924 modules/gui/macosx/bookmarks.m:101
+#: modules/gui/macosx/bookmarks.m:110 modules/gui/macosx/embeddedwindow.m:46
+#: modules/gui/macosx/intf.m:479 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
 msgid "Position"
 msgstr "位置"
 
-#: src/libvlc.h:796
+#: src/libvlc.h:925
 msgid "Select the hotkey to display the position."
 msgstr "選擇熱鍵以顯示位置"
 
-#: src/libvlc.h:798
-#, fuzzy
-msgid "Jump 3 seconds backwards"
-msgstr "向後10秒鐘"
+#: src/libvlc.h:927
+msgid "Very short backwards jump"
+msgstr ""
 
-#: src/libvlc.h:799
+#: src/libvlc.h:929
 #, fuzzy
-msgid "Select the hotkey to jump 3 seconds backwards."
-msgstr "選擇熱鍵以向後10秒鐘"
+msgid "Select the hotkey to make a very short backwards jump."
+msgstr "選擇熱鍵以向後5分鐘"
 
-#: src/libvlc.h:800
-msgid "Jump 10 seconds backwards"
-msgstr "向後10秒鐘"
+#: src/libvlc.h:930
+msgid "Short backwards jump"
+msgstr ""
 
-#: src/libvlc.h:801
-msgid "Select the hotkey to jump 10 seconds backwards."
+#: src/libvlc.h:932
+#, fuzzy
+msgid "Select the hotkey to make a short backwards jump."
 msgstr "選擇熱鍵以向後10秒鐘"
 
-#: src/libvlc.h:803
-msgid "Jump 1 minute backwards"
-msgstr "向後1分鐘"
+#: src/libvlc.h:933
+msgid "Medium backwards jump"
+msgstr ""
 
-#: src/libvlc.h:804
-msgid "Select the hotkey to jump 1 minute backwards."
+#: src/libvlc.h:935
+#, fuzzy
+msgid "Select the hotkey to make a medium backwards jump."
 msgstr "選擇熱鍵以向後1分鐘"
 
-#: src/libvlc.h:805
-msgid "Jump 5 minutes backwards"
-msgstr "向後5分鐘"
+#: src/libvlc.h:936
+msgid "Long backwards jump"
+msgstr ""
 
-#: src/libvlc.h:806
-msgid "Select the hotkey to jump 5 minutes backwards."
-msgstr "選擇熱鍵以向後5分鐘"
+#: src/libvlc.h:938
+#, fuzzy
+msgid "Select the hotkey to make a long backwards jump."
+msgstr "選擇熱鍵以向後10秒鐘"
 
-#: src/libvlc.h:808
+#: src/libvlc.h:940
+msgid "Very short forward jump"
+msgstr ""
+
+#: src/libvlc.h:942
 #, fuzzy
-msgid "Jump 3 seconds forward"
-msgstr "向前10秒鐘"
+msgid "Select the hotkey to make a very short forward jump."
+msgstr "選擇熱鍵以快速重播"
 
-#: src/libvlc.h:809
+#: src/libvlc.h:943
+msgid "Short forward jump"
+msgstr ""
+
+#: src/libvlc.h:945
 #, fuzzy
-msgid "Select the hotkey to jump 3 seconds forward."
+msgid "Select the hotkey to make a short forward jump."
 msgstr "選擇熱鍵以向前10秒鐘"
 
-#: src/libvlc.h:810
-msgid "Jump 10 seconds forward"
-msgstr "向前10秒鐘"
+#: src/libvlc.h:946
+msgid "Medium forward jump"
+msgstr ""
 
-#: src/libvlc.h:811
-msgid "Select the hotkey to jump 10 seconds forward."
+#: src/libvlc.h:948
+#, fuzzy
+msgid "Select the hotkey to make a medium forward jump."
+msgstr "選擇熱鍵以向前1分鐘"
+
+#: src/libvlc.h:949
+msgid "Long forward jump"
+msgstr ""
+
+#: src/libvlc.h:951
+#, fuzzy
+msgid "Select the hotkey to make a long forward jump."
 msgstr "選擇熱鍵以向前10秒鐘"
 
-#: src/libvlc.h:813
-msgid "Jump 1 minute forward"
-msgstr "向前1分鐘"
+#: src/libvlc.h:953
+msgid "Very short jump length"
+msgstr ""
 
-#: src/libvlc.h:814
-msgid "Select the hotkey to jump 1 minute forward."
-msgstr "選擇熱鍵以向前1分鐘"
+#: src/libvlc.h:954
+msgid "Very short jump length, in seconds."
+msgstr ""
 
-#: src/libvlc.h:815
-msgid "Jump 5 minutes forward"
-msgstr "向後5分鐘"
+#: src/libvlc.h:955
+msgid "Short jump length"
+msgstr ""
 
-#: src/libvlc.h:816
-msgid "Select the hotkey to jump 5 minutes forward."
-msgstr "選擇熱鍵以向後5分鐘"
+#: src/libvlc.h:956
+msgid "Short jump length, in seconds."
+msgstr ""
+
+#: src/libvlc.h:957
+msgid "Medium jump length"
+msgstr ""
 
-#: src/libvlc.h:818 modules/control/hotkeys.c:271
-#: modules/gui/beos/InterfaceWindow.cpp:257
+#: src/libvlc.h:958
+msgid "Medium jump length, in seconds."
+msgstr ""
+
+#: src/libvlc.h:959
+#, fuzzy
+msgid "Long jump length"
+msgstr "字型大小"
+
+#: src/libvlc.h:960
+msgid "Long jump length, in seconds."
+msgstr ""
+
+#: src/libvlc.h:962 modules/control/hotkeys.c:258
+#: modules/gui/beos/InterfaceWindow.cpp:274
 msgid "Quit"
 msgstr "離開"
 
-#: src/libvlc.h:819
+#: src/libvlc.h:963
 msgid "Select the hotkey to quit the application."
 msgstr "選擇熱鍵以離開應用程式"
 
-#: src/libvlc.h:820
+#: src/libvlc.h:964
 msgid "Navigate up"
 msgstr "向上導覽"
 
-#: src/libvlc.h:821
+#: src/libvlc.h:965
 msgid "Select the key to move the selector up in DVD menus."
 msgstr "選擇按鍵以向上移動DVD選單中的選擇器"
 
-#: src/libvlc.h:822
+#: src/libvlc.h:966
 msgid "Navigate down"
 msgstr "向下導覽"
 
-#: src/libvlc.h:823
+#: src/libvlc.h:967
 msgid "Select the key to move the selector down in DVD menus."
 msgstr "選擇按鍵以向下移動DVD選單中的選擇器"
 
-#: src/libvlc.h:824
+#: src/libvlc.h:968
 msgid "Navigate left"
 msgstr "向左導覽"
 
-#: src/libvlc.h:825
+#: src/libvlc.h:969
 msgid "Select the key to move the selector left in DVD menus."
 msgstr "選擇按鍵以向左移動DVD選單中的選擇器"
 
-#: src/libvlc.h:826
+#: src/libvlc.h:970
 msgid "Navigate right"
 msgstr "向右導覽"
 
-#: src/libvlc.h:827
+#: src/libvlc.h:971
 msgid "Select the key to move the selector right in DVD menus."
 msgstr "選擇按鍵以向右移動DVD選單中的選擇器"
 
-#: src/libvlc.h:828
+#: src/libvlc.h:972
 msgid "Activate"
 msgstr "啟動"
 
-#: src/libvlc.h:829
+#: src/libvlc.h:973
 msgid "Select the key to activate selected item in DVD menus."
 msgstr "選擇熱鍵以啟動所選擇的DVD選單項目"
 
-#: src/libvlc.h:830
+#: src/libvlc.h:974
+#, fuzzy
+msgid "Go to the DVD menu"
+msgstr "使用DVD選單"
+
+#: src/libvlc.h:975
+#, fuzzy
+msgid "Select the key to take you to the DVD menu"
+msgstr "選擇熱鍵以啟動所選擇的DVD選單項目"
+
+#: src/libvlc.h:976
 #, fuzzy
 msgid "Select previous DVD title"
 msgstr "選擇上一個標題"
 
-#: src/libvlc.h:831
+#: src/libvlc.h:977
 #, fuzzy
 msgid "Select the key to choose the previous title from the DVD"
 msgstr "選擇熱鍵以播放清單中的上一個項目"
 
-#: src/libvlc.h:832
+#: src/libvlc.h:978
 #, fuzzy
 msgid "Select next DVD title"
 msgstr "選擇下一個章節"
 
-#: src/libvlc.h:833
+#: src/libvlc.h:979
 #, fuzzy
 msgid "Select the key to choose the next title from the DVD"
 msgstr "選擇按鍵以向左移動DVD選單中的選擇器"
 
-#: src/libvlc.h:834 src/libvlc.h:836
+#: src/libvlc.h:980
 #, fuzzy
 msgid "Select prev DVD chapter"
 msgstr "選擇上一個章節"
 
-#: src/libvlc.h:835
+#: src/libvlc.h:981
 #, fuzzy
 msgid "Select the key to choose the previous chapter from the DVD"
 msgstr "選擇熱鍵以播放清單中的上一個項目"
 
-#: src/libvlc.h:837
+#: src/libvlc.h:982
+#, fuzzy
+msgid "Select next DVD chapter"
+msgstr "選擇下一個章節"
+
+#: src/libvlc.h:983
 #, fuzzy
 msgid "Select the key to choose the next chapter from the DVD"
 msgstr "選擇按鍵以向左移動DVD選單中的選擇器"
 
-#: src/libvlc.h:838
+#: src/libvlc.h:984
 msgid "Volume up"
 msgstr "增加音量"
 
-#: src/libvlc.h:839
+#: src/libvlc.h:985
 msgid "Select the key to increase audio volume."
 msgstr "選擇按鍵以增加音量"
 
-#: src/libvlc.h:840
+#: src/libvlc.h:986
 msgid "Volume down"
 msgstr "減低音量"
 
-#: src/libvlc.h:841
+#: src/libvlc.h:987
 msgid "Select the key to decrease audio volume."
 msgstr "選擇按鍵以減低音量"
 
-#: src/libvlc.h:842 modules/gui/macosx/controls.m:613
-#: modules/gui/macosx/intf.m:519 modules/gui/macosx/intf.m:575
+#: src/libvlc.h:988 modules/gui/macosx/controls.m:704
+#: modules/gui/macosx/intf.m:538 modules/gui/macosx/intf.m:598
 msgid "Mute"
 msgstr "靜音"
 
-#: src/libvlc.h:843
-msgid "Select the key to turn off audio volume."
-msgstr "選擇按鍵以關閉音訊音量"
+#: src/libvlc.h:989
+#, fuzzy
+msgid "Select the key to mute audio."
+msgstr "選擇熱鍵以暫停"
 
-#: src/libvlc.h:844
+#: src/libvlc.h:990
 msgid "Subtitle delay up"
 msgstr "增加字幕延遲"
 
-#: src/libvlc.h:845
+#: src/libvlc.h:991
 msgid "Select the key to increase the subtitle delay."
 msgstr "選擇按鍵以增加字幕延遲"
 
-#: src/libvlc.h:846
+#: src/libvlc.h:992
 msgid "Subtitle delay down"
 msgstr "減少字幕延遲"
 
-#: src/libvlc.h:847
+#: src/libvlc.h:993
 msgid "Select the key to decrease the subtitle delay."
 msgstr "選擇按鍵以減少字幕延遲"
 
-#: src/libvlc.h:848
+#: src/libvlc.h:994
 msgid "Audio delay up"
 msgstr "增加音訊延遲"
 
-#: src/libvlc.h:849
+#: src/libvlc.h:995
 msgid "Select the key to increase the audio delay."
 msgstr "選擇按鍵以增加音訊延遲"
 
-#: src/libvlc.h:850
+#: src/libvlc.h:996
 msgid "Audio delay down"
 msgstr "減少音訊延遲"
 
-#: src/libvlc.h:851
+#: src/libvlc.h:997
 msgid "Select the key to decrease the audio delay."
 msgstr "選擇按鍵以減少音訊延遲"
 
-#: src/libvlc.h:852
+#: src/libvlc.h:998
 msgid "Play playlist bookmark 1"
 msgstr "播放播放清單書籤 1"
 
-#: src/libvlc.h:853
+#: src/libvlc.h:999
 msgid "Play playlist bookmark 2"
 msgstr "播放播放清單書籤 2"
 
-#: src/libvlc.h:854
+#: src/libvlc.h:1000
 msgid "Play playlist bookmark 3"
 msgstr "播放播放清單書籤 3"
 
-#: src/libvlc.h:855
+#: src/libvlc.h:1001
 msgid "Play playlist bookmark 4"
 msgstr "播放播放清單書籤 4"
 
-#: src/libvlc.h:856
+#: src/libvlc.h:1002
 msgid "Play playlist bookmark 5"
 msgstr "播放播放清單書籤 5"
 
-#: src/libvlc.h:857
+#: src/libvlc.h:1003
 msgid "Play playlist bookmark 6"
 msgstr "播放播放清單書籤 6"
 
-#: src/libvlc.h:858
+#: src/libvlc.h:1004
 msgid "Play playlist bookmark 7"
 msgstr "播放播放清單書籤 7"
 
-#: src/libvlc.h:859
+#: src/libvlc.h:1005
 msgid "Play playlist bookmark 8"
 msgstr "播放播放清單書籤 8"
 
-#: src/libvlc.h:860
+#: src/libvlc.h:1006
 msgid "Play playlist bookmark 9"
 msgstr "播放播放清單書籤 9"
 
-#: src/libvlc.h:861
+#: src/libvlc.h:1007
 msgid "Play playlist bookmark 10"
 msgstr "播放播放清單書籤 10"
 
-#: src/libvlc.h:862
+#: src/libvlc.h:1008
 msgid "Select the key to play this bookmark."
 msgstr "選擇按鍵以播放該書籤"
 
-#: src/libvlc.h:863
+#: src/libvlc.h:1009
 msgid "Set playlist bookmark 1"
 msgstr "設定播放清單書籤 1"
 
-#: src/libvlc.h:864
+#: src/libvlc.h:1010
 msgid "Set playlist bookmark 2"
 msgstr "設定播放清單書籤 2"
 
-#: src/libvlc.h:865
+#: src/libvlc.h:1011
 msgid "Set playlist bookmark 3"
 msgstr "設定播放清單書籤 3"
 
-#: src/libvlc.h:866
+#: src/libvlc.h:1012
 msgid "Set playlist bookmark 4"
 msgstr "設定播放清單書籤 4"
 
-#: src/libvlc.h:867
+#: src/libvlc.h:1013
 msgid "Set playlist bookmark 5"
 msgstr "設定播放清單書籤 5"
 
-#: src/libvlc.h:868
+#: src/libvlc.h:1014
 msgid "Set playlist bookmark 6"
 msgstr "設定播放清單書籤 6"
 
-#: src/libvlc.h:869
+#: src/libvlc.h:1015
 msgid "Set playlist bookmark 7"
 msgstr "設定播放清單書籤 7"
 
-#: src/libvlc.h:870
+#: src/libvlc.h:1016
 msgid "Set playlist bookmark 8"
 msgstr "設定播放清單書籤 8"
 
-#: src/libvlc.h:871
+#: src/libvlc.h:1017
 msgid "Set playlist bookmark 9"
 msgstr "設定播放清單書籤 9"
 
-#: src/libvlc.h:872
+#: src/libvlc.h:1018
 msgid "Set playlist bookmark 10"
 msgstr "設定播放清單書籤 10"
 
-#: src/libvlc.h:873
+#: src/libvlc.h:1019
 msgid "Select the key to set this playlist bookmark."
 msgstr "選擇按鍵以設定該播放清單書籤"
 
-#: src/libvlc.h:875
-msgid "Go back in browsing history"
-msgstr ""
+#: src/libvlc.h:1021 modules/control/hotkeys.c:84
+msgid "Playlist bookmark 1"
+msgstr "播放清單書籤 1"
 
-#: src/libvlc.h:876
-msgid ""
-"Select the key to go back (to the previous media item) in the browsing "
-"history."
-msgstr ""
+#: src/libvlc.h:1022 modules/control/hotkeys.c:85
+msgid "Playlist bookmark 2"
+msgstr "播放清單書籤 2"
 
-#: src/libvlc.h:877
-msgid "Go forward in browsing history"
-msgstr ""
+#: src/libvlc.h:1023 modules/control/hotkeys.c:86
+msgid "Playlist bookmark 3"
+msgstr "播放清單書籤 3"
 
-#: src/libvlc.h:878
-msgid ""
+#: src/libvlc.h:1024 modules/control/hotkeys.c:87
+msgid "Playlist bookmark 4"
+msgstr "播放清單書籤 4"
+
+#: src/libvlc.h:1025 modules/control/hotkeys.c:88
+msgid "Playlist bookmark 5"
+msgstr "播放清單書籤 5"
+
+#: src/libvlc.h:1026 modules/control/hotkeys.c:89
+msgid "Playlist bookmark 6"
+msgstr "播放清單書籤 6"
+
+#: src/libvlc.h:1027 modules/control/hotkeys.c:90
+msgid "Playlist bookmark 7"
+msgstr "播放清單書籤 7"
+
+#: src/libvlc.h:1028 modules/control/hotkeys.c:91
+msgid "Playlist bookmark 8"
+msgstr "播放清單書籤 8"
+
+#: src/libvlc.h:1029 modules/control/hotkeys.c:92
+msgid "Playlist bookmark 9"
+msgstr "播放清單書籤 9"
+
+#: src/libvlc.h:1030 modules/control/hotkeys.c:93
+msgid "Playlist bookmark 10"
+msgstr "播放清單書籤 10"
+
+#: src/libvlc.h:1032
+#, fuzzy
+msgid "This allows you to define playlist bookmarks."
+msgstr "這個選項允許你定義播放清單書籤"
+
+#: src/libvlc.h:1034
+msgid "Go back in browsing history"
+msgstr ""
+
+#: src/libvlc.h:1035
+msgid ""
+"Select the key to go back (to the previous media item) in the browsing "
+"history."
+msgstr ""
+
+#: src/libvlc.h:1036
+msgid "Go forward in browsing history"
+msgstr ""
+
+#: src/libvlc.h:1037
+msgid ""
 "Select the key to go forward (to the next media item) in the browsing "
 "history."
 msgstr ""
 
-#: src/libvlc.h:880
+#: src/libvlc.h:1039
 msgid "Cycle audio track"
 msgstr "循環音軌"
 
-#: src/libvlc.h:881
-msgid "Cycle through the available audio tracks(languages)"
+#: src/libvlc.h:1040
+msgid "Cycle through the available audio tracks(languages)."
 msgstr ""
 
-#: src/libvlc.h:882
+#: src/libvlc.h:1041
 msgid "Cycle subtitle track"
 msgstr "循環字幕軌"
 
-#: src/libvlc.h:883
-msgid "Cycle through the available subtitle tracks"
+#: src/libvlc.h:1042
+#, fuzzy
+msgid "Cycle through the available subtitle tracks."
+msgstr "循環字幕軌"
+
+#: src/libvlc.h:1043
+#, fuzzy
+msgid "Cycle source aspect ratio"
+msgstr "採樣率"
+
+#: src/libvlc.h:1044
+#, fuzzy
+msgid "Cycle through a predefined list of source aspect ratios."
+msgstr "採樣率"
+
+#: src/libvlc.h:1045
+#, fuzzy
+msgid "Cycle video crop"
+msgstr "灰階視訊輸出"
+
+#: src/libvlc.h:1046
+msgid "Cycle through a predefined list of crop formats."
 msgstr ""
 
-#: src/libvlc.h:884
+#: src/libvlc.h:1047
+#, fuzzy
+msgid "Cycle deinterlace modes"
+msgstr "介面模組"
+
+#: src/libvlc.h:1048
+#, fuzzy
+msgid "Cycle through deinterlace modes."
+msgstr "介面模組"
+
+#: src/libvlc.h:1049
 msgid "Show interface"
 msgstr "顯示介面"
 
-#: src/libvlc.h:885
-msgid "Raise the interface above all other windows"
+#: src/libvlc.h:1050
+msgid "Raise the interface above all other windows."
 msgstr ""
 
-#: src/libvlc.h:886
+#: src/libvlc.h:1051
 #, fuzzy
 msgid "Hide interface"
 msgstr "顯示介面"
 
-#: src/libvlc.h:887
-msgid "Lower the interface below all other windows"
+#: src/libvlc.h:1052
+msgid "Lower the interface below all other windows."
 msgstr ""
 
-#: src/libvlc.h:888
+#: src/libvlc.h:1053
 msgid "Take video snapshot"
 msgstr "擷取視訊快照"
 
-#: src/libvlc.h:889
+#: src/libvlc.h:1054
 msgid "Takes a video snapshot and writes it to disk."
 msgstr "擷取視訊快照並寫入磁碟"
 
-#: src/libvlc.h:891 modules/access_filter/record.c:50
-#: modules/access_filter/record.c:51
+#: src/libvlc.h:1056 modules/access_filter/record.c:51
+#: modules/access_filter/record.c:52
 #, fuzzy
 msgid "Record"
 msgstr "回捲"
 
-#: src/libvlc.h:892
+#: src/libvlc.h:1057
 msgid "Record access filter start/stop."
 msgstr ""
 
-#: src/libvlc.h:896
+#: src/libvlc.h:1061
 #, c-format
 msgid ""
-"Usage: %s [options] [playlistitems] ...\n"
-"You can specify multiple playlistitems on the commandline. They will be "
-"enqueued in the playlist.\n"
+"Usage: %s [options] [stream] ...\n"
+"You can specify multiple streams on the commandline. They will be enqueued "
+"in the playlist.\n"
 "The first item specified will be played first.\n"
 "\n"
 "Options-styles:\n"
 "  --option  A global option that is set for the duration of the program.\n"
 "   -option  A single letter version of a global --option.\n"
-"   :option  An option that only applies to the playlistitem directly before "
-"it\n"
+"   :option  An option that only applies to the stream directly before it\n"
 "            and that overrides previous settings.\n"
 "\n"
-"Playlistitem MRL syntax:\n"
-"  URL[@[title][:chapter][-[title][:chapter]]] [:option=value ...]\n"
+"Stream MRL syntax:\n"
+"  [[access][/demux]://]URL[@[title][:chapter][-[title][:chapter]]] [:"
+"option=value ...]\n"
 "\n"
 "  Many of the global --options can also be used as MRL specific :options.\n"
 "  Multiple :option=value pairs can be specified.\n"
@@ -2963,142 +3293,154 @@ msgid ""
 "  vlc:quit                       Special item to quit VLC\n"
 msgstr ""
 
-#: src/libvlc.h:1004 src/video_output/vout_intf.c:239
-#: modules/gui/macosx/controls.m:288 modules/gui/macosx/controls.m:622
-#: modules/gui/macosx/intf.m:536 modules/video_output/snapshot.c:75
+#: src/libvlc.h:1171 src/video_output/vout_intf.c:347
+#: modules/gui/macosx/controls.m:312 modules/gui/macosx/controls.m:713
+#: modules/gui/macosx/intf.m:555 modules/video_output/snapshot.c:76
 msgid "Snapshot"
 msgstr "快照"
 
-#: src/libvlc.h:1011
+#: src/libvlc.h:1180
 #, fuzzy
 msgid "Window properties"
 msgstr "字型設定"
 
-#: src/libvlc.h:1045
+#: src/libvlc.h:1216
 #, fuzzy
 msgid "Subpictures"
 msgstr "字幕"
 
-#: src/libvlc.h:1048 modules/codec/subsdec.c:92 modules/demux/subtitle.c:61
-#: modules/gui/beos/InterfaceWindow.cpp:260
+#: src/libvlc.h:1221 modules/codec/subsdec.c:119 modules/demux/subtitle.c:63
+#: modules/gui/beos/InterfaceWindow.cpp:277
 msgid "Subtitles"
 msgstr "字幕"
 
-#: src/libvlc.h:1065
+#: src/libvlc.h:1238 modules/stream_out/transcode.c:147
 msgid "Overlays"
 msgstr ""
 
-#: src/libvlc.h:1072
-#, fuzzy
-msgid "Input"
-msgstr "輸入清單"
-
-#: src/libvlc.h:1089
+#: src/libvlc.h:1246
 #, fuzzy
 msgid "Track settings"
 msgstr "軌道設定"
 
-#: src/libvlc.h:1108
+#: src/libvlc.h:1268
 msgid "Playback control"
 msgstr "重播控制"
 
-#: src/libvlc.h:1123
+#: src/libvlc.h:1283
 msgid "Default devices"
 msgstr "預設裝置"
 
-#: src/libvlc.h:1132
+#: src/libvlc.h:1292
 msgid "Network settings"
 msgstr "網路設定"
 
-#: src/libvlc.h:1146
+#: src/libvlc.h:1304
 msgid "Socks proxy"
 msgstr ""
 
-#: src/libvlc.h:1155
+#: src/libvlc.h:1313
 msgid "Metadata"
 msgstr ""
 
-#: src/libvlc.h:1182
+#: src/libvlc.h:1343
 msgid "Decoders"
 msgstr "解碼器"
 
-#: src/libvlc.h:1228
+#: src/libvlc.h:1350 modules/gui/macosx/playlistinfo.m:80
+#: modules/gui/wxwidgets/dialogs/infopanels.cpp:264
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:380
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:106
+#, fuzzy
+msgid "Input"
+msgstr "輸入清單"
+
+#: src/libvlc.h:1386 modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:523
+msgid "VLM"
+msgstr ""
+
+#: src/libvlc.h:1417
 msgid "CPU"
 msgstr ""
 
-#: src/libvlc.h:1243
+#: src/libvlc.h:1432
 #, fuzzy
 msgid "Special modules"
 msgstr "輸出模組"
 
-#: src/libvlc.h:1249
+#: src/libvlc.h:1438
 msgid "Plugins"
 msgstr "外掛"
 
-#: src/libvlc.h:1255
+#: src/libvlc.h:1444
 #, fuzzy
 msgid "Performance options"
 msgstr "轉碼選項"
 
-#: src/libvlc.h:1343
+#: src/libvlc.h:1540
 msgid "Hot keys"
 msgstr "熱鍵"
 
-#: src/libvlc.h:1641
+#: src/libvlc.h:1808
+#, fuzzy
+msgid "Jump sizes"
+msgstr "字型大小"
+
+#: src/libvlc.h:1887
 msgid "main program"
 msgstr "主程式"
 
-#: src/libvlc.h:1648
+#: src/libvlc.h:1894
 msgid "print help for VLC (can be combined with --advanced)"
 msgstr ""
 
-#: src/libvlc.h:1650
+#: src/libvlc.h:1896
 msgid ""
 "print help for VLC and all it's modules (can be combined with --advanced)"
 msgstr ""
 
-#: src/libvlc.h:1652
+#: src/libvlc.h:1898
 #, fuzzy
 msgid "print help for the advanced options"
 msgstr "顯示進階選項"
 
-#: src/libvlc.h:1654
+#: src/libvlc.h:1900
 msgid "ask for extra verbosity when displaying help"
 msgstr ""
 
-#: src/libvlc.h:1656
+#: src/libvlc.h:1902
 msgid "print a list of available modules"
 msgstr ""
 
-#: src/libvlc.h:1658
+#: src/libvlc.h:1904
 msgid "print help on a specific module (can be combined with --advanced)"
 msgstr ""
 
-#: src/libvlc.h:1660
+#: src/libvlc.h:1906
 msgid "save the current command line options in the config"
 msgstr ""
 
-#: src/libvlc.h:1662
+#: src/libvlc.h:1908
 msgid "reset the current config to the default values"
 msgstr ""
 
-#: src/libvlc.h:1664
+#: src/libvlc.h:1910
 msgid "use alternate config file"
 msgstr "使用替代的組態檔"
 
-#: src/libvlc.h:1666
+#: src/libvlc.h:1912
 msgid "resets the current plugins cache"
 msgstr "重置目前外掛快取"
 
-#: src/libvlc.h:1668
+#: src/libvlc.h:1914
 msgid "print version information"
 msgstr ""
 
-#: src/misc/configuration.c:1229
+#: src/misc/configuration.c:1212
 msgid "boolean"
 msgstr ""
 
-#: src/misc/configuration.c:1240
+#: src/misc/configuration.c:1223
 msgid "key"
 msgstr ""
 
@@ -3250,10 +3592,6 @@ msgstr ""
 msgid "Frisian"
 msgstr ""
 
-#: src/misc/iso-639_def.h:79
-msgid "Georgian"
-msgstr ""
-
 #: src/misc/iso-639_def.h:81
 msgid "Gaelic (Scots)"
 msgstr ""
@@ -3710,119 +4048,150 @@ msgstr ""
 msgid "Zulu"
 msgstr ""
 
-#: src/misc/iso_lang.c:70 modules/gui/wxwidgets/preferences.cpp:965
+#: src/misc/iso_lang.c:70 modules/gui/wxwidgets/dialogs/preferences.cpp:975
 msgid "Unknown"
 msgstr "未知"
 
-#: src/playlist/playlist.c:35
+#: src/misc/vlm.c:1140 src/misc/vlm.c:1247
+#, c-format
+msgid "Media: %s"
+msgstr ""
+
+#: src/playlist/playlist.c:37
 msgid "By category"
 msgstr ""
 
-#: src/playlist/playlist.c:36
+#: src/playlist/playlist.c:38
 msgid "Manually added"
 msgstr "手動增加"
 
-#: src/playlist/playlist.c:37
+#: src/playlist/playlist.c:39
 msgid "All items, unsorted"
 msgstr "所有項目(未排序)"
 
-#: src/playlist/sort.c:233 src/playlist/sort.c:236 src/playlist/sort.c:333
-msgid "Album/movie/show title"
-msgstr ""
-
 #: src/playlist/sort.c:344 src/playlist/view.c:79 src/playlist/view.c:280
 msgid "Undefined"
 msgstr "未定義"
 
-#: src/video_output/video_output.c:436 modules/gui/macosx/intf.m:543
-#: modules/gui/macosx/intf.m:544 modules/video_filter/deinterlace.c:113
+#: src/video_output/video_output.c:377 modules/gui/macosx/intf.m:566
+#: modules/gui/macosx/intf.m:567 modules/video_filter/deinterlace.c:122
 msgid "Deinterlace"
 msgstr ""
 
-#: src/video_output/video_output.c:440 modules/video_filter/deinterlace.c:108
+#: src/video_output/video_output.c:381 modules/video_filter/deinterlace.c:117
 msgid "Discard"
 msgstr ""
 
-#: src/video_output/video_output.c:442 modules/video_filter/deinterlace.c:108
+#: src/video_output/video_output.c:383 modules/video_filter/deinterlace.c:117
 msgid "Blend"
 msgstr ""
 
-#: src/video_output/video_output.c:444 modules/video_filter/deinterlace.c:108
+#: src/video_output/video_output.c:385 modules/video_filter/deinterlace.c:117
 msgid "Mean"
 msgstr ""
 
-#: src/video_output/video_output.c:446 modules/video_filter/deinterlace.c:109
+#: src/video_output/video_output.c:387 modules/video_filter/deinterlace.c:118
 msgid "Bob"
 msgstr ""
 
-#: src/video_output/video_output.c:448 modules/video_filter/deinterlace.c:109
+#: src/video_output/video_output.c:389 modules/video_filter/deinterlace.c:118
 msgid "Linear"
 msgstr ""
 
-#: src/video_output/vout_intf.c:191
+#: src/video_output/vout_intf.c:202
 msgid "Zoom"
 msgstr "縮放"
 
-#: src/video_output/vout_intf.c:203
+#: src/video_output/vout_intf.c:214
 msgid "1:4 Quarter"
 msgstr ""
 
-#: src/video_output/vout_intf.c:205
+#: src/video_output/vout_intf.c:216
 msgid "1:2 Half"
 msgstr ""
 
-#: src/video_output/vout_intf.c:207
+#: src/video_output/vout_intf.c:218
 msgid "1:1 Original"
 msgstr ""
 
-#: src/video_output/vout_intf.c:209
+#: src/video_output/vout_intf.c:220
 msgid "2:1 Double"
 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/gnomevfs.c:43 modules/access/http.c:51
+#: src/video_output/vout_intf.c:231 modules/gui/macosx/intf.m:560
+#: modules/gui/macosx/intf.m:561 modules/video_filter/crop.c:62
+msgid "Crop"
+msgstr ""
+
+#: src/video_output/vout_intf.c:294 modules/gui/macosx/intf.m:558
+#: modules/gui/macosx/intf.m:559
+#, fuzzy
+msgid "Aspect-ratio"
+msgstr "採樣率"
+
+#: modules/access/cdda.c:52 modules/access/dshow/dshow.cpp:79
+#: modules/access/dv.c:68 modules/access/dvb/access.c:71
+#: modules/access/dvdnav.c:63 modules/access/dvdread.c:61
+#: modules/access/fake.c:40 modules/access/file.c:80 modules/access/ftp.c:42
+#: modules/access/gnomevfs.c:44 modules/access/http.c:53
 #: 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)"
 
-#: modules/access/cdda.c:44 modules/access/vcd/vcd.c:42
+#: modules/access/cdda.c:54
 msgid ""
-"Allows you to modify the default caching value for cdda streams. This value "
-"should be set in milliseconds units."
+"Default caching value for Audio CDs. This value should be set in "
+"milliseconds."
 msgstr ""
 
-#: modules/access/cdda.c:48 modules/gui/macosx/open.m:176
+#: modules/access/cdda.c:58 modules/gui/macosx/open.m:176
 #: modules/gui/macosx/open.m:496 modules/gui/macosx/open.m:587
-#: modules/gui/wxwidgets/open.cpp:682
+#: modules/gui/wxwidgets/dialogs/open.cpp:698
 msgid "Audio CD"
 msgstr "音樂CD"
 
-#: modules/access/cdda.c:49
+#: modules/access/cdda.c:59
 msgid "Audio CD input"
 msgstr "音樂CD輸入"
 
-#: modules/access/cdda.c:55
+#: modules/access/cdda.c:65
 msgid "[cdda:][device][@[track]]"
 msgstr ""
 
-#: modules/access/cdda.c:380
+#: modules/access/cdda.c:71
+#, fuzzy
+msgid "CDDB Server"
+msgstr "CDDB伺服器"
+
+#: modules/access/cdda.c:71
+msgid "Address of the CDDB server to use."
+msgstr ""
+
+#: modules/access/cdda.c:74
+#, fuzzy
+msgid "CDDB port"
+msgstr "CDDB年份"
+
+#: modules/access/cdda.c:74
+#, fuzzy
+msgid "CDDB Server port to use."
+msgstr "CDDB伺服器逾時"
+
+#: modules/access/cdda.c:511 modules/access/cdda.c:606
 #, fuzzy
 msgid "Audio CD - Track "
 msgstr "音訊軌"
 
-#: modules/access/cdda.c:381
+#: modules/access/cdda.c:512 modules/access/cdda.c:615
 #, fuzzy, c-format
 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:248 modules/codec/x264.c:254
 msgid "none"
 msgstr ""
 
@@ -3850,16 +4219,16 @@ msgstr ""
 
 #: modules/access/cdda/cdda.c:59
 msgid ""
-"Allows you to modify the default caching value for CDDA streams. This value "
-"should be set in millisecond units."
+"Caching value for CDDA streams. This value should be set in millisecond "
+"units."
 msgstr ""
 
 #: modules/access/cdda/cdda.c:63
 msgid ""
-"Allows you to specify how many CD blocks to get on a single CD read. "
-"Generally on newer/faster CDs, this increases throughput at the expense of a "
-"little more memory usage and initial delay. SCSI-MMC limitations generally "
-"don't allow for more than 25 blocks per access."
+"How many CD blocks to get on a single CD read. Generally on newer/faster "
+"CDs, this increases throughput at the expense of a little more memory usage "
+"and initial delay. SCSI-MMC limitations generally don't allow for more than "
+"25 blocks per access."
 msgstr ""
 
 #: modules/access/cdda/cdda.c:69
@@ -3923,8 +4292,8 @@ msgstr ""
 msgid "Audio Compact Disc"
 msgstr "音樂CD"
 
-#: modules/access/cdda/cdda.c:124 modules/access/vcdx/vcd.c:106
-msgid "If nonzero, this gives additional debug information."
+#: modules/access/cdda/cdda.c:124
+msgid "Additional debug"
 msgstr ""
 
 #: modules/access/cdda/cdda.c:129
@@ -3961,8 +4330,7 @@ msgid "Use Navigation-style playback?"
 msgstr ""
 
 #: modules/access/cdda/cdda.c:161
-msgid ""
-"If set, tracks are navigated via Navagation rather than a playlist entries"
+msgid "Tracks are navigated via Navagation rather than a playlist entries"
 msgstr ""
 
 #: modules/access/cdda/cdda.c:174
@@ -3975,7 +4343,7 @@ msgid "Format to use in playlist \"title\" field when using CDDB"
 msgstr ""
 
 #: modules/access/cdda/cdda.c:181
-msgid "Do CDDB lookups?"
+msgid "CDDB lookups"
 msgstr ""
 
 #: modules/access/cdda/cdda.c:182
@@ -4040,33 +4408,34 @@ msgid ""
 "are available"
 msgstr ""
 
-#: modules/access/cdda/info.c:325 modules/access/cdda/info.c:330
-#: modules/access/cdda/info.c:334 modules/access/dvdread.c:84
+#: modules/access/cdda/info.c:326 modules/access/cdda/info.c:331
+#: modules/access/cdda/info.c:335 modules/access/dvdread.c:84
 #: modules/access/vcdx/info.c:88 modules/gui/macosx/open.m:161
-#: modules/gui/macosx/open.m:375 modules/gui/wxwidgets/open.cpp:509
+#: modules/gui/macosx/open.m:375 modules/gui/wxwidgets/dialogs/open.cpp:503
 msgid "Disc"
 msgstr "光碟"
 
-#: modules/access/cdda/info.c:330
+#: modules/access/cdda/info.c:331
 msgid "Media Catalog Number (MCN)"
 msgstr ""
 
-#: modules/access/cdda/info.c:334 modules/access/vcdx/info.c:103
+#: modules/access/cdda/info.c:335 modules/access/vcdx/info.c:103
 msgid "Tracks"
 msgstr ""
 
-#: modules/access/cdda/info.c:390 modules/access/cdda/info.c:810
-#: modules/access/cdda/info.c:857 modules/access/vcdx/info.c:286
-#: modules/access/vcdx/info.c:287 modules/gui/wxwidgets/open.cpp:1646
-#: modules/gui/wxwidgets/open.cpp:1664
+#: modules/access/cdda/info.c:391 modules/access/cdda/info.c:813
+#: modules/access/cdda/info.c:860 modules/access/vcdx/access.c:472
+#: modules/access/vcdx/info.c:286 modules/access/vcdx/info.c:287
+#: modules/gui/wxwidgets/dialogs/open.cpp:1703
+#: modules/gui/wxwidgets/dialogs/open.cpp:1721
 msgid "Track"
 msgstr ""
 
-#: modules/access/cdda/info.c:397
+#: modules/access/cdda/info.c:398
 msgid "MRL"
 msgstr ""
 
-#: modules/access/cdda/info.c:857
+#: modules/access/cdda/info.c:860
 msgid "Track Number"
 msgstr ""
 
@@ -4091,26 +4460,28 @@ msgid "expand"
 msgstr ""
 
 #: modules/access/directory.c:80
-msgid "Ignore files with these extensions"
+msgid "Ignored extensions"
 msgstr ""
 
 #: modules/access/directory.c:82
 msgid ""
-"Specify a comma seperated list of file extensions. Files with these "
-"extensions will not be added to playlist when opening a directory. This is "
-"useful if you add directories that contain mp3 albums for instance."
+"Files with these extensions will not be added to playlist when opening a "
+"directory.\n"
+"This is useful if you add directories that contain playlist files for "
+"instance. Use a comma-separated list of extensions."
 msgstr ""
 
-#: modules/access/directory.c:88
+#: modules/access/directory.c:89
 msgid "Directory"
 msgstr ""
 
-#: modules/access/directory.c:90
+#: modules/access/directory.c:91
 msgid "Standard filesystem directory input"
 msgstr ""
 
 #: modules/access/dshow/dshow.cpp:72 modules/access/dshow/dshow.cpp:74
-#: modules/video_output/opengl.c:117
+#: modules/codec/ffmpeg/ffmpeg.c:75 modules/demux/mpc.c:55
+#: modules/video_output/opengl.c:129
 msgid "None"
 msgstr ""
 
@@ -4124,8 +4495,8 @@ msgstr "天線"
 
 #: modules/access/dshow/dshow.cpp:81
 msgid ""
-"Allows you to modify the default caching value for DirectShow streams. This "
-"value should be set in milliseconds units."
+"Caching value for DirectShow streams. This value should be set in "
+"millisecondss."
 msgstr ""
 
 #: modules/access/dshow/dshow.cpp:83 modules/access/v4l/v4l.c:77
@@ -4134,9 +4505,8 @@ msgstr "視訊裝置名稱"
 
 #: modules/access/dshow/dshow.cpp:85
 msgid ""
-"You can specify the 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."
+"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:88 modules/access/v4l/v4l.c:81
@@ -4145,9 +4515,9 @@ msgstr "音訊裝置名稱"
 
 #: modules/access/dshow/dshow.cpp:90
 msgid ""
-"You can specify the 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."
+"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:93
@@ -4156,9 +4526,8 @@ msgstr "視訊大小"
 
 #: modules/access/dshow/dshow.cpp:95
 msgid ""
-"You can specify the 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."
+"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:98 modules/access/v4l/v4l.c:85
@@ -4204,8 +4573,7 @@ msgid "Tuner TV Channel"
 msgstr ""
 
 #: modules/access/dshow/dshow.cpp:115
-msgid ""
-"Allows you to set the TV channel the tuner will set to (0 means default)."
+msgid "Set the TV channel the tuner will set to (0 means default)."
 msgstr ""
 
 #: modules/access/dshow/dshow.cpp:117
@@ -4214,8 +4582,8 @@ msgstr ""
 
 #: modules/access/dshow/dshow.cpp:119
 msgid ""
-"Allows you to set the tuner country code that establishes the current "
-"channel-to-frequency mapping (0 means default)."
+"Set the tuner country code that establishes the current channel-to-frequency "
+"mapping (0 means default)."
 msgstr ""
 
 #: modules/access/dshow/dshow.cpp:121
@@ -4223,192 +4591,326 @@ msgid "Tuner input type"
 msgstr ""
 
 #: modules/access/dshow/dshow.cpp:123
-msgid "Allows you to select the tuner input type (Cable/Antenna)."
+msgid "Select the tuner input type (Cable/Antenna)."
+msgstr ""
+
+#: modules/access/dshow/dshow.cpp:124
+#, fuzzy
+msgid "Video input pin"
+msgstr "視訊選項"
+
+#: modules/access/dshow/dshow.cpp:126
+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 "
+"\"Device config\" area, and use those numbers here. -1 means that settings "
+"will not be changed."
 msgstr ""
 
+#: modules/access/dshow/dshow.cpp:130
+#, fuzzy
+msgid "Audio input pin"
+msgstr "音樂CD輸入"
+
+#: modules/access/dshow/dshow.cpp:132
+#, fuzzy
+msgid "Select the audio input source. See the \"video input\" option."
+msgstr "設定視訊輸入對比"
+
+#: modules/access/dshow/dshow.cpp:133
+#, fuzzy
+msgid "Video output pin"
+msgstr "視訊輸出URL"
+
 #: modules/access/dshow/dshow.cpp:135
+#, fuzzy
+msgid "Select the video output type. See the \"video input\" option."
+msgstr "設定視訊輸入色調"
+
+#: modules/access/dshow/dshow.cpp:136
+#, fuzzy
+msgid "Audio output pin"
+msgstr "音訊輸出URL"
+
+#: modules/access/dshow/dshow.cpp:138
+#, fuzzy
+msgid "Select the audio output type. See the \"video input\" option."
+msgstr "設定視訊輸入色調"
+
+#: modules/access/dshow/dshow.cpp:150
 msgid "DirectShow"
 msgstr ""
 
-#: modules/access/dshow/dshow.cpp:136 modules/access/dshow/dshow.cpp:181
+#: modules/access/dshow/dshow.cpp:151 modules/access/dshow/dshow.cpp:208
 msgid "DirectShow input"
 msgstr "DirectShow輸入"
 
-#: modules/access/dshow/dshow.cpp:144 modules/access/dshow/dshow.cpp:149
-#: modules/audio_output/alsa.c:110 modules/video_output/directx/directx.c:157
+#: modules/access/dshow/dshow.cpp:159 modules/access/dshow/dshow.cpp:164
+#: modules/audio_output/alsa.c:110 modules/video_output/directx/directx.c:158
 msgid "Refresh list"
 msgstr "重新整理清單"
 
-#: modules/access/dshow/dshow.cpp:145 modules/access/dshow/dshow.cpp:150
+#: modules/access/dshow/dshow.cpp:160 modules/access/dshow/dshow.cpp:165
 msgid "Configure"
 msgstr "組態"
 
-#: modules/access/dvb/access.c:69
+#: modules/access/dv.c:70
+msgid "Caching value for DV streams. Thisvalue should be set in milliseconds."
+msgstr ""
+
+#: modules/access/dv.c:74
+msgid "Digital Video (Firewire/ieee1394)  input"
+msgstr ""
+
+#: modules/access/dv.c:75
+msgid "dv"
+msgstr ""
+
+#: modules/access/dvb/access.c:73
 msgid ""
-"Allows you to modify the default caching value for dvb streams. This value "
-"should be set in millisecond units."
+"Caching value for DVB streams. This value should be set in milliseconds."
 msgstr ""
 
-#: modules/access/dvb/access.c:72
+#: modules/access/dvb/access.c:76
 msgid "Adapter card to tune"
 msgstr ""
 
-#: modules/access/dvb/access.c:73
+#: modules/access/dvb/access.c:77
 msgid ""
 "Adapter cards have a device file in directory named /dev/dvb/adapter[n] with "
 "n>=0."
 msgstr ""
 
-#: modules/access/dvb/access.c:75
+#: modules/access/dvb/access.c:79
 msgid "Device number to use on adapter"
 msgstr ""
 
-#: modules/access/dvb/access.c:78
+#: modules/access/dvb/access.c:82
 msgid "Transponder/multiplex frequency"
 msgstr ""
 
-#: modules/access/dvb/access.c:79
+#: modules/access/dvb/access.c:83
 msgid "In kHz for DVB-S or Hz for DVB-C/T"
 msgstr ""
 
-#: modules/access/dvb/access.c:81
+#: modules/access/dvb/access.c:85
 msgid "Inversion mode"
 msgstr ""
 
-#: modules/access/dvb/access.c:82
+#: modules/access/dvb/access.c:86
 msgid "Inversion mode [0=off, 1=on, 2=auto]"
 msgstr ""
 
-#: modules/access/dvb/access.c:84
+#: modules/access/dvb/access.c:88
 msgid "Probe DVB card for capabilities"
 msgstr ""
 
-#: modules/access/dvb/access.c:85
-msgid "Some DVB cards do not like to be probed for their capabilities."
+#: modules/access/dvb/access.c:89
+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:87
+#: modules/access/dvb/access.c:91
 msgid "Budget mode"
 msgstr ""
 
-#: modules/access/dvb/access.c:88
-msgid "This allows you to stream an entire transponder with a budget card."
-msgstr ""
+#: modules/access/dvb/access.c:92
+#, fuzzy
+msgid "This allows you to stream an entire transponder with a \"budget\" card."
+msgstr "這個精靈可以幫助你串流、轉碼或是儲存一個串流"
 
-#: modules/access/dvb/access.c:91
+#: modules/access/dvb/access.c:95
 msgid "Satellite number in the Diseqc system"
 msgstr ""
 
-#: modules/access/dvb/access.c:92
-msgid "[0=no diseqc, 1-4=satellite number]"
+#: modules/access/dvb/access.c:96
+msgid "[0=no diseqc, 1-4=satellite number]."
 msgstr ""
 
-#: modules/access/dvb/access.c:94
+#: modules/access/dvb/access.c:98
 msgid "LNB voltage"
 msgstr ""
 
-#: modules/access/dvb/access.c:95
-msgid "In Volts [0, 13=vertical, 18=horizontal]"
+#: modules/access/dvb/access.c:99
+msgid "In Volts [0, 13=vertical, 18=horizontal]."
 msgstr ""
 
-#: modules/access/dvb/access.c:97
+#: modules/access/dvb/access.c:101
 msgid "High LNB voltage"
 msgstr ""
 
-#: modules/access/dvb/access.c:98
+#: modules/access/dvb/access.c:102
 msgid ""
 "Enable high voltage if your cables are particularly long. This is not "
 "supported by all frontends."
 msgstr ""
 
-#: modules/access/dvb/access.c:101
+#: modules/access/dvb/access.c:105
 msgid "22 kHz tone"
 msgstr ""
 
-#: modules/access/dvb/access.c:102
-msgid "[0=off, 1=on, -1=auto]"
+#: modules/access/dvb/access.c:106
+msgid "[0=off, 1=on, -1=auto]."
 msgstr ""
 
-#: modules/access/dvb/access.c:104
+#: modules/access/dvb/access.c:108
 msgid "Transponder FEC"
 msgstr ""
 
-#: modules/access/dvb/access.c:105
-msgid "FEC=Forward Error Correction mode [9=auto]"
+#: modules/access/dvb/access.c:109
+msgid "FEC=Forward Error Correction mode [9=auto]."
 msgstr ""
 
-#: modules/access/dvb/access.c:107
+#: modules/access/dvb/access.c:111
 msgid "Transponder symbol rate in kHz"
 msgstr ""
 
-#: modules/access/dvb/access.c:110
+#: modules/access/dvb/access.c:114
 msgid "Antenna lnb_lof1 (kHz)"
 msgstr ""
 
-#: modules/access/dvb/access.c:113
+#: modules/access/dvb/access.c:117
 msgid "Antenna lnb_lof2 (kHz)"
 msgstr ""
 
-#: modules/access/dvb/access.c:116
+#: modules/access/dvb/access.c:120
 msgid "Antenna lnb_slof (kHz)"
 msgstr ""
 
-#: modules/access/dvb/access.c:120
+#: modules/access/dvb/access.c:124
 msgid "Modulation type"
 msgstr "調變類型"
 
-#: modules/access/dvb/access.c:121
+#: modules/access/dvb/access.c:125
 msgid "Modulation type for front-end device."
 msgstr ""
 
-#: modules/access/dvb/access.c:124
+#: modules/access/dvb/access.c:128
 msgid "Terrestrial high priority stream code rate (FEC)"
 msgstr ""
 
-#: modules/access/dvb/access.c:127
+#: modules/access/dvb/access.c:131
 msgid "Terrestrial low priority stream code rate (FEC)"
 msgstr ""
 
-#: modules/access/dvb/access.c:130
+#: modules/access/dvb/access.c:134
 msgid "Terrestrial bandwidth"
 msgstr ""
 
-#: modules/access/dvb/access.c:131
+#: modules/access/dvb/access.c:135
 msgid "Terrestrial bandwidth [0=auto,6,7,8 in MHz]"
 msgstr ""
 
-#: modules/access/dvb/access.c:133
+#: modules/access/dvb/access.c:137
 msgid "Terrestrial guard interval"
 msgstr ""
 
-#: modules/access/dvb/access.c:136
+#: modules/access/dvb/access.c:140
 msgid "Terrestrial transmission mode"
 msgstr ""
 
-#: modules/access/dvb/access.c:139
+#: modules/access/dvb/access.c:143
 msgid "Terrestrial hierarchy mode"
 msgstr ""
 
-#: modules/access/dvb/access.c:143
+#: modules/access/dvb/access.c:146
+msgid "HTTP Host address"
+msgstr ""
+
+#: modules/access/dvb/access.c:148
+msgid "To enable the internal HTTP server, set its address and port here."
+msgstr ""
+
+#: modules/access/dvb/access.c:150
+#, fuzzy
+msgid "HTTP user name"
+msgstr "SOCKS使用者名稱"
+
+#: modules/access/dvb/access.c:152
+msgid ""
+"User name the administrator will use to log into the internal HTTP server."
+msgstr ""
+
+#: modules/access/dvb/access.c:155
+#, fuzzy
+msgid "HTTP password"
+msgstr "SOCKS密碼"
+
+#: modules/access/dvb/access.c:157
+msgid ""
+"Password the administrator will use to log into the internal HTTP server."
+msgstr ""
+
+#: modules/access/dvb/access.c:160
+msgid "HTTP ACL"
+msgstr ""
+
+#: modules/access/dvb/access.c:162
+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:166 modules/access_output/http.c:70
+#: modules/control/http/http.c:49
+msgid "Certificate file"
+msgstr ""
+
+#: modules/access/dvb/access.c:167
+msgid "HTTP interface x509 PEM certificate file (enables SSL)"
+msgstr ""
+
+#: modules/access/dvb/access.c:170 modules/access_output/http.c:73
+#: modules/control/http/http.c:52
+msgid "Private key file"
+msgstr ""
+
+#: modules/access/dvb/access.c:171
+msgid "HTTP interface x509 PEM private key file"
+msgstr ""
+
+#: modules/access/dvb/access.c:173 modules/access_output/http.c:77
+#: modules/control/http/http.c:54
+msgid "Root CA file"
+msgstr ""
+
+#: modules/access/dvb/access.c:174
+msgid "HTTP interface x509 PEM trusted root CA certificates file"
+msgstr ""
+
+#: modules/access/dvb/access.c:177 modules/access_output/http.c:82
+#: modules/control/http/http.c:57
+msgid "CRL file"
+msgstr "CRL檔案"
+
+#: modules/access/dvb/access.c:178
+msgid "HTTP interface Certificates Revocation List file"
+msgstr ""
+
+#: modules/access/dvb/access.c:181
 msgid "DVB"
 msgstr ""
 
-#: modules/access/dvb/access.c:144
+#: modules/access/dvb/access.c:182
 msgid "DVB input with v4l2 support"
 msgstr ""
 
+#: modules/access/dvb/access.c:234
+#, fuzzy
+msgid "HTTP server"
+msgstr "沒有伺服器"
+
 #: modules/access/dvdnav.c:59 modules/access/dvdread.c:57
 msgid "DVD angle"
 msgstr ""
 
 #: modules/access/dvdnav.c:61 modules/access/dvdread.c:59
-msgid "Allows you to select the default DVD angle."
+msgid "Default DVD angle."
 msgstr ""
 
-#: modules/access/dvdnav.c:65
-msgid ""
-"Allows you to modify the default caching value for DVDnav streams. This "
-"value should be set in millisecond units."
+#: modules/access/dvdnav.c:65 modules/access/dvdread.c:63
+msgid "Caching value for DVDs. This value should be set in milliseconds."
 msgstr ""
 
 #: modules/access/dvdnav.c:67
@@ -4417,8 +4919,8 @@ msgstr ""
 
 #: modules/access/dvdnav.c:69
 msgid ""
-"Allows you to start the DVD directly in the main menu. This will try to skip "
-"all the useless warnings introductions."
+"Start the DVD directly in the main menu. This will try to skip all the "
+"useless warning introductions."
 msgstr ""
 
 #: modules/access/dvdnav.c:78
@@ -4429,12 +4931,6 @@ msgstr ""
 msgid "DVDnav Input"
 msgstr "DVDnav輸入"
 
-#: modules/access/dvdread.c:63
-msgid ""
-"Allows you to modify the default caching value for DVDread streams. This "
-"value should be set in millisecond units."
-msgstr ""
-
 #: modules/access/dvdread.c:66
 msgid "Method used by libdvdcss for decryption"
 msgstr ""
@@ -4473,28 +4969,27 @@ msgstr ""
 
 #: modules/access/fake.c:42
 msgid ""
-"Allows you to modify the default caching value for fake streams. This value "
-"should be set in millisecond units."
+"Caching value for fake streams. This value should be set in milliseconds."
 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 ""
 
 #: modules/access/fake.c:46
-msgid "Specifies the number of frames per second (eg. 24, 25, 29.97, 30)."
+msgid "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 ""
 
 #: modules/access/fake.c:49
 msgid ""
-"Allows you to set the ID of the fake elementary stream for use in #duplicate"
-"{} constructs (default 0)."
+"Set the ID of the fake elementary stream for use in #duplicate{} constructs "
+"(default 0)."
 msgstr ""
 
 #: modules/access/fake.c:51
@@ -4504,11 +4999,11 @@ msgstr "組態選項"
 
 #: modules/access/fake.c:53
 msgid ""
-"Specifies the duration of the fake streaming before faking an end-of-file "
-"(default 0 means the stream is unlimited)."
+"Duration of the fake streaming before faking an end-of-file (default is 0, "
+"meaning that the stream is unlimited)."
 msgstr ""
 
-#: modules/access/fake.c:57 modules/codec/fake.c:74
+#: modules/access/fake.c:57 modules/codec/fake.c:75
 msgid "Fake"
 msgstr ""
 
@@ -4518,9 +5013,7 @@ 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."
+msgid "Caching value for files. This value should be set in milliseconds."
 msgstr ""
 
 #: modules/access/file.c:84
@@ -4529,165 +5022,125 @@ msgstr ""
 
 #: modules/access/file.c:86
 msgid ""
-"Allows you to play split files as if they were part of a unique file. "
-"Specify a comma-separated list of files."
+"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:90 modules/access/rtsp/access.c:46
-msgid "Standard filesystem file input"
-msgstr "標準檔案系統檔案輸入"
+#: modules/access/file.c:90
+#, fuzzy
+msgid "File input"
+msgstr "沒有輸入"
 
-#: modules/access/file.c:91 modules/access_output/file.c:71
-#: modules/audio_output/file.c:111 modules/gui/beos/InterfaceWindow.cpp:244
+#: modules/access/file.c:91 modules/access_output/file.c:66
+#: modules/audio_output/file.c:112 modules/gui/beos/InterfaceWindow.cpp:261
 #: modules/gui/beos/MediaControlView.cpp:1232
 #: 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:232 modules/gui/macosx/output.m:373
-#: modules/gui/pda/pda_interface.c:366 modules/gui/wxwidgets/open.cpp:507
-#: modules/gui/wxwidgets/streamout.cpp:439
+#: modules/gui/macosx/output.m:230 modules/gui/macosx/output.m:369
+#: modules/gui/pda/pda_interface.c:366
+#: modules/gui/wxwidgets/dialogs/open.cpp:501
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:471
 msgid "File"
 msgstr "檔案"
 
-#: modules/access_filter/record.c:42
-#, fuzzy
-msgid "Record directory"
-msgstr "選擇一個檔案或目錄"
+#: modules/access/ftp.c:44
+msgid ""
+"Caching value for FTP streams. This value should be set in milliseconds."
+msgstr ""
 
-#: modules/access_filter/record.c:44
-#, fuzzy
-msgid "Allows you to specify the directory where the record will be stored"
-msgstr "允許你指定視訊快照的存放目錄"
+#: modules/access/ftp.c:46
+msgid "FTP user name"
+msgstr ""
 
-#: modules/access_filter/timeshift.c:42
-#, fuzzy
-msgid "Timeshift granularity"
-msgstr "時間"
+#: modules/access/ftp.c:47 modules/access/smb.c:64
+msgid "User name that will be used for the connection."
+msgstr ""
 
-#: modules/access_filter/timeshift.c:43
-msgid "Size of the temporary files use to store the timeshifted stream."
+#: modules/access/ftp.c:49
+msgid "FTP password"
 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 "
-"should be set in millisecond units."
-msgstr ""
+#: modules/access/ftp.c:50 modules/access/smb.c:67
+msgid "Password that will be used for the connection."
+msgstr ""
 
 #: modules/access/ftp.c:52
-msgid "FTP user name"
-msgstr ""
-
-#: modules/access/ftp.c:53 modules/access/smb.c:64
-msgid ""
-"Allows you to modify the user name that will be used for the connection."
-msgstr ""
-
-#: modules/access/ftp.c:55
-msgid "FTP password"
-msgstr ""
-
-#: modules/access/ftp.c:56 modules/access/smb.c:67
-msgid "Allows you to modify the password that will be used for the connection."
-msgstr ""
-
-#: modules/access/ftp.c:58
 msgid "FTP account"
 msgstr ""
 
-#: modules/access/ftp.c:59
-msgid "Allows you to modify the account that will be used for the connection."
+#: modules/access/ftp.c:53
+msgid "Account that will be used for the connection."
 msgstr ""
 
-#: modules/access/ftp.c:64
+#: modules/access/ftp.c:58
 msgid "FTP input"
 msgstr ""
 
-#: modules/access/gnomevfs.c:45
+#: modules/access/gnomevfs.c:46
 msgid ""
-"Allows you to modify the default caching value for GnomeVFS streams.This "
-"value should be set in millisecond units."
+"Caching value for GnomeVFS streams.This value should be set in milliseconds."
 msgstr ""
 
-#: modules/access/gnomevfs.c:49
-#, fuzzy
-msgid "GnomeVFS filesystem file input"
-msgstr "標準檔案系統檔案輸入"
-
 #: modules/access/gnomevfs.c:50
-msgid "GnomeVFS"
-msgstr ""
+#, fuzzy
+msgid "GnomeVFS input"
+msgstr "沒有輸入"
 
-#: modules/access/http.c:45
+#: modules/access/http.c:47
 msgid "HTTP proxy"
 msgstr ""
 
-#: modules/access/http.c:47
+#: modules/access/http.c:49
 msgid ""
-"You can specify an HTTP proxy to use. It must be of the form http://[user[:"
-"pass]@]myproxy.mydomain:myport/ ; if empty, the http_proxy environment "
-"variable will be tried."
+"HTTP proxy to be usesd It must be of the form http://[user[:pass]@]myproxy."
+"mydomain:myport/ ; if empty, the http_proxy environment variable will be "
+"tried."
 msgstr ""
 
-#: modules/access/http.c:53
+#: modules/access/http.c:55
 msgid ""
-"Allows you to modify the default caching value for http streams. This value "
-"should be set in millisecond units."
+"Caching value for HTTP streams. This value should be set in milliseconds."
 msgstr ""
 
-#: modules/access/http.c:56
+#: modules/access/http.c:58
 msgid "HTTP user agent"
 msgstr ""
 
-#: modules/access/http.c:57
-msgid ""
-"Allows you to modify the user agent that will be used for the connection."
+#: modules/access/http.c:59
+msgid "User agent that will be used for the connection."
 msgstr ""
 
-#: modules/access/http.c:60
+#: modules/access/http.c:62
 msgid "Auto re-connect"
 msgstr "自動重新連接"
 
-#: modules/access/http.c:61
+#: modules/access/http.c:64
 msgid ""
-"Will automatically attempt a re-connection in case it was untimely closed."
+"Automatically try to reconnect to the stream in case of a sudden disconnect."
 msgstr ""
 
-#: modules/access/http.c:64
+#: modules/access/http.c:67
 msgid "Continuous stream"
 msgstr ""
 
-#: modules/access/http.c:65
+#: modules/access/http.c:68
 msgid ""
-"Enable this option to read a file that is being constantly updated (for "
-"example, a JPG file on a server)"
+"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:74
 msgid "HTTP input"
 msgstr "HTTP輸入"
 
-#: modules/access/http.c:71
-msgid "HTTP/HTTPS"
+#: modules/access/http.c:76
+msgid "HTTP(S)"
 msgstr ""
 
 #: modules/access/mms/mms.c:48
 msgid ""
-"Allows you to modify the default caching value for MMS streams. This value "
-"should be set in millisecond units."
+"Caching value for MMS streams. This value should be set in milliseconds."
 msgstr ""
 
 #: modules/access/mms/mms.c:51
@@ -4695,205 +5148,28 @@ msgid "Force selection of all streams"
 msgstr ""
 
 #: modules/access/mms/mms.c:53
-msgid "Select maximum bitrate stream"
+msgid ""
+"MMS streams can contain several elementary streams, with different bitrates. "
+"You can choose to select all of them."
 msgstr ""
 
-#: modules/access/mms/mms.c:55
-msgid "Always select the stream with the maximum bitrate."
-msgstr ""
+#: modules/access/mms/mms.c:56
+#, fuzzy
+msgid "Maximum bitrate"
+msgstr "最大化編碼位元率"
 
 #: modules/access/mms/mms.c:58
-msgid "MMS"
+msgid "Select the stream with the maximum bitrate under that limit."
 msgstr ""
 
-#: modules/access/mms/mms.c:59
+#: modules/access/mms/mms.c:62
 msgid "Microsoft Media Server (MMS) input"
 msgstr "Microsoft Media Server (MMS)輸入"
 
-#: 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/streamout.cpp:440
-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/shout.c:72
-#, fuzzy
-msgid "Shout"
-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/streamout.cpp:442
-msgid "UDP"
-msgstr ""
-
-#: modules/access/pvr/pvr.c:48 modules/access/pvr/pvr.c:99
+#: 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."
+"Default caching value for PVR streams. This value should be set in "
+"milliseconds."
 msgstr ""
 
 #: modules/access/pvr/pvr.c:51
@@ -4904,149 +5180,172 @@ 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
-msgid "Defines the norm of the stream (Automatic, SECAM, PAL, or NTSC)"
+#: modules/access/pvr/pvr.c:58 modules/access/v4l/v4l.c:98
+msgid "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
+#: modules/video_filter/mosaic.c:96
 msgid "Width"
 msgstr "寬度"
 
-#: modules/access/pvr/pvr.c:59 modules/access/v4l/v4l.c:103
-msgid "Width of the stream to capture (-1 for autodetect)"
+#: modules/access/pvr/pvr.c:62
+msgid "Width of the stream to capture (-1 for autodetection)."
 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
+#: modules/video_filter/mosaic.c:94
 msgid "Height"
 msgstr "高度"
 
-#: modules/access/pvr/pvr.c:63 modules/access/v4l/v4l.c:106
-msgid "Height of the stream to capture (-1 for autodetect)"
+#: modules/access/pvr/pvr.c:66
+msgid "Height of the stream to capture (-1 for autodetection)."
 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
-msgid "Frequency to capture (in kHz), if applicable"
+#: 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
-msgid "Framerate to capture, if applicable (-1 for autodetect)"
+#: 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
-msgid "Interval between keyframes (-1 for autodetect)"
+#: 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
-msgid "Bitrate to use (-1 for default)"
-msgstr ""
-
-#: modules/access/pvr/pvr.c:83
-msgid "Bitrate peak"
-msgstr ""
-
 #: modules/access/pvr/pvr.c:84
-msgid "Peak bitrate in VBR mode"
+msgid "Bitrate to use (-1 for default)."
 msgstr ""
 
 #: modules/access/pvr/pvr.c:86
-msgid "Bitrate mode (vbr or cbr)"
+msgid "Bitrate peak"
 msgstr ""
 
 #: modules/access/pvr/pvr.c:87
-msgid "Bitrate mode to use"
+msgid "Peak bitrate in VBR mode."
 msgstr ""
 
 #: modules/access/pvr/pvr.c:89
+#, fuzzy
+msgid "Bitrate mode)"
+msgstr "位元率"
+
+#: modules/access/pvr/pvr.c:90
+msgid "Bitrate mode to use (VBR or CBR)."
+msgstr ""
+
+#: modules/access/pvr/pvr.c:92
 msgid "Audio bitmask"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:90
-msgid ""
-"This option allows setting of bitmask that will get used by the audio part "
-"of the card."
+#: modules/access/pvr/pvr.c:93
+msgid "Bitmask that will get used by the audio part of the card."
+msgstr ""
+
+#: modules/access/pvr/pvr.c:96 modules/access/vcdx/info.c:97
+#: modules/gui/macosx/intf.m:478 modules/gui/wxwidgets/interface.cpp:1357
+msgid "Volume"
+msgstr ""
+
+#: modules/access/pvr/pvr.c:97
+msgid "Audio volume (0-65535)."
 msgstr ""
 
-#: modules/access/pvr/pvr.c:93 modules/access/v4l/v4l.c:92
+#: modules/access/pvr/pvr.c:99 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:100
 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:106 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:106 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:106 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:106 modules/access/v4l/v4l.c:143
 msgid "NTSC"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:108
+#: modules/access/pvr/pvr.c:109
 msgid "vbr"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:108
+#: modules/access/pvr/pvr.c:109
 msgid "cbr"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:111
+#: modules/access/pvr/pvr.c:114
 msgid "PVR"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:112
-msgid "MPEG Encoding cards input (with ivtv drivers)"
+#: modules/access/pvr/pvr.c:115
+msgid "IVTV MPEG Encoding cards input"
 msgstr ""
 
-#: modules/access/rtsp/access.c:42 modules/demux/livedotcom.cpp:63
+#: 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
 msgid ""
-"Allows you to modify the default caching value for RTSP streams. This value "
-"should be set in millisecond units."
+"Caching value for RTSP streams. This value should be set in milliseconds."
 msgstr ""
 
-#: modules/access/rtsp/access.c:47
+#: modules/access/rtsp/access.c:46 modules/access/rtsp/access.c:47
 msgid "Real RTSP"
 msgstr ""
 
 #: modules/access/screen/screen.c:39
 msgid ""
-"Allows you to modify the default caching value for screen capture streams. "
-"This value should be set in millisecond units."
+"Caching value for screen capture. This value should be set in milliseconds."
 msgstr ""
 
 #: modules/access/screen/screen.c:43
-msgid "Allows you to set the desired frame rate for the capture."
+msgid "Desired frame rate for the capture."
 msgstr ""
 
 #: modules/access/screen/screen.c:46
@@ -5055,22 +5354,21 @@ msgstr ""
 
 #: modules/access/screen/screen.c:48
 msgid ""
-"Allows you optimize the capture by fragmenting the screen in chunks of "
-"predefined height (16 might be a good value, and 0 means disabled)."
+"Optimize the capture by fragmenting the screen in chunks of predefined "
+"height (16 might be a good value, and 0 means disabled)."
 msgstr ""
 
 #: modules/access/screen/screen.c:62
 msgid "Screen Input"
 msgstr "畫面輸入"
 
-#: modules/access/screen/screen.c:63 modules/gui/macosx/vout.m:185
+#: modules/access/screen/screen.c:63 modules/gui/macosx/vout.m:210
 msgid "Screen"
 msgstr "畫面"
 
 #: modules/access/smb.c:61
 msgid ""
-"Allows you to modify the default caching value for SMB streams. This value "
-"should be set in millisecond units."
+"Caching value for SMB streams. This value should be set in milliseconds."
 msgstr ""
 
 #: modules/access/smb.c:63
@@ -5086,9 +5384,7 @@ msgid "SMB domain"
 msgstr ""
 
 #: modules/access/smb.c:70
-msgid ""
-"Allows you to modify the domain/workgroup that will be used for the "
-"connection."
+msgid "Domain/Workgroup that will be used for the connection."
 msgstr ""
 
 #: modules/access/smb.c:75
@@ -5097,8 +5393,7 @@ msgstr "SMB輸入"
 
 #: modules/access/tcp.c:39
 msgid ""
-"Allows you to modify the default caching value for TCP streams. This value "
-"should be set in millisecond units."
+"Caching value for TCP streams. This value should be set in milliseconds."
 msgstr ""
 
 #: modules/access/tcp.c:46
@@ -5109,41 +5404,59 @@ msgstr ""
 msgid "TCP input"
 msgstr "TCP輸入"
 
+#: modules/access/udp.c:44
+msgid ""
+"Caching value for UDP streams. This value should be set in milliseconds."
+msgstr ""
+
 #: modules/access/udp.c:47
 msgid "Autodetection of MTU"
 msgstr ""
 
 #: modules/access/udp.c:49
-msgid "Allows growing the MTU if truncated packets are found"
+msgid ""
+"Automatically detect the line's MTU. This will increase the size if "
+"truncated packets are found"
+msgstr ""
+
+#: modules/access/udp.c:52
+msgid "RTP reordering timeout in ms"
+msgstr ""
+
+#: modules/access/udp.c:54
+msgid ""
+"VLC reorders RTP packets. The input will wait for late packets at most the "
+"time specified here (in milliseconds)."
 msgstr ""
 
-#: modules/access/udp.c:55 modules/gui/macosx/open.m:183
+#: modules/access/udp.c:61 modules/gui/macosx/open.m:183
 #: modules/gui/macosx/open.m:654 modules/gui/macosx/open.m:692
-#: modules/gui/wxwidgets/open.cpp:784
+#: modules/gui/wxwidgets/dialogs/open.cpp:803
 msgid "UDP/RTP"
 msgstr ""
 
-#: modules/access/udp.c:56
+#: modules/access/udp.c:62
 msgid "UDP/RTP input"
 msgstr ""
 
 #: modules/access/v4l/v4l.c:75
 msgid ""
-"Allows you to modify the default caching value for v4l streams. This value "
-"should be set in millisecond units."
+"Caching value for V4L captures. This value should be set in milliseconds."
 msgstr ""
 
 #: modules/access/v4l/v4l.c:79
+#, fuzzy
 msgid ""
-"Specify the name of the video device that will be used. If you don't specify "
-"anything, no video device will be used."
-msgstr ""
+"Name of the video device to use. If you don't specify anything, no video "
+"device will be used."
+msgstr "預設的音樂CD裝置，如果你不指定，程式將會自動掃描適合的光碟機"
 
 #: modules/access/v4l/v4l.c:83
+#, fuzzy
 msgid ""
-"Specify the name of the audio device that will be used. If you don't specify "
-"anything, no audio device will be used."
-msgstr ""
+"Name of the audio device to use. If you don't specify anything, no audio "
+"device will be used."
+msgstr "預設的音樂CD裝置，如果你不指定，程式將會自動掃描適合的光碟機"
 
 #: modules/access/v4l/v4l.c:87
 msgid ""
@@ -5151,49 +5464,69 @@ msgid ""
 "(default), RV24, etc.)"
 msgstr ""
 
+#: modules/access/v4l/v4l.c:94
+msgid ""
+"Channel of the card to use (Usually, 0 = tuner, 1 = composite, 2 = svideo)."
+msgstr ""
+
 #: modules/access/v4l/v4l.c:99
 msgid "Audio Channel"
 msgstr "音訊頻道"
 
 #: modules/access/v4l/v4l.c:101
-msgid "Audio Channel to use, if there are several audio input"
+#, fuzzy
+msgid "Audio Channel to use, if there are several audio inputs."
 msgstr "若有多個音訊輸入時，選擇音訊道"
 
-#: modules/access/v4l/v4l.c:108 modules/gui/macosx/extended.m:107
-#: modules/gui/wxwidgets/extrapanel.cpp:236
+#: modules/access/v4l/v4l.c:103
+msgid "Width of the stream to capture (-1 for autodetect)."
+msgstr ""
+
+#: modules/access/v4l/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:108
+#: modules/gui/wxwidgets/extrapanel.cpp:234
 msgid "Brightness"
 msgstr "亮度"
 
 #: modules/access/v4l/v4l.c:110
-msgid "Set the Brightness of the video input"
+#, fuzzy
+msgid "Brightness of the video input."
 msgstr "設定視訊輸入亮度"
 
-#: modules/access/v4l/v4l.c:111 modules/gui/macosx/extended.m:110
-#: modules/gui/wxwidgets/extrapanel.cpp:226
+#: modules/access/v4l/v4l.c:111 modules/gui/macosx/extended.m:111
+#: modules/gui/wxwidgets/extrapanel.cpp:224
 msgid "Hue"
 msgstr "色調"
 
 #: modules/access/v4l/v4l.c:113
-msgid "Set the Hue of the video input"
+#, fuzzy
+msgid "Hue of the video input."
 msgstr "設定視訊輸入色調"
 
-#: modules/access/v4l/v4l.c:114
+#: 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/video_filter/rss.c:146 modules/video_filter/time.c:85
+#: modules/visualization/xosd.c:78
 #, fuzzy
 msgid "Color"
 msgstr "色彩"
 
 #: modules/access/v4l/v4l.c:116
 #, fuzzy
-msgid "Set the Color of the video input"
+msgid "Color of the video input."
 msgstr "設定視訊輸入對比"
 
-#: modules/access/v4l/v4l.c:117 modules/gui/macosx/extended.m:108
-#: modules/gui/wxwidgets/extrapanel.cpp:231
+#: modules/access/v4l/v4l.c:117 modules/gui/macosx/extended.m:109
+#: modules/gui/wxwidgets/extrapanel.cpp:229
 msgid "Contrast"
 msgstr "對比"
 
 #: modules/access/v4l/v4l.c:119
-msgid "Set the Contrast of the video input"
+#, fuzzy
+msgid "Contrast of the video input."
 msgstr "設定視訊輸入對比"
 
 #: modules/access/v4l/v4l.c:120
@@ -5201,19 +5534,21 @@ msgid "Tuner"
 msgstr "調節器"
 
 #: modules/access/v4l/v4l.c:121
-msgid "Tuner to use, if there are several ones"
-msgstr ""
+#, fuzzy
+msgid "Tuner to use, if there are several ones."
+msgstr "若有多個音訊輸入時，選擇音訊道"
 
 #: modules/access/v4l/v4l.c:122
 msgid "Samplerate"
 msgstr ""
 
 #: modules/access/v4l/v4l.c:124
-msgid "Samplerate of the captures audio stream, in Hz"
+msgid ""
+"Samplerate of the captured audio stream, in Hz (eg: 11025, 22050, 44100)"
 msgstr ""
 
 #: modules/access/v4l/v4l.c:127
-msgid "If this option is set, the audio stream will be captured in stereo"
+msgid "Capture the audio stream in stereo."
 msgstr ""
 
 #: modules/access/v4l/v4l.c:128
@@ -5229,7 +5564,7 @@ msgid "Decimation"
 msgstr ""
 
 #: modules/access/v4l/v4l.c:133
-msgid "Set the Decimation level for MJPEG streams"
+msgid "Decimation level for MJPEG streams"
 msgstr ""
 
 #: modules/access/v4l/v4l.c:134
@@ -5237,7 +5572,8 @@ msgid "Quality"
 msgstr "品質"
 
 #: modules/access/v4l/v4l.c:135
-msgid "Set the quality of the stream"
+#, fuzzy
+msgid "Quality of the stream."
 msgstr "設定串流品質"
 
 #: modules/access/v4l/v4l.c:146
@@ -5248,9 +5584,13 @@ msgstr ""
 msgid "Video4Linux input"
 msgstr "Video4Linux輸入"
 
+#: modules/access/vcd/vcd.c:42
+msgid "Caching value for VCDs. This value should be set in milliseconds."
+msgstr ""
+
 #: modules/access/vcd/vcd.c:46 modules/gui/macosx/open.m:175
 #: modules/gui/macosx/open.m:489 modules/gui/macosx/open.m:579
-#: modules/gui/wxwidgets/open.cpp:681
+#: modules/gui/wxwidgets/dialogs/open.cpp:697
 msgid "VCD"
 msgstr ""
 
@@ -5270,41 +5610,31 @@ msgstr ""
 msgid "The above message had unknown vcdimager log level"
 msgstr ""
 
-#: modules/access/vcdx/access.c:282 modules/access/vcdx/access.c:690
-#: modules/access/vcdx/info.c:290 modules/access/vcdx/info.c:291
+#: 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/info.c:291
 msgid "Entry"
 msgstr ""
 
-#: modules/access/vcdx/access.c:364
-msgid "Entry "
-msgstr ""
-
 #: modules/access/vcdx/access.c:409 modules/access/vcdx/info.c:102
 msgid "Segments"
 msgstr ""
 
-#: modules/access/vcdx/access.c:428 modules/demux/mkv.cpp:4986
-msgid "Segment "
-msgstr ""
-
-#: modules/access/vcdx/access.c:472
-msgid "Track "
+#: modules/access/vcdx/access.c:428 modules/access/vcdx/access.c:709
+#: modules/access/vcdx/info.c:294 modules/access/vcdx/info.c:295
+#: modules/demux/mkv.cpp:5200
+msgid "Segment"
 msgstr ""
 
 #: modules/access/vcdx/access.c:533
-msgid "LID "
-msgstr ""
-
-#: modules/access/vcdx/access.c:709 modules/access/vcdx/info.c:294
-#: modules/access/vcdx/info.c:295
-msgid "Segment"
+msgid "LID"
 msgstr ""
 
 #: modules/access/vcdx/info.c:90
 msgid "VCD Format"
 msgstr "VCD格式"
 
-#: modules/access/vcdx/info.c:91 modules/services_discovery/daap.c:610
+#: modules/access/vcdx/info.c:91 modules/demux/mpc.c:55
 msgid "Album"
 msgstr ""
 
@@ -5328,15 +5658,6 @@ msgstr ""
 msgid "Volume Set"
 msgstr ""
 
-#: modules/access/vcdx/info.c:97 modules/gui/macosx/intf.m:459
-#: modules/gui/wxwidgets/interface.cpp:1443
-msgid "Volume"
-msgstr ""
-
-#: modules/access/vcdx/info.c:98
-msgid "Publisher"
-msgstr ""
-
 #: modules/access/vcdx/info.c:99
 msgid "System Id"
 msgstr ""
@@ -5399,6 +5720,10 @@ msgstr ""
 msgid "vcdx://[device-or-file][@{P,S,T}num]"
 msgstr ""
 
+#: modules/access/vcdx/vcd.c:106
+msgid "If nonzero, this gives additional debug information."
+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 ""
@@ -5441,6 +5766,212 @@ msgstr ""
 msgid "Format to use in the playlist's \"title\" field."
 msgstr ""
 
+#: modules/access_filter/record.c:43
+#, fuzzy
+msgid "Record directory"
+msgstr "選擇一個檔案或目錄"
+
+#: modules/access_filter/record.c:45
+#, fuzzy
+msgid "Directory where the record will be stored."
+msgstr "允許你指定視訊快照的存放目錄"
+
+#: modules/access_filter/timeshift.c:44
+#, fuzzy
+msgid "Timeshift granularity"
+msgstr "時間"
+
+#: modules/access_filter/timeshift.c:45
+msgid ""
+"This is the size of the temporary files tha will be used to store the "
+"timeshifted streams."
+msgstr ""
+
+#: modules/access_filter/timeshift.c:47
+#, fuzzy
+msgid "Timeshift directory"
+msgstr "視訊快照目錄"
+
+#: modules/access_filter/timeshift.c:48
+msgid "Directory used to store the timeshift temporary files."
+msgstr ""
+
+#: modules/access_filter/timeshift.c:52 modules/access_filter/timeshift.c:53
+#, 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:60
+msgid "Append to file"
+msgstr ""
+
+#: modules/access_output/file.c:61
+msgid "Append to file if it exists instead of replacing it."
+msgstr ""
+
+#: modules/access_output/file.c:65
+msgid "File stream output"
+msgstr "檔案串流輸出"
+
+#: modules/access_output/http.c:60
+msgid "Username"
+msgstr ""
+
+#: modules/access_output/http.c:61
+msgid "User name that will be requested to access the stream."
+msgstr ""
+
+#: modules/access_output/http.c:64
+msgid "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 "MIME returned by the server (autodetected if not specified."
+msgstr ""
+
+#: 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: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:78
+msgid ""
+"Path to the x509 PEM trusted root CA certificates (certificate authority) "
+"file that will be used forHTTPS. Leave empty if you don't have one."
+msgstr ""
+
+#: 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:86
+msgid "Advertise with Bonjour"
+msgstr ""
+
+#: modules/access_output/http.c:87
+msgid "Advertise the stream with the Bonjour protocol."
+msgstr ""
+
+#: modules/access_output/http.c:91
+msgid "HTTP stream output"
+msgstr ""
+
+#: modules/access_output/http.c:93 modules/control/http/http.c:61
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:472
+msgid "HTTP"
+msgstr ""
+
+#: modules/access_output/shout.c:58
+#, fuzzy
+msgid "Stream name"
+msgstr "串流"
+
+#: modules/access_output/shout.c:59
+msgid "Name to give to this stream/channel on the icecast server."
+msgstr ""
+
+#: modules/access_output/shout.c:62
+#, fuzzy
+msgid "Stream description"
+msgstr "描述"
+
+#: modules/access_output/shout.c:63
+msgid "Description of the stream content or information about your channel."
+msgstr ""
+
+#: modules/access_output/shout.c:66
+#, fuzzy
+msgid "Stream MP3"
+msgstr "串流"
+
+#: modules/access_output/shout.c:67
+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."
+msgstr ""
+
+#: modules/access_output/shout.c:73
+#, fuzzy
+msgid "IceCAST output"
+msgstr "存取輸出"
+
+#: modules/access_output/udp.c:77
+msgid ""
+"Default caching value for outbound UDP streams. This value should be set in "
+"milliseconds."
+msgstr ""
+
+#: modules/access_output/udp.c:80 modules/gui/macosx/wizard.m:442
+#: modules/gui/macosx/wizard.m:1847
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:610
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:1338 modules/stream_out/rtp.c:87
+msgid "Time-To-Live (TTL)"
+msgstr "有效時間(TTL)"
+
+#: modules/access_output/udp.c:81
+#, fuzzy
+msgid "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. You can "
+"choose 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 ""
+"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:475
+msgid "UDP"
+msgstr ""
+
+#: modules/audio_filter/channel_mixer/dolby.c:47
+msgid "Simple decoder for Dolby Surround encoded streams"
+msgstr ""
+
+#: modules/audio_filter/channel_mixer/dolby.c:48
+#, fuzzy
+msgid "Dolby Surround decoder"
+msgstr "杜比環繞"
+
 #: modules/audio_filter/channel_mixer/headphone.c:49
 msgid ""
 "This effect gives you the feeling that you are standing in a room with a "
@@ -5458,20 +5989,42 @@ msgstr ""
 msgid "Distance between front left speaker and listener in meters."
 msgstr ""
 
-#: modules/audio_filter/channel_mixer/headphone.c:61
-msgid "Headphone channel mixer with virtual spatialization effect"
+#: modules/audio_filter/channel_mixer/headphone.c:60
+msgid "Compensate delay"
 msgstr ""
 
 #: modules/audio_filter/channel_mixer/headphone.c:62
+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
+#, fuzzy
+msgid "No decoding of Dolby Surround"
+msgstr "杜比環繞"
+
+#: modules/audio_filter/channel_mixer/headphone.c:68
+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
+msgid "Headphone virtual spatialization effect"
+msgstr ""
+
+#: modules/audio_filter/channel_mixer/headphone.c:73
 msgid "Headphone effect"
 msgstr ""
 
 #: modules/audio_filter/channel_mixer/simple.c:46
-msgid "audio filter for simple channel mixing"
+msgid "Audio filter for simple channel mixing"
 msgstr ""
 
 #: modules/audio_filter/channel_mixer/trivial.c:46
-msgid "audio filter for trivial channel mixing"
+msgid "Audio filter for trivial channel mixing"
 msgstr ""
 
 #: modules/audio_filter/converter/a52tofloat32.c:94
@@ -5487,13 +6040,22 @@ msgid ""
 "playback will be more adapted to a movie theater or a listening room."
 msgstr ""
 
-#: modules/audio_filter/converter/a52tofloat32.c:104
-#: modules/audio_filter/converter/a52tofloat32.c:112
+#: modules/audio_filter/converter/a52tofloat32.c:101
+#, fuzzy
+msgid "Enable internal upmixing"
+msgstr "啟用交錯編碼"
+
+#: modules/audio_filter/converter/a52tofloat32.c:103
+msgid "Enable the internal upmixing algorithm (not recommended)."
+msgstr ""
+
+#: modules/audio_filter/converter/a52tofloat32.c:107
+#: modules/audio_filter/converter/a52tofloat32.c:116
 msgid "ATSC A/52 (AC-3) audio decoder"
 msgstr "ATSC A/52 (AC-3)音訊解碼器"
 
 #: modules/audio_filter/converter/a52tospdif.c:53
-msgid "audio filter for A/52->S/PDIF encapsulation"
+msgid "Audio filter for A/52->S/PDIF encapsulation"
 msgstr ""
 
 #: modules/audio_filter/converter/dtstofloat32.c:81
@@ -5501,7 +6063,7 @@ msgid "DTS dynamic range compression"
 msgstr ""
 
 #: modules/audio_filter/converter/dtstofloat32.c:92
-msgid "DTS"
+msgid "DCA"
 msgstr ""
 
 #: modules/audio_filter/converter/dtstofloat32.c:93
@@ -5510,31 +6072,31 @@ msgid "DTS Coherent Acoustics audio decoder"
 msgstr ""
 
 #: modules/audio_filter/converter/dtstospdif.c:70
-msgid "audio filter for DTS->S/PDIF encapsulation"
+msgid "Audio filter for DTS->S/PDIF encapsulation"
 msgstr ""
 
 #: modules/audio_filter/converter/fixed32tofloat32.c:50
-msgid "audio filter for fixed32<->float32 conversion"
+msgid "Audio filter for fixed32<->float32 conversion"
 msgstr ""
 
 #: modules/audio_filter/converter/fixed32tos16.c:48
-msgid "audio filter for fixed32->s16 conversion"
+msgid "Audio filter for fixed32->s16 conversion"
 msgstr ""
 
 #: modules/audio_filter/converter/float32tos16.c:48
-msgid "audio filter for float32->s16 conversion"
+msgid "Audio filter for float32->s16 conversion"
 msgstr ""
 
 #: modules/audio_filter/converter/float32tos8.c:48
-msgid "audio filter for float32->s8 conversion"
+msgid "Audio filter for float32->s8 conversion"
 msgstr ""
 
 #: modules/audio_filter/converter/float32tou16.c:48
-msgid "audio filter for float32->u16 conversion"
+msgid "Audio filter for float32->u16 conversion"
 msgstr ""
 
 #: modules/audio_filter/converter/float32tou8.c:48
-msgid "audio filter for float32->u8 conversion"
+msgid "Audio filter for float32->u8 conversion"
 msgstr ""
 
 #: modules/audio_filter/converter/mpgatofixed32.c:67
@@ -5543,59 +6105,67 @@ msgid "MPEG audio decoder"
 msgstr "MPEG音訊解碼器"
 
 #: modules/audio_filter/converter/s16tofixed32.c:48
-msgid "audio filter for s16->fixed32 conversion"
+msgid "Audio filter for s16->fixed32 conversion"
 msgstr ""
 
 #: modules/audio_filter/converter/s16tofloat32.c:50
-msgid "audio filter for s16->float32 conversion"
+msgid "Audio filter for s16->float32 conversion"
 msgstr ""
 
 #: modules/audio_filter/converter/s16tofloat32swab.c:62
-msgid "audio filter for s16->float32 with endianness conversion"
+msgid "Audio filter for s16->float32 with endianness conversion"
 msgstr ""
 
 #: modules/audio_filter/converter/s8tofloat32.c:48
-msgid "audio filter for s8->float32 conversion"
+msgid "Audio filter for s8->float32 conversion"
 msgstr ""
 
 #: modules/audio_filter/converter/u8tofixed32.c:48
-msgid "audio filter for u8->fixed32 conversion"
+msgid "Audio filter for u8->fixed32 conversion"
 msgstr ""
 
 #: modules/audio_filter/converter/u8tofloat32.c:48
-msgid "audio filter for u8->float32 conversion"
+msgid "Audio filter for u8->float32 conversion"
 msgstr ""
 
 #: modules/audio_filter/equalizer.c:52
 msgid "Equalizer preset"
 msgstr ""
 
+#: modules/audio_filter/equalizer.c:53
+msgid "Preset to use for the equalizer."
+msgstr ""
+
 #: modules/audio_filter/equalizer.c:55
 msgid "Bands gain"
 msgstr ""
 
-#: modules/audio_filter/equalizer.c:56
-msgid "Override preset bands gain in dB (-20 ... 20)"
+#: modules/audio_filter/equalizer.c:57
+msgid ""
+"Don't use presets, but manually specified bands. You need to provide 10 "
+"values between -20dB and 20dB, separated by spaces, e.g. \"0 2 4 2 0 -2 -4 -"
+"2 0\""
 msgstr ""
 
-#: modules/audio_filter/equalizer.c:58
+#: modules/audio_filter/equalizer.c:61
 msgid "Two pass"
 msgstr ""
 
-#: modules/audio_filter/equalizer.c:59
-msgid "Filter twice the audio"
+#: modules/audio_filter/equalizer.c:62
+msgid "Filter the audio twice. This provides a more intense effect."
 msgstr ""
 
-#: modules/audio_filter/equalizer.c:61
+#: modules/audio_filter/equalizer.c:65
 msgid "Global gain"
 msgstr "全域增益"
 
-#: modules/audio_filter/equalizer.c:62
-msgid "Set the global gain in dB (-20 ... 20)"
+#: modules/audio_filter/equalizer.c:66
+#, fuzzy
+msgid "Set the global gain in dB (-20 ... 20)."
 msgstr "以分貝(dB)設定全域增益 (-20 ... 20)"
 
-#: modules/audio_filter/equalizer.c:65
-msgid "Equalizer 10 bands"
+#: modules/audio_filter/equalizer.c:69
+msgid "Equalizer with 10 bands"
 msgstr ""
 
 #: modules/audio_filter/equalizer_presets.h:39
@@ -5678,7 +6248,7 @@ msgid "Techno"
 msgstr ""
 
 #: modules/audio_filter/format.c:201
-msgid "audio filter for PCM format conversion"
+msgid "Audio filter for PCM format conversion"
 msgstr ""
 
 #: modules/audio_filter/normvol.c:69
@@ -5689,7 +6259,7 @@ msgstr "音訊緩衝器數量"
 msgid ""
 "This is the number of audio buffers on which the power measurement is made. "
 "A higher number of buffers will increase the response time of the filter to "
-"a high power but will make it less sensitive to short variations."
+"a spike but will make it less sensitive to short variations."
 msgstr ""
 
 #: modules/audio_filter/normvol.c:75
@@ -5707,25 +6277,78 @@ msgstr ""
 msgid "Volume normalizer"
 msgstr "音量正常化"
 
-#: modules/audio_filter/resampler/bandlimited.c:84
-msgid "audio filter for band-limited interpolation resampling"
+#: modules/audio_filter/param_eq.c:49 modules/audio_filter/param_eq.c:50
+#, fuzzy
+msgid "Parametric Equalizer"
+msgstr "等化器"
+
+#: modules/audio_filter/param_eq.c:55
+msgid "Low freq (Hz)"
+msgstr ""
+
+#: modules/audio_filter/param_eq.c:57
+msgid "Low freq gain (Db)"
+msgstr ""
+
+#: modules/audio_filter/param_eq.c:58
+msgid "High freq (Hz)"
+msgstr ""
+
+#: modules/audio_filter/param_eq.c:60
+msgid "High freq gain (Db)"
 msgstr ""
 
-#: modules/audio_filter/resampler/coreaudio.c:65
-msgid "audio filter using CoreAudio for resampling"
+#: modules/audio_filter/param_eq.c:61
+msgid "Freq 1 (Hz)"
+msgstr ""
+
+#: modules/audio_filter/param_eq.c:63
+msgid "Freq 1 gain (Db)"
+msgstr ""
+
+#: modules/audio_filter/param_eq.c:65
+msgid "Freq 1 Q"
+msgstr ""
+
+#: modules/audio_filter/param_eq.c:66
+msgid "Freq 2 (Hz)"
+msgstr ""
+
+#: modules/audio_filter/param_eq.c:68
+msgid "Freq 2 gain (Db)"
+msgstr ""
+
+#: modules/audio_filter/param_eq.c:70
+msgid "Freq 2 Q"
+msgstr ""
+
+#: modules/audio_filter/param_eq.c:71
+msgid "Freq 3 (Hz)"
+msgstr ""
+
+#: modules/audio_filter/param_eq.c:73
+msgid "Freq 3 gain (Db)"
+msgstr ""
+
+#: modules/audio_filter/param_eq.c:75
+msgid "Freq 3 Q"
+msgstr ""
+
+#: modules/audio_filter/resampler/bandlimited.c:84
+msgid "Audio filter for band-limited interpolation resampling"
 msgstr ""
 
 #: modules/audio_filter/resampler/linear.c:65
 #: modules/audio_filter/resampler/linear.c:72
-msgid "audio filter for linear interpolation resampling"
+msgid "Audio filter for linear interpolation resampling"
 msgstr ""
 
 #: modules/audio_filter/resampler/trivial.c:46
-msgid "audio filter for trivial resampling"
+msgid "Audio filter for trivial resampling"
 msgstr ""
 
 #: modules/audio_filter/resampler/ugly.c:46
-msgid "audio filter for ugly resampling"
+msgid "Audio filter for ugly resampling"
 msgstr ""
 
 #: modules/audio_mixer/float32.c:47
@@ -5740,7 +6363,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:242
+#: modules/codec/x264.c:248 modules/codec/x264.c:254
 msgid "default"
 msgstr "預設"
 
@@ -5752,137 +6376,133 @@ msgstr "ALSA音訊輸出"
 msgid "ALSA Device Name"
 msgstr "ALSA裝置名稱"
 
-#: modules/audio_output/alsa.c:130 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/portaudio.c:394 modules/audio_output/sdl.c:179
-#: modules/audio_output/sdl.c:197 modules/audio_output/waveout.c:354
-#: modules/gui/macosx/intf.m:524 modules/gui/macosx/intf.m:525
+#: 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/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:543
+#: modules/gui/macosx/intf.m:544
 msgid "Audio Device"
 msgstr "音訊裝置"
 
-#: modules/audio_output/alsa.c:184 modules/audio_output/directx.c:489
+#: modules/audio_output/alsa.c:185 modules/audio_output/directx.c:478
 #: 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/sdl.c:183 modules/audio_output/sdl.c:202
+#: modules/audio_output/waveout.c:433
 msgid "Mono"
 msgstr ""
 
-#: modules/audio_output/alsa.c:197 modules/audio_output/directx.c:462
+#: modules/audio_output/alsa.c:198 modules/audio_output/directx.c:451
 #: 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:203 modules/audio_output/directx.c:426
-#: modules/audio_output/oss.c:170 modules/audio_output/portaudio.c:435
-#: modules/audio_output/waveout.c:369
-msgid "5.1"
-msgstr ""
-
-#: modules/audio_output/alsa.c:245 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: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:878
+#: modules/audio_output/alsa.c:928
 msgid "Unknown soundcard"
 msgstr "未知的音效卡"
 
-#: modules/audio_output/arts.c:67
+#: modules/audio_output/arts.c:65
 msgid "aRts audio output"
 msgstr "aRts音訊輸出"
 
-#: modules/audio_output/auhal.c:96 modules/audio_output/coreaudio.c:218
+#: modules/audio_output/auhal.c:130
 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:102
+#: modules/audio_output/auhal.c:136
 #, fuzzy
 msgid "HAL AudioUnit output"
 msgstr "ALSA音訊輸出"
 
-#: modules/audio_output/coreaudio.c:224
-msgid "CoreAudio output"
-msgstr "CoreAudio輸出"
+#: modules/audio_output/auhal.c:1011
+#, c-format
+msgid "%s (Encoded Output)"
+msgstr ""
 
-#: modules/audio_output/directx.c:213 modules/audio_output/portaudio.c:107
+#: modules/audio_output/directx.c:205 modules/audio_output/portaudio.c:107
 msgid "Output device"
 msgstr "輸出裝置"
 
-#: modules/audio_output/directx.c:215
+#: modules/audio_output/directx.c:207
 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:209 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:211 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:215
 msgid "DirectX audio output"
 msgstr "DirectX音訊輸出"
 
-#: modules/audio_output/directx.c:444 modules/audio_output/portaudio.c:427
+#: modules/audio_output/directx.c:433 modules/audio_output/portaudio.c:427
 msgid "3 Front 2 Rear"
 msgstr ""
 
-#: modules/audio_output/esd.c:69
+#: modules/audio_output/esd.c:68
 msgid "EsounD audio output"
 msgstr "EsounD音訊輸出"
 
-#: modules/audio_output/esd.c:72
+#: modules/audio_output/esd.c:71
 #, fuzzy
 msgid "Esound server"
 msgstr "沒有伺服器"
 
-#: modules/audio_output/file.c:80
+#: modules/audio_output/file.c:81
 msgid "Output format"
 msgstr "輸出格式"
 
-#: modules/audio_output/file.c:81
+#: modules/audio_output/file.c:82
 msgid ""
 "One of \"u8\", \"s8\", \"u16\", \"s16\", \"u16_le\", \"s16_le\", \"u16_be\", "
 "\"s16_be\", \"fixed32\", \"float32\" or \"spdif\""
 msgstr ""
 
-#: modules/audio_output/file.c:84
-msgid "Output channels number"
-msgstr "輸出頻道數量"
-
 #: modules/audio_output/file.c:85
+#, fuzzy
+msgid "Number of output channels"
+msgstr "複製數量"
+
+#: modules/audio_output/file.c:86
 msgid ""
 "By default, all the channels of the incoming will be saved but you can "
 "restrict the number of channels here."
 msgstr ""
 
-#: modules/audio_output/file.c:88
-msgid "Add wave header"
+#: modules/audio_output/file.c:89
+msgid "Add WAVE header"
 msgstr ""
 
-#: modules/audio_output/file.c:89
-msgid "Instead of writing a raw file, you can add a WAV header to the file"
+#: modules/audio_output/file.c:90
+msgid "Instead of writing a raw file, you can add a WAV header to the file."
 msgstr ""
 
-#: modules/audio_output/file.c:106
+#: modules/audio_output/file.c:107
 msgid "Output file"
 msgstr "輸出檔案"
 
-#: modules/audio_output/file.c:107
-msgid "File to which the audio samples will be written to"
+#: modules/audio_output/file.c:108
+msgid "File to which the audio samples will be written to."
 msgstr ""
 
-#: modules/audio_output/file.c:110
+#: modules/audio_output/file.c:111
 msgid "File audio output"
 msgstr ""
 
@@ -5890,6 +6510,11 @@ msgstr ""
 msgid "Roku HD1000 audio output"
 msgstr ""
 
+#: modules/audio_output/jack.c:64
+#, fuzzy
+msgid "JACK audio output"
+msgstr "ALSA音訊輸出"
+
 #: modules/audio_output/oss.c:101
 msgid "Try to work around buggy OSS drivers"
 msgstr ""
@@ -5917,14 +6542,18 @@ msgstr ""
 msgid "PORTAUDIO audio output"
 msgstr "PORTAUDIO音訊輸出"
 
-#: modules/audio_output/sdl.c:69
+#: modules/audio_output/sdl.c:67
 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 ""
 
+#: modules/audio_output/waveout.c:386
+msgid "5.1"
+msgstr ""
+
 #: modules/codec/a52.c:91
 msgid "A/52 parser"
 msgstr "A/52解析器"
@@ -5967,7 +6596,8 @@ msgid "Encoding quality"
 msgstr "編碼品質"
 
 #: modules/codec/dirac.c:68
-msgid "Allows you to specify a quality between 1.0 (low) and 10.0 (high)."
+#, fuzzy
+msgid "Quality of the encoding between 1.0 (low) and 10.0 (high)."
 msgstr "允許你指定品質，介於1.0(低)到10.0(高)之間"
 
 #: modules/codec/dirac.c:73
@@ -5995,16 +6625,21 @@ msgid "DTS audio packetizer"
 msgstr "DTS音訊封包器"
 
 #: modules/codec/dvbsub.c:45
-msgid "X coordinate of the subpicture"
-msgstr ""
+#, fuzzy
+msgid "Decoding X coordinate"
+msgstr "視訊x座標"
 
-#: modules/codec/dvbsub.c:46 modules/codec/dvbsub.c:49
-#: modules/codec/dvbsub.c:58 modules/codec/dvbsub.c:61
-msgid "You can reposition the subpicture by providing another value here."
+#: modules/codec/dvbsub.c:46
+msgid "X coordinate of the rendered subtitle"
 msgstr ""
 
 #: modules/codec/dvbsub.c:48
-msgid "Y coordinate of the subpicture"
+#, fuzzy
+msgid "Decoding Y coordinate"
+msgstr "視訊x座標"
+
+#: modules/codec/dvbsub.c:49
+msgid "Y coordinate of the rendered subtitle"
 msgstr ""
 
 #: modules/codec/dvbsub.c:51
@@ -6015,23 +6650,35 @@ msgstr "字幕"
 #: modules/codec/dvbsub.c:53
 msgid ""
 "You can enforce the subpicture position on the video (0=center, 1=left, "
-"2=right, 4=top, 8=bottom, you can also use combinations of these values)."
+"2=right, 4=top, 8=bottom, you can also use combinations of these values, e."
+"g. 6=top-right)."
 msgstr ""
 
 #: modules/codec/dvbsub.c:57
-msgid "X coordinate of the encoded subpicture"
+#, fuzzy
+msgid "Encoding X coordinate"
+msgstr "視訊y座標"
+
+#: modules/codec/dvbsub.c:58
+msgid "X coordinate of the encoded subtitle"
 msgstr ""
 
+#: modules/codec/dvbsub.c:59
+#, fuzzy
+msgid "Encoding Y coordinate"
+msgstr "視訊y座標"
+
 #: modules/codec/dvbsub.c:60
-msgid "Y coordinate of encoded the subpicture"
+msgid "Y coordinate of the encoded subtitle"
 msgstr ""
 
-#: modules/codec/dvbsub.c:63
+#: modules/codec/dvbsub.c:62 modules/gui/macosx/sfilters.m:102
+#: modules/video_filter/marq.c:82
 #, fuzzy
-msgid "Timeout of subpictures"
-msgstr "字幕"
+msgid "Timeout"
+msgstr "時間"
 
-#: modules/codec/dvbsub.c:65
+#: modules/codec/dvbsub.c:64
 msgid ""
 "Subpictures get a default timeout of 15 seconds added to their remaining "
 "time.This will ensure that they are at least the specified time visible."
@@ -6049,436 +6696,482 @@ msgstr "DVB字幕編碼器"
 msgid "AAC audio decoder (using libfaad2)"
 msgstr "AAC音訊解碼器(使用libfaad2)"
 
-#: modules/codec/fake.c:44 modules/video_output/image.c:63
+#: modules/codec/fake.c:45 modules/video_output/image.c:69
 #, fuzzy
 msgid "Image file"
 msgstr "影像複製"
 
-#: modules/codec/fake.c:46
-msgid "Path of the image file when using the fake input."
+#: modules/codec/fake.c:47
+msgid "Path of the image file for fake input."
 msgstr ""
 
-#: modules/codec/fake.c:49 modules/stream_out/mosaic_bridge.c:106
-#: modules/stream_out/transcode.c:72
-msgid "Allows you to specify the output video width."
-msgstr "允許你指定輸出視訊寬度"
+#: modules/codec/fake.c:50 modules/stream_out/mosaic_bridge.c:109
+#: modules/stream_out/transcode.c:70
+#, fuzzy
+msgid "Output video width."
+msgstr "視訊寬度"
 
-#: modules/codec/fake.c:52 modules/stream_out/mosaic_bridge.c:109
-#: modules/stream_out/transcode.c:75
-msgid "Allows you to specify the output video height."
-msgstr "允許你指定輸出視訊高度"
+#: modules/codec/fake.c:53 modules/stream_out/mosaic_bridge.c:112
+#: modules/stream_out/transcode.c:73
+#, fuzzy
+msgid "Output video height."
+msgstr "視訊高度"
 
-#: modules/codec/fake.c:53
+#: modules/codec/fake.c:54 modules/video_filter/mosaic.c:128
 #, fuzzy
 msgid "Keep aspect ratio"
 msgstr "採樣率"
 
-#: modules/codec/fake.c:55
-msgid "If selected, width and height will be considered as maximum values."
+#: modules/codec/fake.c:56
+msgid "Consider width and height as maximum values."
 msgstr ""
 
-#: modules/codec/fake.c:56
+#: modules/codec/fake.c:57
 msgid "Background aspect ratio"
 msgstr ""
 
-#: modules/codec/fake.c:58
+#: modules/codec/fake.c:59
 msgid "Aspect ratio of the image file (4:3, 16:9). Default is square pixels."
 msgstr ""
 
-#: modules/codec/fake.c:59 modules/stream_out/transcode.c:64
+#: modules/codec/fake.c:60 modules/stream_out/transcode.c:62
 msgid "Deinterlace video"
 msgstr ""
 
-#: modules/codec/fake.c:61
+#: modules/codec/fake.c:62
 #, fuzzy
-msgid "Allows you to deinterlace the image after loading."
+msgid "Deinterlace the image after loading it."
 msgstr "允許你指定串流輸出的多工器"
 
-#: modules/codec/fake.c:62 modules/stream_out/transcode.c:67
+#: modules/codec/fake.c:63 modules/stream_out/transcode.c:65
 #, fuzzy
 msgid "Deinterlace module"
 msgstr "介面模組"
 
-#: modules/codec/fake.c:64 modules/stream_out/transcode.c:69
-msgid "Specifies the deinterlace module to use."
-msgstr ""
+#: modules/codec/fake.c:65
+#, fuzzy
+msgid "Deinterlace module to use."
+msgstr "介面模組"
 
-#: modules/codec/fake.c:75
+#: modules/codec/fake.c:76
 #, fuzzy
 msgid "Fake video decoder"
 msgstr "Cinepak視訊解碼器"
 
-#: modules/codec/ffmpeg/ffmpeg.c:74
+#: modules/codec/ffmpeg/ffmpeg.c:75
+msgid "Non-ref"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:75
+msgid "Bidir"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:75
+msgid "Non-key"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:75
+#, fuzzy
+msgid "All"
+msgstr "全部"
+
+#: modules/codec/ffmpeg/ffmpeg.c:78
 msgid "rd"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:74
+#: modules/codec/ffmpeg/ffmpeg.c:78
 msgid "bits"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:74
+#: modules/codec/ffmpeg/ffmpeg.c:78
 msgid "simple"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:85
+#: modules/codec/ffmpeg/ffmpeg.c:89
 msgid ""
-"AltiVec ffmpeg audio/video decoder/encoder ((MS)MPEG4,SVQ1,H263,WMV,WMA)"
+"AltiVec FFmpeg audio/video decoder/encoder ((MS)MPEG4,SVQ1,H263,WMV,WMA)"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:89
-msgid "ffmpeg audio/video decoder/encoder ((MS)MPEG4,SVQ1,H263,WMV,WMA)"
+#: modules/codec/ffmpeg/ffmpeg.c:93
+msgid "FFmpeg audio/video decoder/encoder ((MS)MPEG4,SVQ1,H263,WMV,WMA)"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:92
+#: modules/codec/ffmpeg/ffmpeg.c:96
 msgid "Decoding"
 msgstr "解碼"
 
-#: modules/codec/ffmpeg/ffmpeg.c:120
-msgid "ffmpeg chroma conversion"
+#: modules/codec/ffmpeg/ffmpeg.c:127
+#, fuzzy
+msgid "FFmpeg chroma conversion"
 msgstr "ffmpeg彩度轉換"
 
-#: modules/codec/ffmpeg/ffmpeg.c:124
+#: modules/codec/ffmpeg/ffmpeg.c:131
+#: modules/gui/wxwidgets/dialogs/subtitles.cpp:97
 msgid "Encoding"
 msgstr "編碼"
 
-#: modules/codec/ffmpeg/ffmpeg.c:125
-msgid "ffmpeg audio/video encoder"
+#: modules/codec/ffmpeg/ffmpeg.c:132
+#, fuzzy
+msgid "FFmpeg audio/video encoder"
 msgstr "ffmpeg音訊/視訊編碼器"
 
-#: modules/codec/ffmpeg/ffmpeg.c:183
-msgid "ffmpeg demuxer"
+#: modules/codec/ffmpeg/ffmpeg.c:190
+#, fuzzy
+msgid "FFmpeg demuxer"
 msgstr "ffmpeg解多工器"
 
-#: modules/codec/ffmpeg/ffmpeg.c:191
-msgid "ffmpeg video filter"
+#: modules/codec/ffmpeg/ffmpeg.c:198
+#, fuzzy
+msgid "FFmpeg video filter"
 msgstr "ffmpeg視訊過濾器"
 
-#: modules/codec/ffmpeg/ffmpeg.c:197
-msgid "ffmpeg deinterlace video filter"
-msgstr ""
+#: modules/codec/ffmpeg/ffmpeg.c:204
+#, fuzzy
+msgid "FFmpeg crop padd filter"
+msgstr "ffmpeg視訊過濾器"
+
+#: modules/codec/ffmpeg/ffmpeg.c:210
+#, fuzzy
+msgid "FFmpeg deinterlace video filter"
+msgstr "ffmpeg視訊過濾器"
 
-#: modules/codec/ffmpeg/ffmpeg.h:86
+#: modules/codec/ffmpeg/ffmpeg.h:87 modules/codec/ffmpeg/ffmpeg.h:89
 msgid "Direct rendering"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:88
+#: modules/codec/ffmpeg/ffmpeg.h:91
 msgid "Error resilience"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:90
+#: modules/codec/ffmpeg/ffmpeg.h:93
 msgid ""
-"ffmpeg can do error resilience.\n"
+"Ffmpeg can do error resilience.\n"
 "However, with a buggy encoder (such as the ISO MPEG-4 encoder from M$) this "
 "can produce a lot of errors.\n"
 "Valid values range from 0 to 4 (0 disables all errors resilience)."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:95
+#: modules/codec/ffmpeg/ffmpeg.h:98
 msgid "Workaround bugs"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:97
+#: modules/codec/ffmpeg/ffmpeg.h:100
 msgid ""
-"Try to fix some bugs\n"
+"Try to fix some bugs:\n"
 "1  autodetect\n"
 "2  old msmpeg4\n"
 "4  xvid interlaced\n"
 "8  ump4 \n"
 "16 no padding\n"
 "32 ac vlc\n"
-"64 Qpel chroma"
+"64 Qpel chroma.\n"
+"This must be the sum of the values. For example, to fix \"ac vlc\" and \"ump4"
+"\", enter 40."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:106 modules/codec/ffmpeg/ffmpeg.h:230
-#: modules/stream_out/transcode.c:152
+#: modules/codec/ffmpeg/ffmpeg.h:111 modules/codec/ffmpeg/ffmpeg.h:244
+#: modules/stream_out/transcode.c:171
 msgid "Hurry up"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:108
+#: modules/codec/ffmpeg/ffmpeg.h:113
 msgid ""
-"Allow the decoder to 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."
+"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:112
+#: modules/codec/ffmpeg/ffmpeg.h:117
 msgid "Post processing quality"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:114
+#: modules/codec/ffmpeg/ffmpeg.h:119
 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:118
+#: modules/codec/ffmpeg/ffmpeg.h:123
 msgid "Debug mask"
 msgstr "除錯遮罩"
 
-#: modules/codec/ffmpeg/ffmpeg.h:119
+#: modules/codec/ffmpeg/ffmpeg.h:124
 msgid "Set ffmpeg debug mask"
 msgstr "設定ffmpeg除錯遮罩"
 
-#: modules/codec/ffmpeg/ffmpeg.h:121
+#: modules/codec/ffmpeg/ffmpeg.h:127
 msgid "Visualize motion vectors"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:122
+#: modules/codec/ffmpeg/ffmpeg.h:129
 msgid ""
-"Set motion vectors visualization mask.\n"
+"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"
 "1 - visualize forward predicted MVs of P frames\n"
 "2 - visualize forward predicted MVs of B frames\n"
-"4 - visualize backward predicted MVs of B frames"
+"4 - visualize backward predicted MVs of B frames\n"
+"To visualize all vectors, the value should be 7."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:127
+#: modules/codec/ffmpeg/ffmpeg.h:136
 msgid "Low resolution decoding"
 msgstr "低解析度解碼"
 
-#: modules/codec/ffmpeg/ffmpeg.h:128
-msgid "Will only decode a low resolution version of the video."
+#: modules/codec/ffmpeg/ffmpeg.h:137
+msgid ""
+"Only decode a low resolution version of the video. This requires less "
+"processing power"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:131
-msgid "ffmpeg post processing filter chains"
+#: modules/codec/ffmpeg/ffmpeg.h:140
+msgid "Skip the loop filter for H.264 decoding"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:173
-msgid "Ratio of key frames"
+#: modules/codec/ffmpeg/ffmpeg.h:141
+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:174
-msgid ""
-"Allows you to specify the number of frames that will be coded for one key "
-"frame."
+#: modules/codec/ffmpeg/ffmpeg.h:145
+msgid "FFmpeg post processing filter chains"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:177
-msgid "Ratio of B frames"
+#: modules/codec/ffmpeg/ffmpeg.h:187
+msgid "Ratio of key frames"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:178
-msgid ""
-"Allows you to specify the number of B frames that will be coded between two "
-"reference frames."
+#: modules/codec/ffmpeg/ffmpeg.h:188
+#, fuzzy
+msgid "Number of frames that will be coded for one key frame."
+msgstr "頻帶間的空白像素數量"
+
+#: modules/codec/ffmpeg/ffmpeg.h:191
+msgid "Ratio of B frames"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:181
+#: modules/codec/ffmpeg/ffmpeg.h:192
+#, fuzzy
+msgid "Number of B frames that will be coded between two reference frames."
+msgstr "頻帶間的空白像素數量"
+
+#: modules/codec/ffmpeg/ffmpeg.h:195
 msgid "Video bitrate tolerance"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:182
-msgid "Allows you to specify the video bitrate tolerance in kbit/s."
+#: modules/codec/ffmpeg/ffmpeg.h:196
+msgid "Video bitrate tolerance in kbit/s."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:185
-msgid "Enable interlaced encoding"
+#: modules/codec/ffmpeg/ffmpeg.h:198
+#, fuzzy
+msgid "Interlaced encoding"
 msgstr "啟用交錯編碼"
 
-#: modules/codec/ffmpeg/ffmpeg.h:186
-msgid "Allows you to enable dedicated algorithms for interlaced frames."
+#: modules/codec/ffmpeg/ffmpeg.h:199
+msgid "Enable dedicated algorithms for interlaced frames."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:189
+#: modules/codec/ffmpeg/ffmpeg.h:202
 #, fuzzy
-msgid "Enable interlaced motion estimation"
+msgid "Interlaced motion estimation"
 msgstr "啟用交錯編碼"
 
-#: modules/codec/ffmpeg/ffmpeg.h:190
-msgid ""
-"Allows you to enable interlaced motion estimation algorithms. It requires "
-"more CPU."
-msgstr ""
+#: modules/codec/ffmpeg/ffmpeg.h:203
+#, fuzzy
+msgid "Enable interlaced motion estimation algorithms. This requires more CPU."
+msgstr "啟用交錯編碼"
 
-#: modules/codec/ffmpeg/ffmpeg.h:193
-msgid "Enable pre motion estimation"
-msgstr ""
+#: modules/codec/ffmpeg/ffmpeg.h:206
+#, fuzzy
+msgid "Pre-motion estimation"
+msgstr "啟用交錯編碼"
 
-#: modules/codec/ffmpeg/ffmpeg.h:194
-msgid "Allows you to enable the pre motion estimation."
-msgstr ""
+#: modules/codec/ffmpeg/ffmpeg.h:207
+#, fuzzy
+msgid "Enable the pre-motion estimation algorithm."
+msgstr "啟用交錯編碼"
 
-#: modules/codec/ffmpeg/ffmpeg.h:197
-msgid "Enable strict rate control"
+#: modules/codec/ffmpeg/ffmpeg.h:210
+msgid "Strict rate control"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:198
-msgid "Allows you to enable the strict rate control algorithm."
+#: modules/codec/ffmpeg/ffmpeg.h:211
+msgid "Enable the strict rate control algorithm."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:201
+#: modules/codec/ffmpeg/ffmpeg.h:214
 msgid "Rate control buffer size"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:202
-msgid "Allows you to specify the rate control buffer size."
+#: modules/codec/ffmpeg/ffmpeg.h:215
+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:205
+#: modules/codec/ffmpeg/ffmpeg.h:219
 msgid "Rate control buffer aggressiveness"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:206
-msgid "Allows you to specify the rate control buffer aggressiveness."
+#: modules/codec/ffmpeg/ffmpeg.h:220
+msgid "Rate control buffer aggressiveness."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:209
+#: modules/codec/ffmpeg/ffmpeg.h:223
 msgid "I quantization factor"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:210
+#: modules/codec/ffmpeg/ffmpeg.h:225
 msgid ""
-"Allows you to specify the quantization factor of I frames, compared with P "
-"frames (for instance 1.0 => same qscale for I and P frames)."
+"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:214 modules/demux/mod.c:54
+#: modules/codec/ffmpeg/ffmpeg.h:228 modules/codec/x264.c:223
+#: modules/demux/mod.c:71
 msgid "Noise reduction"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:215
+#: modules/codec/ffmpeg/ffmpeg.h:229
 msgid ""
-"Allows you to enable a simple noise reduction algorithm to lower the "
-"encoding length and bitrate, at the expense of lower quality frames."
+"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:219
-msgid "Enable MPEG4 quantization matrix"
+#: modules/codec/ffmpeg/ffmpeg.h:233
+msgid "MPEG4 quantization matrix"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:220
+#: modules/codec/ffmpeg/ffmpeg.h:234
 msgid ""
-"Allows you to use the MPEG4 quantization matrix for mpeg2 encoding. This "
-"generally yields a better looking picture, while still retaining the "
-"compatibility with standard MPEG-2 decoders."
+"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:225
+#: modules/codec/ffmpeg/ffmpeg.h:239
 msgid "Quality level"
 msgstr "品質等級"
 
-#: modules/codec/ffmpeg/ffmpeg.h:226
+#: modules/codec/ffmpeg/ffmpeg.h:240
 msgid ""
-"Allows you to specify the quality level for the encoding of motions vectors "
-"(this can slow down the encoding very much)."
+"Quality level for the encoding of motions vectors (this can slow down the "
+"encoding very much)."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:231
+#: modules/codec/ffmpeg/ffmpeg.h:245
 msgid ""
-"Allows you to specify if the encoder should 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 distortion of motion vectors (hq), and "
-"raise the noise reduction threshold to ease the encoder's task."
+"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 "
+"distortion of motion vectors (hq), and raise the noise reduction threshold "
+"to ease the encoder's task."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:237
+#: modules/codec/ffmpeg/ffmpeg.h:251
 msgid "Minimum video quantizer scale"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:238
-msgid "Allows you to specify the minimum video quantizer scale."
+#: modules/codec/ffmpeg/ffmpeg.h:252
+msgid "Minimum video quantizer scale."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:241
+#: modules/codec/ffmpeg/ffmpeg.h:255
 msgid "Maximum video quantizer scale"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:242
-msgid "Allows you to specify the maximum video quantizer scale."
-msgstr ""
+#: modules/codec/ffmpeg/ffmpeg.h:256
+#, fuzzy
+msgid "Maximum video quantizer scale."
+msgstr "視訊寬度"
 
-#: modules/codec/ffmpeg/ffmpeg.h:245
-msgid "Enable trellis quantization"
-msgstr ""
+#: modules/codec/ffmpeg/ffmpeg.h:259
+#, fuzzy
+msgid "Trellis quantization"
+msgstr "視覺效果"
 
-#: modules/codec/ffmpeg/ffmpeg.h:246
-msgid ""
-"Allows you to enable trellis quantization (rate distortion for block "
-"coefficients)."
+#: modules/codec/ffmpeg/ffmpeg.h:260
+msgid "Enable trellis quantization (rate distortion for block coefficients)."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:249
-msgid "Use fixed video quantizer scale"
+#: modules/codec/ffmpeg/ffmpeg.h:263
+msgid "Fixed quantizer scale"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:250
+#: modules/codec/ffmpeg/ffmpeg.h:264
 msgid ""
-"Allows you to specify a fixed video quantizer scale for VBR encoding "
-"(accepted values: 0.01 to 255.0)."
+"A fixed video quantizer scale for VBR encoding (accepted values: 0.01 to "
+"255.0)."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:253
+#: modules/codec/ffmpeg/ffmpeg.h:267
 msgid "Strict standard compliance"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:254
+#: modules/codec/ffmpeg/ffmpeg.h:268
 msgid ""
-"Allows you to force a strict standard compliance when encoding (accepted "
-"values: -1, 0, 1)."
+"Force a strict standard compliance when encoding (accepted values: -1, 0, 1)."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:257
+#: modules/codec/ffmpeg/ffmpeg.h:271
 msgid "Luminance masking"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:258
-msgid ""
-"Allows you to raise the quantizer for very bright macroblocks (default: 0.0)."
+#: modules/codec/ffmpeg/ffmpeg.h:272
+msgid "Raise the quantizer for very bright macroblocks (default: 0.0)."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:261
+#: modules/codec/ffmpeg/ffmpeg.h:275
 msgid "Darkness masking"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:262
-msgid ""
-"Allows you to raise the quantizer for very dark macroblocks (default: 0.0)."
+#: modules/codec/ffmpeg/ffmpeg.h:276
+msgid "Raise the quantizer for very dark macroblocks (default: 0.0)."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:265
+#: modules/codec/ffmpeg/ffmpeg.h:279
 #, fuzzy
 msgid "Motion masking"
 msgstr "動作對應"
 
-#: modules/codec/ffmpeg/ffmpeg.h:266
+#: modules/codec/ffmpeg/ffmpeg.h:280
 msgid ""
-"Allows you to raise the quantizer for macroblocks with a high temporal "
-"complexity (default: 0.0)."
+"Raise the quantizer for macroblocks with a high temporal complexity "
+"(default: 0.0)."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:269
+#: modules/codec/ffmpeg/ffmpeg.h:283
 msgid "Border masking"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:270
+#: modules/codec/ffmpeg/ffmpeg.h:284
 msgid ""
-"Allows you to raise the quantizer for macroblocks at the border of the frame "
-"(default: 0.0)."
+"Raise the quantizer for macroblocks at the border of the frame (default: "
+"0.0)."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:273
+#: modules/codec/ffmpeg/ffmpeg.h:287
 msgid "Luminance elimination"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:274
+#: modules/codec/ffmpeg/ffmpeg.h:288
 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:278
+#: modules/codec/ffmpeg/ffmpeg.h:292
 msgid "Chrominance elimination"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:279
+#: modules/codec/ffmpeg/ffmpeg.h:293
 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:545
-#: modules/gui/macosx/intf.m:546
+#: modules/codec/ffmpeg/postprocess.c:88 modules/gui/macosx/intf.m:568
+#: modules/gui/macosx/intf.m:569
 msgid "Post processing"
 msgstr ""
 
@@ -6502,7 +7195,7 @@ msgstr "Flac音訊編碼器"
 msgid "Flac audio packetizer"
 msgstr "Flac音訊封包器"
 
-#: modules/codec/libmpeg2.c:94
+#: modules/codec/libmpeg2.c:96
 msgid "MPEG I/II video decoder (using libmpeg2)"
 msgstr "MPEG I/II視訊解碼器(使用libmpeg2)"
 
@@ -6519,8 +7212,9 @@ msgid "Video decoder using openmash"
 msgstr "視訊解碼器(使用openmash)"
 
 #: modules/codec/mpeg_audio.c:106
-msgid "MPEG audio layer I/II/III parser"
-msgstr ""
+#, fuzzy
+msgid "MPEG audio layer I/II/III decoder"
+msgstr "MPEG音訊解碼器"
 
 #: modules/codec/mpeg_audio.c:117
 msgid "MPEG audio layer I/II/III packetizer"
@@ -6564,11 +7258,11 @@ msgstr "Speex音訊封包器"
 msgid "Speex audio encoder"
 msgstr "Speex音訊編碼器"
 
-#: modules/codec/speex.c:551 modules/codec/speex.c:568
+#: modules/codec/speex.c:552 modules/codec/speex.c:569
 msgid "Speex comment"
 msgstr ""
 
-#: modules/codec/speex.c:551
+#: modules/codec/speex.c:552
 msgid "Mode"
 msgstr "模式"
 
@@ -6580,27 +7274,54 @@ msgstr "DVD字幕解碼器"
 msgid "DVD subtitles packetizer"
 msgstr "DVD字幕封包器"
 
-#: modules/codec/subsdec.c:86
+#: modules/codec/subsdec.c:106
 msgid "Subtitles text encoding"
 msgstr "字幕字體編碼"
 
-#: modules/codec/subsdec.c:87
+#: modules/codec/subsdec.c:107
 msgid "Set the encoding used in text subtitles"
 msgstr "設定文字字幕編碼"
 
-#: modules/codec/subsdec.c:88 modules/gui/macosx/open.m:252
+#: modules/codec/subsdec.c:108
 msgid "Subtitles justification"
 msgstr "字幕對齊"
 
-#: modules/codec/subsdec.c:89
+#: modules/codec/subsdec.c:109
 msgid "Set the justification of subtitles"
 msgstr "設定字幕對齊"
 
-#: modules/codec/subsdec.c:93
+#: modules/codec/subsdec.c:110
+#, fuzzy
+msgid "UTF-8 subtitles autodetection"
+msgstr "字幕自動偵測路徑"
+
+#: modules/codec/subsdec.c:111
+msgid ""
+"This enables automatic detection of UTF-8 encoding within subtitles files."
+msgstr ""
+
+#: modules/codec/subsdec.c:113
+#, fuzzy
+msgid "Formatted Subtitles"
+msgstr "字幕"
+
+#: modules/codec/subsdec.c:114
+msgid ""
+"Some subtitle formats allow for text formatting. VLC partly implements this, "
+"but you can choose to disable all formatting."
+msgstr ""
+
+#: modules/codec/subsdec.c:120
 #, fuzzy
 msgid "Text subtitles decoder"
 msgstr "字體字幕解碼器"
 
+#: modules/codec/subsdec.c:339
+msgid ""
+"failed to convert subtitle encoding.\n"
+"Try manually setting a character-encoding before you open the file."
+msgstr ""
+
 #: modules/codec/svcdsub.c:51
 msgid "Philips OGT (SVCD subtitle) decoder"
 msgstr "Philips OGT (SVCD字幕)解碼器"
@@ -6619,8 +7340,8 @@ msgstr "Tarkin解碼器模組"
 
 #: modules/codec/theora.c:92 modules/codec/vorbis.c:157
 msgid ""
-"Allows you to specify a quality between 1 (low) and 10 (high), instead of "
-"specifying a particular bitrate. This will produce a VBR stream."
+"Enforce a quality between 1 (low) and 10 (high), instead of specifying a "
+"particular bitrate. This will produce a VBR stream."
 msgstr ""
 
 #: modules/codec/theora.c:99
@@ -6641,7 +7362,7 @@ msgstr ""
 
 #: modules/codec/twolame.c:52
 msgid ""
-"Allows you to specify a quality between 0.0 (high) and 50.0 (low), instead "
+"Force a specific encoding quality between 0.0 (high) and 50.0 (low), instead "
 "of specifying a particular bitrate. This will produce a VBR stream."
 msgstr ""
 
@@ -6649,27 +7370,35 @@ msgstr ""
 msgid "Stereo mode"
 msgstr ""
 
-#: modules/codec/twolame.c:57
-msgid "[0=stereo, 1=dual-mono, 2=joint-stereo]"
+#: modules/codec/twolame.c:56
+msgid "Handling mode for stereo streams"
 msgstr ""
 
-#: modules/codec/twolame.c:58
+#: modules/codec/twolame.c:57
 msgid "VBR mode"
 msgstr ""
 
-#: modules/codec/twolame.c:60
-msgid "By default the encoding is CBR."
+#: modules/codec/twolame.c:59
+msgid "Use Variable BitRate. Default is to use Constant BitRate (CBR)."
 msgstr ""
 
-#: modules/codec/twolame.c:61
+#: modules/codec/twolame.c:60
 msgid "Psycho-acoustic model"
 msgstr ""
 
-#: modules/codec/twolame.c:63
+#: modules/codec/twolame.c:62
 msgid "Integer from -1 (no model) to 4."
 msgstr ""
 
-#: modules/codec/twolame.c:67
+#: modules/codec/twolame.c:66
+msgid "Dual mono"
+msgstr ""
+
+#: modules/codec/twolame.c:66
+msgid "Joint stereo"
+msgstr ""
+
+#: modules/codec/twolame.c:71
 #, fuzzy
 msgid "Libtwolame audio encoder"
 msgstr "libtoolame音訊編碼器"
@@ -6679,379 +7408,636 @@ msgid "Maximum encoding bitrate"
 msgstr "最大化編碼位元率"
 
 #: modules/codec/vorbis.c:161
-msgid ""
-"Allows you to specify a maximum bitrate in kbps. Useful for streaming "
-"applications."
+msgid "Maximum bitrate in kbps. This is useful for streaming applications."
 msgstr ""
 
-#: modules/codec/vorbis.c:163
+#: modules/codec/vorbis.c:162
 msgid "Minimum encoding bitrate"
 msgstr "最小化編碼位元率"
 
-#: modules/codec/vorbis.c:165
+#: modules/codec/vorbis.c:164
 msgid ""
-"Allows you to specify a minimum bitrate in kbps. Useful for encoding for a "
-"fixed-size channel."
+"Minimum bitrate in kbps. This is useful for encoding for a fixed-size "
+"channel."
 msgstr ""
 
-#: modules/codec/vorbis.c:167
+#: modules/codec/vorbis.c:165
 msgid "CBR encoding"
 msgstr "CBR編碼"
 
-#: modules/codec/vorbis.c:169
-msgid "Allows you to force a constant bitrate encoding (CBR)."
+#: modules/codec/vorbis.c:167
+msgid "Force a constant bitrate encoding (CBR)."
 msgstr ""
 
-#: modules/codec/vorbis.c:173
+#: modules/codec/vorbis.c:171
 msgid "Vorbis audio decoder"
 msgstr "Vorbis音訊解碼器"
 
-#: modules/codec/vorbis.c:184
+#: modules/codec/vorbis.c:182
 msgid "Vorbis audio packetizer"
 msgstr "Vorbis音訊封包器"
 
-#: modules/codec/vorbis.c:191
+#: modules/codec/vorbis.c:189
 msgid "Vorbis audio encoder"
 msgstr "Vorbis音訊編碼器"
 
-#: modules/codec/vorbis.c:618
+#: modules/codec/vorbis.c:616
 msgid "Vorbis comment"
 msgstr ""
 
-#: modules/codec/x264.c:42
-msgid "Quantizer parameter"
+#: modules/codec/x264.c:44
+#, fuzzy
+msgid "Maximum GOP size"
+msgstr "最大化編碼位元率"
+
+#: modules/codec/x264.c:45
+msgid ""
+"Sets maximum interval between IDR-frames.Larger values save bits, thus "
+"improving quality for a given bitrate at the cost of seeking precision."
+msgstr ""
+
+#: modules/codec/x264.c:49
+msgid "Minimum GOP size"
 msgstr ""
 
-#: modules/codec/x264.c:44
+#: modules/codec/x264.c:50
 msgid ""
-"This selects the quantizer to use (1 to 51). Lower values result in better "
-"fidelity, but higher bitrates. 26 is a good default value."
+"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"
+"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:47
-msgid "Minimum quantizer parameter"
+#: modules/codec/x264.c:59
+msgid "Extra I-Frames aggressivity"
 msgstr ""
 
-#: modules/codec/x264.c:48
-msgid "Minimum quantizer, 15/35 seems to be a useful range."
+#: modules/codec/x264.c:60
+msgid ""
+"Scene-cut detection. Controls how aggressively to insert extra I-frames. "
+"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)."
+msgstr ""
+
+#: modules/codec/x264.c:70
+#, fuzzy
+msgid "B-frames between I and P"
+msgstr "頻帶間的空白像素數量"
+
+#: modules/codec/x264.c:71
+#, fuzzy
+msgid "Number of consecutive B-frames between I and P-frames. (1 to 16)"
+msgstr "頻帶間的空白像素數量"
+
+#: modules/codec/x264.c:74
+msgid "Adaptive B-frame decision"
 msgstr ""
 
-#: modules/codec/x264.c:51
-msgid "Maximum quantizer parameter"
+#: modules/codec/x264.c:75
+#, fuzzy
+msgid ""
+"Force the specified number of consecutive B-frames to be used, except "
+"possibly before an I-frame. "
+msgstr "頻帶間的空白像素數量"
+
+#: modules/codec/x264.c:78
+msgid "B-frames usage"
 msgstr ""
 
-#: modules/codec/x264.c:52
-msgid "Maximum quantizer parameter."
+#: 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. "
 msgstr ""
 
-#: modules/codec/x264.c:54
-msgid "Enable CABAC"
-msgstr "啟用CABAC"
+#: modules/codec/x264.c:82
+msgid "Keep some B-frames as references"
+msgstr ""
 
-#: modules/codec/x264.c:55
+#: modules/codec/x264.c:83
 msgid ""
-"Enable CABAC (Context-Adaptive Binary Arithmetic Coding). Slightly slows "
-"down encoding and decoding, but should save 10-15% bitrate."
+"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:59
-msgid "Enable loop filter"
-msgstr "開啟迴圈過濾器"
+#: modules/codec/x264.c:87
+msgid "CABAC"
+msgstr ""
 
-#: modules/codec/x264.c:60
-msgid "Use deblocking loop filter (increases quality)."
+#: modules/codec/x264.c:88
+msgid ""
+"CABAC (Context-Adaptive Binary Arithmetic Coding). Slightly slows down "
+"encoding and decoding, but should save 10-15% bitrate."
+msgstr ""
+
+#: modules/codec/x264.c:92
+#, fuzzy
+msgid "Number of reference frames"
+msgstr "頻帶間的空白像素數量"
+
+#: 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"
+msgstr ""
+
+#: modules/codec/x264.c:98
+#, fuzzy
+msgid "Loop filter"
+msgstr "Logo檔名"
+
+#: modules/codec/x264.c:99
+msgid "Deblocking loop filter (increases quality)."
+msgstr ""
+
+#: modules/codec/x264.c:103
+msgid "Set QP"
+msgstr ""
+
+#: modules/codec/x264.c:104
+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"
+msgstr ""
+
+#: modules/codec/x264.c:108
+msgid "Quality-based VBR"
+msgstr ""
+
+#: modules/codec/x264.c:109
+msgid "1-pass Quality-based VBR. From 0 to 51"
+msgstr ""
+
+#: modules/codec/x264.c:111
+msgid "Min QP"
 msgstr ""
 
-#: modules/codec/x264.c:62
-msgid "Analyse mode"
-msgstr "分析模式"
+#: modules/codec/x264.c:112
+msgid "Minimum quantizer, 15/35 seems to be a useful range."
+msgstr ""
+
+#: modules/codec/x264.c:115
+msgid "ax QP"
+msgstr ""
+
+#: modules/codec/x264.c:116
+msgid "Maximum quantizer parameter."
+msgstr ""
 
-#: modules/codec/x264.c:63
-msgid "This selects the analysing mode."
+#: modules/codec/x264.c:118
+msgid "ax QP step"
 msgstr ""
 
-#: modules/codec/x264.c:65
-msgid "Bitrate tolerance"
+#: modules/codec/x264.c:119
+msgid "Max QP step between frames."
 msgstr ""
 
-#: modules/codec/x264.c:66
-msgid "Sets the allowed variance in average bitrate."
+#: modules/codec/x264.c:121
+msgid "Average bitrate tolerance"
 msgstr ""
 
-#: modules/codec/x264.c:69
+#: modules/codec/x264.c:122
+msgid "Allowed variance in average. bitrate (in kbits/s)."
+msgstr ""
+
+#: modules/codec/x264.c:125
 #, fuzzy
-msgid "Maximum local bitrate"
+msgid "Max local bitrate"
 msgstr "最大化編碼位元率"
 
-#: modules/codec/x264.c:70
+#: modules/codec/x264.c:126
 msgid "Sets a maximum local bitrate in kbits/s."
 msgstr ""
 
-#: modules/codec/x264.c:72
-msgid "Averaging period for the maximum local bitrate"
+#: modules/codec/x264.c:128
+msgid "VBV buffer"
 msgstr ""
 
-#: modules/codec/x264.c:73
-msgid "Sets an averaging period for the maximum local bitrate, in kbits/s."
+#: modules/codec/x264.c:129
+msgid "Averaging period for the maximum local bitrate in kbits."
 msgstr ""
 
-#: modules/codec/x264.c:76
-msgid "Initial buffer occupancy"
+#: modules/codec/x264.c:132
+msgid "Initial VBV buffer occupancy"
 msgstr ""
 
-#: modules/codec/x264.c:77
+#: modules/codec/x264.c:133
 msgid "Sets the initial buffer occupancy as a fraction of the buffer size."
 msgstr ""
 
-#: modules/codec/x264.c:80
-msgid "Sets maximum interval between IDR-frames"
+#: modules/codec/x264.c:136
+msgid "QP factor between I and P"
 msgstr ""
 
-#: modules/codec/x264.c:81
-msgid ""
-"Larger values save bits, thus improve quality for a given bitrate, at the "
-"cost of seeking precision."
+#: modules/codec/x264.c:137
+msgid "QP factor between I and P."
 msgstr ""
 
-#: modules/codec/x264.c:84
-msgid "Sets minimum interval between IDR-frames"
+#: modules/codec/x264.c:139
+msgid "QP factor between P and B"
 msgstr ""
 
-#: modules/codec/x264.c:85
-msgid ""
-"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"
-"If scenecuts appear within this interval, they are still encoded as I-"
-"frames, but do not start a new GOP. Default value is keyint * 0.4."
+#: modules/codec/x264.c:140
+msgid "QP factor between P and B."
 msgstr ""
 
-#: modules/codec/x264.c:94
-msgid "B frames"
+#: modules/codec/x264.c:142
+msgid "QP difference between chroma and luma"
 msgstr ""
 
-#: modules/codec/x264.c:95
-msgid "Number of consecutive B-Frames between I and P-frames."
+#: modules/codec/x264.c:143
+msgid "QP difference between chroma and luma."
 msgstr ""
 
-#: modules/codec/x264.c:98
-msgid "B pyramid"
+#: modules/codec/x264.c:145
+msgid "QP curve compression"
 msgstr ""
 
-#: modules/codec/x264.c:99
-msgid "Allows B-frames to be used as references for predicting other frames."
+#: modules/codec/x264.c:146
+msgid "QP curve compression. (0.0=CBR to 1.0=QCP)"
 msgstr ""
 
-#: modules/codec/x264.c:102
-msgid "Number of previous frames used as predictors."
+#: modules/codec/x264.c:148 modules/codec/x264.c:152
+msgid "Reduce fluctuations in QP"
 msgstr ""
 
-#: modules/codec/x264.c:103
+#: modules/codec/x264.c:149
 msgid ""
-"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."
-msgstr ""
-
-#: modules/codec/x264.c:107
-msgid "Scene-cut detection."
+"This reduces the fluctuations in QP before curve compression. Temporally "
+"blurs complexity."
 msgstr ""
 
-#: modules/codec/x264.c:108
+#: modules/codec/x264.c:153
 msgid ""
-"Controls how aggressively to insert extra I-frames. 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."
+"This reduces the fluctations in QP after curve compression. Temporally blurs "
+"quants."
 msgstr ""
 
-#: modules/codec/x264.c:116
-msgid "Sub-pixel refinement quality."
+#: modules/codec/x264.c:158
+msgid "Partitions to consider"
 msgstr ""
 
-#: modules/codec/x264.c:117
+#: modules/codec/x264.c:159
 msgid ""
-"This parameter controls quality versus speed tradeoffs involved in the "
-"motion estimation decision process (lower = quicker and higher = better "
-"quality)."
+"Partitions to consider in analyse mode: \n"
+" - none  : \n"
+" - fast  : i4x4\n"
+" - normal: i4x4,p8x8,(i8x8)\n"
+" - slow  : i4x4,p8x8,(i8x8),b8x8\n"
+" - all   : i4x4,p8x8,(i8x8),b8x8,p4x4\n"
+"(p4x4 requires p8x8. i8x8 requires 8x8dct)."
 msgstr ""
 
-#: modules/codec/x264.c:124
-msgid "all"
-msgstr "全部"
+#: modules/codec/x264.c:167
+#, fuzzy
+msgid "Direct MV prediction mode"
+msgstr "DirectMedia物件解碼器"
 
-#: modules/codec/x264.c:124
+#: modules/codec/x264.c:168
 #, fuzzy
-msgid "slow"
-msgstr "慢速"
+msgid "Direct MV prediction mode. "
+msgstr "DirectMedia物件解碼器"
 
-#: modules/codec/x264.c:124
-msgid "normal"
-msgstr "正常"
+#: modules/codec/x264.c:170
+msgid "Weighted prediction for B-frames"
+msgstr ""
 
-#: modules/codec/x264.c:125
-msgid "fast"
-msgstr "快速"
+#: modules/codec/x264.c:171
+msgid "Weighted prediction for B-frames."
+msgstr ""
 
-#: modules/codec/x264.c:128
-msgid "h264 video encoder using x264 library"
+#: modules/codec/x264.c:173
+#, fuzzy
+msgid "Integer pixel motion estimation method"
+msgstr "啟用交錯編碼"
+
+#: modules/codec/x264.c:174
+msgid ""
+"Selects the motion estimation algorithm:  - dia: diamond search, radius 1 "
+"(fast)\n"
+" - hex: hexagonal search, radius 2\n"
+" - umh: uneven multi-hexagon search (better but slower)\n"
+" - esa: exhaustive search (extremely slow, primarily for testing)\n"
 msgstr ""
 
-#: modules/control/corba/corba.c:687
-msgid "Corba control"
+#: modules/codec/x264.c:180
+msgid "Maximum motion vector search range"
 msgstr ""
 
-#: modules/control/corba/corba.c:689
-msgid "corba control module"
+#: modules/codec/x264.c:181
+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."
 msgstr ""
 
-#: modules/control/gestures.c:77
-msgid "Motion threshold (10-100)"
+#: modules/codec/x264.c:187
+msgid "Subpixel motion estimation and partition decision quality"
 msgstr ""
 
-#: modules/control/gestures.c:79
-msgid "Amount of movement required for a mouse gesture to be recorded."
+#: modules/codec/x264.c:189
+msgid ""
+"This parameter controls quality versus speed tradeoffs involved in the "
+"motion estimation decision process (lower = quicker and higher = better "
+"quality). From 1 to 6."
 msgstr ""
 
-#: modules/control/gestures.c:82
-msgid "Trigger button"
-msgstr "觸發按鍵"
+#: modules/codec/x264.c:193
+msgid "RD based mode decision for B-frames."
+msgstr ""
 
-#: modules/control/gestures.c:84
-msgid "You can set the trigger button for mouse gestures here."
+#: modules/codec/x264.c:194
+msgid "RD based mode decision for B-frames. This requires subme 6."
 msgstr ""
 
-#: modules/control/gestures.c:87
-msgid "Middle"
+#: modules/codec/x264.c:197
+msgid "Decide references on a per partition basis"
 msgstr ""
 
-#: modules/control/gestures.c:90
+#: modules/codec/x264.c:198
+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:202
 #, fuzzy
-msgid "Gestures"
-msgstr "類型"
+msgid "Ignore chroma in motion estimation"
+msgstr "啟用交錯編碼"
 
-#: modules/control/gestures.c:97
-msgid "Mouse gestures control interface"
+#: modules/codec/x264.c:203
+msgid "Chroma ME for subpel and mode decision in P-frames."
 msgstr ""
 
-#: modules/control/hotkeys.c:84
-msgid "Playlist bookmark 1"
-msgstr "播放清單書籤 1"
+#: modules/codec/x264.c:206
+msgid "Jointly optimize both MVs in B-frames"
+msgstr ""
 
-#: modules/control/hotkeys.c:85
-msgid "Playlist bookmark 2"
-msgstr "播放清單書籤 2"
+#: modules/codec/x264.c:207
+msgid "Joint bidirectional motion refinement."
+msgstr ""
 
-#: modules/control/hotkeys.c:86
-msgid "Playlist bookmark 3"
-msgstr "播放清單書籤 3"
+#: modules/codec/x264.c:209
+msgid "Adaptive spatial transform size"
+msgstr ""
 
-#: modules/control/hotkeys.c:87
-msgid "Playlist bookmark 4"
-msgstr "播放清單書籤 4"
+#: modules/codec/x264.c:211
+msgid "SATD-based decision for 8x8 transform in inter-MBs."
+msgstr ""
 
-#: modules/control/hotkeys.c:88
-msgid "Playlist bookmark 5"
-msgstr "播放清單書籤 5"
+#: modules/codec/x264.c:213
+msgid "Trellis RD quantization"
+msgstr ""
 
-#: modules/control/hotkeys.c:89
-msgid "Playlist bookmark 6"
-msgstr "播放清單書籤 6"
+#: modules/codec/x264.c:214
+msgid ""
+"Trellis RD quantization: \n"
+" - 0: disabled\n"
+" - 1: enabled only on the final encode of a MB\n"
+" - 2: enabled on all mode decisions\n"
+"This requires CABAC."
+msgstr ""
 
-#: modules/control/hotkeys.c:90
-msgid "Playlist bookmark 7"
-msgstr "播放清單書籤 7"
+#: modules/codec/x264.c:220
+msgid "Early SKIP detection on P-frames"
+msgstr ""
 
-#: modules/control/hotkeys.c:91
-msgid "Playlist bookmark 8"
-msgstr "播放清單書籤 8"
+#: modules/codec/x264.c:221
+msgid "Early SKIP detection on P-frames."
+msgstr ""
 
-#: modules/control/hotkeys.c:92
-msgid "Playlist bookmark 9"
-msgstr "播放清單書籤 9"
+#: modules/codec/x264.c:224
+msgid "Dct-domain noise reduction. Adaptive pseudo-deadzone."
+msgstr ""
 
-#: modules/control/hotkeys.c:93
-msgid "Playlist bookmark 10"
-msgstr "播放清單書籤 10"
+#: modules/codec/x264.c:228
+msgid "CPU optimizations"
+msgstr ""
 
-#: modules/control/hotkeys.c:95
-msgid "This option allows you to define playlist bookmarks."
-msgstr "這個選項允許你定義播放清單書籤"
+#: modules/codec/x264.c:229
+msgid "Use assembler CPU optimizations."
+msgstr ""
+
+#: modules/codec/x264.c:231
+msgid "PSNR calculation"
+msgstr ""
+
+#: modules/codec/x264.c:232
+msgid ""
+"This has no effect on actual encoding quality, it just prevents the stats "
+"from being calculated (for speed)."
+msgstr ""
+
+#: modules/codec/x264.c:235 modules/gui/macosx/playlistinfo.m:64
+#: modules/gui/wxwidgets/dialogs/fileinfo.cpp:85
+msgid "Statistics"
+msgstr ""
+
+#: modules/codec/x264.c:236
+msgid "Print stats for each frame."
+msgstr ""
+
+#: modules/codec/x264.c:242
+msgid "dia"
+msgstr ""
+
+#: modules/codec/x264.c:242
+msgid "hex"
+msgstr ""
+
+#: modules/codec/x264.c:242
+msgid "umh"
+msgstr ""
+
+#: modules/codec/x264.c:242
+msgid "esa"
+msgstr ""
+
+#: modules/codec/x264.c:248
+msgid "fast"
+msgstr "快速"
+
+#: modules/codec/x264.c:248
+msgid "normal"
+msgstr "正常"
+
+#: modules/codec/x264.c:249
+#, fuzzy
+msgid "slow"
+msgstr "慢速"
+
+#: modules/codec/x264.c:249
+msgid "all"
+msgstr "全部"
+
+#: modules/codec/x264.c:254
+msgid "spatial"
+msgstr ""
+
+#: modules/codec/x264.c:254
+msgid "temporal"
+msgstr ""
+
+#: modules/codec/x264.c:257
+msgid "H.264/MPEG4 AVC encoder (using x264 library)"
+msgstr ""
+
+#: modules/control/corba/corba.c:687
+msgid "Corba control"
+msgstr ""
+
+#: modules/control/corba/corba.c:689
+msgid "Reactivity"
+msgstr ""
+
+#: modules/control/corba/corba.c:691
+msgid ""
+"The corba interface will handle events every 50ms/Reactivity. 5000 appears "
+"to be a sensible value."
+msgstr ""
+
+#: modules/control/corba/corba.c:694
+msgid "corba control module"
+msgstr ""
+
+#: modules/control/gestures.c:77
+msgid "Motion threshold (10-100)"
+msgstr ""
+
+#: modules/control/gestures.c:79
+msgid "Amount of movement required for a mouse gesture to be recorded."
+msgstr ""
+
+#: modules/control/gestures.c:81
+msgid "Trigger button"
+msgstr "觸發按鍵"
+
+#: modules/control/gestures.c:83
+msgid "Trigger button for mouse gestures."
+msgstr ""
+
+#: modules/control/gestures.c:86
+msgid "Middle"
+msgstr ""
+
+#: modules/control/gestures.c:89
+#, fuzzy
+msgid "Gestures"
+msgstr "類型"
+
+#: modules/control/gestures.c:97
+msgid "Mouse gestures control interface"
+msgstr ""
+
+#: modules/control/hotkeys.c:94
+#, fuzzy
+msgid "Define playlist bookmarks."
+msgstr "設定播放清單書籤 9"
+
+#: modules/control/hotkeys.c:97
+#, fuzzy
+msgid "Hotkeys"
+msgstr "熱鍵"
 
 #: modules/control/hotkeys.c:98
 msgid "Hotkeys management interface"
 msgstr "熱鍵管理介面"
 
-#: modules/control/hotkeys.c:552
+#: modules/control/hotkeys.c:467
 #, c-format
 msgid "Audio track: %s"
 msgstr "音軌: %s"
 
-#: modules/control/hotkeys.c:566 modules/control/hotkeys.c:594
+#: modules/control/hotkeys.c:482 modules/control/hotkeys.c:511
 #, c-format
 msgid "Subtitle track: %s"
 msgstr "字幕軌: %s"
 
-#: modules/control/hotkeys.c:566
+#: modules/control/hotkeys.c:482
 msgid "N/A"
 msgstr ""
 
-#: modules/control/http/http.c:34 modules/misc/rtsp.c:46
+#: modules/control/hotkeys.c:535
+#, fuzzy, c-format
+msgid "Aspect ratio: %s"
+msgstr "採樣率"
+
+#: modules/control/hotkeys.c:561
+#, c-format
+msgid "Crop: %s"
+msgstr ""
+
+#: modules/control/hotkeys.c:587
+#, fuzzy, c-format
+msgid "Deinterlace mode: %s"
+msgstr "介面模組"
+
+#: modules/control/http/http.c:34
 msgid "Host address"
 msgstr ""
 
 #: modules/control/http/http.c:36
-msgid "You can set the address and port the http interface will bind to."
+msgid ""
+"Address and port the HTTP interface will listen on. It defaults to all "
+"network interfaces (0.0.0.0). If you want the telnet interface to be "
+"available only on the local machine, enter 127.0.0.1"
 msgstr ""
 
-#: modules/control/http/http.c:37 modules/control/http/http.c:38
+#: modules/control/http/http.c:40 modules/control/http/http.c:41
 msgid "Source directory"
 msgstr ""
 
-#: modules/control/http/http.c:39
+#: modules/control/http/http.c:42
 #, fuzzy
 msgid "Charset"
 msgstr "選擇"
 
-#: modules/control/http/http.c:41
+#: modules/control/http/http.c:44
 msgid "Charset declared in Content-Type header (default UTF-8)."
 msgstr ""
 
-#: modules/control/http/http.c:42
+#: modules/control/http/http.c:45
 msgid "Handlers"
 msgstr ""
 
-#: modules/control/http/http.c:44
-msgid ""
-"List of extensions and executable paths (for instance: php=/usr/bin/php,pl=/"
-"usr/bin/perl)."
-msgstr ""
-
 #: modules/control/http/http.c:47
-msgid "HTTP interface x509 PEM certificate file (enables SSL)"
+msgid ""
+"List of handler extensions and executable paths (for instance: php=/usr/bin/"
+"php,pl=/usr/bin/perl)."
 msgstr ""
 
 #: modules/control/http/http.c:50
-msgid "HTTP interface x509 PEM private key file"
+msgid "HTTP interface x509 PEM certificate file (enables SSL)."
 msgstr ""
 
-#: modules/control/http/http.c:52
-msgid "HTTP interface x509 PEM trusted root CA certificates file"
+#: modules/control/http/http.c:53
+msgid "HTTP interface x509 PEM private key file."
 msgstr ""
 
 #: modules/control/http/http.c:55
-msgid "HTTP interace Certificates Revocation List file"
+msgid "HTTP interface x509 PEM trusted root CA certificates file."
+msgstr ""
+
+#: modules/control/http/http.c:58
+msgid "HTTP interace Certificates Revocation List file."
 msgstr ""
 
-#: modules/control/http/http.c:59
+#: modules/control/http/http.c:62
 msgid "HTTP remote control interface"
 msgstr ""
 
-#: modules/control/http/http.c:68
+#: modules/control/http/http.c:71
 msgid "HTTP SSL"
 msgstr ""
 
@@ -7059,57 +8045,53 @@ msgstr ""
 msgid "Infrared remote control interface"
 msgstr "紅外線遙控介面"
 
-#: modules/control/netsync.c:60
-msgid "Act as master for network synchronisation"
+#: modules/control/netsync.c:59
+msgid "Act as master"
 msgstr ""
 
-#: modules/control/netsync.c:61
-msgid ""
-"Allows you to specify if this client should act as the master client for the "
-"network synchronisation."
+#: modules/control/netsync.c:60
+msgid "Should act as the master client for the network synchronisation?"
 msgstr ""
 
-#: modules/control/netsync.c:64
+#: modules/control/netsync.c:63
 msgid "Master client ip address"
 msgstr ""
 
-#: modules/control/netsync.c:65
-msgid ""
-"Allows you to specify the ip address of the master client used for the "
-"network synchronisation."
-msgstr ""
-
-#: modules/control/netsync.c:69
-msgid "Netsync"
+#: modules/control/netsync.c:64
+msgid "IP address of the master client used for the network synchronisation."
 msgstr ""
 
-#: modules/control/netsync.c:70
-msgid "Network synchronisation"
-msgstr ""
+#: modules/control/netsync.c:68
+#, fuzzy
+msgid "Network Sync"
+msgstr "網路:"
 
 #: modules/control/ntservice.c:39
 msgid "Install Windows Service"
 msgstr "安裝Windows服務"
 
 #: modules/control/ntservice.c:41
-msgid "If enabled the interface will install the Service and exit."
-msgstr ""
+#, fuzzy
+msgid "Install the Service and exit."
+msgstr "安裝Windows服務"
 
 #: modules/control/ntservice.c:42
 msgid "Uninstall Windows Service"
 msgstr "解除安裝Windows服務"
 
 #: modules/control/ntservice.c:44
-msgid "If enabled the interface will uninstall the Service and exit."
-msgstr ""
+#, fuzzy
+msgid "Uninstall the Service and exit."
+msgstr "解除安裝Windows服務"
 
 #: modules/control/ntservice.c:45
 msgid "Display name of the Service"
 msgstr "顯示服務名稱"
 
 #: modules/control/ntservice.c:47
-msgid "This allows you to change the display name of the Service."
-msgstr ""
+#, fuzzy
+msgid "Change the display name of the Service."
+msgstr "顯示服務名稱"
 
 #: modules/control/ntservice.c:48
 msgid "Configuration options"
@@ -7117,17 +8099,16 @@ msgstr "組態選項"
 
 #: modules/control/ntservice.c:50
 msgid ""
-"This option allows you to specify configuration options that will be used by "
-"the Service (eg. --foo=bar --no-foobar). It should be specified at install "
-"time so the Service is properly configured."
+"Configuration options that will be used by the Service (eg. --foo=bar --no-"
+"foobar). It should be specified at install time so the Service is properly "
+"configured."
 msgstr ""
 
 #: modules/control/ntservice.c:55
 msgid ""
-"This option allows you to select additional interfaces spawned by the "
-"Service. It should be specified at install time so the Service is properly "
-"configured. Use a comma separated list of interface modules. (common values "
-"are: logger, sap, rc, http)"
+"Additional interfaces spawned by the Service. It should be specified at "
+"install time so the Service is properly configured. Use a comma separated "
+"list of interface modules. (common values are: logger, sap, rc, http)"
 msgstr ""
 
 #: modules/control/ntservice.c:61
@@ -7139,346 +8120,364 @@ msgstr "服務"
 msgid "Windows Service interface"
 msgstr "Windows服務介面"
 
-#: modules/control/rc.c:150
+#: modules/control/rc.c:154
 msgid "Show stream position"
 msgstr "顯示串流位置"
 
-#: modules/control/rc.c:151
+#: modules/control/rc.c:155
 msgid ""
 "Show the current position in seconds within the stream from time to time."
 msgstr ""
 
-#: modules/control/rc.c:154
+#: modules/control/rc.c:158
 msgid "Fake TTY"
 msgstr ""
 
-#: modules/control/rc.c:155
+#: modules/control/rc.c:159
 msgid "Force the rc module to use stdin as if it was a TTY."
 msgstr ""
 
-#: modules/control/rc.c:157
+#: modules/control/rc.c:161
 msgid "UNIX socket command input"
 msgstr "Unix socket指令輸入"
 
-#: modules/control/rc.c:158
+#: modules/control/rc.c:162
 msgid "Accept commands over a Unix socket rather than stdin."
 msgstr ""
 
-#: modules/control/rc.c:161
+#: modules/control/rc.c:165
 msgid "TCP command input"
 msgstr "TCP指令輸入"
 
-#: modules/control/rc.c:162
+#: modules/control/rc.c:166
 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:166 modules/misc/dummy/dummy.c:49
+#: modules/control/rc.c:170 modules/misc/dummy/dummy.c:49
 msgid "Do not open a DOS command box interface"
 msgstr "不要開啟DOS指令視窗介面"
 
-#: modules/control/rc.c:168
+#: modules/control/rc.c:172
 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:175
+#: modules/control/rc.c:179
 msgid "RC"
 msgstr ""
 
-#: modules/control/rc.c:178
+#: modules/control/rc.c:182
 msgid "Remote control interface"
 msgstr "搖控介面"
 
-#: modules/control/rc.c:331
+#: modules/control/rc.c:335
 #, fuzzy
-msgid "Remote control interface initialized, `h' for help"
+msgid "Remote control interface initialized. Type `help' for help."
 msgstr "搖控介面"
 
-#: modules/control/rc.c:819
+#: modules/control/rc.c:847
 #, c-format
-msgid "unknown command `%s', type `help' for help"
+msgid "Unknown command `%s'. Type `help' for help."
 msgstr ""
 
-#: modules/control/rc.c:852
+#: modules/control/rc.c:880
 msgid "+----[ Remote control commands ]"
 msgstr ""
 
-#: modules/control/rc.c:854
+#: modules/control/rc.c:882
 msgid "| add XYZ  . . . . . . . . . . add XYZ to playlist"
 msgstr ""
 
-#: modules/control/rc.c:855
+#: modules/control/rc.c:883
 msgid "| playlist . . .  show items currently in playlist"
 msgstr ""
 
-#: modules/control/rc.c:856
+#: modules/control/rc.c:884
 msgid "| play . . . . . . . . . . . . . . . . play stream"
 msgstr ""
 
-#: modules/control/rc.c:857
+#: modules/control/rc.c:885
 msgid "| stop . . . . . . . . . . . . . . . . stop stream"
 msgstr ""
 
-#: modules/control/rc.c:858
+#: modules/control/rc.c:886
 msgid "| next . . . . . . . . . . . .  next playlist item"
 msgstr ""
 
-#: modules/control/rc.c:859
+#: modules/control/rc.c:887
 msgid "| prev . . . . . . . . . .  previous playlist item"
 msgstr ""
 
-#: modules/control/rc.c:860
+#: modules/control/rc.c:888
 msgid "| goto . . . . . . . . . . . .  goto item at index"
 msgstr ""
 
-#: modules/control/rc.c:861
+#: modules/control/rc.c:889
+msgid "| clear . . . . . . . . . . .   clear the playlist"
+msgstr ""
+
+#: modules/control/rc.c:890
+msgid "| status . . . . . . . . . current playlist status"
+msgstr ""
+
+#: modules/control/rc.c:891
 msgid "| title [X]  . . . . set/get title in current item"
 msgstr ""
 
-#: modules/control/rc.c:862
+#: modules/control/rc.c:892
 msgid "| title_n  . . . . . .  next title in current item"
 msgstr ""
 
-#: modules/control/rc.c:863
+#: modules/control/rc.c:893
 msgid "| title_p  . . . .  previous title in current item"
 msgstr ""
 
-#: modules/control/rc.c:864
+#: modules/control/rc.c:894
 msgid "| chapter [X]  . . set/get chapter in current item"
 msgstr ""
 
-#: modules/control/rc.c:865
+#: modules/control/rc.c:895
 msgid "| chapter_n  . . . .  next chapter in current item"
 msgstr ""
 
-#: modules/control/rc.c:866
+#: modules/control/rc.c:896
 msgid "| chapter_p  . .  previous chapter in current item"
 msgstr ""
 
-#: modules/control/rc.c:868
+#: modules/control/rc.c:898
 msgid "| seek X . seek in seconds, for instance `seek 12'"
 msgstr ""
 
-#: modules/control/rc.c:869
+#: modules/control/rc.c:899
 msgid "| pause  . . . . . . . . . . . . . .  toggle pause"
 msgstr ""
 
-#: modules/control/rc.c:870
+#: modules/control/rc.c:900
 msgid "| fastforward  . . . . . .  .  set to maximum rate"
 msgstr ""
 
-#: modules/control/rc.c:871
+#: modules/control/rc.c:901
 msgid "| rewind  . . . . . . . . . .  set to minimum rate"
 msgstr ""
 
-#: modules/control/rc.c:872
+#: modules/control/rc.c:902
 msgid "| faster . . . . . . . .  faster playing of stream"
 msgstr ""
 
-#: modules/control/rc.c:873
+#: modules/control/rc.c:903
 msgid "| slower . . . . . . . .  slower playing of stream"
 msgstr ""
 
-#: modules/control/rc.c:874
+#: modules/control/rc.c:904
 msgid "| normal . . . . . . . .  normal playing of stream"
 msgstr ""
 
-#: modules/control/rc.c:875
-msgid "| f  . . . . . . . . . . . . . . toggle fullscreen"
+#: modules/control/rc.c:905
+msgid "| f [on|off] . . . . . . . . . . toggle fullscreen"
 msgstr ""
 
-#: modules/control/rc.c:876
+#: modules/control/rc.c:906
 msgid "| info . . .  information about the current stream"
 msgstr ""
 
-#: modules/control/rc.c:878
+#: modules/control/rc.c:908
 msgid "| volume [X] . . . . . . . .  set/get audio volume"
 msgstr ""
 
-#: modules/control/rc.c:879
+#: modules/control/rc.c:909
 msgid "| volup [X]  . . . . .  raise audio volume X steps"
 msgstr ""
 
-#: modules/control/rc.c:880
+#: modules/control/rc.c:910
 msgid "| voldown [X]  . . . .  lower audio volume X steps"
 msgstr ""
 
-#: modules/control/rc.c:881
+#: modules/control/rc.c:911
 msgid "| adev [X] . . . . . . . . .  set/get audio device"
 msgstr ""
 
-#: modules/control/rc.c:882
+#: modules/control/rc.c:912
 msgid "| achan [X]. . . . . . . .  set/get audio channels"
 msgstr ""
 
-#: modules/control/rc.c:883
+#: modules/control/rc.c:913
 msgid "| menu [on|off|up|down|left|right|select] use menu"
 msgstr ""
 
-#: modules/control/rc.c:888
+#: modules/control/rc.c:918
 msgid "| marq-marquee STRING  . . overlay STRING in video"
 msgstr ""
 
-#: modules/control/rc.c:889
+#: modules/control/rc.c:919
 msgid "| marq-x X . . . . . . . . . . . .offset from left"
 msgstr ""
 
-#: modules/control/rc.c:890
+#: modules/control/rc.c:920
 msgid "| marq-y Y . . . . . . . . . . . . offset from top"
 msgstr ""
 
-#: modules/control/rc.c:891
+#: modules/control/rc.c:921
 msgid "| marq-position #. . .  .relative position control"
 msgstr ""
 
-#: modules/control/rc.c:892
+#: modules/control/rc.c:922
 msgid "| marq-color # . . . . . . . . . . font color, RGB"
 msgstr ""
 
-#: modules/control/rc.c:893
+#: modules/control/rc.c:923
 msgid "| marq-opacity # . . . . . . . . . . . . . opacity"
 msgstr ""
 
-#: modules/control/rc.c:894
+#: modules/control/rc.c:924
 msgid "| marq-timeout T. . . . . . . . . . timeout, in ms"
 msgstr ""
 
-#: modules/control/rc.c:895
+#: modules/control/rc.c:925
 msgid "| marq-size # . . . . . . . . font size, in pixels"
 msgstr ""
 
-#: modules/control/rc.c:897
+#: modules/control/rc.c:927
 msgid "| time-format STRING . . . overlay STRING in video"
 msgstr ""
 
-#: modules/control/rc.c:898
+#: modules/control/rc.c:928
 msgid "| time-x X . . . . . . . . . . . .offset from left"
 msgstr ""
 
-#: modules/control/rc.c:899
+#: modules/control/rc.c:929
 msgid "| time-y Y . . . . . . . . . . . . offset from top"
 msgstr ""
 
-#: modules/control/rc.c:900
+#: modules/control/rc.c:930
 msgid "| time-position #. . . . . . . . relative position"
 msgstr ""
 
-#: modules/control/rc.c:901
+#: modules/control/rc.c:931
 msgid "| time-color # . . . . . . . . . . font color, RGB"
 msgstr ""
 
-#: modules/control/rc.c:902
+#: modules/control/rc.c:932
 msgid "| time-opacity # . . . . . . . . . . . . . opacity"
 msgstr ""
 
-#: modules/control/rc.c:903
+#: modules/control/rc.c:933
 msgid "| time-size # . . . . . . . . font size, in pixels"
 msgstr ""
 
-#: modules/control/rc.c:905
-msgid "| logo-file STRING . . . the overlay file path/name"
+#: modules/control/rc.c:935
+msgid "| logo-file STRING . . .the overlay file path/name"
 msgstr ""
 
-#: modules/control/rc.c:906
+#: modules/control/rc.c:936
 msgid "| logo-x X . . . . . . . . . . . .offset from left"
 msgstr ""
 
-#: modules/control/rc.c:907
+#: modules/control/rc.c:937
 msgid "| logo-y Y . . . . . . . . . . . . offset from top"
 msgstr ""
 
-#: modules/control/rc.c:908
+#: modules/control/rc.c:938
 msgid "| logo-position #. . . . . . . . relative position"
 msgstr ""
 
-#: modules/control/rc.c:909
+#: modules/control/rc.c:939
 msgid "| logo-transparency #. . . . . . . . .transparency"
 msgstr ""
 
-#: modules/control/rc.c:911
+#: modules/control/rc.c:941
 msgid "| mosaic-alpha # . . . . . . . . . . . . . . alpha"
 msgstr ""
 
-#: modules/control/rc.c:912
+#: modules/control/rc.c:942
 msgid "| mosaic-height #. . . . . . . . . . . . . .height"
 msgstr ""
 
-#: modules/control/rc.c:913
+#: modules/control/rc.c:943
 msgid "| mosaic-width # . . . . . . . . . . . . . . width"
 msgstr ""
 
-#: modules/control/rc.c:914
+#: modules/control/rc.c:944
 msgid "| mosaic-xoffset # . . . .top left corner position"
 msgstr ""
 
-#: modules/control/rc.c:915
+#: modules/control/rc.c:945
 msgid "| mosaic-yoffset # . . . .top left corner position"
 msgstr ""
 
-#: modules/control/rc.c:916
+#: modules/control/rc.c:946
 msgid "| mosaic-align 0..2,4..6,8..10. . .mosaic alignment"
 msgstr ""
 
-#: modules/control/rc.c:917
+#: modules/control/rc.c:947
 msgid "| mosaic-vborder # . . . . . . . . vertical border"
 msgstr ""
 
-#: modules/control/rc.c:918
+#: modules/control/rc.c:948
 msgid "| mosaic-hborder # . . . . . . . horizontal border"
 msgstr ""
 
-#: modules/control/rc.c:919
+#: modules/control/rc.c:949
 msgid "| mosaic-position {0=auto,1=fixed} . . . .position"
 msgstr ""
 
-#: modules/control/rc.c:920
+#: modules/control/rc.c:950
 msgid "| mosaic-rows #. . . . . . . . . . .number of rows"
 msgstr ""
 
-#: modules/control/rc.c:921
+#: modules/control/rc.c:951
 msgid "| mosaic-cols #. . . . . . . . . . .number of cols"
 msgstr ""
 
-#: modules/control/rc.c:922
+#: modules/control/rc.c:952
 msgid "| mosaic-keep-aspect-ratio {0,1} . . .aspect ratio"
 msgstr ""
 
-#: modules/control/rc.c:925
+#: modules/control/rc.c:954
+msgid ""
+"| check-updates [newer] [equal] [older]\n"
+"|               [undef] [info] [source] [binary] [plugin]"
+msgstr ""
+
+#: modules/control/rc.c:958
 msgid "| help . . . . . . . . . . . . . this help message"
 msgstr ""
 
-#: modules/control/rc.c:926
+#: modules/control/rc.c:959
 msgid "| longhelp . . . . . . . . . a longer help message"
 msgstr ""
 
-#: modules/control/rc.c:927
+#: modules/control/rc.c:960
 msgid "| logout . . . . .  exit (if in socket connection)"
 msgstr ""
 
-#: modules/control/rc.c:928
+#: modules/control/rc.c:961
 msgid "| quit . . . . . . . . . . . . . . . . .  quit vlc"
 msgstr ""
 
-#: modules/control/rc.c:930
+#: modules/control/rc.c:963
 msgid "+----[ end of help ]"
 msgstr ""
 
-#: modules/control/rc.c:1037 modules/control/rc.c:1211
-#: modules/control/rc.c:1688 modules/control/rc.c:1758
-#: modules/control/rc.c:1807 modules/control/rc.c:1906
-msgid "press menu select or pause to continue"
+#: modules/control/rc.c:1070
+msgid "Press menu select or pause to continue."
 msgstr ""
 
-#: modules/control/rc.c:1348
-msgid "press pause to continue"
+#: modules/control/rc.c:1238 modules/control/rc.c:1725
+#: modules/control/rc.c:1795 modules/control/rc.c:1844
+#: modules/control/rc.c:1943
+msgid "Type 'menu select' or 'pause' to continue."
 msgstr ""
 
-#: modules/control/rc.c:1891 modules/control/rc.c:1930
-msgid "please provide one of the following paramaters"
+#: modules/control/rc.c:1385
+msgid "Type 'pause' to continue."
+msgstr ""
+
+#: modules/control/rc.c:1928 modules/control/rc.c:1967
+msgid "Please provide one of the following parameters:"
 msgstr ""
 
 #: modules/control/showintf.c:62
@@ -7486,39 +8485,41 @@ msgid "Threshold"
 msgstr ""
 
 #: modules/control/showintf.c:63
-msgid "Height of the zone triggering the interface"
-msgstr ""
-
-#: modules/control/showintf.c:70
-msgid "Interface showing control interface"
+msgid "Height of the zone triggering the interface."
 msgstr ""
 
-#: modules/control/telnet.c:79
-#, fuzzy
-msgid "Telnet Interface host"
-msgstr "一般介面設定"
-
-#: modules/control/telnet.c:80
-msgid "Default to listen on all network interfaces"
+#: modules/control/telnet.c:72
+msgid "Host"
 msgstr ""
 
-#: modules/control/telnet.c:81
-msgid "Telnet Interface port"
+#: modules/control/telnet.c:73
+msgid ""
+"This is the host on which the interface will listen. It defaults to all "
+"network interfaces (0.0.0.0). If you want this interface to be available "
+"only on the local machine, enter \"127.0.0.1\"."
 msgstr ""
 
-#: modules/control/telnet.c:82
-msgid "Default to 4212"
-msgstr ""
+#: modules/control/telnet.c:77 modules/gui/macosx/open.m:178
+#: modules/gui/macosx/open.m:180 modules/gui/macosx/output.m:147
+#: modules/gui/wxwidgets/dialogs/open.cpp:829
+#: modules/gui/wxwidgets/dialogs/open.cpp:856
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:531 modules/stream_out/rtp.c:77
+msgid "Port"
+msgstr "埠"
 
-#: modules/control/telnet.c:84
-msgid "Telnet Interface password"
+#: modules/control/telnet.c:78
+msgid ""
+"This is the TCP port on which this interface will listen. It defaults to "
+"4212."
 msgstr ""
 
-#: modules/control/telnet.c:85
-msgid "Default to admin"
+#: modules/control/telnet.c:82
+msgid ""
+"A single administration password is used to protect this interface. The "
+"default value is \"admin\"."
 msgstr ""
 
-#: modules/control/telnet.c:98
+#: modules/control/telnet.c:96
 #, fuzzy
 msgid "VLM remote control interface"
 msgstr "搖控介面"
@@ -7539,45 +8540,71 @@ msgstr "ASF v1.0解多工器"
 msgid "AU demuxer"
 msgstr "AU解多工器"
 
-#: modules/demux/avi/avi.c:40 modules/demux/avi/avi.c:41
+#: modules/demux/avi/avi.c:42
 msgid "Force interleaved method"
 msgstr ""
 
 #: modules/demux/avi/avi.c:43
+#, fuzzy
+msgid "Force interleaved method."
+msgstr "介面模組"
+
+#: modules/demux/avi/avi.c:45
 msgid "Force index creation"
 msgstr ""
 
-#: modules/demux/avi/avi.c:45
+#: modules/demux/avi/avi.c:47
 msgid ""
-"Recreate a index for the AVI file so we can seek trough it more reliably."
+"Recreate a index for the AVI file. Use this if your AVI file is damaged or "
+"incomplete (not seekable)."
 msgstr ""
 
-#: modules/demux/avi/avi.c:52
+#: modules/demux/avi/avi.c:55
 msgid "AVI demuxer"
 msgstr "AVI解多工器"
 
-#: modules/demux/demuxdump.c:37 modules/demux/ts.c:110
-msgid "Filename of dump"
+#: modules/demux/avi/avi.c:549
+#, fuzzy
+msgid "AVI Index"
+msgstr "AVI解多工器"
+
+#: modules/demux/avi/avi.c:550
+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/demuxdump.c:39
-msgid "Specify a file name to which the raw stream will be dumped."
+#: modules/demux/avi/avi.c:2269
+msgid "Fixing AVI Index"
 msgstr ""
 
-#: modules/demux/demuxdump.c:40 modules/demux/ts.c:113
-msgid "Append"
+#: modules/demux/avi/avi.c:2270 modules/demux/avi/avi.c:2293
+msgid "Creating AVI Index ..."
 msgstr ""
 
-#: modules/demux/demuxdump.c:42 modules/demux/ts.c:115
-msgid ""
-"If the file exists and this option is selected, the existing file will not "
-"be overwritten."
+#: modules/demux/demuxdump.c:38
+#, fuzzy
+msgid "Dump filename"
+msgstr "記錄檔檔名"
+
+#: modules/demux/demuxdump.c:40
+msgid "Name of the file to which the raw stream will be dumped."
 msgstr ""
 
-#: modules/demux/demuxdump.c:52
-msgid "Filedump demuxer"
+#: modules/demux/demuxdump.c:41
+#, fuzzy
+msgid "Append to existing file"
+msgstr "開啟面板檔案"
+
+#: modules/demux/demuxdump.c:43
+msgid "If the file already exists, it will not be overwritten."
 msgstr ""
 
+#: modules/demux/demuxdump.c:52
+#, fuzzy
+msgid "File dumpper"
+msgstr "調節器數量"
+
 #: modules/demux/dts.c:40
 msgid "Raw DTS demuxer"
 msgstr ""
@@ -7586,20 +8613,26 @@ msgstr ""
 msgid "FLAC demuxer"
 msgstr "FLAC解多工器"
 
+#: modules/demux/livedotcom.cpp:63
+msgid ""
+"Allows you to modify the default caching value for RTSP streams. This value "
+"should be set in millisecond units."
+msgstr ""
+
 #: modules/demux/livedotcom.cpp:66
 msgid "Kasenna RTSP dialect"
 msgstr ""
 
 #: modules/demux/livedotcom.cpp:67
 msgid ""
-"Kasenna server speak an old and unstandard dialect of RTSP. When you set "
-"this parameter, VLC will try this dialect for communication. In this mode "
-"you cannot talk to normal RTSP servers."
+"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/livedotcom.cpp:72
-msgid "live.com (RTSP/RTP/SDP) demuxer"
-msgstr "live.com (RTSP/RTP/SDP)解多工器"
+msgid "RTP/RTSP/SDP demuxer (using Live555.com)"
+msgstr ""
 
 #: modules/demux/livedotcom.cpp:81
 msgid "RTSP/RTP access and demux"
@@ -7609,6 +8642,28 @@ msgstr "RTSP/RTP存取及解多工器"
 msgid "Use RTP over RTSP (TCP)"
 msgstr ""
 
+#: modules/demux/livedotcom.cpp:90
+#, fuzzy
+msgid "Client port"
+msgstr "視訊埠"
+
+#: modules/demux/livedotcom.cpp:91
+msgid "Port to use for the RTP source of the session"
+msgstr ""
+
+#: modules/demux/livedotcom.cpp:94 modules/demux/livedotcom.cpp:95
+msgid "Tunnel RTSP and RTP over HTTP"
+msgstr ""
+
+#: modules/demux/livedotcom.cpp:97
+#, fuzzy
+msgid "HTTP tunnel port"
+msgstr "HTTP輸入"
+
+#: modules/demux/livedotcom.cpp:98
+msgid "Port to use for tunneling the RTSP/RTP over HTTP"
+msgstr ""
+
 #: modules/demux/m3u.c:68
 msgid "Playlist metademux"
 msgstr ""
@@ -7619,155 +8674,203 @@ msgstr ""
 
 #: modules/demux/mjpeg.c:44
 msgid ""
-"Allows you to set the desired frame rate when playing from files, use 0 for "
-"live."
+"This is the desired frame rate when playing MJPEG from a file. Use 0 (this "
+"is the default value) for a live stream (from a camera)."
 msgstr ""
 
-#: modules/demux/mjpeg.c:49
-msgid "JPEG camera demuxer"
-msgstr ""
+#: modules/demux/mjpeg.c:50
+#, fuzzy
+msgid "M-JPEG camera demuxer"
+msgstr "MPEG-4音訊解多工器"
 
-#: modules/demux/mkv.cpp:391
+#: modules/demux/mkv.cpp:394
 msgid "Matroska stream demuxer"
 msgstr "Matroska串流解多工器"
 
-#: modules/demux/mkv.cpp:398
+#: modules/demux/mkv.cpp:401
 #, fuzzy
 msgid "Ordered chapters"
 msgstr "下一個章節"
 
-#: modules/demux/mkv.cpp:399
+#: modules/demux/mkv.cpp:402
 msgid "Play ordered chapters as specified in the segment."
 msgstr ""
 
-#: modules/demux/mkv.cpp:402
+#: modules/demux/mkv.cpp:405
 #, fuzzy
 msgid "Chapter codecs"
 msgstr "其他編碼器"
 
-#: modules/demux/mkv.cpp:403
+#: modules/demux/mkv.cpp:406
 msgid "Use chapter codecs found in the segment."
 msgstr ""
 
-#: modules/demux/mkv.cpp:406
+#: modules/demux/mkv.cpp:409
+#, fuzzy
+msgid "Preload Directory"
+msgstr "選擇一個檔案或目錄"
+
+#: modules/demux/mkv.cpp:410
+msgid ""
+"Preload matroska files from the same family in the same directory (not good "
+"for broken files)."
+msgstr ""
+
+#: modules/demux/mkv.cpp:413
 msgid "Seek based on percent not time"
 msgstr ""
 
-#: modules/demux/mkv.cpp:407
+#: modules/demux/mkv.cpp:414
 msgid "Seek based on percent not time."
 msgstr ""
 
-#: modules/demux/mkv.cpp:410
+#: modules/demux/mkv.cpp:417
 msgid "Dummy Elements"
 msgstr ""
 
-#: modules/demux/mkv.cpp:411
+#: modules/demux/mkv.cpp:418
 msgid "Read and discard unknown EBML elements (not good for broken files)."
 msgstr ""
 
-#: modules/demux/mkv.cpp:3003
+#: modules/demux/mkv.cpp:3159
 #, fuzzy
 msgid "---  DVD Menu"
 msgstr "使用DVD選單"
 
-#: modules/demux/mkv.cpp:3009
+#: modules/demux/mkv.cpp:3165
 msgid "First Played"
 msgstr ""
 
-#: modules/demux/mkv.cpp:3011
+#: modules/demux/mkv.cpp:3167
 #, fuzzy
 msgid "Video Manager"
 msgstr "視訊編碼器"
 
-#: modules/demux/mkv.cpp:3017
+#: modules/demux/mkv.cpp:3173
 #, fuzzy
 msgid "----- Title"
 msgstr "標題"
 
-#: modules/demux/mkv.cpp:4714
+#: modules/demux/mkv.cpp:4928
 msgid "Segment filename"
 msgstr ""
 
-#: modules/demux/mkv.cpp:4718
+#: modules/demux/mkv.cpp:4932
 msgid "Muxing application"
 msgstr ""
 
-#: modules/demux/mkv.cpp:4722
+#: modules/demux/mkv.cpp:4936
 msgid "Writing application"
 msgstr ""
 
+#: modules/demux/mod.c:47
+msgid "Enable noise reduction algorithm"
+msgstr ""
+
+#: modules/demux/mod.c:48
+#, fuzzy
+msgid "Enable reverberation"
+msgstr "啟動音訊"
+
 #: modules/demux/mod.c:49
-msgid "MOD demuxer (libmodplug)"
-msgstr "MOD解多工器(libmodplug)"
+#, fuzzy
+msgid "Reverberation level (from 0 to 100, default value is 0)."
+msgstr "環繞等級(0-100，預設為0)"
 
-#: modules/demux/mod.c:56
-msgid "Reverb"
+#: modules/demux/mod.c:51
+msgid "Reverberation delay, in ms. Usual values are from to 40 to 200ms."
 msgstr ""
 
-#: modules/demux/mod.c:57
-msgid "Reverb level (0-100)"
-msgstr ""
+#: modules/demux/mod.c:53
+#, fuzzy
+msgid "Enable megabass mode"
+msgstr "開啟峰值"
 
-#: modules/demux/mod.c:57
-msgid "Reverb level (0-100 defaults to 0)"
+#: modules/demux/mod.c:54
+msgid "Megabass mode level (from 0 to 100, default value is 0)."
 msgstr ""
 
-#: modules/demux/mod.c:58
-msgid "Reverb delay (ms)"
+#: modules/demux/mod.c:56
+msgid ""
+"Megabass mode cutoff frequency, in Hz.This is the maximum frequency for "
+"which the megabass effect applies. Valid values are from 10 to 100 Hz"
 msgstr ""
 
-#: modules/demux/mod.c:58
-msgid "Reverb delay in ms (usually 40-200ms)"
-msgstr ""
+#: modules/demux/mod.c:59
+#, fuzzy
+msgid "Surround effect level (from 0 to 100, default value is 0)."
+msgstr "環繞等級(0-100，預設為0)"
 
-#: modules/demux/mod.c:60
-msgid "Mega bass"
+#: modules/demux/mod.c:61
+#, fuzzy
+msgid "Surround delay, in ms. Usual values are from 5 to 40 ms"
+msgstr "環繞延遲(ms，同常為5-40ms)"
+
+#: modules/demux/mod.c:66
+msgid "MOD demuxer (libmodplug)"
+msgstr "MOD解多工器(libmodplug)"
+
+#: modules/demux/mod.c:74
+msgid "Reverb"
 msgstr ""
 
-#: modules/demux/mod.c:61
-msgid "Mega bass level (0-100)"
+#: modules/demux/mod.c:77
+msgid "Reverberation level"
 msgstr ""
 
-#: modules/demux/mod.c:61
-msgid "Mega bass level (0-100 defaults to 0)"
+#: modules/demux/mod.c:79
+msgid "Reverberation delay"
 msgstr ""
 
-#: modules/demux/mod.c:62
-msgid "Mega bass cut off (Hz)"
+#: modules/demux/mod.c:81
+msgid "Mega bass"
 msgstr ""
 
-#: modules/demux/mod.c:62
-msgid "Mega bass cut off (10-100Hz)"
+#: modules/demux/mod.c:84
+#, fuzzy
+msgid "Mega bass level"
+msgstr "最大等級"
+
+#: modules/demux/mod.c:86
+msgid "Mega bass cutoff"
 msgstr ""
 
-#: modules/demux/mod.c:64
+#: modules/demux/mod.c:88
 msgid "Surround"
 msgstr "環繞"
 
-#: modules/demux/mod.c:65
-msgid "Surround level (0-100)"
+#: modules/demux/mod.c:91
+#, fuzzy
+msgid "Surround level"
 msgstr "環繞等級(0-100)"
 
-#: modules/demux/mod.c:65
-msgid "Surround level (0-100 defaults to 0)"
-msgstr "環繞等級(0-100，預設為0)"
-
-#: modules/demux/mod.c:66
+#: modules/demux/mod.c:93
 msgid "Surround delay (ms)"
 msgstr "環繞延遲(ms)"
 
-#: modules/demux/mod.c:66
-msgid "Surround delay in ms (usually 5-40ms)"
-msgstr "環繞延遲(ms，同常為5-40ms)"
-
-#: modules/demux/mp4/mp4.c:50
+#: modules/demux/mp4/mp4.c:51
 msgid "MP4 stream demuxer"
 msgstr "MP4串流解多工器"
 
-#: modules/demux/mpeg/h264.c:40
+#: modules/demux/mpc.c:46
 #, fuzzy
-msgid "Allows you to set the desired frame rate."
-msgstr "允許你指定串流輸出的多工器"
+msgid "Replay Gain type"
+msgstr "播放和停止"
+
+#: modules/demux/mpc.c:47
+msgid ""
+"Musepack can have a title-specific replay gain (volume control) or an album-"
+"specific one. Choose which type you want to use"
+msgstr ""
+
+#: modules/demux/mpc.c:59
+#, fuzzy
+msgid "MusePack demuxer"
+msgstr "PS解多工器"
+
+#: modules/demux/mpeg/h264.c:40
+msgid "Desired frame rate for the H264 stream."
+msgstr ""
 
 #: modules/demux/mpeg/h264.c:47
 msgid "H264 video demuxer"
@@ -7782,8 +8885,9 @@ msgid "MPEG-4 video demuxer"
 msgstr "MPEG-4視訊解多工器"
 
 #: modules/demux/mpeg/mpga.c:46
-msgid "MPEG-I/II audio demuxer"
-msgstr "MPEG-I/II音訊解多工器"
+#, fuzzy
+msgid "MPEG audio / MP3 demuxer"
+msgstr "MPEG-4音訊解多工器"
 
 #: modules/demux/mpeg/mpgv.c:42
 msgid "MPEG-I/II video demuxer"
@@ -7802,9 +8906,10 @@ msgstr "NullSoft解多工器"
 msgid "Nuv demuxer"
 msgstr "AU解多工器"
 
-#: modules/demux/ogg.c:43
-msgid "Ogg stream demuxer"
-msgstr "Ogg串流解多工器"
+#: modules/demux/ogg.c:44
+#, fuzzy
+msgid "OGG demuxer"
+msgstr "AAC解多工器"
 
 #: modules/demux/playlist/b4s.c:341
 #, fuzzy
@@ -7817,11 +8922,7 @@ msgid "Auto start"
 msgstr "製作人"
 
 #: modules/demux/playlist/playlist.c:37
-msgid "Automatically start the playlist when it's loaded.\n"
-msgstr ""
-
-#: modules/demux/playlist/playlist.c:49
-msgid "Old playlist open"
+msgid "Automatically start playing the playlist content once it's loaded.\n"
 msgstr ""
 
 #: modules/demux/playlist/playlist.c:55
@@ -7846,16 +8947,96 @@ msgstr "PLS播放清單匯入"
 msgid "DVB playlist import"
 msgstr "PLS播放清單匯入"
 
+#: modules/demux/playlist/playlist.c:83
+#, fuzzy
+msgid "Podcast parser"
+msgstr "CDDB分類"
+
+#: modules/demux/playlist/playlist.c:88
+#, fuzzy
+msgid "XSPF playlist import"
+msgstr "PLS播放清單匯入"
+
+#: modules/demux/playlist/podcast.c:289 modules/demux/playlist/podcast.c:298
+#: modules/demux/playlist/podcast.c:307 modules/demux/playlist/podcast.c:316
+#: modules/demux/playlist/podcast.c:325 modules/demux/playlist/podcast.c:335
+#: 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
+#: modules/demux/playlist/podcast.c:420 modules/demux/playlist/podcast.c:428
+#: modules/demux/playlist/podcast.c:436
+#, fuzzy
+msgid "Podcast Info"
+msgstr "位置"
+
+#: modules/demux/playlist/podcast.c:290
+#, fuzzy
+msgid "Podcast Link"
+msgstr "位置"
+
+#: modules/demux/playlist/podcast.c:299
+#, fuzzy
+msgid "Podcast Copyright"
+msgstr "著作權"
+
+#: modules/demux/playlist/podcast.c:308
+#, fuzzy
+msgid "Podcast Category"
+msgstr "CDDB分類"
+
+#: modules/demux/playlist/podcast.c:317 modules/demux/playlist/podcast.c:405
+msgid "Podcast Keywords"
+msgstr ""
+
+#: modules/demux/playlist/podcast.c:326 modules/demux/playlist/podcast.c:413
+#, fuzzy
+msgid "Podcast Subtitle"
+msgstr "字幕"
+
+#: modules/demux/playlist/podcast.c:336 modules/demux/playlist/podcast.c:421
+#, fuzzy
+msgid "Podcast Summary"
+msgstr "虛擬"
+
+#: modules/demux/playlist/podcast.c:373
+#, fuzzy
+msgid "Podcast Publication Date"
+msgstr "調變類型"
+
+#: modules/demux/playlist/podcast.c:381
+#, fuzzy
+msgid "Podcast Author"
+msgstr "製作人"
+
+#: modules/demux/playlist/podcast.c:389
+msgid "Podcast Subcategory"
+msgstr ""
+
+#: modules/demux/playlist/podcast.c:397
+#, fuzzy
+msgid "Podcast Duration"
+msgstr "編碼器描述"
+
+#: modules/demux/playlist/podcast.c:429
+#, fuzzy
+msgid "Podcast Size"
+msgstr "封包器"
+
+#: modules/demux/playlist/podcast.c:437
+msgid "Podcast Type"
+msgstr ""
+
 #: modules/demux/ps.c:47 modules/demux/ps.c:55
-msgid "PS demuxer"
+#, fuzzy
+msgid "MPEG-PS demuxer"
 msgstr "PS解多工器"
 
 #: modules/demux/pva.c:43
 msgid "PVA demuxer"
 msgstr "PVA解多工器"
 
-#: modules/demux/rawdv.c:39
-msgid "raw DV demuxer"
+#: modules/demux/rawdv.c:40
+msgid "DV (Digital Video) demuxer"
 msgstr ""
 
 #: modules/demux/real.c:39
@@ -7863,94 +9044,125 @@ msgid "Real demuxer"
 msgstr "Real解多工器"
 
 #: modules/demux/sgimb.c:113
-msgid "Kasenna MediaBase metademux"
+msgid "Kasenna MediaBase parser"
 msgstr ""
 
-#: modules/demux/subtitle.c:62
-msgid "Text subtitles demux"
-msgstr "文字字幕解多工"
+#: modules/demux/subtitle.c:64
+#, fuzzy
+msgid "Text subtitles parser"
+msgstr "字體字幕解碼器"
 
-#: modules/demux/subtitle.c:67 modules/gui/wxwidgets/subtitles.cpp:210
+#: modules/demux/subtitle.c:69 modules/gui/wxwidgets/dialogs/subtitles.cpp:202
 msgid "Frames per second"
 msgstr ""
 
-#: modules/demux/subtitle.c:70
+#: modules/demux/subtitle.c:72
 msgid "Subtitles delay"
 msgstr "字幕延遲"
 
-#: modules/demux/ts.c:82
+#: modules/demux/subtitle.c:74
+#, fuzzy
+msgid "Subtitles format"
+msgstr "字幕延遲"
+
+#: modules/demux/ts.c:83
 msgid "Extra PMT"
 msgstr ""
 
-#: modules/demux/ts.c:84
-msgid "Allows a user to specify an extra pmt (pmt_pid=pid:stream_type[,...])"
+#: modules/demux/ts.c:85
+msgid "Allows a user to specify an extra pmt (pmt_pid=pid:stream_type[,...])."
 msgstr ""
 
-#: modules/demux/ts.c:86
+#: modules/demux/ts.c:87
 msgid "Set id of ES to PID"
 msgstr ""
 
-#: modules/demux/ts.c:87
-msgid "set id of es to pid"
+#: modules/demux/ts.c:88
+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:89
+#: modules/demux/ts.c:93
 msgid "Fast udp streaming"
 msgstr ""
 
-#: modules/demux/ts.c:91
-msgid "Sends TS to specific ip:port by udp (you must know what you are doing)"
+#: modules/demux/ts.c:95
+msgid "Sends TS to specific ip:port by udp (you must know what you are doing)."
 msgstr ""
 
-#: modules/demux/ts.c:93 modules/demux/ts.c:94
+#: modules/demux/ts.c:97
 msgid "MTU for out mode"
 msgstr ""
 
-#: modules/demux/ts.c:96 modules/demux/ts.c:97
+#: modules/demux/ts.c:98
+msgid "MTU for out mode."
+msgstr ""
+
+#: modules/demux/ts.c:100
 msgid "CSA ck"
 msgstr ""
 
-#: modules/demux/ts.c:99
+#: modules/demux/ts.c:101
+msgid "Control word for the CSA encryption algorithm"
+msgstr ""
+
+#: modules/demux/ts.c:103
 msgid "Silent mode"
 msgstr "靜音模式"
 
-#: modules/demux/ts.c:100
-msgid "do not complain on encrypted PES"
+#: modules/demux/ts.c:104
+msgid "Do not complain on encrypted PES."
 msgstr ""
 
-#: modules/demux/ts.c:102
+#: modules/demux/ts.c:106
 msgid "CAPMT System ID"
 msgstr ""
 
-#: modules/demux/ts.c:103
-msgid "only forward descriptors from this SysID to the CAM"
+#: modules/demux/ts.c:107
+msgid "Only forward descriptors from this SysID to the CAM."
 msgstr ""
 
-#: modules/demux/ts.c:105
+#: modules/demux/ts.c:109
 msgid "Packet size in bytes to decrypt"
 msgstr ""
 
-#: modules/demux/ts.c:106
+#: modules/demux/ts.c:110
 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:111
-msgid "Specify a filename where to dump the TS in"
+#: modules/demux/ts.c:114
+msgid "Filename of dump"
+msgstr ""
+
+#: modules/demux/ts.c:115
+msgid "Specify a filename where to dump the TS in."
+msgstr ""
+
+#: modules/demux/ts.c:117
+msgid "Append"
+msgstr ""
+
+#: modules/demux/ts.c:119
+msgid ""
+"If the file exists and this option is selected, the existing file will not "
+"be overwritten."
 msgstr ""
 
-#: modules/demux/ts.c:118
+#: modules/demux/ts.c:122
 msgid "Dump buffer size"
 msgstr ""
 
-#: modules/demux/ts.c:120
+#: modules/demux/ts.c:124
 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:124
+#: modules/demux/ts.c:128
 #, fuzzy
 msgid "MPEG Transport Stream demuxer"
 msgstr "MP4串流解多工器"
@@ -8004,6 +9216,10 @@ msgstr ""
 msgid "Oldies"
 msgstr ""
 
+#: modules/demux/util/id3genres.h:40
+msgid "Other"
+msgstr "其他"
+
 #: modules/demux/util/id3genres.h:42
 msgid "R&B"
 msgstr ""
@@ -8196,7 +9412,7 @@ msgstr ""
 msgid "New wave"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:95
+#: modules/demux/util/id3genres.h:95 modules/video_filter/distort.c:78
 msgid "Psychedelic"
 msgstr ""
 
@@ -8249,11 +9465,13 @@ msgid "Hard rock"
 msgstr ""
 
 #: modules/demux/util/id3tag.c:50
-msgid "ID3 tag parser using libid3tag"
-msgstr "ID3標籤解析器(使用libid3tag)"
+#, fuzzy
+msgid "ID3 tags parser"
+msgstr "DTS解析器"
 
 #: modules/demux/vobsub.c:48
-msgid "Vobsub subtitles demux"
+#, fuzzy
+msgid "Vobsub subtitles parser"
 msgstr "Vobsub字幕解多工"
 
 #: modules/demux/voc.c:42
@@ -8283,106 +9501,100 @@ 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/open.m:158 modules/gui/macosx/playlistinfo.m:58
+#: modules/gui/macosx/controls.m:48 modules/gui/macosx/interaction.m:121
+#: 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/update.m:90 modules/gui/macosx/wizard.m:343
-#: modules/gui/wxwidgets/bookmarks.cpp:170
-#: modules/gui/wxwidgets/iteminfo.cpp:93 modules/gui/wxwidgets/open.cpp:329
-#: modules/gui/wxwidgets/open.cpp:498
-#: modules/gui/wxwidgets/preferences.cpp:212
-#: modules/gui/wxwidgets/streamout.cpp:204
-#: modules/gui/wxwidgets/subtitles.cpp:253
+#: 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:488
-#: modules/gui/wxwidgets/menus.cpp:314
+#: modules/gui/macosx/open.m:784 modules/gui/wxwidgets/interface.cpp:672
+#: modules/gui/wxwidgets/interface.cpp:683 modules/gui/wxwidgets/menus.cpp:317
 msgid "Open"
 msgstr "開啟"
 
-#: modules/gui/beos/InterfaceWindow.cpp:208
-#: modules/gui/beos/InterfaceWindow.cpp:309 modules/gui/macosx/prefs.m:120
-#: modules/gui/wxwidgets/preferences.cpp:189
+#: modules/gui/beos/InterfaceWindow.cpp:225
+#: modules/gui/beos/InterfaceWindow.cpp:326 modules/gui/macosx/prefs.m:120
+#: modules/gui/wxwidgets/dialogs/preferences.cpp:184
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: modules/gui/beos/InterfaceWindow.cpp:218
-#: modules/gui/beos/InterfaceWindow.cpp:307 modules/gui/macosx/intf.m:464
-#: modules/gui/macosx/intf.m:557 modules/gui/wxwidgets/messages.cpp:64
+#: modules/gui/beos/InterfaceWindow.cpp:235
+#: modules/gui/beos/InterfaceWindow.cpp:324 modules/gui/macosx/intf.m:483
+#: modules/gui/macosx/intf.m:580 modules/gui/wxwidgets/dialogs/messages.cpp:53
 msgid "Messages"
 msgstr "訊息"
 
-#: modules/gui/beos/InterfaceWindow.cpp:246
+#: modules/gui/beos/InterfaceWindow.cpp:263
 #: 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:397 modules/gui/wxwidgets/open.cpp:1235
-#: modules/gui/wxwidgets/wizard.cpp:1277
+#: modules/gui/wxwidgets/dialogs.cpp:419
+#: modules/gui/wxwidgets/dialogs/open.cpp:1263
 msgid "Open File"
 msgstr "開啟檔案"
 
-#: modules/gui/beos/InterfaceWindow.cpp:248
+#: modules/gui/beos/InterfaceWindow.cpp:265
 #: modules/gui/beos/PlayListWindow.cpp:92
 msgid "Open Disc"
 msgstr "開啟光碟"
 
-#: modules/gui/beos/InterfaceWindow.cpp:249
+#: modules/gui/beos/InterfaceWindow.cpp:266
 msgid "Open Subtitles"
 msgstr "開啟字幕"
 
-#: modules/gui/beos/InterfaceWindow.cpp:253
+#: modules/gui/beos/InterfaceWindow.cpp:270
 #: 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:268
+#: modules/gui/beos/InterfaceWindow.cpp:285
 msgid "Prev Title"
 msgstr "上一個標題"
 
-#: modules/gui/beos/InterfaceWindow.cpp:269
+#: modules/gui/beos/InterfaceWindow.cpp:286
 msgid "Next Title"
 msgstr "下一個標題"
 
-#: modules/gui/beos/InterfaceWindow.cpp:278
+#: modules/gui/beos/InterfaceWindow.cpp:295
 msgid "Go to Title"
 msgstr "前往標題"
 
-#: modules/gui/beos/InterfaceWindow.cpp:282
+#: modules/gui/beos/InterfaceWindow.cpp:299
 msgid "Go to Chapter"
 msgstr "前往章節"
 
-#: modules/gui/beos/InterfaceWindow.cpp:285
+#: modules/gui/beos/InterfaceWindow.cpp:302
 msgid "Speed"
 msgstr "速度"
 
-#: modules/gui/beos/InterfaceWindow.cpp:304 modules/gui/macosx/intf.m:548
+#: modules/gui/beos/InterfaceWindow.cpp:321 modules/gui/macosx/intf.m:571
 msgid "Window"
 msgstr "視窗"
 
-#: modules/gui/beos/InterfaceWindow.cpp:381 modules/gui/macosx/bookmarks.m:106
+#: modules/gui/beos/InterfaceWindow.cpp:398 modules/gui/macosx/bookmarks.m:106
 #: modules/gui/macosx/bookmarks.m:233 modules/gui/macosx/bookmarks.m:241
-#: modules/gui/macosx/bookmarks.m:291 modules/gui/macosx/bookmarks.m:301
-#: modules/gui/macosx/extended.m:578 modules/gui/macosx/open.m:157
-#: modules/gui/macosx/open.m:254 modules/gui/macosx/output.m:138
-#: modules/gui/macosx/playlistinfo.m:57 modules/gui/macosx/update.m:92
-#: modules/gui/macosx/wizard.m:457 modules/gui/macosx/wizard.m:587
-#: modules/gui/macosx/wizard.m:653 modules/gui/macosx/wizard.m:1044
-#: modules/gui/macosx/wizard.m:1094 modules/gui/wxwidgets/bookmarks.cpp:167
-#: modules/gui/wxwidgets/iteminfo.cpp:90 modules/gui/wxwidgets/open.cpp:326
-#: modules/gui/wxwidgets/open.cpp:495
-#: modules/gui/wxwidgets/preferences.cpp:209
-#: modules/gui/wxwidgets/streamout.cpp:201
-#: modules/gui/wxwidgets/subtitles.cpp:250
+#: modules/gui/macosx/bookmarks.m:292 modules/gui/macosx/bookmarks.m:302
+#: modules/gui/macosx/controls.m:49 modules/gui/macosx/extended.m:601
+#: 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:696 modules/gui/macosx/wizard.m:1088
+#: modules/gui/macosx/wizard.m:1168 modules/gui/macosx/wizard.m:1175
+#: 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/wxwidgets/dialogs/vlm/vlm_panel.cpp:416
 msgid "OK"
 msgstr "確定"
 
-#: modules/gui/beos/InterfaceWindow.cpp:389
+#: modules/gui/beos/InterfaceWindow.cpp:406
 msgid "VLC media player: Open Media Files"
 msgstr "VLC media player:開啟多媒體檔"
 
-#: modules/gui/beos/InterfaceWindow.cpp:393
+#: modules/gui/beos/InterfaceWindow.cpp:410
 msgid "VLC media player: Open Subtitle File"
 msgstr "VLC media player:開啟字幕檔"
 
@@ -8395,17 +9607,18 @@ msgid "playlist"
 msgstr "播放清單"
 
 #: modules/gui/beos/PlayListWindow.cpp:96
-#: modules/gui/wxwidgets/messages.cpp:89
 msgid "Close"
 msgstr "關閉"
 
 #: modules/gui/beos/PlayListWindow.cpp:101 modules/gui/macosx/bookmarks.m:95
-#: modules/gui/macosx/intf.m:489 modules/gui/wxwidgets/bookmarks.cpp:227
+#: modules/gui/macosx/intf.m:508
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:165
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_streampanel.cpp:99
 msgid "Edit"
 msgstr "編輯"
 
-#: modules/gui/beos/PlayListWindow.cpp:103 modules/gui/macosx/intf.m:494
-#: modules/gui/macosx/playlist.m:503
+#: modules/gui/beos/PlayListWindow.cpp:103 modules/gui/macosx/intf.m:513
+#: modules/gui/macosx/playlist.m:483
 msgid "Select All"
 msgstr "全選"
 
@@ -8430,7 +9643,6 @@ msgid "Randomize"
 msgstr "隨機"
 
 #: modules/gui/beos/PlayListWindow.cpp:127 modules/gui/macosx/bookmarks.m:97
-#: modules/gui/wxwidgets/bookmarks.cpp:223
 msgid "Remove"
 msgstr "移除"
 
@@ -8447,8 +9659,11 @@ msgid "Path"
 msgstr "路徑"
 
 #: modules/gui/beos/PlayListWindow.cpp:147 modules/gui/macosx/bookmarks.m:108
-#: modules/gui/macosx/playlist.m:132 modules/gui/wxwidgets/bookmarks.cpp:159
-#: modules/gui/wxwidgets/iteminfo.cpp:148 modules/gui/wxwidgets/wizard.cpp:590
+#: modules/gui/macosx/playlist.m:133
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:97
+#: modules/gui/wxwidgets/dialogs/infopanels.cpp:72
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:374
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:590
 msgid "Name"
 msgstr "名稱"
 
@@ -8456,9 +9671,8 @@ msgstr "名稱"
 msgid "Apply"
 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/preferences.cpp:213
+#: modules/gui/beos/PreferencesWindow.cpp:254 modules/gui/macosx/output.m:526
+#: modules/gui/macosx/playlist.m:750 modules/gui/macosx/prefs.m:121
 msgid "Save"
 msgstr "儲存"
 
@@ -8498,8 +9712,7 @@ msgstr ""
 msgid "Take Screen Shot"
 msgstr "擷取畫面快照"
 
-#: modules/gui/macosx/about.m:73 modules/gui/macosx/intf.m:468
-#: modules/gui/wxwidgets/interface.cpp:441
+#: modules/gui/macosx/about.m:73 modules/gui/macosx/intf.m:487
 msgid "About VLC media player"
 msgstr "關於VLC多媒體播放程式"
 
@@ -8508,54 +9721,44 @@ msgstr "關於VLC多媒體播放程式"
 msgid "Compiled by %s, based on SVN revision %s"
 msgstr ""
 
-#: modules/gui/macosx/bookmarks.m:92 modules/gui/macosx/intf.m:554
-#: modules/gui/wxwidgets/bookmarks.cpp:201
+#: modules/gui/macosx/bookmarks.m:92 modules/gui/macosx/intf.m:577
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:139
 msgid "Bookmarks"
 msgstr "書籤"
 
-#: modules/gui/macosx/bookmarks.m:93 modules/gui/wxwidgets/bookmarks.cpp:221
+#: modules/gui/macosx/bookmarks.m:93
 msgid "Add"
 msgstr "增加"
 
-#: modules/gui/macosx/bookmarks.m:94 modules/gui/macosx/intf.m:493
-#: modules/gui/wxwidgets/bookmarks.cpp:225
-#: modules/gui/wxwidgets/messages.cpp:94
+#: modules/gui/macosx/bookmarks.m:94 modules/gui/macosx/intf.m:512
 msgid "Clear"
 msgstr "清除"
 
-#: modules/gui/macosx/bookmarks.m:96 modules/gui/wxwidgets/bookmarks.cpp:229
+#: modules/gui/macosx/bookmarks.m:96
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:167
 msgid "Extract"
 msgstr ""
 
-#: modules/gui/macosx/bookmarks.m:101 modules/gui/wxwidgets/bookmarks.cpp:259
-msgid "Size offset"
-msgstr ""
-
-#: modules/gui/macosx/bookmarks.m:103 modules/gui/wxwidgets/bookmarks.cpp:260
-msgid "Time offset"
-msgstr "時間補償"
-
-#: modules/gui/macosx/bookmarks.m:109 modules/gui/pda/pda.c:281
-#: modules/gui/wxwidgets/bookmarks.cpp:161
+#: modules/gui/macosx/bookmarks.m:103 modules/gui/macosx/bookmarks.m:109
+#: modules/gui/macosx/sfilters.m:72 modules/gui/pda/pda.c:281
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:99
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:198
 msgid "Time"
 msgstr "時間"
 
-#: modules/gui/macosx/bookmarks.m:110 modules/gui/wxwidgets/bookmarks.cpp:163
-msgid "Bytes"
-msgstr ""
-
-#: modules/gui/macosx/bookmarks.m:136 modules/gui/macosx/playlist.m:764
+#: modules/gui/macosx/bookmarks.m:136 modules/gui/macosx/playlist.m:748
 #, fuzzy
 msgid "Untitled"
 msgstr "標題"
 
-#: modules/gui/macosx/bookmarks.m:233 modules/gui/wxwidgets/bookmarks.cpp:505
+#: modules/gui/macosx/bookmarks.m:233
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:443
 msgid "No input"
 msgstr "沒有輸入"
 
-#: modules/gui/macosx/bookmarks.m:234 modules/gui/wxwidgets/bookmarks.cpp:503
+#: modules/gui/macosx/bookmarks.m:234
 msgid ""
-"No input found. The stream must be playing or paused for bookmarks to work."
+"No input found. A stream must be playing or paused for bookmarks to work."
 msgstr ""
 
 #: modules/gui/macosx/bookmarks.m:241
@@ -8563,524 +9766,575 @@ msgstr ""
 msgid "Input has changed"
 msgstr "輸入已改變"
 
-#: modules/gui/macosx/bookmarks.m:242 modules/gui/wxwidgets/bookmarks.cpp:511
+#: modules/gui/macosx/bookmarks.m:242
 msgid ""
-"Input has changed, unable to save bookmark. Use \"pause\" while editing "
-"bookmarks to keep the same input."
+"Input has changed, unable to save bookmark. Suspending playback with \"Pause"
+"\" while editing bookmarks to ensure to keep the same input."
 msgstr ""
 
-#: modules/gui/macosx/bookmarks.m:291 modules/gui/macosx/wizard.m:1044
-#: modules/gui/wxwidgets/bookmarks.cpp:410
+#: modules/gui/macosx/bookmarks.m:292 modules/gui/macosx/wizard.m:1088
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:348
 msgid "Invalid selection"
 msgstr "無效的選擇"
 
-#: modules/gui/macosx/bookmarks.m:292 modules/gui/wxwidgets/bookmarks.cpp:409
-msgid "You must select two bookmarks"
-msgstr "你必須選擇兩個書籤"
+#: modules/gui/macosx/bookmarks.m:293
+msgid "Two bookmarks have to be selected."
+msgstr ""
 
-#: modules/gui/macosx/bookmarks.m:301 modules/gui/wxwidgets/bookmarks.cpp:420
+#: modules/gui/macosx/bookmarks.m:302
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:358
 msgid "No input found"
 msgstr "沒有輸入"
 
-#: modules/gui/macosx/bookmarks.m:302 modules/gui/wxwidgets/bookmarks.cpp:419
-msgid "The stream must be playing or paused for bookmarks to work"
+#: modules/gui/macosx/bookmarks.m:303
+msgid "The stream must be playing or paused for bookmarks to work."
+msgstr ""
+
+#: modules/gui/macosx/controls.m:47 modules/gui/macosx/controls.m:695
+#, fuzzy
+msgid "Jump To Time"
+msgstr "跳至: "
+
+#: modules/gui/macosx/controls.m:50
+msgid "sec."
 msgstr ""
 
-#: modules/gui/macosx/controls.m:126
+#: modules/gui/macosx/controls.m:51
+#, fuzzy
+msgid "Jump to time"
+msgstr "跳至: "
+
+#: modules/gui/macosx/controls.m:136
 msgid "Random On"
 msgstr "開啟隨機播放"
 
-#: modules/gui/macosx/controls.m:130
+#: modules/gui/macosx/controls.m:140
 msgid "Random Off"
 msgstr "關閉隨機播放"
 
-#: modules/gui/macosx/controls.m:158 modules/gui/macosx/controls.m:590
-#: modules/gui/macosx/intf.m:504 modules/gui/macosx/playlist.m:518
-#: modules/gui/macosx/playlist.m:1192 modules/gui/wxwidgets/playlist.cpp:53
+#: modules/gui/macosx/controls.m:168 modules/gui/macosx/controls.m:679
+#: modules/gui/macosx/intf.m:523 modules/gui/macosx/playlist.m:498
+#: modules/gui/macosx/playlist.m:1176
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:54
 msgid "Repeat One"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:162 modules/gui/macosx/controls.m:194
-#: modules/gui/macosx/playlist.m:1211
+#: modules/gui/macosx/controls.m:172 modules/gui/macosx/controls.m:204
+#: modules/gui/macosx/playlist.m:1195
 msgid "Repeat Off"
 msgstr "關閉重複播放"
 
-#: modules/gui/macosx/controls.m:190 modules/gui/macosx/controls.m:597
-#: modules/gui/macosx/intf.m:505 modules/gui/macosx/playlist.m:519
-#: modules/gui/macosx/playlist.m:1200 modules/gui/wxwidgets/playlist.cpp:52
+#: modules/gui/macosx/controls.m:200 modules/gui/macosx/controls.m:686
+#: modules/gui/macosx/intf.m:524 modules/gui/macosx/playlist.m:499
+#: modules/gui/macosx/playlist.m:1184
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:53
 msgid "Repeat All"
 msgstr "重複播放全部"
 
-#: modules/gui/macosx/controls.m:275 modules/gui/macosx/controls.m:618
-#: modules/gui/macosx/intf.m:530
+#: modules/gui/macosx/controls.m:299 modules/gui/macosx/controls.m:709
+#: modules/gui/macosx/intf.m:549
 msgid "Half Size"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:277 modules/gui/macosx/controls.m:619
-#: modules/gui/macosx/intf.m:531
+#: modules/gui/macosx/controls.m:301 modules/gui/macosx/controls.m:710
+#: modules/gui/macosx/intf.m:550
 msgid "Normal Size"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:279 modules/gui/macosx/controls.m:620
-#: modules/gui/macosx/intf.m:532
+#: modules/gui/macosx/controls.m:303 modules/gui/macosx/controls.m:711
+#: modules/gui/macosx/intf.m:551
 msgid "Double Size"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:281 modules/gui/macosx/controls.m:624
-#: modules/gui/macosx/controls.m:635 modules/gui/macosx/intf.m:535
+#: modules/gui/macosx/controls.m:305 modules/gui/macosx/controls.m:715
+#: modules/gui/macosx/controls.m:726 modules/gui/macosx/intf.m:554
 msgid "Float on Top"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:283 modules/gui/macosx/controls.m:621
-#: modules/gui/macosx/intf.m:533
+#: modules/gui/macosx/controls.m:307 modules/gui/macosx/controls.m:712
+#: modules/gui/macosx/intf.m:552
 msgid "Fit to Screen"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:583 modules/gui/macosx/intf.m:503
-#: modules/gui/macosx/playlist.m:512
+#: modules/gui/macosx/controls.m:672 modules/gui/macosx/intf.m:522
+#: modules/gui/macosx/playlist.m:492
 msgid "Random"
 msgstr "隨機"
 
-#: modules/gui/macosx/controls.m:604 modules/gui/macosx/intf.m:506
+#: modules/gui/macosx/controls.m:693 modules/gui/macosx/intf.m:525
 msgid "Step Forward"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:605 modules/gui/macosx/intf.m:507
+#: modules/gui/macosx/controls.m:694 modules/gui/macosx/intf.m:526
 msgid "Step Backward"
 msgstr ""
 
-#: modules/gui/macosx/equalizer.m:141 modules/gui/wxwidgets/extrapanel.cpp:473
+#: modules/gui/macosx/embeddedwindow.m:42 modules/gui/macosx/intf.m:472
+#: 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:475
+msgid "Fast Forward"
+msgstr "快速向前"
+
+#: modules/gui/macosx/embeddedwindow.m:45
+#: modules/gui/macosx/embeddedwindow.m:72 modules/gui/macosx/intf.m:473
+#: modules/gui/macosx/intf.m:516 modules/gui/macosx/intf.m:594
+#: modules/gui/macosx/intf.m:1318 modules/gui/macosx/intf.m:1319
+#: modules/gui/macosx/intf.m:1320 modules/gui/macosx/playlist.m:480
+#: modules/gui/pda/pda_interface.c:262 modules/gui/pda/pda_interface.c:263
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:274
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:283
+#: modules/gui/wxwidgets/interface.cpp:674
+#: modules/gui/wxwidgets/interface.cpp:685
+#: modules/gui/wxwidgets/interface.cpp:1213
+#: modules/gui/wxwidgets/menus.cpp:294 modules/gui/wxwidgets/menus.cpp:308
+msgid "Play"
+msgstr "播放"
+
+#: modules/gui/macosx/embeddedwindow.m:66 modules/gui/macosx/intf.m:1310
+#: modules/gui/macosx/intf.m:1311 modules/gui/macosx/intf.m:1312
+#: 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:296 modules/visualization/xosd.c:243
+msgid "Pause"
+msgstr "暫停"
+
+#: modules/gui/macosx/equalizer.m:141 modules/gui/wxwidgets/extrapanel.cpp:471
 msgid "2 Pass"
 msgstr ""
 
 #: modules/gui/macosx/equalizer.m:142
-msgid ""
-"If you enable this settting, the equalizer filter will be applied twice. The "
-"effect will be sharper."
+msgid "Apply theequalizer filter twice. The effect will be sharper."
 msgstr ""
 
 #: modules/gui/macosx/equalizer.m:145
-msgid ""
-"Enable the equalizer. You can either manually change the bands or use a "
-"preset."
+msgid "Enable the equalizer. Bands can be set manually or using a preset."
 msgstr ""
 
 #: modules/gui/macosx/equalizer.m:147
 msgid "Preamp"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:79 modules/gui/wxwidgets/extrapanel.cpp:1214
+#: modules/gui/macosx/extended.m:79 modules/gui/wxwidgets/extrapanel.cpp:1210
 msgid "Extended controls"
 msgstr "延伸控制"
 
-#: modules/gui/macosx/extended.m:83 modules/gui/wxwidgets/extrapanel.cpp:302
+#: modules/gui/macosx/extended.m:83 modules/gui/wxwidgets/extrapanel.cpp:300
 #, fuzzy
 msgid "Video filters"
 msgstr "視訊過濾器"
 
-#: modules/gui/macosx/extended.m:84 modules/gui/wxwidgets/extrapanel.cpp:206
-msgid "Adjust Image"
-msgstr "調整影像"
+#: modules/gui/macosx/extended.m:84 modules/gui/wxwidgets/extrapanel.cpp:204
+#, fuzzy
+msgid "Image adjustment"
+msgstr "影像調整"
 
-#: modules/gui/macosx/extended.m:85 modules/gui/macosx/wizard.m:351
-#: modules/gui/macosx/wizard.m:352 modules/gui/macosx/wizard.m:422
-#: modules/gui/macosx/wizard.m:424 modules/gui/wxwidgets/wizard.cpp:477
-#: modules/gui/wxwidgets/wizard.cpp:484
+#: modules/gui/macosx/extended.m:85 modules/gui/macosx/wizard.m:371
+#: modules/gui/macosx/wizard.m:372 modules/gui/macosx/wizard.m:443
+#: modules/gui/macosx/wizard.m:445 modules/gui/macosx/wizard.m:447
+#: modules/gui/macosx/wizard.m:456
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:477
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:484
+#: modules/gui/wxwidgets/extrapanel.cpp:317
 msgid "More Info"
 msgstr "更多資訊"
 
-#: modules/gui/macosx/extended.m:86 modules/gui/wxwidgets/extrapanel.cpp:154
+#: modules/gui/macosx/extended.m:86 modules/gui/wxwidgets/extrapanel.cpp:151
 msgid "Blurring"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:87 modules/gui/wxwidgets/extrapanel.cpp:154
-msgid "Creates a motion blurring on the image"
+#: modules/gui/macosx/extended.m:87 modules/gui/wxwidgets/extrapanel.cpp:151
+msgid "Adds motion blurring to the image"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:88 modules/gui/wxwidgets/extrapanel.cpp:151
-#: modules/video_filter/distort.c:67
+#: modules/gui/macosx/extended.m:88 modules/gui/wxwidgets/extrapanel.cpp:149
+#: modules/video_filter/distort.c:82
 msgid "Distortion"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:89 modules/gui/wxwidgets/extrapanel.cpp:151
-msgid "Adds distorsion effects"
-msgstr ""
+#: modules/gui/macosx/extended.m:89 modules/gui/wxwidgets/extrapanel.cpp:149
+#, fuzzy
+msgid "Adds distortion effects"
+msgstr "選擇效果"
 
-#: modules/gui/macosx/extended.m:90 modules/gui/wxwidgets/extrapanel.cpp:150
+#: modules/gui/macosx/extended.m:90 modules/gui/wxwidgets/extrapanel.cpp:148
 msgid "Image clone"
 msgstr "影像複製"
 
-#: modules/gui/macosx/extended.m:91 modules/gui/wxwidgets/extrapanel.cpp:150
-msgid "Creates several clones of the image"
+#: modules/gui/macosx/extended.m:91
+#, fuzzy
+msgid "Creates several copies of the Video output window"
 msgstr "建立數個影像複製"
 
-#: modules/gui/macosx/extended.m:92 modules/gui/wxwidgets/extrapanel.cpp:153
+#: modules/gui/macosx/extended.m:93
 msgid "Image cropping"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:93 modules/gui/wxwidgets/extrapanel.cpp:153
-msgid "Crops the image"
-msgstr ""
+#: modules/gui/macosx/extended.m:94
+#, fuzzy
+msgid "Crops a defined part of the image"
+msgstr "旋轉或翻轉影像"
 
-#: modules/gui/macosx/extended.m:94 modules/gui/wxwidgets/extrapanel.cpp:152
+#: modules/gui/macosx/extended.m:95 modules/gui/wxwidgets/extrapanel.cpp:150
 msgid "Image inversion"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:95 modules/gui/wxwidgets/extrapanel.cpp:152
-msgid "Inverts the image colors"
-msgstr ""
+#: modules/gui/macosx/extended.m:96 modules/gui/wxwidgets/extrapanel.cpp:150
+#, fuzzy
+msgid "Inverts the colors of the image"
+msgstr "建立數個影像複製"
 
-#: modules/gui/macosx/extended.m:96 modules/gui/wxwidgets/extrapanel.cpp:155
+#: modules/gui/macosx/extended.m:97 modules/gui/wxwidgets/extrapanel.cpp:152
 #: modules/video_filter/transform.c:67
 msgid "Transformation"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:97 modules/gui/wxwidgets/extrapanel.cpp:155
+#: modules/gui/macosx/extended.m:98 modules/gui/wxwidgets/extrapanel.cpp:152
 msgid "Rotates or flips the image"
 msgstr "旋轉或翻轉影像"
 
-#: modules/gui/macosx/extended.m:98 modules/gui/wxwidgets/extrapanel.cpp:403
+#: modules/gui/macosx/extended.m:99 modules/gui/wxwidgets/extrapanel.cpp:401
 msgid "Volume normalization"
 msgstr "音量正規化"
 
-#: modules/gui/macosx/extended.m:99
-msgid ""
-"This filters prevents the audio output power from going over a defined value."
+#: modules/gui/macosx/extended.m:100
+msgid "Prevents the audio output from going over a predefined value."
 msgstr ""
 
-#: modules/gui/macosx/extended.m:101 modules/gui/wxwidgets/extrapanel.cpp:398
+#: modules/gui/macosx/extended.m:102 modules/gui/wxwidgets/extrapanel.cpp:396
 msgid "Headphone virtualization"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:102 modules/gui/wxwidgets/extrapanel.cpp:399
-msgid ""
-"This filter gives the feeling of a 5.1 speaker set when using a headphone."
+#: modules/gui/macosx/extended.m:103 modules/gui/wxwidgets/extrapanel.cpp:397
+msgid "Imitates the effect of surround sound when using headphones."
 msgstr ""
 
-#: modules/gui/macosx/extended.m:104 modules/gui/wxwidgets/extrapanel.cpp:408
+#: modules/gui/macosx/extended.m:105 modules/gui/wxwidgets/extrapanel.cpp:406
 msgid "Maximum level"
 msgstr "最大等級"
 
-#: modules/gui/macosx/extended.m:105 modules/gui/wxwidgets/extrapanel.cpp:223
-#: modules/gui/wxwidgets/extrapanel.cpp:483
+#: modules/gui/macosx/extended.m:106 modules/gui/wxwidgets/extrapanel.cpp:221
+#: modules/gui/wxwidgets/extrapanel.cpp:481
 msgid "Restore Defaults"
 msgstr "恢復預設值"
 
-#: modules/gui/macosx/extended.m:109 modules/gui/wxwidgets/extrapanel.cpp:246
+#: modules/gui/macosx/extended.m:110 modules/gui/wxwidgets/extrapanel.cpp:244
 msgid "Gamma"
 msgstr "virtualization"
 
-#: modules/gui/macosx/extended.m:111 modules/gui/wxwidgets/extrapanel.cpp:241
+#: modules/gui/macosx/extended.m:112 modules/gui/wxwidgets/extrapanel.cpp:239
 msgid "Saturation"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:112 modules/gui/macosx/macosx.m:55
+#: modules/gui/macosx/extended.m:113 modules/gui/macosx/macosx.m:59
+#: modules/gui/macosx/sfilters.m:81 modules/gui/macosx/sfilters.m:90
+#: modules/gui/macosx/sfilters.m:100
 msgid "Opaqueness"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:578 modules/gui/wxwidgets/extrapanel.cpp:1011
-#: modules/gui/wxwidgets/wizard.cpp:506
-msgid "More information"
+#: modules/gui/macosx/extended.m:601 modules/gui/wxwidgets/extrapanel.cpp:1007
+#, fuzzy
+msgid "More Information"
 msgstr "更多資訊"
 
-#: modules/gui/macosx/extended.m:579 modules/gui/wxwidgets/extrapanel.cpp:1001
+#: modules/gui/macosx/extended.m:602
 msgid ""
-"Select the video effects filters to apply. You must restart the stream for "
-"these settings to take effect.\n"
-"To configure the filters, go to the Preferences, and go to Modules/Video "
-"Filters. You can then configure each filter.\n"
-"If you want fine control over the filters ( to choose the order in which "
-"they are applied ), you need to enter manually a filters string "
-"(Preferences / Video / Filters)."
+"This panel allows to select video effects filters to apply.\n"
+"The filters can be configured indivudually in the Preferences, in the "
+"subsections of Video/Filters\n"
+".To choose the order in which the filter are applied, a filter option string "
+"can be set in the Preferences, Video / Filters section."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:448
+#: modules/gui/macosx/intf.m:467
 msgid "VLC - Controller"
 msgstr "VLC - 控制器"
 
-#: modules/gui/macosx/intf.m:449 modules/gui/macosx/intf.m:863
-#: modules/gui/macosx/intf.m:1172 modules/gui/pda/pda_interface.c:212
+#: modules/gui/macosx/intf.m:468 modules/gui/macosx/intf.m:901
+#: modules/gui/macosx/intf.m:1219 modules/gui/pda/pda_interface.c:212
 #: modules/gui/pda/pda_interface.c:1355
 msgid "VLC media player"
 msgstr "VLC多媒體播放程式"
 
-#: modules/gui/macosx/intf.m:453 modules/gui/pda/pda_interface.c:238
-#: modules/gui/pda/pda_interface.c:239
-msgid "Rewind"
-msgstr "回捲"
-
-#: modules/gui/macosx/intf.m:454 modules/gui/macosx/intf.m:497
-#: modules/gui/macosx/intf.m:571 modules/gui/macosx/intf.m:1271
-#: modules/gui/macosx/intf.m:1272 modules/gui/macosx/intf.m:1273
-#: modules/gui/macosx/playlist.m:500 modules/gui/pda/pda_interface.c:262
-#: modules/gui/pda/pda_interface.c:263 modules/gui/wxwidgets/interface.cpp:490
-#: modules/gui/wxwidgets/interface.cpp:1292
-#: modules/gui/wxwidgets/menus.cpp:291 modules/gui/wxwidgets/menus.cpp:305
-#: modules/gui/wxwidgets/playlist.cpp:267
-#: modules/gui/wxwidgets/playlist.cpp:275
-msgid "Play"
-msgstr "播放"
-
-#: modules/gui/macosx/intf.m:456
-msgid "Fast Forward"
-msgstr "快速向前"
-
-#: modules/gui/macosx/intf.m:465
+#: modules/gui/macosx/intf.m:484
 msgid "Open CrashLog"
 msgstr "開啟當機紀錄"
 
-#: modules/gui/macosx/intf.m:470
+#: modules/gui/macosx/intf.m:489
 msgid "Check for Update..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:471
+#: modules/gui/macosx/intf.m:490
 msgid "Preferences..."
 msgstr "偏好設定..."
 
-#: modules/gui/macosx/intf.m:474
+#: modules/gui/macosx/intf.m:493
 msgid "Services"
 msgstr "服務"
 
-#: modules/gui/macosx/intf.m:475
+#: modules/gui/macosx/intf.m:494
 msgid "Hide VLC"
 msgstr "隱藏VLC"
 
-#: modules/gui/macosx/intf.m:476
+#: modules/gui/macosx/intf.m:495
 msgid "Hide Others"
 msgstr "隱藏其他"
 
-#: modules/gui/macosx/intf.m:477
+#: modules/gui/macosx/intf.m:496
 msgid "Show All"
 msgstr "顯示全部"
 
-#: modules/gui/macosx/intf.m:478 modules/gui/wxwidgets/interface.cpp:1563
+#: modules/gui/macosx/intf.m:497 modules/gui/wxwidgets/interface.cpp:1485
 msgid "Quit VLC"
 msgstr "離開VLC"
 
-#: modules/gui/macosx/intf.m:480
+#: modules/gui/macosx/intf.m:499
 msgid "1:File"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:481
+#: modules/gui/macosx/intf.m:500
 msgid "Open File..."
 msgstr "開啟檔案..."
 
-#: modules/gui/macosx/intf.m:482
+#: modules/gui/macosx/intf.m:501
 msgid "Quick Open File..."
 msgstr "快速開啟檔案..."
 
-#: modules/gui/macosx/intf.m:483
+#: modules/gui/macosx/intf.m:502
 msgid "Open Disc..."
 msgstr "開啟光碟..."
 
-#: modules/gui/macosx/intf.m:484
+#: modules/gui/macosx/intf.m:503
 msgid "Open Network..."
 msgstr "開啟網路..."
 
-#: modules/gui/macosx/intf.m:485
+#: modules/gui/macosx/intf.m:504
 msgid "Open Recent"
 msgstr "開啟最近的檔案"
 
-#: modules/gui/macosx/intf.m:486 modules/gui/macosx/intf.m:1769
+#: modules/gui/macosx/intf.m:505 modules/gui/macosx/intf.m:1874
 msgid "Clear Menu"
 msgstr "清除選單"
 
-#: modules/gui/macosx/intf.m:487
+#: modules/gui/macosx/intf.m:506
 #, fuzzy
 msgid "Streaming/Exporting Wizard..."
 msgstr "串流/轉碼精靈"
 
-#: modules/gui/macosx/intf.m:490
+#: modules/gui/macosx/intf.m:509
 msgid "Cut"
 msgstr "剪下"
 
-#: modules/gui/macosx/intf.m:491
+#: modules/gui/macosx/intf.m:510
 msgid "Copy"
 msgstr "複製"
 
-#: modules/gui/macosx/intf.m:492
+#: modules/gui/macosx/intf.m:511
 msgid "Paste"
 msgstr "貼上"
 
-#: modules/gui/macosx/intf.m:496
+#: modules/gui/macosx/intf.m:515
 #, fuzzy
 msgid "Playback"
 msgstr "暫停重播"
 
-#: modules/gui/macosx/intf.m:517
+#: modules/gui/macosx/intf.m:536
 msgid "Volume Up"
 msgstr "增加音量"
 
-#: modules/gui/macosx/intf.m:518
+#: modules/gui/macosx/intf.m:537
 msgid "Volume Down"
 msgstr "減低音量"
 
-#: modules/gui/macosx/intf.m:539 modules/gui/macosx/intf.m:540
-#: modules/gui/macosx/vout.m:168
+#: modules/gui/macosx/intf.m:562 modules/gui/macosx/intf.m:563
+#: modules/gui/macosx/vout.m:193
 msgid "Video Device"
 msgstr "視訊裝置"
 
-#: modules/gui/macosx/intf.m:549
+#: modules/gui/macosx/intf.m:572
 msgid "Minimize Window"
 msgstr "最小化視窗"
 
-#: modules/gui/macosx/intf.m:550
+#: modules/gui/macosx/intf.m:573
 msgid "Close Window"
 msgstr "關閉視窗"
 
-#: modules/gui/macosx/intf.m:551
+#: modules/gui/macosx/intf.m:574
 msgid "Controller"
 msgstr "控制器"
 
-#: modules/gui/macosx/intf.m:553
+#: modules/gui/macosx/intf.m:576
 #, fuzzy
 msgid "Extended Controls"
 msgstr "延伸控制"
 
-#: modules/gui/macosx/intf.m:556 modules/gui/macosx/intf.m:587
-#: modules/gui/macosx/playlistinfo.m:202
-#: modules/gui/wxwidgets/playlist.cpp:272
-#: modules/gui/wxwidgets/playlist.cpp:278
-msgid "Info"
-msgstr "資訊"
+#: modules/gui/macosx/intf.m:579 modules/gui/macosx/intf.m:610
+#: modules/gui/macosx/playlist.m:484 modules/gui/macosx/playlistinfo.m:55
+#: modules/gui/macosx/playlistinfo.m:371
+#, fuzzy
+msgid "Information"
+msgstr "更多資訊"
 
-#: modules/gui/macosx/intf.m:559
+#: modules/gui/macosx/intf.m:582
 msgid "Bring All to Front"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:561
+#: modules/gui/macosx/intf.m:584
 msgid "Help"
 msgstr "說明"
 
-#: modules/gui/macosx/intf.m:562
+#: modules/gui/macosx/intf.m:585
 msgid "ReadMe..."
 msgstr "讀我..."
 
-#: modules/gui/macosx/intf.m:563
+#: modules/gui/macosx/intf.m:586
 msgid "Online Documentation"
 msgstr "線上文件"
 
-#: modules/gui/macosx/intf.m:564
+#: modules/gui/macosx/intf.m:587
 msgid "Report a Bug"
 msgstr "錯誤回報"
 
-#: modules/gui/macosx/intf.m:565
+#: modules/gui/macosx/intf.m:588
 msgid "VideoLAN Website"
 msgstr "VideoLAN網站"
 
-#: modules/gui/macosx/intf.m:566
+#: modules/gui/macosx/intf.m:589
 msgid "License"
 msgstr "授權"
 
-#: modules/gui/macosx/intf.m:567
+#: modules/gui/macosx/intf.m:590
 msgid "Make a donation"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:568
+#: modules/gui/macosx/intf.m:591
 #, fuzzy
 msgid "Online Forum"
 msgstr "線上文件"
 
-#: modules/gui/macosx/intf.m:578 modules/gui/wxwidgets/wizard.cpp:87
+#: modules/gui/macosx/intf.m:601 modules/gui/wxwidgets/dialogs/wizard.cpp:81
 msgid "Error"
 msgstr "錯誤"
 
-#: modules/gui/macosx/intf.m:579
+#: modules/gui/macosx/intf.m:602
 msgid ""
-"An error has occurred which probably prevented the execution of your request:"
+"An error has occurred which probably prevented the proper execution of the "
+"program:"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:581
+#: modules/gui/macosx/intf.m:604
 msgid "If you believe that it is a bug, please follow the instructions at:"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:583
+#: modules/gui/macosx/intf.m:606
 msgid "Open Messages Window"
 msgstr "開啟訊息視窗"
 
-#: modules/gui/macosx/intf.m:584
+#: modules/gui/macosx/intf.m:607
 msgid "Dismiss"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:585
-msgid "Suppress further errors"
+#: modules/gui/macosx/intf.m:608
+msgid "Do not display further errors"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:1032
+#: modules/gui/macosx/intf.m:1071
 #, fuzzy, c-format
 msgid "Volume: %d%%"
 msgstr "減低音量"
 
-#: modules/gui/macosx/intf.m:1263 modules/gui/macosx/intf.m:1264
-#: modules/gui/macosx/intf.m:1265 modules/gui/pda/pda_interface.c:250
-#: modules/gui/pda/pda_interface.c:251 modules/gui/wxwidgets/interface.cpp:491
-#: modules/gui/wxwidgets/interface.cpp:1286
-#: modules/gui/wxwidgets/menus.cpp:293 modules/visualization/xosd.c:241
-#: modules/visualization/xosd.c:242
-#, c-format
-msgid "Pause"
-msgstr "暫停"
-
-#: modules/gui/macosx/intf.m:1636
+#: modules/gui/macosx/intf.m:1741
 msgid "No CrashLog found"
 msgstr "沒有發現當機紀錄"
 
-#: modules/gui/macosx/intf.m:1636
-msgid "You haven't experienced any heavy crashes yet."
+#: modules/gui/macosx/intf.m:1741
+msgid "Couldn't find any trace of a previous crash."
 msgstr ""
 
 #: modules/gui/macosx/macosx.m:50
+#, fuzzy
+msgid "Embedded video output"
+msgstr "影像視訊輸出"
+
+#: modules/gui/macosx/macosx.m:52
+msgid ""
+"Display the video in the controller window instead of a in separate window."
+msgstr ""
+
+#: modules/gui/macosx/macosx.m:54
 msgid "Video device"
 msgstr "視訊裝置"
 
-#: modules/gui/macosx/macosx.m:51
+#: modules/gui/macosx/macosx.m:55
 msgid ""
-"Choose a number corresponding to a screen in you video device selection menu "
-"and this screen will be used by default as the screen for 'fullscreen'."
+"Number of the screen to use by default to display videos in 'fullscreen'. "
+"The screen number correspondance can be found in the video device selection "
+"menu."
 msgstr ""
 
-#: modules/gui/macosx/macosx.m:57
+#: modules/gui/macosx/macosx.m:61
 msgid ""
 "Set the transparency of the video output. 1 is non-transparent (default) 0 "
 "is fully transparent."
 msgstr ""
 
-#: modules/gui/macosx/macosx.m:60
-msgid "Stretch Aspect Ratio"
+#: modules/gui/macosx/macosx.m:64
+msgid "Stretch video to fill window"
 msgstr ""
 
-#: modules/gui/macosx/macosx.m:61
+#: modules/gui/macosx/macosx.m:65
 msgid ""
-"Instead of keeping the aspect ratio of the movie when resizing the video, "
-"stretch the video to fill the entire window."
+"Stretch the video to fill the entire window when resizing the video instead "
+"of keeping the aspect ratio and displaying black borders."
 msgstr ""
 
-#: modules/gui/macosx/macosx.m:65
-msgid "Fill fullscreen"
-msgstr "放大到全螢幕"
+#: modules/gui/macosx/macosx.m:69
+msgid "Crop borders in fullscreen"
+msgstr ""
 
-#: modules/gui/macosx/macosx.m:66
+#: modules/gui/macosx/macosx.m:70
 msgid ""
 "In fullscreen mode, crop the picture if necessary in order to fill the "
 "screen without black borders (OpenGL only)."
 msgstr ""
 
-#: modules/gui/macosx/macosx.m:70
+#: modules/gui/macosx/macosx.m:74
+msgid "Black screens in fullscreen"
+msgstr ""
+
+#: modules/gui/macosx/macosx.m:75
+msgid "In fullscreen mode, keep screen where there is no video displayed black"
+msgstr ""
+
+#: modules/gui/macosx/macosx.m:78
 msgid "Use as Desktop Background"
 msgstr ""
 
-#: modules/gui/macosx/macosx.m:71
+#: modules/gui/macosx/macosx.m:79
 msgid ""
-"Use the video as the Desktop Background of the Finder. Desktop icons cannot "
-"be interacted with in this mode."
+"Use the video as the Desktop Background Desktop icons cannot be interacted "
+"with in this mode."
 msgstr ""
 
-#: modules/gui/macosx/macosx.m:75
+#: modules/gui/macosx/macosx.m:82
+#, fuzzy
+msgid "Remember wizard options"
+msgstr "採樣率"
+
+#: modules/gui/macosx/macosx.m:83
+msgid "Remember the options in the wizard during one session of VLC."
+msgstr ""
+
+#: modules/gui/macosx/macosx.m:87
 #, fuzzy
 msgid "Mac OS X interface"
 msgstr "XOSD介面"
 
-#: modules/gui/macosx/macosx.m:81
+#: modules/gui/macosx/macosx.m:98
 msgid "Quartz video"
 msgstr ""
 
@@ -9089,18 +10343,18 @@ msgid "Open Source"
 msgstr "開啟來源"
 
 #: modules/gui/macosx/open.m:155 modules/gui/wince/open.cpp:130
-#: modules/gui/wxwidgets/open.cpp:426
 msgid "Media Resource Locator (MRL)"
 msgstr "多媒體來源定位器(MRL)"
 
 #: modules/gui/macosx/open.m:164 modules/gui/macosx/open.m:170
 #: modules/gui/macosx/open.m:242 modules/gui/macosx/output.m:145
-#: modules/gui/macosx/prefs_widgets.m:1183
+#: modules/gui/macosx/prefs_widgets.m:1183 modules/gui/macosx/sfilters.m:75
 #: modules/gui/wince/preferences_widgets.cpp:512
-#: modules/gui/wxwidgets/open.cpp:636
-#: modules/gui/wxwidgets/preferences_widgets.cpp:670
-#: modules/gui/wxwidgets/streamout.cpp:468
-#: modules/gui/wxwidgets/subtitles.cpp:91
+#: modules/gui/wxwidgets/dialogs/open.cpp:630
+#: modules/gui/wxwidgets/dialogs/open.cpp:664
+#: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:662
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:501
+#: modules/gui/wxwidgets/dialogs/subtitles.cpp:82
 msgid "Browse..."
 msgstr "瀏覽..."
 
@@ -9108,7 +10362,7 @@ msgstr "瀏覽..."
 msgid "Treat as a pipe rather than as a file"
 msgstr ""
 
-#: modules/gui/macosx/open.m:167 modules/gui/wxwidgets/open.cpp:706
+#: modules/gui/macosx/open.m:167 modules/gui/wxwidgets/dialogs/open.cpp:722
 msgid "Device name"
 msgstr "裝置名稱"
 
@@ -9117,28 +10371,23 @@ msgid "Use DVD menus"
 msgstr "使用DVD選單"
 
 #: modules/gui/macosx/open.m:173 modules/gui/macosx/open.m:478
-msgid "VIDEO_TS folder"
-msgstr ""
+#, fuzzy
+msgid "VIDEO_TS directory"
+msgstr "開啟VIDEO_TS目錄"
 
 #: modules/gui/macosx/open.m:174 modules/gui/macosx/open.m:595
-#: modules/gui/wxwidgets/open.cpp:680
+#: modules/gui/wxwidgets/dialogs/open.cpp:696
 msgid "DVD"
 msgstr ""
 
-#: modules/gui/macosx/open.m:178 modules/gui/macosx/open.m:180
-#: modules/gui/macosx/output.m:147 modules/gui/wxwidgets/open.cpp:810
-#: modules/gui/wxwidgets/open.cpp:837 modules/gui/wxwidgets/streamout.cpp:498
-#: modules/stream_out/rtp.c:67
-msgid "Port"
-msgstr "埠"
-
 #: modules/gui/macosx/open.m:179 modules/gui/macosx/output.m:146
-#: modules/gui/wxwidgets/open.cpp:829 modules/gui/wxwidgets/streamout.cpp:487
+#: modules/gui/wxwidgets/dialogs/open.cpp:848
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:520
 msgid "Address"
 msgstr "位置"
 
 #: modules/gui/macosx/open.m:184 modules/gui/macosx/open.m:655
-#: modules/gui/macosx/open.m:704 modules/gui/wxwidgets/open.cpp:785
+#: modules/gui/macosx/open.m:704 modules/gui/wxwidgets/dialogs/open.cpp:804
 msgid "UDP/RTP Multicast"
 msgstr ""
 
@@ -9147,7 +10396,8 @@ msgstr ""
 msgid "HTTP/FTP/MMS/RTSP"
 msgstr ""
 
-#: modules/gui/macosx/open.m:186 modules/gui/wxwidgets/open.cpp:803
+#: modules/gui/macosx/open.m:186 modules/gui/wxwidgets/dialogs/open.cpp:822
+#: modules/services_discovery/sap.c:112
 msgid "Allow timeshifting"
 msgstr ""
 
@@ -9156,31 +10406,38 @@ msgid "Load subtitles file:"
 msgstr "讀取字幕檔:"
 
 #: modules/gui/macosx/open.m:241 modules/gui/macosx/output.m:137
-#: modules/gui/wxwidgets/open.cpp:459 modules/gui/wxwidgets/open.cpp:648
+#: modules/gui/wxwidgets/dialogs/open.cpp:436
 msgid "Settings..."
 msgstr "設定..."
 
 #: modules/gui/macosx/open.m:243
-msgid "Override"
+msgid "Override parametters"
 msgstr ""
 
 #: modules/gui/macosx/open.m:244
-msgid "delay"
+#: modules/gui/wxwidgets/dialogs/subtitles.cpp:218
+#: modules/stream_out/bridge.c:41 modules/stream_out/display.c:41
+#: modules/video_filter/mosaic.c:139
+msgid "Delay"
 msgstr "延遲"
 
 #: modules/gui/macosx/open.m:246
-msgid "fps"
+msgid "FPS"
 msgstr ""
 
-#: modules/gui/macosx/open.m:248 modules/gui/wxwidgets/subtitles.cpp:105
+#: modules/gui/macosx/open.m:248
 msgid "Subtitles encoding"
 msgstr "字幕編碼"
 
-#: modules/gui/macosx/open.m:250 modules/misc/freetype.c:96
-#: modules/misc/win32text.c:67
+#: modules/gui/macosx/open.m:250
 msgid "Font size"
 msgstr "字型大小"
 
+#: modules/gui/macosx/open.m:252
+#, fuzzy
+msgid "Subtitles alignment"
+msgstr "字幕檔"
+
 #: modules/gui/macosx/open.m:255
 msgid "Font Properties"
 msgstr "字型設定"
@@ -9200,37 +10457,46 @@ msgid "Open VIDEO_TS Directory"
 msgstr "開啟VIDEO_TS目錄"
 
 #: modules/gui/macosx/output.m:136
-msgid "Advanced output:"
-msgstr "進階輸出:"
+#, fuzzy
+msgid "Streaming/Saving:"
+msgstr "串流"
 
 #: modules/gui/macosx/output.m:140
-msgid "Output Options"
-msgstr "輸出選項"
+#, fuzzy
+msgid "Streaming and Transcoding Options"
+msgstr "串流/轉碼精靈"
 
-#: modules/gui/macosx/output.m:141 modules/gui/wxwidgets/streamout.cpp:438
-msgid "Play locally"
-msgstr ""
+#: modules/gui/macosx/output.m:141
+#, fuzzy
+msgid "Display the stream locally"
+msgstr "串流時顯示"
 
-#: modules/gui/macosx/output.m:144 modules/gui/wxwidgets/streamout.cpp:477
+#: modules/gui/macosx/output.m:144
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:510
 msgid "Dump raw input"
 msgstr ""
 
-#: modules/gui/macosx/output.m:155 modules/gui/wxwidgets/streamout.cpp:625
+#: modules/gui/macosx/output.m:155
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:661
 msgid "Encapsulation Method"
 msgstr ""
 
 #: modules/gui/macosx/output.m:159
-msgid "Transcode options"
-msgstr "轉碼選項"
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:711
+msgid "Transcoding options"
+msgstr ""
 
 #: modules/gui/macosx/output.m:163 modules/gui/macosx/output.m:173
-#: modules/gui/macosx/wizard.m:404 modules/gui/wxwidgets/streamout.cpp:740
-#: modules/gui/wxwidgets/streamout.cpp:815
-#: modules/gui/wxwidgets/wizard.cpp:833 modules/gui/wxwidgets/wizard.cpp:872
+#: modules/gui/macosx/wizard.m:425
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:776
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:851
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:846
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:885
 msgid "Bitrate (kb/s)"
 msgstr ""
 
-#: modules/gui/macosx/output.m:166 modules/gui/wxwidgets/streamout.cpp:746
+#: modules/gui/macosx/output.m:166
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:782
 msgid "Scale"
 msgstr ""
 
@@ -9238,111 +10504,187 @@ msgstr ""
 msgid "Stream Announcing"
 msgstr ""
 
-#: modules/gui/macosx/output.m:181 modules/gui/wxwidgets/streamout.cpp:557
+#: modules/gui/macosx/output.m:181
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:590
 msgid "SAP announce"
 msgstr ""
 
-#: modules/gui/macosx/output.m:182
-msgid "SLP announce"
-msgstr ""
-
-#: modules/gui/macosx/output.m:183 modules/gui/macosx/output.m:647
+#: modules/gui/macosx/output.m:182 modules/gui/macosx/output.m:635
 msgid "RTSP announce"
 msgstr ""
 
-#: modules/gui/macosx/output.m:184 modules/gui/macosx/output.m:653
+#: modules/gui/macosx/output.m:183 modules/gui/macosx/output.m:641
 msgid "HTTP announce"
 msgstr ""
 
-#: modules/gui/macosx/output.m:185 modules/gui/macosx/output.m:659
+#: modules/gui/macosx/output.m:184 modules/gui/macosx/output.m:647
 msgid "Export SDP as file"
 msgstr ""
 
-#: modules/gui/macosx/output.m:187
+#: modules/gui/macosx/output.m:186
 msgid "Channel Name"
 msgstr "頻道名稱"
 
-#: modules/gui/macosx/output.m:188
+#: modules/gui/macosx/output.m:187
 msgid "SDP URL"
 msgstr ""
 
-#: modules/gui/macosx/output.m:537
+#: modules/gui/macosx/output.m:525
 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/iteminfo.cpp:137
-#: modules/gui/wxwidgets/wizard.cpp:591
-msgid "URI"
-msgstr ""
-
-#: modules/gui/macosx/playlist.m:499
+#: modules/gui/macosx/playlist.m:479
 msgid "Save Playlist..."
 msgstr "儲存播放清單..."
 
-#: modules/gui/macosx/playlist.m:501 modules/gui/pda/pda_interface.c:1254
-#: modules/gui/wxwidgets/playlist.cpp:271
-#: modules/gui/wxwidgets/playlist.cpp:277
+#: modules/gui/macosx/playlist.m:481 modules/gui/pda/pda_interface.c:1254
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:278
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:285
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_streampanel.cpp:104
 msgid "Delete"
 msgstr "刪除"
 
-#: modules/gui/macosx/playlist.m:502
+#: modules/gui/macosx/playlist.m:482
 msgid "Expand Node"
 msgstr ""
 
-#: modules/gui/macosx/playlist.m:505 modules/gui/wxwidgets/playlist.cpp:269
-#: modules/gui/wxwidgets/playlist.cpp:276
-msgid "Preparse"
-msgstr ""
+#: modules/gui/macosx/playlist.m:485
+#, fuzzy
+msgid "Get Stream Information"
+msgstr "更多資訊"
 
-#: modules/gui/macosx/playlist.m:506
+#: modules/gui/macosx/playlist.m:486
 msgid "Sort Node by Name"
 msgstr "依名稱排序節點"
 
-#: modules/gui/macosx/playlist.m:507
+#: modules/gui/macosx/playlist.m:487
 msgid "Sort Node by Author"
 msgstr "依製作人排序節點"
 
-#: modules/gui/macosx/playlist.m:510 modules/gui/macosx/playlist.m:1519
-msgid "no items in playlist"
+#: modules/gui/macosx/playlist.m:490 modules/gui/macosx/playlist.m:1523
+#, fuzzy
+msgid "No items in the playlist"
 msgstr "播放清單中沒有項目"
 
-#: modules/gui/macosx/playlist.m:514 modules/gui/wxwidgets/playlist.cpp:315
+#: modules/gui/macosx/playlist.m:494
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:323
 msgid "Search"
 msgstr "搜尋"
 
-#: modules/gui/macosx/playlist.m:516
+#: modules/gui/macosx/playlist.m:496
 #, fuzzy
 msgid "Search in Playlist"
 msgstr "開啟播放清單"
 
-#: modules/gui/macosx/playlist.m:517
+#: modules/gui/macosx/playlist.m:497
 msgid "Standard Play"
 msgstr "標準播放"
 
-#: modules/gui/macosx/playlist.m:765
+#: modules/gui/macosx/playlist.m:500
+#, fuzzy
+msgid "Add Folder to Playlist"
+msgstr "增加至播放清單"
+
+#: modules/gui/macosx/playlist.m:749
 #, fuzzy
 msgid "Save Playlist"
 msgstr "儲存播放清單"
 
-#: modules/gui/macosx/playlist.m:1512 modules/gui/wxwidgets/playlist.cpp:581
-#: modules/gui/wxwidgets/playlist.cpp:793
-#, c-format
-msgid "%i items in playlist"
+#: modules/gui/macosx/playlist.m:1492
+msgid "Empty Folder"
+msgstr ""
+
+#: modules/gui/macosx/playlist.m:1517
+#, fuzzy, c-format
+msgid "%i items in the playlist"
 msgstr "播放清單中有 %i 個項目"
 
-#: modules/gui/macosx/playlist.m:1524
-msgid "1 item in playlist"
+#: modules/gui/macosx/playlist.m:1527
+#, fuzzy
+msgid "1 item in the playlist"
 msgstr "播放清單中有 1 個項目"
 
-#: modules/gui/macosx/prefs.m:123 modules/gui/wxwidgets/preferences.cpp:215
+#: modules/gui/macosx/playlistinfo.m:56
+#: modules/gui/wxwidgets/dialogs/infopanels.cpp:63
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:591
+msgid "URI"
+msgstr ""
+
+#: modules/gui/macosx/playlistinfo.m:63
+#, fuzzy
+msgid "Advanced Information"
+msgstr "進階選項"
+
+#: modules/gui/macosx/playlistinfo.m:81
+msgid "Read at media"
+msgstr ""
+
+#: modules/gui/macosx/playlistinfo.m:82
+#, fuzzy
+msgid "Input bitrate"
+msgstr "輸入清單"
+
+#: modules/gui/macosx/playlistinfo.m:83
+#, fuzzy
+msgid "Demuxed"
+msgstr "解多工器"
+
+#: modules/gui/macosx/playlistinfo.m:84
+#, fuzzy
+msgid "Stream bitrate"
+msgstr "最大化編碼位元率"
+
+#: modules/gui/macosx/playlistinfo.m:87 modules/gui/macosx/playlistinfo.m:97
+#, fuzzy
+msgid "Decoded blocks"
+msgstr "解碼器"
+
+#: modules/gui/macosx/playlistinfo.m:88
+#, fuzzy
+msgid "Displayed frames"
+msgstr "略過頁面"
+
+#: modules/gui/macosx/playlistinfo.m:89
+#, fuzzy
+msgid "Lost frames"
+msgstr "Logo檔名"
+
+#: modules/gui/macosx/playlistinfo.m:91 modules/gui/macosx/wizard.m:404
+#: modules/gui/wxwidgets/dialogs/infopanels.cpp:315
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:139
+#: modules/video_filter/deinterlace.c:137
+msgid "Streaming"
+msgstr "串流"
+
+#: modules/gui/macosx/playlistinfo.m:92
+msgid "Sent packets"
+msgstr ""
+
+#: modules/gui/macosx/playlistinfo.m:93
+msgid "Sent bytes"
+msgstr ""
+
+#: modules/gui/macosx/playlistinfo.m:94
+#, fuzzy
+msgid "Send rate"
+msgstr "採樣率"
+
+#: modules/gui/macosx/playlistinfo.m:98
+#, fuzzy
+msgid "Played buffers"
+msgstr "快速播放"
+
+#: modules/gui/macosx/playlistinfo.m:99
+msgid "Lost buffers"
+msgstr ""
+
+#: modules/gui/macosx/prefs.m:123
+#: modules/gui/wxwidgets/dialogs/preferences.cpp:212
 msgid "Reset All"
 msgstr "全部重置"
 
-#: modules/gui/macosx/prefs.m:142 modules/gui/wxwidgets/preferences.cpp:296
+#: modules/gui/macosx/prefs.m:142
+#: modules/gui/wxwidgets/dialogs/preferences.cpp:295
 msgid "Reset Preferences"
 msgstr "重設偏好設定"
 
@@ -9350,14 +10692,14 @@ msgstr "重設偏好設定"
 msgid "Continue"
 msgstr "繼續"
 
-#: modules/gui/macosx/prefs.m:145 modules/gui/wxwidgets/preferences.cpp:294
+#: modules/gui/macosx/prefs.m:145
 msgid ""
-"Beware this will reset your VLC media player preferences.\n"
+"Beware this will reset the VLC media player preferences.\n"
 "Are you sure you want to continue?"
 msgstr ""
 
-#: modules/gui/macosx/prefs.m:703
-msgid "Some options are available but hidden. Check \"Advanced\" to see them."
+#: modules/gui/macosx/prefs.m:708
+msgid "Some options are hidden. Check \"Advanced\" to display them."
 msgstr ""
 
 #: modules/gui/macosx/prefs_widgets.m:1222
@@ -9374,35 +10716,223 @@ msgstr "選擇檔案"
 msgid "Select"
 msgstr "選擇"
 
-#: modules/gui/macosx/update.m:91
-msgid "Download now"
-msgstr ""
+#: modules/gui/macosx/sfilters.m:70
+#, fuzzy
+msgid "Subpicture Filters"
+msgstr "字幕"
 
-#: modules/gui/macosx/update.m:93
+#: modules/gui/macosx/sfilters.m:71
 #, fuzzy
-msgid "Current version"
-msgstr "色彩反向"
+msgid "Logo"
+msgstr "循環"
 
-#: modules/gui/macosx/update.m:95
-msgid "Released on"
+#: modules/gui/macosx/sfilters.m:73 modules/gui/macosx/sfilters.m:98
+#: modules/video_filter/marq.c:115
+msgid "Marquee"
 msgstr ""
 
-#: modules/gui/macosx/update.m:97 modules/gui/pda/pda.c:232
+#: modules/gui/macosx/sfilters.m:74
+#, fuzzy
+msgid "Save settings"
+msgstr "視訊設定"
+
+#: modules/gui/macosx/sfilters.m:76 modules/gui/macosx/sfilters.m:83
+#: modules/gui/macosx/sfilters.m:95
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:401
+#, fuzzy
+msgid "Enabled"
+msgstr "啟動"
+
+#: modules/gui/macosx/sfilters.m:77
+msgid "Image"
+msgstr "影像"
+
+#: modules/gui/macosx/sfilters.m:84
+#, 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/update.m:99
+#: modules/gui/macosx/sfilters.m:94 modules/gui/macosx/sfilters.m:109
+msgid "(in pixels)"
+msgstr ""
+
+#: modules/gui/macosx/sfilters.m:104
+msgid "ms"
+msgstr ""
+
+#: modules/gui/macosx/sfilters.m:135 modules/misc/freetype.c:127
+#: modules/misc/win32text.c:84 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:127
+#: modules/misc/win32text.c:84 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:127
+#: modules/misc/win32text.c:84 modules/video_filter/marq.c:53
+#: modules/video_filter/rss.c:64 modules/video_filter/time.c:53
 #, fuzzy
-msgid "Your version"
-msgstr "色彩反向"
+msgid "Silver"
+msgstr "放慢"
+
+#: modules/gui/macosx/sfilters.m:138 modules/misc/freetype.c:127
+#: modules/misc/win32text.c:84 modules/video_filter/marq.c:53
+#: modules/video_filter/rss.c:64 modules/video_filter/time.c:53
+msgid "White"
+msgstr ""
 
-#: modules/gui/macosx/update.m:101
+#: modules/gui/macosx/sfilters.m:139 modules/misc/freetype.c:127
+#: modules/misc/win32text.c:84 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:128
+#: modules/misc/win32text.c:85 modules/video_filter/marq.c:53
+#: modules/video_filter/rss.c:64 modules/video_filter/time.c:53
 #, fuzzy
-msgid "Mirror"
-msgstr "錯誤"
+msgid "Red"
+msgstr "回捲"
+
+#: modules/gui/macosx/sfilters.m:141 modules/misc/freetype.c:128
+#: modules/misc/win32text.c:85 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:128
+#: modules/misc/win32text.c:85 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:128
+#: modules/misc/win32text.c:85 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:128
+#: modules/misc/win32text.c:85 modules/video_filter/marq.c:54
+#: modules/video_filter/rss.c:65 modules/video_filter/time.c:54
+#, fuzzy
+msgid "Green"
+msgstr "畫面"
+
+#: modules/gui/macosx/sfilters.m:145 modules/misc/freetype.c:128
+#: modules/misc/win32text.c:85 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:129
+#: modules/misc/win32text.c:86 modules/video_filter/marq.c:55
+#: modules/video_filter/rss.c:66 modules/video_filter/time.c:55
+#, fuzzy
+msgid "Lime"
+msgstr "時間"
+
+#: modules/gui/macosx/sfilters.m:147 modules/misc/freetype.c:129
+#: modules/misc/win32text.c:86 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:129
+#: modules/misc/win32text.c:86 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:129
+#: modules/misc/win32text.c:86 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:129
+#: modules/misc/win32text.c:86 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
+#, fuzzy
+msgid "Center-Center"
+msgstr "置中"
+
+#: modules/gui/macosx/sfilters.m:191
+#, fuzzy
+msgid "Left-Center"
+msgstr "置中"
+
+#: modules/gui/macosx/sfilters.m:192
+#, fuzzy
+msgid "Right-Center"
+msgstr "置中"
+
+#: modules/gui/macosx/sfilters.m:193
+#, fuzzy
+msgid "Center-Top"
+msgstr "置中"
+
+#: modules/gui/macosx/sfilters.m:194
+#, fuzzy
+msgid "Left-Top"
+msgstr "左"
+
+#: modules/gui/macosx/sfilters.m:195
+#, fuzzy
+msgid "Right-Top"
+msgstr "右"
+
+#: modules/gui/macosx/sfilters.m:196
+#, fuzzy
+msgid "Center-Bottom"
+msgstr "置中"
+
+#: modules/gui/macosx/sfilters.m:197
+#, fuzzy
+msgid "Left-Bottom"
+msgstr "底部"
+
+#: modules/gui/macosx/sfilters.m:198
+#, fuzzy
+msgid "Right-Bottom"
+msgstr "底部"
+
+#: modules/gui/macosx/update.m:84
+msgid "Check for Updates"
+msgstr ""
+
+#: modules/gui/macosx/update.m:85
+msgid "Download now"
+msgstr ""
+
+#: modules/gui/macosx/update.m:92
+msgid "Checking for Updates..."
+msgstr ""
+
+#: modules/gui/macosx/update.m:180
+#, c-format
+msgid "The latest VLC media player release is %s (%i MB to download)."
+msgstr ""
+
+#: modules/gui/macosx/update.m:195
+msgid "This version of VLC is outdated."
+msgstr ""
 
-#: modules/gui/macosx/update.m:103
-msgid "Checking for update..."
+#: modules/gui/macosx/update.m:208
+msgid "This version of VLC is latest available."
 msgstr ""
 
 #: modules/gui/macosx/wizard.m:114
@@ -9419,19 +10949,19 @@ msgid ""
 "RAW)"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:126 modules/gui/wxwidgets/streamdata.h:66
+#: modules/gui/macosx/wizard.m:126 modules/gui/wxwidgets/streamdata.cpp:43
 msgid "DivX first version (useable with MPEG TS, MPEG1, ASF and OGG)"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:130 modules/gui/wxwidgets/streamdata.h:70
+#: modules/gui/macosx/wizard.m:130 modules/gui/wxwidgets/streamdata.cpp:47
 msgid "DivX second version (useable with MPEG TS, MPEG1, ASF and OGG)"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:134 modules/gui/wxwidgets/streamdata.h:73
+#: modules/gui/macosx/wizard.m:134 modules/gui/wxwidgets/streamdata.cpp:50
 msgid "DivX third version (useable with MPEG TS, MPEG1, ASF and OGG)"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:138 modules/gui/wxwidgets/streamdata.h:76
+#: modules/gui/macosx/wizard.m:138 modules/gui/wxwidgets/streamdata.cpp:53
 msgid ""
 "H263 is a video codec optimized for videoconference (low rates, useable with "
 "MPEG TS)"
@@ -9450,98 +10980,99 @@ msgstr ""
 msgid "WMV (Windows Media Video) 2 (useable with MPEG TS, MPEG1, ASF and OGG)"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:154 modules/gui/wxwidgets/streamdata.h:93
+#: modules/gui/macosx/wizard.m:154 modules/gui/wxwidgets/streamdata.cpp:70
 msgid ""
 "MJPEG consists of a series of JPEG pictures (useable with MPEG TS, MPEG1, "
 "ASF and OGG)"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:158 modules/gui/wxwidgets/streamdata.h:96
+#: modules/gui/macosx/wizard.m:158
 #, fuzzy
-msgid "Theora is a free general-purpose codec (useable with MPEG TS)"
+msgid "Theora is a free general-purpose codec (useable with MPEG TS and OGG)"
 msgstr "Theora是一個免費、開放的通用編碼器"
 
-#: modules/gui/macosx/wizard.m:161 modules/gui/macosx/wizard.m:212
-#: modules/gui/wxwidgets/streamdata.h:99
-#: modules/gui/wxwidgets/streamdata.h:136
+#: modules/gui/macosx/wizard.m:162 modules/gui/macosx/wizard.m:213
+#: modules/gui/wxwidgets/streamdata.cpp:76
+#: modules/gui/wxwidgets/streamdata.cpp:113
 msgid "Dummy codec (do not transcode, useable with all encapsulation formats)"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:180 modules/gui/wxwidgets/streamdata.h:107
+#: modules/gui/macosx/wizard.m:181 modules/gui/wxwidgets/streamdata.cpp:84
 msgid ""
 "The standard MPEG audio (1/2) format (useable with MPEG PS, MPEG TS, MPEG1, "
 "ASF, OGG and RAW)"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:184 modules/gui/wxwidgets/streamdata.h:111
+#: modules/gui/macosx/wizard.m:185 modules/gui/wxwidgets/streamdata.cpp:88
 msgid ""
 "MPEG Audio Layer 3 (useable with MPEG PS, MPEG TS, MPEG1, ASF, OGG and RAW)"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:188 modules/gui/wxwidgets/streamdata.h:115
+#: modules/gui/macosx/wizard.m:189 modules/gui/wxwidgets/streamdata.cpp:92
 msgid "Audio format for MPEG4 (useable with MPEG TS and MPEG4)"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:191 modules/gui/wxwidgets/streamdata.h:118
+#: modules/gui/macosx/wizard.m:192 modules/gui/wxwidgets/streamdata.cpp:95
 msgid ""
 "DVD audio format (useable with MPEG PS, MPEG TS, MPEG1, ASF, OGG and RAW)"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:195 modules/gui/wxwidgets/streamdata.h:122
+#: modules/gui/macosx/wizard.m:196 modules/gui/wxwidgets/streamdata.cpp:99
 #, fuzzy
 msgid "Vorbis is a free audio codec (useable with OGG)"
 msgstr "Vorbis是一個免費、開放的音訊編碼器"
 
-#: modules/gui/macosx/wizard.m:198 modules/gui/wxwidgets/streamdata.h:124
+#: modules/gui/macosx/wizard.m:199 modules/gui/wxwidgets/streamdata.cpp:101
 #, fuzzy
 msgid "FLAC is a lossless audio codec (useable with OGG and RAW)"
 msgstr "FLAC是一個低失真的音訊編碼器"
 
-#: modules/gui/macosx/wizard.m:202
-msgid "A free audio codec dedicated to compression of voice (useable with OGG"
+#: modules/gui/macosx/wizard.m:203 modules/gui/wxwidgets/streamdata.cpp:104
+msgid "A free audio codec dedicated to compression of voice (useable with OGG)"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:206 modules/gui/macosx/wizard.m:209
-#: modules/gui/wxwidgets/streamdata.h:130
-#: modules/gui/wxwidgets/streamdata.h:133
+#: modules/gui/macosx/wizard.m:207 modules/gui/macosx/wizard.m:210
+#: modules/gui/wxwidgets/streamdata.cpp:107
+#: modules/gui/wxwidgets/streamdata.cpp:110
 msgid "Uncompressed audio samples (useable with WAV)"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:234 modules/gui/wxwidgets/streamdata.h:185
+#: modules/gui/macosx/wizard.m:235 modules/gui/wxwidgets/streamdata.cpp:148
 msgid "MPEG Program Stream"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:236 modules/gui/wxwidgets/streamdata.h:186
+#: modules/gui/macosx/wizard.m:237 modules/gui/wxwidgets/streamdata.cpp:149
 msgid "MPEG Transport Stream"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:238 modules/gui/wxwidgets/streamdata.h:187
+#: modules/gui/macosx/wizard.m:239 modules/gui/wxwidgets/streamdata.cpp:150
 msgid "MPEG 1 Format"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:255 modules/gui/wxwidgets/streamdata.h:168
+#: modules/gui/macosx/wizard.m:258
 msgid ""
-"Enter the local addresses you want to listen to. Do not enter anything if "
-"you want to listen to all adresses or if you don't understand. This is "
+"Enter the local addresses you want to listen requests on. Do not enter "
+"anything if you want to listen on all the network interfaces. This is "
 "generally the best thing to do. Other computers can then access the stream "
 "at http://yourip:8080 by default."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:259 modules/gui/wxwidgets/streamdata.h:165
+#: modules/gui/macosx/wizard.m:262
 msgid ""
-"Use this to stream to several computers. This method is less efficient, as "
-"the server needs to send the stream several times."
+"Use this to stream to several computers. This method is not the most "
+"efficient, as the server needs to send the stream several times, but "
+"generally the most compatible"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:262
+#: modules/gui/macosx/wizard.m:265
 msgid ""
-"Enter the local addresses you want to listen to. Do not enter anything if "
-"you want to listen to all adresses or if you don't understand. This is "
+"Enter the local addresses you want to listen requests on. Do not enter "
+"anything if you want to listen on all the network interfaces. This is "
 "generally the best thing to do. Other computers can then access the stream "
 "at mms://yourip:8080 by default."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:266
+#: modules/gui/macosx/wizard.m:269
 msgid ""
 "Use this to stream to several computers using the Microsoft MMS protocol. "
 "This protocol is used as transport method by many Microsoft's softwares. "
@@ -9549,343 +11080,392 @@ msgid ""
 "encapsulated in HTTP)."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:271 modules/gui/macosx/wizard.m:388
-#: modules/gui/wxwidgets/streamdata.h:154
+#: modules/gui/macosx/wizard.m:274 modules/gui/macosx/wizard.m:284
+#: modules/gui/wxwidgets/streamdata.cpp:123
 msgid "Enter the address of the computer to stream to."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:272 modules/gui/macosx/wizard.m:392
-#: modules/gui/wxwidgets/streamdata.h:153
+#: modules/gui/macosx/wizard.m:275 modules/gui/macosx/wizard.m:413
 #, fuzzy
 msgid "Use this to stream to a single computer."
 msgstr "串流至網路"
 
-#: modules/gui/macosx/wizard.m:274
+#: modules/gui/macosx/wizard.m:277 modules/gui/macosx/wizard.m:287
 msgid ""
 "Enter the multicast address to stream to in this field. This must be an IP "
 "address between 224.0.0.0 and 239.255.255.255. For a private use, enter an "
 "address beginning with 239.255."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:277 modules/gui/wxwidgets/streamdata.h:157
+#: modules/gui/macosx/wizard.m:280
 msgid ""
 "Use this to stream to a dynamic group of computers on a multicast-enabled "
 "network. This is the most efficient method to stream to several computers, "
-"but it does not work over Internet."
-msgstr ""
-
-#: modules/gui/macosx/wizard.m:342
-msgid "Back"
+"but it won't work over the Internet."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:345 modules/gui/macosx/wizard.m:348
-#: modules/gui/macosx/wizard.m:1117 modules/gui/wxwidgets/wizard.cpp:88
-#: modules/gui/wxwidgets/wizard.cpp:91 modules/gui/wxwidgets/wizard.cpp:1394
-msgid "Streaming/Transcoding Wizard"
-msgstr "串流/轉碼精靈"
-
-#: modules/gui/macosx/wizard.m:349 modules/gui/wxwidgets/wizard.cpp:92
+#: modules/gui/macosx/wizard.m:285
 #, fuzzy
-msgid "This wizard helps you to stream, transcode or save a stream."
-msgstr "這個精靈可以幫助你串流、轉碼或是儲存一個串流"
+msgid ""
+"Use this to stream to a single computer. RTP headers will be added to the "
+"stream"
+msgstr "串流至網路"
+
+#: modules/gui/macosx/wizard.m:290
+msgid ""
+"Use this to stream to a dynamic group of computers on a multicast-enabled "
+"network. This is the most efficient method to stream to several computers, "
+"but it won't work over Internet. RTP headers will be added to the stream"
+msgstr ""
+
+#: modules/gui/macosx/wizard.m:362
+msgid "Back"
+msgstr ""
+
+#: modules/gui/macosx/wizard.m:365 modules/gui/macosx/wizard.m:368
+#: modules/gui/macosx/wizard.m:1291
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:82
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:85
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:1406
+msgid "Streaming/Transcoding Wizard"
+msgstr "串流/轉碼精靈"
+
+#: modules/gui/macosx/wizard.m:369
+msgid "This wizard allows to configure simple streaming or transcoding setups."
+msgstr ""
 
-#: modules/gui/macosx/wizard.m:353 modules/gui/wxwidgets/wizard.cpp:98
+#: modules/gui/macosx/wizard.m:373
 msgid ""
 "This wizard only gives access to a small subset of VLC's streaming and "
-"transcoding capabilities. Use the Open and Stream Output dialogs to get all "
-"of them."
+"transcoding capabilities. The Open and 'Saving/Streaming' dialogs will give "
+"access to more features."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:356 modules/gui/macosx/wizard.m:501
-#: modules/gui/macosx/wizard.m:1399 modules/gui/wxwidgets/wizard.cpp:94
+#: modules/gui/macosx/wizard.m:377 modules/gui/macosx/wizard.m:525
+#: modules/gui/macosx/wizard.m:1659
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:88
 msgid "Stream to network"
 msgstr "串流至網路"
 
-#: modules/gui/macosx/wizard.m:358 modules/gui/macosx/wizard.m:1411
-#: modules/gui/wxwidgets/wizard.cpp:96
+#: modules/gui/macosx/wizard.m:379 modules/gui/macosx/wizard.m:1667
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:90
 msgid "Transcode/Save to file"
 msgstr "轉碼/儲存至檔案"
 
-#: modules/gui/macosx/wizard.m:362 modules/gui/wxwidgets/wizard.cpp:107
+#: modules/gui/macosx/wizard.m:383
 msgid "Choose input"
 msgstr "選擇輸出"
 
-#: modules/gui/macosx/wizard.m:363 modules/gui/wxwidgets/wizard.cpp:108
+#: modules/gui/macosx/wizard.m:384
 #, fuzzy
 msgid "Choose here your input stream."
 msgstr "在這選擇你的輸入串流"
 
-#: modules/gui/macosx/wizard.m:365 modules/gui/macosx/wizard.m:535
-#: modules/gui/macosx/wizard.m:1448 modules/gui/wxwidgets/wizard.cpp:110
+#: modules/gui/macosx/wizard.m:386 modules/gui/macosx/wizard.m:563
+#: modules/gui/macosx/wizard.m:1700
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:109
 msgid "Select a stream"
 msgstr "選擇串流"
 
-#: modules/gui/macosx/wizard.m:367 modules/gui/wxwidgets/wizard.cpp:111
+#: modules/gui/macosx/wizard.m:388
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:110
 msgid "Existing playlist item"
 msgstr "存在的播放清單項目"
 
-#: modules/gui/macosx/wizard.m:368 modules/gui/macosx/wizard.m:431
-#: modules/gui/wxwidgets/wizard.cpp:573
+#: modules/gui/macosx/wizard.m:389 modules/gui/macosx/wizard.m:454
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:573
 msgid "Choose..."
 msgstr "選擇..."
 
-#: modules/gui/macosx/wizard.m:373 modules/gui/macosx/wizard.m:443
-#: modules/gui/wxwidgets/wizard.cpp:623
+#: modules/gui/macosx/wizard.m:394 modules/gui/macosx/wizard.m:468
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:625
 msgid "Partial Extract"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:375 modules/gui/wxwidgets/wizard.cpp:116
+#: modules/gui/macosx/wizard.m:396
 msgid ""
-"Use this to read only a part of the stream. You must be able to control the "
-"incoming stream (for example, a file or a disc, but not an UDP network "
-"stream.)\n"
-"Enter the starting and ending times (in seconds)."
+"This can be used to read only a part of the stream. It must be possible to "
+"control the incoming stream (for example, a file or a disc, but not an UDP "
+"network stream.) The starting and ending times can be given in seconds."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:379 modules/gui/wxwidgets/wizard.cpp:634
+#: modules/gui/macosx/wizard.m:400
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:636
 msgid "From"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:380 modules/gui/wxwidgets/wizard.cpp:639
+#: modules/gui/macosx/wizard.m:401
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:641
 msgid "To"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:383 modules/gui/wxwidgets/wizard.cpp:139
-msgid "Streaming"
-msgstr "串流"
-
-#: modules/gui/macosx/wizard.m:384 modules/gui/wxwidgets/wizard.cpp:140
-msgid "In this page, you will select how your input stream will be sent."
+#: modules/gui/macosx/wizard.m:405
+#, fuzzy
+msgid "This page allows to select how the input stream will be sent."
 msgstr "在這一頁，你可以選擇你的輸入串流的傳送方式"
 
-#: modules/gui/macosx/wizard.m:386 modules/gui/macosx/wizard.m:437
-#: modules/gui/wxwidgets/wizard.cpp:1039 modules/stream_out/rtp.c:41
+#: modules/gui/macosx/wizard.m:407 modules/gui/macosx/wizard.m:462
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:1052 modules/stream_out/rtp.c:46
 msgid "Destination"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:387 modules/gui/macosx/wizard.m:449
-#: modules/gui/wxwidgets/wizard.cpp:1025
+#: modules/gui/macosx/wizard.m:408 modules/gui/macosx/wizard.m:474
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:1038
 msgid "Streaming method"
 msgstr "串流方式"
 
-#: modules/gui/macosx/wizard.m:390 modules/gui/macosx/wizard.m:630
-#: modules/gui/wxwidgets/streamdata.h:153
+#: modules/gui/macosx/wizard.m:409
+msgid "Address of the computer to stream to."
+msgstr ""
+
+#: modules/gui/macosx/wizard.m:411
 msgid "UDP Unicast"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:391 modules/gui/wxwidgets/streamdata.h:156
+#: modules/gui/macosx/wizard.m:412
 msgid "UDP Multicast"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:396 modules/gui/pda/pda_interface.c:1221
-#: modules/gui/wxwidgets/wizard.cpp:125 modules/stream_out/transcode.c:167
+#: 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
 msgid "Transcode"
 msgstr "轉碼"
 
-#: modules/gui/macosx/wizard.m:397 modules/gui/wxwidgets/wizard.cpp:126
+#: modules/gui/macosx/wizard.m:418
 msgid ""
-"If you want to change the compression format of the audio or video tracks, "
-"fill in this page. (If you only want to change the container format, proceed "
-"to next page.)"
+"This page allows to change the compression format of the audio or video "
+"tracks. To change only the container format, proceed to next page."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:402 modules/gui/macosx/wizard.m:451
-#: modules/gui/wxwidgets/wizard.cpp:855
+#: modules/gui/macosx/wizard.m:423 modules/gui/macosx/wizard.m:476
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:868
 msgid "Transcode audio"
 msgstr "音訊轉碼"
 
-#: modules/gui/macosx/wizard.m:403 modules/gui/macosx/wizard.m:453
-#: modules/gui/wxwidgets/wizard.cpp:816
+#: modules/gui/macosx/wizard.m:424 modules/gui/macosx/wizard.m:478
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:829
 msgid "Transcode video"
 msgstr "視訊轉碼"
 
-#: modules/gui/macosx/wizard.m:406 modules/gui/macosx/wizard.m:1535
-#: modules/gui/wxwidgets/wizard.cpp:133
-msgid "If your stream has audio and you want to transcode it, enable this."
+#: modules/gui/macosx/wizard.m:427 modules/gui/macosx/wizard.m:1802
+msgid ""
+"Enabling this allows to transcode the audio track if one is present in the "
+"stream."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:408 modules/gui/macosx/wizard.m:1552
-#: modules/gui/wxwidgets/wizard.cpp:128
-msgid "If your stream has video and you want to transcode it, enable this."
+#: modules/gui/macosx/wizard.m:429 modules/gui/macosx/wizard.m:1819
+msgid ""
+"Enabling this allows to transcode the video track if one is present in the "
+"stream."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:412 modules/gui/wxwidgets/wizard.cpp:148
+#: modules/gui/macosx/wizard.m:433
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:148
 msgid "Encapsulation format"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:413 modules/gui/wxwidgets/wizard.cpp:149
+#: modules/gui/macosx/wizard.m:434
 msgid ""
-"In this page, you will select how the stream will be encapsulated. Depending "
-"on the choices you made, all formats won't be available."
+"This page allows to select how the stream will be encapsulated. Depending on "
+"previously chosen settings all formats won't be available."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:418 modules/gui/wxwidgets/wizard.cpp:162
+#: modules/gui/macosx/wizard.m:439
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:162
 msgid "Additional streaming options"
 msgstr "附加的串流選項"
 
-#: modules/gui/macosx/wizard.m:419
+#: modules/gui/macosx/wizard.m:440
 #, fuzzy
-msgid ""
-"In this page, you will define a few additional parameters for your stream."
+msgid "In this page, a few additional streaming parameters can be set."
 msgstr "在這一頁，你可以選擇你的輸入串流的傳送方式"
 
-#: modules/gui/macosx/wizard.m:421 modules/gui/macosx/wizard.m:1579
-#: modules/gui/wxwidgets/streamout.cpp:573
-#: modules/gui/wxwidgets/wizard.cpp:1326
-msgid "Time-To-Live (TTL)"
-msgstr "有效時間(TTL)"
-
-#: modules/gui/macosx/wizard.m:423 modules/gui/macosx/wizard.m:445
-#: modules/gui/macosx/wizard.m:1594 modules/gui/wxwidgets/wizard.cpp:1334
+#: modules/gui/macosx/wizard.m:444 modules/gui/macosx/wizard.m:470
+#: modules/gui/macosx/wizard.m:1858
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:1346
 msgid "SAP Announce"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:427 modules/gui/wxwidgets/wizard.cpp:155
+#: modules/gui/macosx/wizard.m:446 modules/gui/macosx/wizard.m:455
+#: modules/gui/macosx/wizard.m:480 modules/gui/macosx/wizard.m:1871
+#, fuzzy
+msgid "Local playback"
+msgstr "停止重播"
+
+#: modules/gui/macosx/wizard.m:450
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:155
 msgid "Additional transcode options"
 msgstr "附加的轉碼選項"
 
-#: modules/gui/macosx/wizard.m:428
-msgid ""
-"In this page, you will define a few additionnal parameters for your "
-"transcoding."
-msgstr ""
+#: modules/gui/macosx/wizard.m:451
+#, fuzzy
+msgid "In this page, a few additional transcoding parameters can be set."
+msgstr "在這一頁，你可以選擇你的輸入串流的傳送方式"
 
-#: modules/gui/macosx/wizard.m:430 modules/gui/wxwidgets/wizard.cpp:1258
+#: modules/gui/macosx/wizard.m:453 modules/gui/macosx/wizard.m:1121
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:1270
 msgid "Select the file to save to"
 msgstr "選擇檔案以儲存至"
 
-#: modules/gui/macosx/wizard.m:434
+#: modules/gui/macosx/wizard.m:459
 msgid ""
-"This page lists all your selections. Click \"Finish\" to start your "
-"streaming or transcoding."
+"This page lists all the settings.Click \"Finish\" to start streaming or "
+"transcoding."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:436
+#: modules/gui/macosx/wizard.m:461
 #, fuzzy
 msgid "Summary"
 msgstr "虛擬"
 
-#: modules/gui/macosx/wizard.m:439
+#: modules/gui/macosx/wizard.m:464
 #, fuzzy
 msgid "Encap. format"
 msgstr "影像格式"
 
-#: modules/gui/macosx/wizard.m:441
+#: modules/gui/macosx/wizard.m:466
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:107
 #, fuzzy
 msgid "Input stream"
 msgstr "輸入清單"
 
-#: modules/gui/macosx/wizard.m:447
+#: modules/gui/macosx/wizard.m:472
 #, fuzzy
 msgid "Save file to"
 msgstr "儲存檔案"
 
-#: modules/gui/macosx/wizard.m:586
+#: modules/gui/macosx/wizard.m:630
 #, fuzzy
 msgid "No input selected"
 msgstr "沒有輸入"
 
-#: modules/gui/macosx/wizard.m:588
+#: modules/gui/macosx/wizard.m:632
 msgid ""
-"You selected neither a new stream nor a valid playlist item. VLC is unable "
-"to guess, which input you want use. \n"
+"No new stream or valid playlist item has been selected.\n"
 "\n"
-" Choose one before going to the next page."
+"Choose one before going to the next page."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:652
+#: modules/gui/macosx/wizard.m:695
 msgid "No valid destination"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:654
+#: modules/gui/macosx/wizard.m:697
 msgid ""
-"You need to enter a valid destination you want to stream to. Enter either a "
-"Unicast-IP or a Multicast-IP.\n"
+"A valid destination has to be selected Enter either a Unicast-IP or a "
+"Multicast-IP.\n"
 "\n"
-" If you don't know what this means, have a look at the VLC Streaming HOWTO "
+"If you don't know what this means, have a look at the VLC Streaming HOWTO "
 "and the help texts in this window."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:1045
+#: modules/gui/macosx/wizard.m:1089
 msgid ""
-"Your chosen codecs are not compatible with each other. For example: you "
-"cannot mix uncompressed audio with any video codec.\n"
+"The chosen codecs are not compatible with each other. For example: It is "
+"impossibleto  mix uncompressed audio with any video codec.\n"
 "\n"
 "Correct your selection and try again."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:1094
-msgid "No file selected"
-msgstr ""
+#: modules/gui/macosx/wizard.m:1116
+#, fuzzy
+msgid "Select the directory to save to"
+msgstr "選擇檔案以儲存至"
+
+#: modules/gui/macosx/wizard.m:1167
+#, fuzzy
+msgid "No folder selected"
+msgstr "沒有輸入"
+
+#: modules/gui/macosx/wizard.m:1169
+#, fuzzy
+msgid "A directory where to save the files has to be selected."
+msgstr "允許你指定視訊快照的存放目錄"
 
-#: modules/gui/macosx/wizard.m:1095
+#: modules/gui/macosx/wizard.m:1171
 msgid ""
-"You you need to select a file, you want to save to. \n"
-"\n"
-" Enter either a valid path or choose a location through the button's dialog-"
-"box."
+"Enter either a valid path or use the \"Choose...\" button to select a "
+"location."
 msgstr ""
 
 #: modules/gui/macosx/wizard.m:1174
-msgid "Finish"
+msgid "No file selected"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:1179 modules/gui/macosx/wizard.m:1203
-#: modules/gui/macosx/wizard.m:1215 modules/gui/macosx/wizard.m:1227
-msgid "yes"
+#: modules/gui/macosx/wizard.m:1176
+msgid "A file where to save the stream has to be selected."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:1181
-msgid "from "
+#: modules/gui/macosx/wizard.m:1178
+msgid ""
+"Enter either a valid path or use the \"Choose\" button to select a location."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:1183 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 "
+#: modules/gui/macosx/wizard.m:1372
+msgid "Finish"
+msgstr ""
+
+#: modules/gui/macosx/wizard.m:1377
+#, fuzzy, c-format
+msgid "%i items"
+msgstr "檢視項目(&V)"
+
+#: modules/gui/macosx/wizard.m:1385 modules/gui/macosx/wizard.m:1439
+msgid "yes"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:1186 modules/gui/macosx/wizard.m:1205
-#: modules/gui/macosx/wizard.m:1223 modules/gui/macosx/wizard.m:1235
+#: 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
 #, fuzzy
 msgid "no"
 msgstr "資訊"
 
-#: modules/gui/macosx/wizard.m:1400 modules/gui/wxwidgets/wizard.cpp:95
+#: modules/gui/macosx/wizard.m:1393
+#, objc-format
+msgid "yes: from %@ to %@ secs"
+msgstr ""
+
+#: modules/gui/macosx/wizard.m:1403 modules/gui/macosx/wizard.m:1415
+#, objc-format
+msgid "yes: %@ @ %@ kb/s"
+msgstr ""
+
+#: modules/gui/macosx/wizard.m:1661
 #, fuzzy
-msgid "Use this to stream on a network."
+msgid "This allows to stream on a network."
 msgstr "串流至網路"
 
-#: modules/gui/macosx/wizard.m:1412 modules/gui/wxwidgets/wizard.cpp:102
+#: modules/gui/macosx/wizard.m:1669
 msgid ""
-"Use this to save a stream to a file. You have the possibility to reencode "
-"the stream. You can save whatever VLC can read.\n"
-"Please notice that VLC is not very suited for file to file transcoding. You "
-"should use its transcoding features to save network streams, for example."
+"This allows to save a stream to a file. The can be reencoded on the fly. "
+"Whatever VLC can read can be saved.\n"
+"Please note that VLC is not very suited for file to file transcoding. Its "
+"transcoding features are however useful to save network streams, for example."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:1530 modules/gui/wxwidgets/wizard.cpp:135
+#: modules/gui/macosx/wizard.m:1797
 #, fuzzy
 msgid "Select your audio codec. Click one to get more information."
 msgstr "選擇你的音訊編碼器，點擊以顯示更多資訊"
 
-#: modules/gui/macosx/wizard.m:1547 modules/gui/wxwidgets/wizard.cpp:130
+#: modules/gui/macosx/wizard.m:1814
 #, fuzzy
 msgid "Select your video codec. Click one to get more information."
 msgstr "選擇你的視訊編碼器，點擊以顯示更多資訊"
 
-#: modules/gui/macosx/wizard.m:1580 modules/gui/wxwidgets/wizard.cpp:166
+#: modules/gui/macosx/wizard.m:1849
 msgid ""
-"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 know what it "
-"means, or if you want to stream on your local network only, leave this "
-"setting to 1."
+"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 "
+"know what it means, or if you want to stream on your local network only, "
+"leave this setting to 1."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:1595
+#: modules/gui/macosx/wizard.m:1860
 msgid ""
-"When streaming using UDP, you can announce your streams using the SAP/SDP "
+"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 "
 "multicast address, it will appear in their playlist if they enable the SAP "
 "extra interface.\n"
@@ -9893,17 +11473,26 @@ msgid ""
 "name will be used."
 msgstr ""
 
-#: modules/gui/ncurses.c:93
+#: modules/gui/macosx/wizard.m:1873
+msgid ""
+"When this option is enabled, the stream will be both played and transcoded/"
+"streamed.\n"
+"\n"
+"Note that this requires much more CPU power than simple transcoding or "
+"streaming."
+msgstr ""
+
+#: modules/gui/ncurses.c:94
 msgid "Filebrowser starting point"
 msgstr "檔案瀏覽器起始位置"
 
-#: modules/gui/ncurses.c:95
+#: modules/gui/ncurses.c:96
 msgid ""
 "This option allows you to specify the directory the ncurses filebrowser will "
 "show you initially."
 msgstr ""
 
-#: modules/gui/ncurses.c:100
+#: modules/gui/ncurses.c:101
 #, fuzzy
 msgid "Ncurses interface"
 msgstr "Qt介面"
@@ -9921,7 +11510,7 @@ msgid "PDA Linux Gtk2+ interface"
 msgstr "PDA Linux Gtk2+ 介面"
 
 #: modules/gui/pda/pda.c:220 modules/gui/pda/pda.c:275
-#: modules/gui/wxwidgets/streamout.cpp:464
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:497
 msgid "Filename"
 msgstr "檔案名稱"
 
@@ -10085,7 +11674,7 @@ msgstr ""
 msgid "secam"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:743 modules/video_filter/mosaic.c:116
+#: modules/gui/pda/pda_interface.c:743 modules/video_filter/mosaic.c:167
 msgid "auto"
 msgstr "自動"
 
@@ -10349,68 +11938,74 @@ msgstr ""
 msgid "QNX RTOS video and audio output"
 msgstr "QNX RTOS視訊及音訊輸出"
 
-#: modules/gui/skins2/src/dialogs.cpp:228
+#: modules/gui/skins2/src/dialogs.cpp:223
 msgid "Open a skin file"
 msgstr "開啟面板檔案"
 
-#: modules/gui/skins2/src/dialogs.cpp:229
+#: modules/gui/skins2/src/dialogs.cpp:224
 #, fuzzy
-msgid "Skin files (*.vlt)|*.vlt|Skin files (*.xml)|*.xml"
+msgid "Skin files (*.vlt;*.wsz)|*.vlt;*.wsz|Skin files (*.xml)|*.xml"
 msgstr "面板檔案 (*.vlt)|*.vlt|Skin files (*.xml)|*.xml|"
 
-#: modules/gui/skins2/src/dialogs.cpp:236
-#: modules/gui/wxwidgets/playlist.cpp:930
+#: modules/gui/skins2/src/dialogs.cpp:231
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:949
 msgid "Open playlist"
 msgstr "開啟播放清單"
 
-#: modules/gui/skins2/src/dialogs.cpp:237
-msgid "All playlists|*.pls;*.m3u;*.asx;*.b4s|M3U files|*.m3u"
+#: modules/gui/skins2/src/dialogs.cpp:232
+#, fuzzy
+msgid ""
+"All playlists|*.pls;*.m3u;*.asx;*.b4s;*.xspf|M3U files|*.m3u|XSPF playlist|*."
+"xspf"
 msgstr "所有播放清單|*.pls;*.m3u;*.asx;*.b4s|M3U files|*.m3u"
 
-#: modules/gui/skins2/src/dialogs.cpp:244
-#: modules/gui/wxwidgets/playlist.cpp:914
+#: modules/gui/skins2/src/dialogs.cpp:241
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:933
 msgid "Save playlist"
 msgstr "儲存播放清單"
 
-#: modules/gui/skins2/src/dialogs.cpp:244
-msgid "M3U file|*.m3u"
+#: modules/gui/skins2/src/dialogs.cpp:241
+msgid "M3U file|*.m3u|XSPF playlist|*.xspf"
+msgstr ""
+
+#: modules/gui/skins2/src/skin_main.cpp:343
+msgid "Skin to use"
 msgstr ""
 
 #: modules/gui/skins2/src/skin_main.cpp:344
-msgid "Last skin used"
-msgstr "上一個使用的面板"
+#, fuzzy
+msgid "Path to the skin to use."
+msgstr "欲使用的PNG檔案完整路徑"
 
 #: modules/gui/skins2/src/skin_main.cpp:345
-msgid "Select the path to the last skin used."
-msgstr "選擇上一個使用的面板的路徑"
-
-#: modules/gui/skins2/src/skin_main.cpp:346
 msgid "Config of last used skin"
 msgstr "組態上一次使用的面板"
 
-#: modules/gui/skins2/src/skin_main.cpp:347
-msgid "Config of last used skin."
-msgstr "組態上一次使用的面板"
+#: modules/gui/skins2/src/skin_main.cpp:346
+msgid ""
+"Windows configuration of the last used. This option is updated automatically "
+"by the skins module."
+msgstr ""
 
-#: modules/gui/skins2/src/skin_main.cpp:348
+#: modules/gui/skins2/src/skin_main.cpp:349
 msgid "Enable transparency effects"
 msgstr "啟用透明效果"
 
-#: modules/gui/skins2/src/skin_main.cpp:349
+#: modules/gui/skins2/src/skin_main.cpp:350
 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:366
+#: modules/gui/skins2/src/skin_main.cpp:367
 msgid "Skins"
 msgstr ""
 
-#: modules/gui/skins2/src/skin_main.cpp:367
+#: modules/gui/skins2/src/skin_main.cpp:368
 msgid "Skinnable Interface"
 msgstr "可面板化介面"
 
-#: modules/gui/skins2/src/skin_main.cpp:374
+#: modules/gui/skins2/src/skin_main.cpp:375
 msgid "Skins loader demux"
 msgstr "面板載入器解多工"
 
@@ -10432,36 +12027,48 @@ msgstr ""
 "(WinCE介面)\n"
 "\n"
 
-#: modules/gui/wince/interface.cpp:497 modules/gui/wxwidgets/interface.cpp:867
+#: modules/gui/wince/interface.cpp:497 modules/gui/wxwidgets/interface.cpp:937
 msgid ""
-"(c) 1996-2005 - the VideoLAN Team\n"
+"(c) 1996-2006 - the VideoLAN Team\n"
 "\n"
 msgstr ""
 
-#: modules/gui/wince/interface.cpp:498 modules/gui/wxwidgets/interface.cpp:877
+#: modules/gui/wince/interface.cpp:498 modules/gui/wxwidgets/interface.cpp:938
+msgid "Compiled by "
+msgstr ""
+
+#: modules/gui/wince/interface.cpp:500 modules/gui/wxwidgets/interface.cpp:940
+msgid "Compiler: "
+msgstr ""
+
+#: modules/gui/wince/interface.cpp:502 modules/gui/wxwidgets/interface.cpp:942
+msgid "Based on SVN revision: "
+msgstr ""
+
+#: modules/gui/wince/interface.cpp:504
+#, 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/open.cpp:430
+#: modules/gui/wince/open.cpp:134 modules/gui/wxwidgets/dialogs/open.cpp:625
 msgid "Open:"
 msgstr "開啟:"
 
-#: modules/gui/wince/open.cpp:146 modules/gui/wxwidgets/open.cpp:444
+#: modules/gui/wince/open.cpp:146
 msgid ""
 "Alternatively, you can build an MRL using one of the following predefined "
 "targets:"
 msgstr ""
 
 #: modules/gui/wince/preferences_widgets.cpp:527
-#: modules/gui/wxwidgets/preferences_widgets.cpp:685
+#: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:677
 msgid "Choose directory"
 msgstr "選擇目錄"
 
 #: modules/gui/wince/preferences_widgets.cpp:536
-#: modules/gui/wxwidgets/preferences_widgets.cpp:694
+#: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:686
 msgid "Choose file"
 msgstr "選擇檔案"
 
@@ -10483,841 +12090,1175 @@ msgstr "WinCE介面模組"
 msgid "WinCE dialogs provider"
 msgstr ""
 
-#: modules/gui/wxwidgets/bookmarks.cpp:137
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:75
 msgid "Edit bookmark"
 msgstr "編輯書籤"
 
-#: modules/gui/wxwidgets/bookmarks.cpp:514
-msgid "Input has changed "
-msgstr "輸入已改變"
-
-#: modules/gui/wxwidgets/extrapanel.cpp:42
-msgid ""
-"If this setting is not zero, the bands will move together when you move one. "
-"The higher the value is, the more correlated their movement will be."
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:101
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:197
+msgid "Bytes"
 msgstr ""
 
-#: modules/gui/wxwidgets/extrapanel.cpp:272
-msgid "Video Options"
-msgstr "視訊選項"
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:347
+msgid "You must select two bookmarks"
+msgstr "你必須選擇兩個書籤"
 
-#: modules/gui/wxwidgets/extrapanel.cpp:286
-msgid "Aspect Ratio"
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:357
+msgid "The stream must be playing or paused for bookmarks to work"
 msgstr ""
 
-#: modules/gui/wxwidgets/extrapanel.cpp:319
-msgid "More info"
-msgstr "更多資訊"
-
-#: modules/gui/wxwidgets/extrapanel.cpp:404
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:441
 msgid ""
-"This filter prevents the audio output power from going over a defined value."
+"No input found. The stream must be playing or paused for bookmarks to work."
 msgstr ""
 
-#: modules/gui/wxwidgets/extrapanel.cpp:468
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:449
 msgid ""
-"Enable the equalizer. You can either manually change the bands or use a "
-"preset (Audio Menu->Equalizer)."
+"Input has changed, unable to save bookmark. Use \"pause\" while editing "
+"bookmarks to keep the same input."
 msgstr ""
 
-#: modules/gui/wxwidgets/extrapanel.cpp:475
-msgid ""
-"If you enable this setting, the equalizer filter will be applied twice. The "
-"effect will be sharper."
-msgstr ""
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:452
+msgid "Input has changed "
+msgstr "輸入已改變"
 
-#: modules/gui/wxwidgets/fileinfo.cpp:59
-msgid "Stream and media info"
+#: modules/gui/wxwidgets/dialogs/fileinfo.cpp:54
+#, fuzzy
+msgid "Stream and Media Info"
 msgstr "串流及媒體資訊"
 
-#: modules/gui/wxwidgets/interface.cpp:406
-msgid "Quick &Open File...\tCtrl-O"
-msgstr "快速開啟檔案...\tCtrl-O"
+#: modules/gui/wxwidgets/dialogs/fileinfo.cpp:83
+#, fuzzy
+msgid "Advanced information"
+msgstr "進階選項"
 
-#: modules/gui/wxwidgets/interface.cpp:409
-msgid "Open &File...\tCtrl-F"
-msgstr "開啟檔案(&F)...\tCtrl-F"
+#: modules/gui/wxwidgets/dialogs/interaction.cpp:116
+msgid ""
+"The following errors occurred. More details might be available in the "
+"Messages window."
+msgstr ""
 
-#: modules/gui/wxwidgets/interface.cpp:410
-#, fuzzy
-msgid "Open Dir&ectory...\tCtrl-E"
-msgstr "開啟檔案(&F)...\tCtrl-F"
+#: modules/gui/wxwidgets/dialogs/interaction.cpp:191
+msgid "Don't show further errors"
+msgstr ""
 
-#: modules/gui/wxwidgets/interface.cpp:411
-msgid "Open &Disc...\tCtrl-D"
-msgstr "開啟光碟(&D)...\tCtrl-D"
+#: modules/gui/wxwidgets/dialogs/iteminfo.cpp:58
+msgid "Playlist item info"
+msgstr "播放清單項目資訊"
 
-#: modules/gui/wxwidgets/interface.cpp:413
-msgid "Open &Network Stream...\tCtrl-N"
-msgstr "開啟網路串流(&N)...\tCtrl-N"
+#: modules/gui/wxwidgets/dialogs/messages.cpp:205
+msgid "Save Messages As..."
+msgstr "另存訊息..."
 
-#: modules/gui/wxwidgets/interface.cpp:415
-#, fuzzy
-msgid "Open C&apture Device...\tCtrl-A"
-msgstr "開啟擷取裝置(&C)...\tCtrl-C"
+#: modules/gui/wxwidgets/dialogs/open.cpp:259
+msgid "Advanced options..."
+msgstr "進階選項..."
 
-#: modules/gui/wxwidgets/interface.cpp:418
-msgid "&Wizard...\tCtrl-W"
-msgstr "精靈(W)...\tCtrl-W"
+#: modules/gui/wxwidgets/dialogs/open.cpp:264
+#: modules/gui/wxwidgets/dialogs/open.cpp:275
+#: modules/gui/wxwidgets/dialogs/open.cpp:420
+#: modules/gui/wxwidgets/dialogs/preferences.cpp:216
+msgid "Advanced options"
+msgstr "進階選項"
 
-#: modules/gui/wxwidgets/interface.cpp:421
-msgid "E&xit\tCtrl-X"
-msgstr "é\9b¢é\96\8b(&X)\tCtrl-X"
+#: modules/gui/wxwidgets/dialogs/open.cpp:279
+msgid "Options:"
+msgstr "é\81¸é \85:"
 
-#: modules/gui/wxwidgets/interface.cpp:427
-msgid "&Playlist...\tCtrl-P"
-msgstr "播放清單(&P)\tCtrl-P"
+#: modules/gui/wxwidgets/dialogs/open.cpp:388
+#: modules/gui/wxwidgets/dialogs/open.cpp:396
+msgid "Open..."
+msgstr "開啟..."
 
-#: modules/gui/wxwidgets/interface.cpp:429
-msgid "&Messages...\tCtrl-M"
-msgstr "訊息(&M)...\tCtrl-M"
+#: modules/gui/wxwidgets/dialogs/open.cpp:430
+#, fuzzy
+msgid "Stream/Save"
+msgstr "串流"
 
-#: modules/gui/wxwidgets/interface.cpp:431
-msgid "Stream and Media &info...\tCtrl-I"
-msgstr "串流及媒體資訊(&I)...\tCtrl-I"
+#: modules/gui/wxwidgets/dialogs/open.cpp:431
+#, fuzzy
+msgid "Use VLC as a stream server"
+msgstr "使用VLC作為串流伺服器"
+
+#: modules/gui/wxwidgets/dialogs/open.cpp:457
+msgid "Caching"
+msgstr "快取"
 
-#: modules/gui/wxwidgets/interface.cpp:443
-#: modules/gui/wxwidgets/updatevlc.cpp:104
-msgid "Check for updates ..."
+#: modules/gui/wxwidgets/dialogs/open.cpp:458
+msgid "Change the default caching value (in milliseconds)"
+msgstr "變更預設快取值(ms)"
+
+#: modules/gui/wxwidgets/dialogs/open.cpp:471
+msgid "Customize:"
 msgstr ""
 
-#: modules/gui/wxwidgets/interface.cpp:447
-msgid "&File"
-msgstr "檔案(&F)"
+#: modules/gui/wxwidgets/dialogs/open.cpp:475
+msgid ""
+"You can use this field directly by typing the full MRL you want to open.\n"
+"Alternatively, the field will be filled automatically when you use the "
+"controls above."
+msgstr ""
 
-#: modules/gui/wxwidgets/interface.cpp:448
-msgid "&View"
-msgstr "檢視(&V)"
+#: modules/gui/wxwidgets/dialogs/open.cpp:637
+msgid "Use a subtitles file"
+msgstr "使用字幕檔"
 
-#: modules/gui/wxwidgets/interface.cpp:449
-msgid "&Settings"
-msgstr "設定(&S)"
+#: modules/gui/wxwidgets/dialogs/open.cpp:638
+#, fuzzy
+msgid "Use an external subtitles file."
+msgstr "使用字幕檔"
 
-#: modules/gui/wxwidgets/interface.cpp:450
-msgid "&Audio"
-msgstr "音訊(&A)"
+#: modules/gui/wxwidgets/dialogs/open.cpp:642
+#, fuzzy
+msgid "Advanced Settings..."
+msgstr "進階選項..."
 
-#: modules/gui/wxwidgets/interface.cpp:451
-msgid "&Video"
-msgstr "視訊(&V)"
+#: modules/gui/wxwidgets/dialogs/open.cpp:658
+#, fuzzy
+msgid "File:"
+msgstr "檔案"
 
-#: modules/gui/wxwidgets/interface.cpp:452
-msgid "&Navigation"
-msgstr "導覽(&N)"
+#: modules/gui/wxwidgets/dialogs/open.cpp:695
+msgid "DVD (menus)"
+msgstr "DVD(選單)"
 
-#: modules/gui/wxwidgets/interface.cpp:453
-msgid "&Help"
-msgstr "輔助說明(&H)"
+#: modules/gui/wxwidgets/dialogs/open.cpp:701
+msgid "Disc type"
+msgstr "光碟類型"
 
-#: modules/gui/wxwidgets/interface.cpp:493
-msgid "Previous playlist item"
-msgstr "前一個播放清單項目"
+#: modules/gui/wxwidgets/dialogs/open.cpp:708
+msgid "Probe Disc(s)"
+msgstr ""
 
-#: modules/gui/wxwidgets/interface.cpp:494
-msgid "Next playlist item"
-msgstr "下一個播放清單項目"
+#: modules/gui/wxwidgets/dialogs/open.cpp:709
+msgid ""
+"Probe for a DVD, VCD or audio CD. First try the Device name entered for the "
+"selected Disc type (DVD, DVD Menu, VCD, audio CD). If that doesn't find "
+"media, try any device for the Disc type.  If that doesn't work, then try "
+"looking for CD-ROMs or DVD drives. The Disc type, Device name, and some "
+"parameter ranges are set based on media we find."
+msgstr ""
 
-#: modules/gui/wxwidgets/interface.cpp:495
-msgid "Play slower"
-msgstr "慢速播放"
+#: modules/gui/wxwidgets/dialogs/open.cpp:805
+msgid "HTTP/HTTPS/FTP/MMS"
+msgstr ""
 
-#: modules/gui/wxwidgets/interface.cpp:496
-msgid "Play faster"
-msgstr "快速播放"
+#: modules/gui/wxwidgets/dialogs/open.cpp:806
+msgid "RTSP"
+msgstr ""
 
-#: modules/gui/wxwidgets/interface.cpp:803
+#: modules/gui/wxwidgets/dialogs/open.cpp:926
 #, fuzzy
-msgid "Extended &GUI\tCtrl-G"
-msgstr "延伸使用者介面(&E)"
+msgid "DVD device to use"
+msgstr "DVD裝置"
 
-#: modules/gui/wxwidgets/interface.cpp:807
-msgid "&Undock Ext. GUI"
+#: modules/gui/wxwidgets/dialogs/open.cpp:956
+msgid ""
+"Name of CD-ROM device to read Video CD from. If this field is left empty, we "
+"will scan for a CD-ROM with a VCD in it."
 msgstr ""
 
-#: modules/gui/wxwidgets/interface.cpp:811
+#: modules/gui/wxwidgets/dialogs/open.cpp:965
+#: modules/gui/wxwidgets/dialogs/open.cpp:988
 #, fuzzy
-msgid "&Bookmarks...\tCtrl-B"
-msgstr "書籤(&B)"
+msgid "CD-ROM device to use"
+msgstr "CDDB伺服器逾時"
+
+#: modules/gui/wxwidgets/dialogs/open.cpp:983
+msgid ""
+"Name of CD-ROM device to read audio CD from. If this field is left empty, we "
+"will scan for a CD-ROM with an audio CD in it."
+msgstr ""
 
-#: modules/gui/wxwidgets/interface.cpp:813
+#: modules/gui/wxwidgets/dialogs/open.cpp:1290
 #, fuzzy
-msgid "Preference&s...\tCtrl-S"
-msgstr "偏好設定..."
+msgid "Open subtitles file"
+msgstr "使用字幕檔"
 
-#: modules/gui/wxwidgets/interface.cpp:866
+#: modules/gui/wxwidgets/dialogs/open.cpp:1667
 #, fuzzy
+msgid "Title number."
+msgstr "調節器數量"
+
+#: modules/gui/wxwidgets/dialogs/open.cpp:1669
 msgid ""
-" (wxWidgets interface)\n"
-"\n"
-msgstr ""
-" (wxWindows介面)\n"
-"\n"
-
-#: modules/gui/wxwidgets/interface.cpp:868
-msgid "Compiled by "
-msgstr ""
-
-#: modules/gui/wxwidgets/interface.cpp:870
-msgid "Compiler: "
-msgstr ""
-
-#: modules/gui/wxwidgets/interface.cpp:871
-msgid "Based on SVN revision: "
-msgstr ""
-
-#: modules/gui/wxwidgets/interface.cpp:880
-#, c-format
-msgid "About %s"
-msgstr "關於 %s"
-
-#: modules/gui/wxwidgets/interface.cpp:1574
-#, fuzzy
-msgid "Show/Hide interface"
-msgstr "顯示介面"
-
-#: modules/gui/wxwidgets/iteminfo.cpp:70
-msgid "Playlist item info"
-msgstr "播放清單項目資訊"
-
-#: modules/gui/wxwidgets/iteminfo.cpp:129
-msgid "Item Info"
-msgstr "項目資訊"
-
-#: modules/gui/wxwidgets/menus.cpp:131
-msgid "Quick &Open File..."
-msgstr "快速開啟檔案(&O)"
-
-#: modules/gui/wxwidgets/menus.cpp:132
-msgid "Open &File..."
-msgstr "開啟檔案(&F)"
-
-#: modules/gui/wxwidgets/menus.cpp:133
-#, fuzzy
-msgid "Open D&irectory..."
-msgstr "開啟檔案(&F)...\tCtrl-F"
-
-#: modules/gui/wxwidgets/menus.cpp:134
-msgid "Open &Disc..."
-msgstr "開啟光碟(&D)"
-
-#: modules/gui/wxwidgets/menus.cpp:135
-msgid "Open &Network Stream..."
-msgstr "開啟網路串流(&N)"
-
-#: modules/gui/wxwidgets/menus.cpp:136
-msgid "Open &Capture Device..."
-msgstr "開啟擷取裝置(&C)"
-
-#: modules/gui/wxwidgets/menus.cpp:143
-msgid "Media &Info..."
-msgstr "媒體資訊(&I)"
-
-#: modules/gui/wxwidgets/menus.cpp:144
-msgid "&Messages..."
-msgstr "訊息(&M)"
-
-#: modules/gui/wxwidgets/menus.cpp:145
-msgid "&Preferences..."
-msgstr "偏好設定(&P)"
-
-#: modules/gui/wxwidgets/menus.cpp:564 modules/gui/wxwidgets/menus.cpp:591
-msgid "Empty"
-msgstr "無項目"
-
-#: modules/gui/wxwidgets/messages.cpp:99
-msgid "Save As..."
-msgstr "另存新擋..."
-
-#: modules/gui/wxwidgets/messages.cpp:216
-msgid "Save Messages As..."
-msgstr "另存訊息..."
-
-#: modules/gui/wxwidgets/open.cpp:265
-msgid "Advanced options..."
-msgstr "進階選項..."
-
-#: modules/gui/wxwidgets/open.cpp:270 modules/gui/wxwidgets/open.cpp:281
-#: modules/gui/wxwidgets/preferences.cpp:219
-msgid "Advanced options"
-msgstr "進階選項"
-
-#: modules/gui/wxwidgets/open.cpp:285
-msgid "Options:"
-msgstr "選項:"
-
-#: modules/gui/wxwidgets/open.cpp:394 modules/gui/wxwidgets/open.cpp:402
-msgid "Open..."
-msgstr "開啟..."
-
-#: modules/gui/wxwidgets/open.cpp:433
-msgid ""
-"You can use this field directly by typing the full MRL you want to open.\n"
-"Alternatively, the field will be filled automatically when you use the "
-"controls below."
-msgstr ""
-
-#: modules/gui/wxwidgets/open.cpp:454
-msgid "Use VLC as a server of streams"
-msgstr "使用VLC作為串流伺服器"
-
-#: modules/gui/wxwidgets/open.cpp:480
-msgid "Caching"
-msgstr "快取"
-
-#: modules/gui/wxwidgets/open.cpp:481
-msgid "Change the default caching value (in milliseconds)"
-msgstr "變更預設快取值(ms)"
-
-#: modules/gui/wxwidgets/open.cpp:643 modules/gui/wxwidgets/subtitles.cpp:65
-msgid "Subtitle options"
-msgstr "字幕選項"
-
-#: modules/gui/wxwidgets/open.cpp:644
-msgid "Force options for separate subtitle files."
-msgstr "強制分離字幕檔選項"
-
-#: modules/gui/wxwidgets/open.cpp:679
-msgid "DVD (menus)"
-msgstr "DVD(選單)"
-
-#: modules/gui/wxwidgets/open.cpp:685
-msgid "Disc type"
-msgstr "光碟類型"
-
-#: modules/gui/wxwidgets/open.cpp:692
-msgid "Probe Disc(s)"
-msgstr ""
-
-#: modules/gui/wxwidgets/open.cpp:693
-msgid ""
-"Probe for a DVD, VCD or audio CD. First try the Device name entered for the "
-"selected Disc type (DVD, DVD Menu, VCD, audio CD). If that doesn't find "
-"media, try any device for the Disc type.  If that doesn't work, then try "
-"looking for CD-ROMs or DVD drives. The Disc type, Device name, and some "
-"parameter ranges are set based on media we find."
-msgstr ""
-
-#: modules/gui/wxwidgets/open.cpp:751
-msgid "Subtitles track"
-msgstr "字幕軌"
-
-#: modules/gui/wxwidgets/open.cpp:759
-#, fuzzy
-msgid "Audio track"
-msgstr "音訊軌"
-
-#: modules/gui/wxwidgets/open.cpp:786
-msgid "HTTP/HTTPS/FTP/MMS"
-msgstr ""
-
-#: modules/gui/wxwidgets/open.cpp:787
-msgid "RTSP"
-msgstr ""
-
-#: modules/gui/wxwidgets/open.cpp:907
-msgid "Name of DVD device to read from."
-msgstr ""
-
-#: modules/gui/wxwidgets/open.cpp:938
-msgid ""
-"Name of CD-ROM device to read Video CD from. If this field is left empty, we "
-"will scan for a CD-ROM with a VCD in it."
-msgstr ""
-
-#: modules/gui/wxwidgets/open.cpp:947
-msgid "Name of CD-ROM device to read Video CD from."
-msgstr ""
-
-#: modules/gui/wxwidgets/open.cpp:966
-msgid ""
-"Name of CD-ROM device to read audio CD from. If this field is left empty, we "
-"will scan for a CD-ROM with an audio CD in it."
-msgstr ""
-
-#: modules/gui/wxwidgets/open.cpp:971
-msgid "Name of CD-ROM device to read audio CD from."
-msgstr ""
-
-#: modules/gui/wxwidgets/open.cpp:1610
-#, fuzzy
-msgid "Title number."
-msgstr "調節器數量"
-
-#: modules/gui/wxwidgets/open.cpp:1612
-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."
+"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/open.cpp:1615
+#: modules/gui/wxwidgets/dialogs/open.cpp:1672
 msgid "Audio track number. DVD's can have up to 8 audio tracks numbered 0..7."
 msgstr ""
 
-#: modules/gui/wxwidgets/open.cpp:1636
+#: modules/gui/wxwidgets/dialogs/open.cpp:1693
 msgid "Playback control (PBC) usually starts with number 1."
 msgstr ""
 
-#: modules/gui/wxwidgets/open.cpp:1642
+#: modules/gui/wxwidgets/dialogs/open.cpp:1699
 msgid "The first entry (the beginning of the first MPEG track) is 0."
 msgstr ""
 
-#: modules/gui/wxwidgets/open.cpp:1647
+#: modules/gui/wxwidgets/dialogs/open.cpp:1704
 #, fuzzy
 msgid "Track number."
 msgstr "調節器數量"
 
-#: modules/gui/wxwidgets/open.cpp:1653
+#: modules/gui/wxwidgets/dialogs/open.cpp:1710
 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/open.cpp:1655
+#: modules/gui/wxwidgets/dialogs/open.cpp:1712
 msgid ""
 "Audio track number. VCD's can have up to 2 audio tracks numbered 0 or 1. "
 msgstr ""
 
-#: modules/gui/wxwidgets/open.cpp:1667
+#: modules/gui/wxwidgets/dialogs/open.cpp:1724
 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/open.cpp:1671
+#: modules/gui/wxwidgets/dialogs/open.cpp:1728
 msgid "Audio CDs can have up to 100 tracks, the first track is usually 1."
 msgstr ""
 
-#: modules/gui/wxwidgets/playlist.cpp:51
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:52
 msgid "Shuffle"
 msgstr ""
 
-#: modules/gui/wxwidgets/playlist.cpp:229
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:236
 msgid "&Simple Add File..."
 msgstr "增加檔案(&S)..."
 
-#: modules/gui/wxwidgets/playlist.cpp:230
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:237
 msgid "Add &Directory..."
 msgstr "增加目錄(&D)..."
 
-#: modules/gui/wxwidgets/playlist.cpp:231
-msgid "&Add MRL..."
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:238
+#, fuzzy
+msgid "&Add URL..."
 msgstr "增加MRL(&A)..."
 
-#: modules/gui/wxwidgets/playlist.cpp:236
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:240
+#, fuzzy
+msgid "Services Discovery"
+msgstr "服務探索模組"
+
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:243
 msgid "&Open Playlist..."
 msgstr "開啟播放清單(&O)..."
 
-#: modules/gui/wxwidgets/playlist.cpp:237
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:244
 msgid "&Save Playlist..."
 msgstr "儲存播放清單(&S)..."
 
-#: modules/gui/wxwidgets/playlist.cpp:239
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:246
 msgid "&Close"
 msgstr "關閉(&C)"
 
-#: modules/gui/wxwidgets/playlist.cpp:243
-msgid "Sort by &title"
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:250
+#, fuzzy
+msgid "Sort by &Title"
 msgstr "依標題排序(&T)"
 
-#: modules/gui/wxwidgets/playlist.cpp:244
-msgid "&Reverse sort by title"
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:251
+#, fuzzy
+msgid "&Reverse Sort by Title"
 msgstr "依標題反向排序(&R)"
 
-#: modules/gui/wxwidgets/playlist.cpp:246
-msgid "&Shuffle Playlist"
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:253
+#, fuzzy
+msgid "&Shuffle"
 msgstr "亂化播放清單"
 
-#: modules/gui/wxwidgets/playlist.cpp:250
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:257
 msgid "D&elete"
 msgstr "刪除(&D)"
 
-#: modules/gui/wxwidgets/playlist.cpp:257
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:264
 msgid "&Manage"
 msgstr "管理(&M)"
 
-#: modules/gui/wxwidgets/playlist.cpp:258
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:265
 msgid "S&ort"
 msgstr "排序(&S)"
 
-#: modules/gui/wxwidgets/playlist.cpp:259
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:266
 msgid "&Selection"
 msgstr "選擇(&S)"
 
-#: modules/gui/wxwidgets/playlist.cpp:260
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:267
 msgid "&View items"
 msgstr "檢視項目(&V)"
 
-#: modules/gui/wxwidgets/playlist.cpp:268
-msgid "Play this branch"
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:275
+#, fuzzy
+msgid "Play this Branch"
 msgstr "播放該分支"
 
-#: modules/gui/wxwidgets/playlist.cpp:270
-msgid "Sort this branch"
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:276
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:284
+msgid "Preparse"
+msgstr ""
+
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:277
+#, fuzzy
+msgid "Sort this Branch"
 msgstr "排序該分支"
 
-#: modules/gui/wxwidgets/playlist.cpp:350
-#: modules/gui/wxwidgets/playlist.cpp:769
-#: modules/gui/wxwidgets/updatevlc.cpp:121
-#: modules/gui/wxwidgets/updatevlc.cpp:503
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:279
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:286
+msgid "Info"
+msgstr "資訊"
+
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:280
+#, fuzzy
+msgid "Add Node"
+msgstr "音訊編碼器"
+
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:358
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:794
+#: modules/gui/wxwidgets/playlist_manager.cpp:426
 msgid "root"
 msgstr ""
 
-#: modules/gui/wxwidgets/playlist.cpp:568
-#: modules/gui/wxwidgets/playlist.cpp:786
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:591
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:811
 #, c-format
 msgid "%i items in playlist (%i not shown)"
 msgstr "%i個項目在播放清單中(%i未顯示)"
 
-#: modules/gui/wxwidgets/playlist.cpp:896
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:604
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:818
+#, c-format
+msgid "%i items in playlist"
+msgstr "播放清單中有 %i 個項目"
+
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:913
 msgid "M3U file"
 msgstr "M3U檔案"
 
-#: modules/gui/wxwidgets/playlist.cpp:902
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:914
+#, fuzzy
+msgid "XSPF playlist"
+msgstr "儲存播放清單"
+
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:921
 msgid "Playlist is empty"
 msgstr "逼放清單是空的"
 
-#: modules/gui/wxwidgets/playlist.cpp:902
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:921
 msgid "Can't save"
 msgstr "無法儲存"
 
-#: modules/gui/wxwidgets/playlist.cpp:1219 modules/misc/freetype.c:100
-#: modules/misc/win32text.c:71
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:1415
+#: modules/gui/wxwidgets/wxwidgets.cpp:114 modules/misc/freetype.c:105
+#: modules/misc/win32text.c:76
 msgid "Normal"
 msgstr "正常"
 
-#: modules/gui/wxwidgets/playlist.cpp:1221
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:1417
 #, fuzzy
-msgid "Sorted by artist"
+msgid "Sorted by Artist"
 msgstr "依製作人排序"
 
-#: modules/gui/wxwidgets/playlist.cpp:1223
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:1419
 #, fuzzy
 msgid "Sorted by Album"
 msgstr "依名稱排序"
 
-#: modules/gui/wxwidgets/preferences.cpp:1014
-msgid ""
-"Some options are available but hidden. Check \"Advanced options\" to see "
-"them."
-msgstr ""
-
-#: modules/gui/wxwidgets/preferences_widgets.cpp:206
-msgid "Alt"
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:1624
+msgid "Please enter node name"
 msgstr ""
 
-#: modules/gui/wxwidgets/preferences_widgets.cpp:208
-msgid "Ctrl"
-msgstr ""
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:1625
+#, fuzzy
+msgid "Add node"
+msgstr "音訊編碼器"
 
-#: modules/gui/wxwidgets/preferences_widgets.cpp:210
-msgid "Shift"
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:1625
+msgid "New node"
 msgstr ""
 
-#: modules/gui/wxwidgets/preferences_widgets.cpp:443
+#: modules/gui/wxwidgets/dialogs/preferences.cpp:293
 msgid ""
-"Select modules that you want. To get more advanced control, you can also "
-"modify the resulting chain by yourself"
-msgstr ""
-
-#: modules/gui/wxwidgets/streamdata.h:54
-msgid "MPEG-1 Video codec (useable with MPEG PS, MPEG TS, MPEG1, OGG and RAW)"
-msgstr ""
-
-#: modules/gui/wxwidgets/streamdata.h:58
-msgid "MPEG-2 Video codec (useable with MPEG PS, MPEG TS, MPEG1, OGG and RAW)"
+"This will reset your VLC media player preferences.\n"
+"Are you sure you want to continue?"
 msgstr ""
 
-#: modules/gui/wxwidgets/streamdata.h:62
+#: modules/gui/wxwidgets/dialogs/preferences.cpp:1024
 msgid ""
-"MPEG-4 Video codec (useable with MPEG PS, MPEG TS, MPEG1, ASF, MPEG4, OGG "
-"and RAW)"
-msgstr ""
-
-#: modules/gui/wxwidgets/streamdata.h:79
-#, fuzzy
-msgid "H264 is a new video codec (useable with MPEG TS and MPEG4)"
-msgstr "H264是一個新的視訊編碼器"
-
-#: modules/gui/wxwidgets/streamdata.h:82
-msgid "WMV (Windows Media Video) 7 (useable with MPEG TS, MPEG1, ASF and OGG)"
+"Some options are available but hidden. Check \"Advanced options\" to see "
+"them."
 msgstr ""
 
-#: modules/gui/wxwidgets/streamdata.h:85
-msgid "WMV (Windows Media Video) 8 (useable with MPEG TS, MPEG1, ASF and OGG)"
+#: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:196
+msgid "Alt"
 msgstr ""
 
-#: modules/gui/wxwidgets/streamdata.h:89
-msgid "WMV (Windows Media Video) 9 (useable with MPEG TS, MPEG1, ASF and OGG)"
+#: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:198
+msgid "Ctrl"
 msgstr ""
 
-#: modules/gui/wxwidgets/streamdata.h:127
-msgid "A free audio codec dedicated to compression of voice (useable with OGG)"
+#: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:200
+msgid "Shift"
 msgstr ""
 
-#: modules/gui/wxwidgets/streamdata.h:160
+#: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:433
 msgid ""
-"Enter the multicast address to stream to in this field. This must be an IP "
-"address between 224.0.0.0 an 239.255.255.255. For a private use, enter an "
-"address beginning with 239.255."
+"Select the desired modules. For more advanced control, the resulting \"chain"
+"\" can be modified."
 msgstr ""
 
-#: modules/gui/wxwidgets/streamout.cpp:173
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:167
 msgid "Stream output MRL"
 msgstr "串流輸出MRL"
 
-#: modules/gui/wxwidgets/streamout.cpp:177
-msgid "Destination Target:"
-msgstr ""
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:171
+#, fuzzy
+msgid "Target:"
+msgstr "開啟目標:"
 
-#: modules/gui/wxwidgets/streamout.cpp:180
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:174
 msgid ""
-"You can use this field directly by typing the full MRL you want to open.\n"
-"Alternatively, the field will be filled automatically when you use the "
-"controls below"
+"Specifies the MRL. This can be specified directly or filled in automatically "
+"by adjusting the stream settings."
 msgstr ""
 
-#: modules/gui/wxwidgets/streamout.cpp:430
-msgid "Output methods"
-msgstr "輸出方式"
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:462
+#, fuzzy
+msgid "Outputs"
+msgstr "輸出URL"
+
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:470
+msgid "Play locally"
+msgstr ""
 
-#: modules/gui/wxwidgets/streamout.cpp:441
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:473
 msgid "MMSH"
 msgstr ""
 
-#: modules/gui/wxwidgets/streamout.cpp:545
-msgid "Miscellaneous options"
-msgstr "雜項選項"
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:474
+#: modules/stream_out/rtp.c:101
+msgid "RTP"
+msgstr ""
 
-#: modules/gui/wxwidgets/streamout.cpp:559
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:592
 msgid "Group name"
 msgstr "群組名稱"
 
-#: modules/gui/wxwidgets/streamout.cpp:566
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:599
 msgid "Channel name"
 msgstr "頻道名稱"
 
-#: modules/gui/wxwidgets/streamout.cpp:591
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:606
 #, fuzzy
 msgid "Select all elementary streams"
 msgstr "選擇一個網路串流"
 
-#: modules/gui/wxwidgets/streamout.cpp:675
-msgid "Transcoding options"
-msgstr ""
-
-#: modules/gui/wxwidgets/streamout.cpp:732
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:768
 msgid "Video codec"
 msgstr "視訊編碼器"
 
-#: modules/gui/wxwidgets/streamout.cpp:802
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:838
 msgid "Audio codec"
 msgstr "音訊編碼器"
 
-#: modules/gui/wxwidgets/streamout.cpp:852
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:888
 #, fuzzy
 msgid "Subtitles codec"
 msgstr "字幕編碼器"
 
-#: modules/gui/wxwidgets/streamout.cpp:861
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:897
 #, fuzzy
 msgid "Subtitles overlay"
 msgstr "字幕延遲"
 
-#: modules/gui/wxwidgets/streamout.cpp:974
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:1011
 msgid "Save file"
 msgstr "儲存檔案"
 
-#: modules/gui/wxwidgets/subtitles.cpp:82
+#: modules/gui/wxwidgets/dialogs/subtitles.cpp:55
+msgid "Subtitle options"
+msgstr "字幕選項"
+
+#: modules/gui/wxwidgets/dialogs/subtitles.cpp:73
 msgid "Subtitles file"
 msgstr "字幕檔"
 
-#: modules/gui/wxwidgets/subtitles.cpp:137
-msgid "Subtitles options"
-msgstr "字幕選項"
+#: modules/gui/wxwidgets/dialogs/subtitles.cpp:129
+#, fuzzy
+msgid "Options"
+msgstr "選項:"
 
-#: modules/gui/wxwidgets/subtitles.cpp:219
+#: modules/gui/wxwidgets/dialogs/subtitles.cpp:211
 msgid ""
 "Override frames per second. It will only work with MicroDVD and SubRIP "
 "subtitles."
 msgstr ""
 
-#: modules/gui/wxwidgets/subtitles.cpp:226 modules/stream_out/bridge.c:40
-#: modules/stream_out/display.c:41 modules/video_filter/mosaic.c:109
-msgid "Delay"
-msgstr "延遲"
-
-#: modules/gui/wxwidgets/subtitles.cpp:235
+#: modules/gui/wxwidgets/dialogs/subtitles.cpp:227
 msgid "Set subtitle delay (in 1/10s)"
 msgstr "設定字幕延遲(1/10秒)"
 
-#: modules/gui/wxwidgets/subtitles.cpp:294
+#: modules/gui/wxwidgets/dialogs/subtitles.cpp:286
 msgid "Open file"
 msgstr "開啟檔案"
 
-#: modules/gui/wxwidgets/timer.cpp:156 modules/gui/wxwidgets/timer.cpp:337
+#: modules/gui/wxwidgets/dialogs/updatevlc.cpp:65
 #, fuzzy
-msgid "Playing"
-msgstr "播放"
-
-#: modules/gui/wxwidgets/timer.cpp:176
-#, fuzzy
-msgid "Stopped"
-msgstr "停止"
-
-#: modules/gui/wxwidgets/timer.cpp:223
-msgid "Menu"
-msgstr "選單"
+msgid "Updates"
+msgstr "更新"
 
-#: modules/gui/wxwidgets/timer.cpp:226
-msgid "Previous track"
-msgstr "上一軌"
+#: modules/gui/wxwidgets/dialogs/updatevlc.cpp:78
+msgid "Check for updates"
+msgstr ""
 
-#: modules/gui/wxwidgets/timer.cpp:227
-msgid "Next track"
-msgstr "下一軌"
+#: modules/gui/wxwidgets/dialogs/updatevlc.cpp:154
+msgid ""
+"\n"
+"Available updates and related downloads.\n"
+"(Double click on a file to download it)\n"
+msgstr ""
 
-#: modules/gui/wxwidgets/timer.cpp:333
+#: modules/gui/wxwidgets/dialogs/updatevlc.cpp:182
 #, fuzzy
-msgid "Paused"
-msgstr "暫停"
+msgid "Save file..."
+msgstr "儲存檔案"
 
-#: modules/gui/wxwidgets/updatevlc.cpp:130
-msgid "Check for updates now !"
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:67
+msgid "Broadcasts"
 msgstr ""
 
-#: modules/gui/wxwidgets/updatevlc.cpp:569
-msgid "type : "
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:80
+msgid "Load"
 msgstr ""
 
-#: modules/gui/wxwidgets/updatevlc.cpp:571
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:219
 #, fuzzy
-msgid "URL : "
-msgstr "網址"
+msgid "Load Configuration"
+msgstr "VLM設定檔"
 
-#: modules/gui/wxwidgets/updatevlc.cpp:575
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:233
 #, fuzzy
-msgid "file size : "
-msgstr "視訊大小"
+msgid "Save Configuration"
+msgstr "VLM設定檔"
 
-#: modules/gui/wxwidgets/updatevlc.cpp:579
-msgid "file md5 hash : "
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:249
+msgid "New broadcast"
 msgstr ""
 
-#: modules/gui/wxwidgets/updatevlc.cpp:594
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:385
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:396
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:122
+msgid "Choose"
+msgstr "選擇"
+
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:390
 #, fuzzy
-msgid "Choose a mirror"
-msgstr "選擇目錄"
+msgid "Output"
+msgstr "輸出URL"
+
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:406
+msgid "Loop"
+msgstr "循環"
 
-#: modules/gui/wxwidgets/updatevlc.cpp:642
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:416
 #, fuzzy
-msgid "Save file ..."
-msgstr "儲存檔案"
+msgid "Create"
+msgstr "置中"
 
-#: modules/gui/wxwidgets/updatevlc.cpp:679
-msgid "Downloading..."
-msgstr ""
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:561
+#, fuzzy
+msgid "VLM stream"
+msgstr "播放串流"
+
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:86
+#, fuzzy
+msgid "This wizard helps you to stream, transcode or save a stream."
+msgstr "這個精靈可以幫助你串流、轉碼或是儲存一個串流"
 
-#: modules/gui/wxwidgets/wizard.cpp:97
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:89
+#, fuzzy
+msgid "Use this to stream on a network."
+msgstr "串流至網路"
+
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:91
 msgid "Use this to re-encode a stream and save it to a file."
 msgstr ""
 
-#: modules/gui/wxwidgets/wizard.cpp:100
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:93
+msgid ""
+"This wizard only contains a small subset of VLC's streaming and transcoding "
+"capabilities. Use the Open and Stream Output dialogs to access all of them."
+msgstr ""
+
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:97
 #, fuzzy
 msgid "Use this to stream on a network"
 msgstr "串流至網路"
 
-#: modules/gui/wxwidgets/wizard.cpp:113
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:99
+msgid ""
+"Saves the stream to a file. The stream must be a format that VLC recognizes. "
+"If desired, the stream can also be transcoded to another format.\n"
+"\n"
+"Please note that VLC is not very suited for file-to-file transcoding. Its "
+"transcoding features are more appropriate for saving network streams."
+msgstr ""
+
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:112
 msgid "You must choose a stream"
 msgstr "你必須選擇一個串流"
 
-#: modules/gui/wxwidgets/wizard.cpp:114
-msgid "Uh Oh! Unable to find playlist !"
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:113
+#, fuzzy
+msgid "Unable to find playlist"
 msgstr "喔喔!無法找到播放清單 !"
 
-#: modules/gui/wxwidgets/wizard.cpp:122
-msgid "Choose"
-msgstr "選擇"
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:115
+msgid ""
+"Use this to read only a part of the stream. To use, enter the starting and "
+"ending times (in seconds).\n"
+"\n"
+"Note: You must be able to control the incoming stream (for example, a file "
+"or a disc, but not a RTP/UDP network stream).\n"
+msgstr ""
+
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:126
+msgid ""
+"Changes the compression format of the audio or video tracks. To change only "
+"the container format, proceed to the next page."
+msgstr ""
+
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:130
+#, fuzzy
+msgid "Transcode video (if available)"
+msgstr "視訊轉碼"
+
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:131
+#, fuzzy
+msgid ""
+"Select the target video codec. Choose a codec to display more information "
+"about it."
+msgstr "選擇你的視訊編碼器，點擊以顯示更多資訊"
+
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:134
+#, fuzzy
+msgid "Transcode audio (if available)"
+msgstr "音訊轉碼"
+
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:135
+#, fuzzy
+msgid ""
+"Select the target audio codec. Choose a codec to display more information "
+"about it."
+msgstr "選擇你的音訊編碼器，點擊以顯示更多資訊"
+
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:140
+#, fuzzy
+msgid "Determines how the input stream will be sent."
+msgstr "在這一頁，你可以選擇你的輸入串流的傳送方式"
 
-#: modules/gui/wxwidgets/wizard.cpp:143
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:143
 msgid "This does not appear to be a valid multicast address"
 msgstr ""
 
-#: modules/gui/wxwidgets/wizard.cpp:145
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:145
 #, fuzzy
-msgid "You need to enter an address"
+msgid "Please enter an address"
 msgstr "你必須輸入位置"
 
-#: modules/gui/wxwidgets/wizard.cpp:156
-#, fuzzy
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:149
+msgid ""
+"Determines how the stream will be encapsulated. Depending on the previous "
+"choices, some formats might not be available."
+msgstr ""
+
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:156
+#, fuzzy
+msgid "Defines a few additional parameters for the transcoding."
+msgstr "在這一頁，你可以選擇你的輸入串流的傳送方式"
+
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:159
+msgid "You must choose a file to save to"
+msgstr "你必須選擇檔案以另存"
+
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:163
+#, fuzzy
+msgid "Defines a few additional parameters for the stream."
+msgstr "在這一頁，你可以選擇你的輸入串流的傳送方式"
+
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:166
+msgid ""
+"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 know what it "
+"means, or if you want to stream on your local network only, leave this "
+"setting to 1."
+msgstr ""
+
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:171
+msgid ""
+"When streaming using RTP, you can announce your streams using the SAP/SDP "
+"announcing protocol. This way, the clients won't have to type in the "
+"multicast address, it will appear in their playlist if they enable the SAP "
+"extra interface.\n"
+"If you want to give a name to your stream, enter it here. Otherwise, a "
+"default name will be used."
+msgstr ""
+
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:506
+msgid "More information"
+msgstr "更多資訊"
+
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:1289
+#, fuzzy
+msgid "Save to file"
+msgstr "儲存檔案"
+
+#: modules/gui/wxwidgets/extrapanel.cpp:41
+msgid ""
+"Controls the blending of equalizer bands. The higher this value is, the more "
+"correlated their movement will be."
+msgstr ""
+
+#: modules/gui/wxwidgets/extrapanel.cpp:148
+msgid "Creates several clones of the image"
+msgstr "建立數個影像複製"
+
+#: modules/gui/wxwidgets/extrapanel.cpp:153 modules/video_filter/magnify.c:60
+msgid "Magnify"
+msgstr ""
+
+#: modules/gui/wxwidgets/extrapanel.cpp:153
+#, fuzzy
+msgid "Magnifies part of the image"
+msgstr "旋轉或翻轉影像"
+
+#: modules/gui/wxwidgets/extrapanel.cpp:270
+msgid "Video Options"
+msgstr "視訊選項"
+
+#: modules/gui/wxwidgets/extrapanel.cpp:284
+msgid "Aspect Ratio"
+msgstr ""
+
+#: modules/gui/wxwidgets/extrapanel.cpp:402
+msgid "Prevents the audio output level from going over a predefined value."
+msgstr ""
+
+#: modules/gui/wxwidgets/extrapanel.cpp:466
+msgid ""
+"Enable the equalizer. You can either manually adjust the bands or use a "
+"preset (Audio Menu->Equalizer)."
+msgstr ""
+
+#: modules/gui/wxwidgets/extrapanel.cpp:473
+msgid "Apply the equalizer twice. The resulting effect will be sharper."
+msgstr ""
+
+#: modules/gui/wxwidgets/extrapanel.cpp:999
+msgid ""
+"Filtering effects to apply to the video. You must restart the stream for "
+"these settings to take effect.\n"
+"\n"
+"To configure these filters, go to Preferences / Video / Filters. In order to "
+"control the order in which they are applied, enter a filters string in the "
+"Video Filter Module inside the preferences."
+msgstr ""
+
+#: modules/gui/wxwidgets/input_manager.cpp:180
+#, fuzzy
+msgid "Stopped"
+msgstr "停止"
+
+#: modules/gui/wxwidgets/input_manager.cpp:205
+#, fuzzy
+msgid "Paused"
+msgstr "暫停"
+
+#: modules/gui/wxwidgets/input_manager.cpp:205
+#, fuzzy
+msgid "Playing"
+msgstr "播放"
+
+#: modules/gui/wxwidgets/input_manager.cpp:220
+msgid "Menu"
+msgstr "選單"
+
+#: modules/gui/wxwidgets/input_manager.cpp:223
+msgid "Previous track"
+msgstr "上一軌"
+
+#: modules/gui/wxwidgets/input_manager.cpp:224
+msgid "Next track"
+msgstr "下一軌"
+
+#: modules/gui/wxwidgets/interface.cpp:568
+msgid "Quick &Open File...\tCtrl-O"
+msgstr "快速開啟檔案...\tCtrl-O"
+
+#: modules/gui/wxwidgets/interface.cpp:571
+msgid "Open &File...\tCtrl-F"
+msgstr "開啟檔案(&F)...\tCtrl-F"
+
+#: modules/gui/wxwidgets/interface.cpp:572
+#, fuzzy
+msgid "Open Dir&ectory...\tCtrl-E"
+msgstr "開啟檔案(&F)...\tCtrl-F"
+
+#: modules/gui/wxwidgets/interface.cpp:573
+msgid "Open &Disc...\tCtrl-D"
+msgstr "開啟光碟(&D)...\tCtrl-D"
+
+#: modules/gui/wxwidgets/interface.cpp:575
+msgid "Open &Network Stream...\tCtrl-N"
+msgstr "開啟網路串流(&N)...\tCtrl-N"
+
+#: modules/gui/wxwidgets/interface.cpp:577
+#, fuzzy
+msgid "Open C&apture Device...\tCtrl-A"
+msgstr "開啟擷取裝置(&C)...\tCtrl-C"
+
+#: modules/gui/wxwidgets/interface.cpp:580
+msgid "&Wizard...\tCtrl-W"
+msgstr "精靈(W)...\tCtrl-W"
+
+#: modules/gui/wxwidgets/interface.cpp:583
+msgid "E&xit\tCtrl-X"
+msgstr "離開(&X)\tCtrl-X"
+
+#: modules/gui/wxwidgets/interface.cpp:589
+msgid "&Playlist...\tCtrl-P"
+msgstr "播放清單(&P)\tCtrl-P"
+
+#: modules/gui/wxwidgets/interface.cpp:591
+msgid "&Messages...\tCtrl-M"
+msgstr "訊息(&M)...\tCtrl-M"
+
+#: modules/gui/wxwidgets/interface.cpp:593
+#, fuzzy
+msgid "Stream and Media &Info...\tCtrl-I"
+msgstr "串流及媒體資訊(&I)...\tCtrl-I"
+
+#: modules/gui/wxwidgets/interface.cpp:595
+msgid "VLM Control...\tCtrl-V"
+msgstr ""
+
+#: modules/gui/wxwidgets/interface.cpp:605
+#, fuzzy
+msgid "About..."
+msgstr "關於"
+
+#: modules/gui/wxwidgets/interface.cpp:607
+msgid "Check for Updates..."
+msgstr ""
+
+#: modules/gui/wxwidgets/interface.cpp:611
+msgid "&File"
+msgstr "檔案(&F)"
+
+#: modules/gui/wxwidgets/interface.cpp:612
+msgid "&View"
+msgstr "檢視(&V)"
+
+#: modules/gui/wxwidgets/interface.cpp:613
+msgid "&Settings"
+msgstr "設定(&S)"
+
+#: modules/gui/wxwidgets/interface.cpp:614
+msgid "&Audio"
+msgstr "音訊(&A)"
+
+#: modules/gui/wxwidgets/interface.cpp:615
+msgid "&Video"
+msgstr "視訊(&V)"
+
+#: modules/gui/wxwidgets/interface.cpp:616
+msgid "&Navigation"
+msgstr "導覽(&N)"
+
+#: modules/gui/wxwidgets/interface.cpp:617
+msgid "&Help"
+msgstr "輔助說明(&H)"
+
+#: modules/gui/wxwidgets/interface.cpp:677
+#: modules/gui/wxwidgets/interface.cpp:688
+#, fuzzy
+msgid "Embedded playlist"
+msgstr "開啟播放清單"
+
+#: modules/gui/wxwidgets/interface.cpp:678
+msgid "Previous playlist item"
+msgstr "前一個播放清單項目"
+
+#: modules/gui/wxwidgets/interface.cpp:679
+msgid "Next playlist item"
+msgstr "下一個播放清單項目"
+
+#: modules/gui/wxwidgets/interface.cpp:680
+msgid "Play slower"
+msgstr "慢速播放"
+
+#: modules/gui/wxwidgets/interface.cpp:681
+msgid "Play faster"
+msgstr "快速播放"
+
+#: modules/gui/wxwidgets/interface.cpp:878
+#, fuzzy
+msgid "Extended &GUI\tCtrl-G"
+msgstr "延伸使用者介面(&E)"
+
+#: modules/gui/wxwidgets/interface.cpp:881
+#, fuzzy
+msgid "&Bookmarks...\tCtrl-B"
+msgstr "書籤(&B)"
+
+#: modules/gui/wxwidgets/interface.cpp:883
+#, fuzzy
+msgid "Preference&s...\tCtrl-S"
+msgstr "偏好設定..."
+
+#: modules/gui/wxwidgets/interface.cpp:936
+#, fuzzy
+msgid ""
+" (wxWidgets interface)\n"
+"\n"
+msgstr ""
+" (wxWindows介面)\n"
+"\n"
+
+#: modules/gui/wxwidgets/interface.cpp:949
+msgid ""
+"The VideoLAN team <videolan@videolan.org>\n"
+"http://www.videolan.org/\n"
+"\n"
+msgstr ""
+
+#: modules/gui/wxwidgets/interface.cpp:952
+#, c-format
+msgid "About %s"
+msgstr "關於 %s"
+
+#: modules/gui/wxwidgets/interface.cpp:1496
+#, fuzzy
+msgid "Show/Hide Interface"
+msgstr "顯示介面"
+
+#: modules/gui/wxwidgets/menus.cpp:132
+msgid "Quick &Open File..."
+msgstr "快速開啟檔案(&O)"
+
+#: modules/gui/wxwidgets/menus.cpp:133
+msgid "Open &File..."
+msgstr "開啟檔案(&F)"
+
+#: modules/gui/wxwidgets/menus.cpp:134
+#, fuzzy
+msgid "Open D&irectory..."
+msgstr "開啟檔案(&F)...\tCtrl-F"
+
+#: modules/gui/wxwidgets/menus.cpp:135
+msgid "Open &Disc..."
+msgstr "開啟光碟(&D)"
+
+#: modules/gui/wxwidgets/menus.cpp:136
+msgid "Open &Network Stream..."
+msgstr "開啟網路串流(&N)"
+
+#: modules/gui/wxwidgets/menus.cpp:137
+msgid "Open &Capture Device..."
+msgstr "開啟擷取裝置(&C)"
+
+#: modules/gui/wxwidgets/menus.cpp:144
+msgid "Media &Info..."
+msgstr "媒體資訊(&I)"
+
+#: modules/gui/wxwidgets/menus.cpp:145
+msgid "&Messages..."
+msgstr "訊息(&M)"
+
+#: modules/gui/wxwidgets/menus.cpp:146
+msgid "&Preferences..."
+msgstr "偏好設定(&P)"
+
+#: modules/gui/wxwidgets/menus.cpp:569 modules/gui/wxwidgets/menus.cpp:596
+msgid "Empty"
+msgstr "無項目"
+
+#: modules/gui/wxwidgets/streamdata.cpp:31
+msgid "MPEG-1 Video codec (useable with MPEG PS, MPEG TS, MPEG1, OGG and RAW)"
+msgstr ""
+
+#: modules/gui/wxwidgets/streamdata.cpp:35
+msgid "MPEG-2 Video codec (useable with MPEG PS, MPEG TS, MPEG1, OGG and RAW)"
+msgstr ""
+
+#: modules/gui/wxwidgets/streamdata.cpp:39
+msgid ""
+"MPEG-4 Video codec (useable with MPEG PS, MPEG TS, MPEG1, ASF, MPEG4, OGG "
+"and RAW)"
+msgstr ""
+
+#: modules/gui/wxwidgets/streamdata.cpp:56
+#, fuzzy
+msgid "H264 is a new video codec (useable with MPEG TS and MPEG4)"
+msgstr "H264是一個新的視訊編碼器"
+
+#: modules/gui/wxwidgets/streamdata.cpp:59
+msgid "WMV (Windows Media Video) 7 (useable with MPEG TS, MPEG1, ASF and OGG)"
+msgstr ""
+
+#: modules/gui/wxwidgets/streamdata.cpp:62
+msgid "WMV (Windows Media Video) 8 (useable with MPEG TS, MPEG1, ASF and OGG)"
+msgstr ""
+
+#: modules/gui/wxwidgets/streamdata.cpp:66
+msgid "WMV (Windows Media Video) 9 (useable with MPEG TS, MPEG1, ASF and OGG)"
+msgstr ""
+
+#: modules/gui/wxwidgets/streamdata.cpp:73
+#, fuzzy
+msgid "Theora is a free general-purpose codec (useable with MPEG TS)"
+msgstr "Theora是一個免費、開放的通用編碼器"
+
+#: modules/gui/wxwidgets/streamdata.cpp:122
+msgid "RTP Unicast"
+msgstr ""
+
+#: modules/gui/wxwidgets/streamdata.cpp:122
+#, fuzzy
+msgid "Stream to a single computer."
+msgstr "串流至網路"
+
+#: modules/gui/wxwidgets/streamdata.cpp:125
+msgid "RTP Multicast"
+msgstr ""
+
+#: modules/gui/wxwidgets/streamdata.cpp:126
 msgid ""
-"In this page, you will define a few additionnal parameters for your "
-"transcoding"
-msgstr "在這一頁，你可以選擇你的輸入串流的傳送方式"
+"Stream to a dynamic group of computers on a multicast-enabled network. This "
+"is the most efficient method to stream to several computers, but it does not "
+"work over the Internet."
+msgstr ""
 
-#: modules/gui/wxwidgets/wizard.cpp:159
-msgid "You must choose a file to save to"
-msgstr "你必須選擇檔案以另存"
+#: modules/gui/wxwidgets/streamdata.cpp:129
+msgid ""
+"Enter the multicast address to stream to. This must be an IP address between "
+"224.0.0.0 an 239.255.255.255. For private use, enter an address beginning "
+"with 239.255."
+msgstr ""
 
-#: modules/gui/wxwidgets/wizard.cpp:163
-#, fuzzy
+#: modules/gui/wxwidgets/streamdata.cpp:134
 msgid ""
-"In this page, you will define a few additionnal parameters for your stream"
-msgstr "在這一頁，你可以選擇你的輸入串流的傳送方式"
+"Stream to several computers. This method is less efficient, as the server "
+"needs to send the stream several times."
+msgstr ""
 
-#: modules/gui/wxwidgets/wizard.cpp:171
+#: modules/gui/wxwidgets/streamdata.cpp:137
 msgid ""
-"When streaming using UDP, you can announce your streams using the SAP/SDP "
-"announcing protocol. This way, the clients won't have to type in the "
-"multicast address, it will appear in their playlist if they enable the SAP "
-"extra interface.\n"
-"If you want to give a name to your stream, enter it here, else, a default "
-"name will be used"
+"Enter the local addresses you want to listen to. Do not enter anything if "
+"you want to listen to all adresses or if you don't understand. This is "
+"generally the best thing to do. Other computers can then access the stream "
+"at http://yourip:8080 by default."
 msgstr ""
 
 #: modules/gui/wxwidgets/wxwidgets.cpp:89
-msgid "Show bookmarks dialog"
+#, fuzzy
+msgid "Bookmarks dialog"
 msgstr "顯示書籤對話框"
 
 #: modules/gui/wxwidgets/wxwidgets.cpp:90
-msgid "Show bookmarks dialog when the interface starts."
-msgstr "介面啟動時顯示書籤對話框"
+#, fuzzy
+msgid "Show bookmarks dialog at startup"
+msgstr "顯示書籤對話框"
+
+#: modules/gui/wxwidgets/wxwidgets.cpp:91
+#, fuzzy
+msgid "Extended GUI"
+msgstr "延伸使用者介面(&E)"
 
 #: modules/gui/wxwidgets/wxwidgets.cpp:92
-#: modules/gui/wxwidgets/wxwidgets.cpp:93
-msgid "Show taskbar entry"
+msgid ""
+"Show extended GUI (equalizer, image adjust, video filters...) at startup"
 msgstr ""
 
 #: modules/gui/wxwidgets/wxwidgets.cpp:94
+msgid "Taskbar"
+msgstr ""
+
+#: modules/gui/wxwidgets/wxwidgets.cpp:95
+msgid "Show VLC on the taskbar"
+msgstr ""
+
+#: modules/gui/wxwidgets/wxwidgets.cpp:96
 #, fuzzy
 msgid "Minimal interface"
 msgstr "可面板化介面"
 
-#: modules/gui/wxwidgets/wxwidgets.cpp:95
-msgid "Use minimal interface, no toolbar, few menus"
+#: modules/gui/wxwidgets/wxwidgets.cpp:97
+msgid "Use minimal interface, with no toolbar and fewer menus."
 msgstr ""
 
-#: modules/gui/wxwidgets/wxwidgets.cpp:96
+#: modules/gui/wxwidgets/wxwidgets.cpp:99
 #, fuzzy
 msgid "Size to video"
 msgstr "有效時間"
 
-#: modules/gui/wxwidgets/wxwidgets.cpp:97
-msgid "Resize VLC to match the video resolution"
+#: modules/gui/wxwidgets/wxwidgets.cpp:100
+msgid "Resize VLC to match the video resolution."
 msgstr ""
 
-#: modules/gui/wxwidgets/wxwidgets.cpp:98
-#: modules/gui/wxwidgets/wxwidgets.cpp:99
+#: modules/gui/wxwidgets/wxwidgets.cpp:101
+#, fuzzy
+msgid "Systray icon"
+msgstr "顯示串流位置"
+
+#: modules/gui/wxwidgets/wxwidgets.cpp:102
 #, fuzzy
-msgid "Show systray icon"
+msgid "Show a systray icon for VLC"
 msgstr "顯示串流位置"
 
-#: modules/gui/wxwidgets/wxwidgets.cpp:108
+#: modules/gui/wxwidgets/wxwidgets.cpp:103
+#, fuzzy
+msgid "Show labels in toolbar"
+msgstr "顯示工具列按鈕文字"
+
+#: modules/gui/wxwidgets/wxwidgets.cpp:104
+#, fuzzy
+msgid "Show labels below the icons in the toolbar."
+msgstr "在工具列圖示的下方顯示文字"
+
+#: modules/gui/wxwidgets/wxwidgets.cpp:106
+#, fuzzy
+msgid "Playlist view"
+msgstr "播放清單"
+
+#: modules/gui/wxwidgets/wxwidgets.cpp:107
+msgid ""
+"There are two possible playlist views in the interface : the normal playlist "
+"(separate window), or an embedded playlist (within the main interface, but "
+"with less features). You can select which one will be available on the "
+"toolbar (or both)."
+msgstr ""
+
+#: modules/gui/wxwidgets/wxwidgets.cpp:114
+msgid "Embedded"
+msgstr ""
+
+#: modules/gui/wxwidgets/wxwidgets.cpp:115
+msgid "Both"
+msgstr ""
+
+#: modules/gui/wxwidgets/wxwidgets.cpp:124
 #, fuzzy
 msgid "wxWidgets interface module"
 msgstr "wxWindows介面模組"
 
-#: modules/gui/wxwidgets/wxwidgets.cpp:145
+#: modules/gui/wxwidgets/wxwidgets.cpp:170
 msgid "wxWidgets dialogs provider"
 msgstr ""
 
@@ -11337,8 +13278,8 @@ msgstr "儲存空白編碼器資料"
 
 #: modules/misc/dummy/dummy.c:45
 msgid ""
-"This option allows you to save the raw codec data if you have selected/"
-"forced the dummy decoder in the main options."
+"Save the raw codec data if you have selected/forced the dummy decoder in the "
+"main options."
 msgstr ""
 
 #: modules/misc/dummy/dummy.c:51
@@ -11352,55 +13293,56 @@ msgstr ""
 msgid "Dummy interface function"
 msgstr "虛擬介面功能"
 
-#: modules/misc/dummy/dummy.c:66
+#: modules/misc/dummy/dummy.c:64
 msgid "Dummy Interface"
 msgstr "虛擬介面"
 
-#: modules/misc/dummy/dummy.c:71
+#: modules/misc/dummy/dummy.c:69
 msgid "Dummy access function"
 msgstr "虛擬存取功能"
 
-#: modules/misc/dummy/dummy.c:75
+#: modules/misc/dummy/dummy.c:73
 msgid "Dummy demux function"
 msgstr "虛擬解多工功能"
 
-#: modules/misc/dummy/dummy.c:79
+#: modules/misc/dummy/dummy.c:77
 msgid "Dummy decoder"
 msgstr "虛擬解碼器"
 
-#: modules/misc/dummy/dummy.c:80
+#: modules/misc/dummy/dummy.c:78
 msgid "Dummy decoder function"
 msgstr "虛擬解碼器功能"
 
-#: modules/misc/dummy/dummy.c:85
+#: modules/misc/dummy/dummy.c:83
 msgid "Dummy encoder function"
 msgstr "虛擬編碼器功能"
 
-#: modules/misc/dummy/dummy.c:89
+#: modules/misc/dummy/dummy.c:87
 msgid "Dummy audio output function"
 msgstr "虛擬音訊輸出功能"
 
-#: modules/misc/dummy/dummy.c:93
+#: modules/misc/dummy/dummy.c:91
 msgid "Dummy video output function"
 msgstr "虛擬視訊輸出功能"
 
-#: modules/misc/dummy/dummy.c:94
+#: modules/misc/dummy/dummy.c:92
 msgid "Dummy Video output"
 msgstr "虛擬視訊輸出"
 
-#: modules/misc/dummy/dummy.c:100
+#: modules/misc/dummy/dummy.c:98
 msgid "Dummy font renderer function"
 msgstr ""
 
 #: modules/misc/freetype.c:83 modules/misc/win32text.c:54
-#: modules/video_filter/marq.c:125 modules/video_filter/rss.c:163
-#: modules/visualization/xosd.c:73
+#: modules/video_filter/marq.c:127 modules/video_filter/rss.c:180
+#: modules/visualization/xosd.c:76
 msgid "Font"
 msgstr "字型"
 
 #: modules/misc/freetype.c:84 modules/misc/win32text.c:55
-msgid "Font filename"
-msgstr "字型檔案名稱"
+#, fuzzy
+msgid "Filename for the font you want to use"
+msgstr "設定你想使用的音訊頻道的串流數量(從0到n)"
 
 #: modules/misc/freetype.c:85 modules/misc/win32text.c:56
 msgid "Font size in pixels"
@@ -11408,253 +13350,256 @@ msgstr ""
 
 #: modules/misc/freetype.c:86 modules/misc/win32text.c:57
 msgid ""
-"The size of the fonts used by the osd module. If set to something different "
-"than 0 this option will override the relative font size "
+"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/freetype.c:89 modules/misc/win32text.c:60
+#: modules/misc/freetype.c:90 modules/misc/win32text.c:61
+#: modules/video_filter/marq.c:86 modules/video_filter/rss.c:138
 #: modules/video_filter/time.c:77
-msgid "Opacity, 0..255"
+msgid "Opacity"
 msgstr ""
 
-#: modules/misc/freetype.c:90 modules/misc/win32text.c:61
-#: modules/video_filter/marq.c:87 modules/video_filter/rss.c:125
-#: modules/video_filter/time.c:78
+#: modules/misc/freetype.c:91 modules/misc/win32text.c:62
 msgid ""
-"The opacity (inverse of transparency) of overlay text. 0 = transparent, 255 "
-"= totally opaque. "
+"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:92 modules/misc/win32text.c:63
-#: modules/video_filter/marq.c:93 modules/video_filter/rss.c:131
-#: modules/video_filter/time.c:84
-msgid "Text Default Color"
+#: modules/misc/freetype.c:94 modules/misc/win32text.c:65
+msgid "Text default color"
 msgstr ""
 
-#: modules/misc/freetype.c:93 modules/misc/win32text.c:64
-#: modules/video_filter/marq.c:94 modules/video_filter/rss.c:132
-#: modules/video_filter/time.c:85
+#: modules/misc/freetype.c:95 modules/misc/win32text.c:66
 msgid ""
-"The color of overlay text. 1 byte for each color, hexadecimal. #000000 = all "
-"colors off, 0xFF0000 = just Red, 0xFFFFFF = all color on [White]"
+"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, "
+"then blue. #000000 = black, #FF0000 = red, #00FF00 = green, #FFFF00 = yellow "
+"(red + green), #FFFFFF = white"
 msgstr ""
 
-#: modules/misc/freetype.c:97 modules/misc/win32text.c:68
-msgid "The size of the fonts used by the osd module"
-msgstr "OSD模組所使用的字型大小"
+#: modules/misc/freetype.c:99 modules/misc/win32text.c:70
+msgid "Relative font size"
+msgstr ""
 
 #: modules/misc/freetype.c:100 modules/misc/win32text.c:71
+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:105 modules/misc/win32text.c:76
 msgid "Smaller"
 msgstr "更小"
 
-#: modules/misc/freetype.c:100 modules/misc/win32text.c:71
+#: modules/misc/freetype.c:105 modules/misc/win32text.c:76
 msgid "Small"
 msgstr "小"
 
-#: modules/misc/freetype.c:101 modules/misc/win32text.c:72
+#: modules/misc/freetype.c:106 modules/misc/win32text.c:77
 msgid "Large"
 msgstr "大"
 
-#: modules/misc/freetype.c:101 modules/misc/win32text.c:72
+#: modules/misc/freetype.c:106 modules/misc/win32text.c:77
 msgid "Larger"
 msgstr "更大"
 
-#: modules/misc/freetype.c:108 modules/misc/win32text.c:79
-#: modules/video_filter/marq.c:52 modules/video_filter/rss.c:55
-#: modules/video_filter/time.c:52
-msgid "Black"
-msgstr ""
-
-#: modules/misc/freetype.c:108 modules/misc/win32text.c:79
-#: modules/video_filter/marq.c:53 modules/video_filter/rss.c:56
-#: modules/video_filter/time.c:53
-msgid "Gray"
-msgstr ""
-
-#: modules/misc/freetype.c:108 modules/misc/win32text.c:79
-#: modules/video_filter/marq.c:53 modules/video_filter/rss.c:56
-#: modules/video_filter/time.c:53
-#, fuzzy
-msgid "Silver"
-msgstr "放慢"
-
-#: modules/misc/freetype.c:108 modules/misc/win32text.c:79
-#: modules/video_filter/marq.c:53 modules/video_filter/rss.c:56
-#: modules/video_filter/time.c:53
-msgid "White"
-msgstr ""
-
-#: modules/misc/freetype.c:108 modules/misc/win32text.c:79
-#: modules/video_filter/marq.c:53 modules/video_filter/rss.c:56
-#: modules/video_filter/time.c:53
-msgid "Maroon"
-msgstr ""
-
-#: modules/misc/freetype.c:109 modules/misc/win32text.c:80
-#: modules/video_filter/marq.c:53 modules/video_filter/rss.c:56
-#: modules/video_filter/time.c:53
-#, fuzzy
-msgid "Red"
-msgstr "回捲"
-
-#: modules/misc/freetype.c:109 modules/misc/win32text.c:80
-#: modules/video_filter/marq.c:54 modules/video_filter/rss.c:57
-#: modules/video_filter/time.c:54
-msgid "Fuchsia"
-msgstr ""
-
-#: modules/misc/freetype.c:109 modules/misc/win32text.c:80
-#: modules/video_filter/marq.c:54 modules/video_filter/rss.c:57
-#: modules/video_filter/time.c:54
-msgid "Yellow"
-msgstr ""
-
-#: modules/misc/freetype.c:109 modules/misc/win32text.c:80
-#: modules/video_filter/marq.c:54 modules/video_filter/rss.c:57
-#: modules/video_filter/time.c:54
-msgid "Olive"
-msgstr ""
-
-#: modules/misc/freetype.c:109 modules/misc/win32text.c:80
-#: modules/video_filter/marq.c:54 modules/video_filter/rss.c:57
-#: modules/video_filter/time.c:54
+#: modules/misc/freetype.c:107
 #, fuzzy
-msgid "Green"
-msgstr "畫面"
+msgid "Use YUVP renderer"
+msgstr "字體表現"
 
-#: modules/misc/freetype.c:109 modules/misc/win32text.c:80
-#: modules/video_filter/marq.c:55 modules/video_filter/rss.c:58
-#: modules/video_filter/time.c:55
-msgid "Teal"
+#: 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:110 modules/misc/win32text.c:81
-#: modules/video_filter/marq.c:55 modules/video_filter/rss.c:58
-#: modules/video_filter/time.c:55
+#: modules/misc/freetype.c:110
 #, fuzzy
-msgid "Lime"
-msgstr "時間"
+msgid "Font Effect"
+msgstr "Goom效果"
 
-#: modules/misc/freetype.c:110 modules/misc/win32text.c:81
-#: modules/video_filter/marq.c:55 modules/video_filter/rss.c:58
-#: modules/video_filter/time.c:55
-msgid "Purple"
+#: modules/misc/freetype.c:111
+msgid ""
+"It is possible to apply effects to the renderedtext to improve its "
+"readability."
 msgstr ""
 
-#: modules/misc/freetype.c:110 modules/misc/win32text.c:81
-#: modules/video_filter/marq.c:55 modules/video_filter/rss.c:58
-#: modules/video_filter/time.c:55
-msgid "Navy"
+#: modules/misc/freetype.c:119
+msgid "Background"
 msgstr ""
 
-#: modules/misc/freetype.c:110 modules/misc/win32text.c:81
-#: modules/video_filter/marq.c:55 modules/video_filter/rss.c:58
-#: modules/video_filter/time.c:55
-msgid "Blue"
+#: modules/misc/freetype.c:119
+msgid "Outline"
 msgstr ""
 
-#: modules/misc/freetype.c:110 modules/misc/win32text.c:81
-#: modules/video_filter/marq.c:56 modules/video_filter/rss.c:59
-#: modules/video_filter/time.c:56
-msgid "Aqua"
+#: modules/misc/freetype.c:120
+msgid "Fat Outline"
 msgstr ""
 
-#: modules/misc/freetype.c:113 modules/misc/win32text.c:84
+#: modules/misc/freetype.c:132 modules/misc/win32text.c:89
 #, fuzzy
 msgid "Text renderer"
 msgstr "字體表現"
 
-#: modules/misc/freetype.c:114
+#: modules/misc/freetype.c:133
 msgid "Freetype2 font renderer"
 msgstr ""
 
-#: modules/misc/gnutls.c:66
+#: modules/misc/gnutls.c:67
 msgid "Diffie-Hellman prime bits"
 msgstr ""
 
-#: modules/misc/gnutls.c:68
+#: modules/misc/gnutls.c:69
 msgid ""
-"Allows you to modify the Diffie-Hellman prime's number of bits (used for TLS "
-"or SSL-based server-side encryption)."
+"This allows you to modify the Diffie-Hellman prime's number of bits, used "
+"for TLS or SSL-based server-side encryption. This is generally not needed."
 msgstr ""
 
-#: modules/misc/gnutls.c:71
+#: modules/misc/gnutls.c:73
 msgid "Expiration time for resumed TLS sessions"
 msgstr ""
 
-#: modules/misc/gnutls.c:73
+#: modules/misc/gnutls.c:75
 msgid ""
-"Defines the delay before resumed TLS sessions will be expired (in seconds)."
+"It is possible to cache the resumed TLS sessions. This is the expiration "
+"time of the sessions stored in this cache, in seconds."
 msgstr ""
 
-#: modules/misc/gnutls.c:76
+#: modules/misc/gnutls.c:78
 msgid "Number of resumed TLS sessions"
 msgstr ""
 
-#: modules/misc/gnutls.c:78
+#: modules/misc/gnutls.c:80
 msgid ""
-"Allows you to modify the maximum number of resumed TLS sessions that the "
-"cache will hold."
+"This is the maximum number of resumed TLS sessions that the cache will hold."
 msgstr ""
 
-#: modules/misc/gnutls.c:81
+#: modules/misc/gnutls.c:83
 msgid "Check TLS/SSL server certificate validity"
 msgstr ""
 
-#: modules/misc/gnutls.c:83
+#: modules/misc/gnutls.c:85
 msgid ""
-"Ensures that server certificate is valid (i.e. signed by an approved "
-"Certificate Authority)."
+"This ensures that the server certificate is valid (i.e. signed by an "
+"approved Certification Authority)."
 msgstr ""
 
-#: modules/misc/gnutls.c:86
+#: modules/misc/gnutls.c:88
 msgid "Check TLS/SSL server hostname in certificate"
 msgstr ""
 
-#: modules/misc/gnutls.c:88
-msgid "Ensures that server hostname in certificate match requested host name."
+#: modules/misc/gnutls.c:90
+msgid ""
+"This ensures that the server hostname in certificate matches the requested "
+"host name."
 msgstr ""
 
-#: modules/misc/gnutls.c:92
+#: modules/misc/gnutls.c:95
 msgid "GnuTLS TLS encryption layer"
 msgstr ""
 
+#: modules/misc/growl.c:56
+#, fuzzy
+msgid "Growl server"
+msgstr "沒有伺服器"
+
+#: modules/misc/growl.c:57
+msgid ""
+"This is the host to which Growl notifications will be sent. By default, "
+"notifications are sent locally."
+msgstr ""
+
+#: modules/misc/growl.c:60
+#, fuzzy
+msgid "Growl password"
+msgstr "SOCKS密碼"
+
+#: modules/misc/growl.c:61
+msgid "Growl password on the server."
+msgstr ""
+
+#: modules/misc/growl.c:62
+#, fuzzy
+msgid "Growl UDP port"
+msgstr "TCP指令輸入"
+
+#: modules/misc/growl.c:63
+#, fuzzy
+msgid "Growl UDP port on the server."
+msgstr "TCP指令輸入"
+
+#: modules/misc/growl.c:68
+#, fuzzy
+msgid "Growl"
+msgstr "群組"
+
+#: modules/misc/growl.c:69
+msgid "Growl Notification Plugin"
+msgstr ""
+
+#: modules/misc/growl.c:167 modules/misc/msn.c:201
+#, fuzzy
+msgid "(no title)"
+msgstr "標題"
+
+#: modules/misc/growl.c:168 modules/misc/msn.c:202
+msgid "(no artist)"
+msgstr ""
+
+#: modules/misc/growl.c:169 modules/misc/msn.c:203
+msgid "(no album)"
+msgstr ""
+
 #: modules/misc/gtk_main.c:60
 msgid "Gtk+ GUI helper"
 msgstr ""
 
-#: modules/misc/logger.c:95
+#: modules/misc/logger.c:112 modules/video_filter/marq.c:76
 msgid "Text"
 msgstr ""
 
-#: modules/misc/logger.c:97
+#: modules/misc/logger.c:118
 msgid "Log format"
 msgstr "記錄格式"
 
-#: modules/misc/logger.c:98
+#: modules/misc/logger.c:120
+msgid ""
+"Specify the log format. Available choices are \"text\" (default), \"html\", "
+"and \"syslog\" (special mode to send to syslog instead of file."
+msgstr ""
+
+#: modules/misc/logger.c:124
 msgid ""
 "Specify the log format. Available choices are \"text\" (default) and \"html"
 "\"."
 msgstr ""
 
-#: modules/misc/logger.c:103
+#: modules/misc/logger.c:129
 msgid "Logging"
 msgstr ""
 
-#: modules/misc/logger.c:104
+#: modules/misc/logger.c:130
 msgid "File logging"
 msgstr ""
 
-#: modules/misc/logger.c:106
+#: modules/misc/logger.c:136
 msgid "Log filename"
 msgstr "記錄檔檔名"
 
-#: modules/misc/logger.c:106
+#: modules/misc/logger.c:136
 msgid "Specify the log filename."
 msgstr ""
 
-#: modules/misc/memcpy/memcpyaltivec.c:56
-msgid "AltiVec memcpy"
+#: modules/misc/logger.c:141
+#, fuzzy
+msgid "RRD output file"
+msgstr "輸出檔案"
+
+#: modules/misc/logger.c:142
+msgid "Output data for RRDTool in this file."
 msgstr ""
 
 #: modules/misc/memcpy/memcpy.c:83
@@ -11673,23 +13618,35 @@ msgstr ""
 msgid "MMX EXT memcpy"
 msgstr ""
 
-#: modules/misc/network/ipv4.c:94
-#, fuzzy
-msgid "Multicast output interface"
-msgstr "搖桿控制介面"
+#: modules/misc/memcpy/memcpyaltivec.c:56
+msgid "AltiVec memcpy"
+msgstr ""
 
-#: modules/misc/network/ipv4.c:96
+#: modules/misc/msn.c:63
+msgid "MSN Title format string"
+msgstr ""
+
+#: modules/misc/msn.c:64
 msgid ""
-"Indicate here the multicast output interface. This overrides the routing "
-"table."
+"Format of the string to send to MSN {0} Artist, {1} Title, {2} Album. "
+"Defaults to \"Artist - Title\" ({0} - {1})."
+msgstr ""
+
+#: modules/misc/msn.c:70
+msgid "MSN"
 msgstr ""
 
-#: modules/misc/network/ipv4.c:101
+#: modules/misc/msn.c:71
+#, fuzzy
+msgid "MSN Now-Playing"
+msgstr "播放"
+
+#: modules/misc/network/ipv4.c:96
 #, fuzzy
 msgid "UDP/IPv4 network abstraction layer"
 msgstr "IPv4網路抽象層"
 
-#: modules/misc/network/ipv6.c:95
+#: modules/misc/network/ipv6.c:89
 #, fuzzy
 msgid "UDP/IPv6 network abstraction layer"
 msgstr "IPv6網路抽象層"
@@ -11702,6 +13659,11 @@ msgstr ""
 msgid "Old playlist exporter"
 msgstr ""
 
+#: modules/misc/playlist/export.c:56
+#, fuzzy
+msgid "XSPF playlist export"
+msgstr "PLS播放清單匯入"
+
 #: modules/misc/qte_main.cpp:66
 msgid "Run as standalone Qt/Embedded GUI Server"
 msgstr ""
@@ -11721,17 +13683,33 @@ msgid "video"
 msgstr "視訊"
 
 #: modules/misc/rtsp.c:48
+msgid "RTSP host address"
+msgstr ""
+
+#: modules/misc/rtsp.c:50
+msgid ""
+"This defines the address, port and path the RTSP VOD server will listen on.\n"
+"Syntax is address:port/path. The default is to listen on all interfaces "
+"(address 0.0.0.0), on port 554, with no path.\n"
+" To listen only on the local interface, use \"localhost\" as address."
+msgstr ""
+
+#: modules/misc/rtsp.c:55
+#, fuzzy
+msgid "Maximum number of connections"
+msgstr "複製數量"
+
+#: modules/misc/rtsp.c:56
 msgid ""
-"You can set the address, port and path the rtsp interface will bind to.\n"
-" Syntax is address:port/path. Default is to bind to any address on port 554, "
-"with no path."
+"This limits the maximum number of clients that can connect to the RTSP VOD. "
+"0 means no limit."
 msgstr ""
 
-#: modules/misc/rtsp.c:52
+#: modules/misc/rtsp.c:60
 msgid "RTSP VoD"
 msgstr ""
 
-#: modules/misc/rtsp.c:53
+#: modules/misc/rtsp.c:61
 msgid "RTSP VoD server"
 msgstr ""
 
@@ -11739,11 +13717,11 @@ msgstr ""
 msgid "X Screensaver disabler"
 msgstr ""
 
-#: modules/misc/svg.c:57
+#: modules/misc/svg.c:65
 msgid "SVG template file"
 msgstr "AVG暫存檔"
 
-#: modules/misc/svg.c:58
+#: modules/misc/svg.c:66
 msgid ""
 "Location of a file holding a SVG template for automatic string conversion"
 msgstr ""
@@ -11760,57 +13738,56 @@ msgstr ""
 msgid "Miscellaneous stress tests"
 msgstr ""
 
-#: modules/misc/win32text.c:85
+#: modules/misc/win32text.c:90
 msgid "Win32 font renderer"
 msgstr ""
 
-#: modules/misc/xml/libxml.c:43
+#: modules/misc/xml/libxml.c:41
 msgid "XML Parser (using libxml2)"
 msgstr "XML解析器(使用libxml2)"
 
-#: modules/misc/xml/xtag.c:90
+#: modules/misc/xml/xtag.c:88
 msgid "Simple XML Parser"
 msgstr "簡易XML解析器"
 
 #: modules/mux/asf.c:49
-msgid "Allows you to define the title that will be put in ASF comments."
+msgid "Title to put in ASF comments."
 msgstr ""
 
-#: modules/mux/asf.c:52
-msgid "Allows you to define the author that will be put in ASF comments."
+#: modules/mux/asf.c:51
+msgid "Author to put in ASF comments."
 msgstr ""
 
-#: modules/mux/asf.c:55
-msgid ""
-"Allows you to define the copyright string that will be put in ASF comments."
+#: modules/mux/asf.c:53
+msgid "Copyright string to put in ASF comments."
 msgstr ""
 
-#: modules/mux/asf.c:57
+#: modules/mux/asf.c:54
 msgid "Comment"
 msgstr "註解"
 
-#: modules/mux/asf.c:58
-msgid "Allows you to define the comment that will be put in ASF comments."
+#: modules/mux/asf.c:55
+msgid "Comment to put in ASF comments."
 msgstr ""
 
-#: modules/mux/asf.c:61
-msgid "Allows you to define the \"rating\" that will be put in ASF comments."
+#: modules/mux/asf.c:57
+msgid "\"Rating\" to put in ASF comments."
 msgstr ""
 
-#: modules/mux/asf.c:63
+#: modules/mux/asf.c:58
 #, fuzzy
 msgid "Packet Size"
 msgstr "封包器"
 
-#: modules/mux/asf.c:64
-msgid "The ASF packet size -- default is 4096 bytes"
+#: modules/mux/asf.c:59
+msgid "ASF packet size -- default is 4096 bytes"
 msgstr ""
 
-#: modules/mux/asf.c:67
+#: modules/mux/asf.c:62
 msgid "ASF muxer"
 msgstr "ASF多工器"
 
-#: modules/mux/asf.c:540
+#: modules/mux/asf.c:535
 msgid "Unknown Video"
 msgstr "未知的視訊"
 
@@ -11823,29 +13800,30 @@ msgid "Dummy/Raw muxer"
 msgstr ""
 
 #: modules/mux/mp4.c:45
-msgid "Create \"Fast start\" files"
+#, fuzzy
+msgid "Create \"Fast Start\" files"
 msgstr "建立\"快速開始\"檔案"
 
 #: modules/mux/mp4.c:47
 msgid ""
-"When this option is turned on, \"Fast start\" files will be created. (\"Fast "
-"start\" files are optimized for download, allowing the user to start "
-"previewing the file while it is downloading)."
+"Create \"Fast Start\" files. \"Fast Start\" files are optimized for "
+"downloads and allow the user to start previewing the file while it is "
+"downloading."
 msgstr ""
 
-#: modules/mux/mp4.c:56
+#: modules/mux/mp4.c:57
 msgid "MP4/MOV muxer"
 msgstr "MP4/MOV多工器"
 
-#: modules/mux/mpeg/ps.c:45 modules/mux/mpeg/ts.c:131
+#: modules/mux/mpeg/ps.c:45 modules/mux/mpeg/ts.c:143
 msgid "DTS delay (ms)"
 msgstr ""
 
 #: modules/mux/mpeg/ps.c:46
 msgid ""
-"This option will delay the DTS (decoding time stamps) and PTS (presentation "
-"timestamps) of the data in the stream, compared to the SCRs. This allows for "
-"some buffering inside the client decoder."
+"Delay the DTS (decoding time stamps) and PTS (presentation timestamps) of "
+"the data in the stream, compared to the SCRs. This allows for some buffering "
+"inside the client decoder."
 msgstr ""
 
 #: modules/mux/mpeg/ps.c:51
@@ -11853,9 +13831,7 @@ msgid "PES maximum size"
 msgstr ""
 
 #: modules/mux/mpeg/ps.c:52
-msgid ""
-"This option will set the maximum allowed PES size when producing the MPEG PS "
-"stream."
+msgid "Set the maximum allowed PES size when producing the MPEG PS streams."
 msgstr ""
 
 #: modules/mux/mpeg/ps.c:61
@@ -11868,7 +13844,7 @@ msgstr ""
 
 #: modules/mux/mpeg/ts.c:84
 msgid ""
-"Assigns a fixed PID to the video stream. The PCR PID will automatically be "
+"Assign a fixed PID to the video stream. The PCR PID will automatically be "
 "the video."
 msgstr ""
 
@@ -11877,7 +13853,7 @@ msgid "Audio PID"
 msgstr ""
 
 #: modules/mux/mpeg/ts.c:87
-msgid "Assigns a fixed PID to the audio stream."
+msgid "Assign a fixed PID to the audio stream."
 msgstr ""
 
 #: modules/mux/mpeg/ts.c:88
@@ -11885,7 +13861,7 @@ msgid "SPU PID"
 msgstr ""
 
 #: modules/mux/mpeg/ts.c:89
-msgid "Assigns a fixed PID to the SPU."
+msgid "Assign a fixed PID to the SPU."
 msgstr ""
 
 #: modules/mux/mpeg/ts.c:90
@@ -11893,7 +13869,7 @@ msgid "PMT PID"
 msgstr ""
 
 #: modules/mux/mpeg/ts.c:91
-msgid "Assigns a fixed PID to the PMT"
+msgid "Assign a fixed PID to the PMT"
 msgstr ""
 
 #: modules/mux/mpeg/ts.c:92
@@ -11901,7 +13877,7 @@ msgid "TS ID"
 msgstr ""
 
 #: modules/mux/mpeg/ts.c:93
-msgid "Assigns a fixed Transport Stream ID."
+msgid "Assign a fixed Transport Stream ID."
 msgstr ""
 
 #: modules/mux/mpeg/ts.c:94
@@ -11909,57 +13885,77 @@ msgid "NET ID"
 msgstr ""
 
 #: modules/mux/mpeg/ts.c:95
-msgid "Assigns a fixed Network ID (for SDT table)"
-msgstr ""
-
-#: modules/mux/mpeg/ts.c:96
-msgid "PMT Program numbers (requires --sout-ts-es-id-pid)"
+msgid "Assign a fixed Network ID (for SDT table)"
 msgstr ""
 
 #: modules/mux/mpeg/ts.c:97
-msgid "Assigns a program number to each PMT"
-msgstr ""
+#, fuzzy
+msgid "PMT Program numbers"
+msgstr "調節器數量"
 
 #: modules/mux/mpeg/ts.c:98
+msgid ""
+"Assign a program number to each PMT. This requires \"Set PID to ID of ES\" "
+"to be enabled."
+msgstr ""
+
+#: modules/mux/mpeg/ts.c:101
 msgid "Mux PMT (requires --sout-ts-es-id-pid)"
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:99
-msgid "Defines the pids to add to each pmt."
+#: modules/mux/mpeg/ts.c:102
+msgid ""
+"Define the pids to add to each pmt. This requires \"Set PID to ID of ES\" to "
+"be enabled."
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:101
+#: modules/mux/mpeg/ts.c:105
 msgid "SDT Descriptors (requires --sout-ts-es-id-pid)"
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:102
-msgid "Defines the descriptors of each SDT"
+#: modules/mux/mpeg/ts.c:106
+msgid ""
+"Defines the descriptors of each SDT. Thisrequires \"Set PID to ID of ES\" to "
+"be enabled."
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:104
-msgid "Set PID to id of ES"
+#: modules/mux/mpeg/ts.c:109
+msgid "Set PID to ID of ES"
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:105
-msgid "set PID to id of es"
+#: modules/mux/mpeg/ts.c:110
+msgid ""
+"Sets PID to the ID if the incoming ES. This is for use with --ts-es-id-pid, "
+"and allows to have the same PIDs in the input and output streams."
+msgstr ""
+
+#: modules/mux/mpeg/ts.c:114
+#, fuzzy
+msgid "Data alignment"
+msgstr "視訊對齊"
+
+#: modules/mux/mpeg/ts.c:115
+msgid ""
+"Enforces alignment of all access units on PES boundaries. This is a waste of "
+"bandwidth."
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:107
+#: modules/mux/mpeg/ts.c:118
 msgid "Shaping delay (ms)"
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:108
+#: modules/mux/mpeg/ts.c:119
 msgid ""
-"If enabled, the TS muxer will cut the stream in slices of the given "
-"duration, and ensure a constant bitrate between the two boundaries. This "
-"avoids having huge bitrate peaks for reference frames, in particular."
+"Cut the stream in slices of the given duration, and ensure a constant "
+"bitrate between the two boundaries. This avoids having huge bitrate peaks, "
+"especially for reference frames."
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:112
+#: modules/mux/mpeg/ts.c:124
 msgid "Use keyframes"
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:113
+#: modules/mux/mpeg/ts.c:125
 msgid ""
 "If enabled, and shaping is specified, the TS muxer will place the boundaries "
 "at the end of I pictures. In that case, the shaping duration given by the "
@@ -11968,73 +13964,72 @@ msgid ""
 "the biggest frames in the stream."
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:120
+#: modules/mux/mpeg/ts.c:132
 msgid "PCR delay (ms)"
 msgstr "PCR延遲(ms)"
 
-#: modules/mux/mpeg/ts.c:121
+#: modules/mux/mpeg/ts.c:133
 msgid ""
-"This option allows you to set at which interval PCRs (Program Clock "
-"Reference) will be sent. This value should be below 100ms. (default is 70)"
+"Set at which interval PCRs (Program Clock Reference) will be sent (in "
+"milliseconds). This value should be below 100ms. (default is 70ms)."
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:125
+#: modules/mux/mpeg/ts.c:137
 msgid "Minimum B (deprecated)"
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:126 modules/mux/mpeg/ts.c:129
+#: modules/mux/mpeg/ts.c:138 modules/mux/mpeg/ts.c:141
 msgid "This setting is deprecated and not used anymore"
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:128
+#: modules/mux/mpeg/ts.c:140
 msgid "Maximum B (deprecated)"
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:132
+#: modules/mux/mpeg/ts.c:144
 msgid ""
-"This option will delay the DTS (decoding time stamps) and PTS (presentation "
-"timestamps) of the data in the stream, compared to the PCRs. This allows for "
-"some buffering inside the client decoder."
+"Delay the DTS (decoding time stamps) and PTS (presentation timestamps) of "
+"the data in the stream, compared to the PCRs. This allows for some buffering "
+"inside the client decoder."
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:137
+#: modules/mux/mpeg/ts.c:149
 msgid "Crypt audio"
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:138
+#: modules/mux/mpeg/ts.c:150
 msgid "Crypt audio using CSA"
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:139
+#: modules/mux/mpeg/ts.c:151
 #, fuzzy
 msgid "Crypt video"
 msgstr "視訊"
 
-#: modules/mux/mpeg/ts.c:140
+#: modules/mux/mpeg/ts.c:152
 msgid "Crypt video using CSA"
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:142
+#: modules/mux/mpeg/ts.c:154
 msgid "CSA Key"
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:143
+#: modules/mux/mpeg/ts.c:155
 msgid ""
-"Defines the CSA encryption key. This must be a 16 char string (8 hexadecimal "
-"bytes)."
+"CSA encryption key. This must be a 16 char string (8 hexadecimal bytes)."
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:146
+#: modules/mux/mpeg/ts.c:158
 msgid "Packet size in bytes to encrypt"
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:147
+#: modules/mux/mpeg/ts.c:159
 msgid ""
-"Specify the size of the TS packet to encrypt. The encryption routines "
-"subtract the TS-header from the value before encrypting. "
+"Size of the TS packet to encrypt. The encryption routines subtract the TS-"
+"header from the value before encrypting. "
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:160
+#: modules/mux/mpeg/ts.c:172
 msgid "TS muxer (libdvbpsi)"
 msgstr "TS多工器(libdvbpsi)"
 
@@ -12044,16 +14039,18 @@ msgstr ""
 
 #: modules/mux/mpjpeg.c:33
 msgid ""
-"Multipart strings like MPJPEG use a separator string between content pieces. "
-"You can select this string. Default is --myboundary"
+"Multipart strings like MPJPEG use a specific string to separate its content "
+"pieces. You can select this string. Default is --myboundary"
 msgstr ""
 
 #: modules/mux/mpjpeg.c:50
-msgid "Multipart jpeg muxer"
-msgstr ""
+#, fuzzy
+msgid "Multipart JPEG muxer"
+msgstr "輸出多工器"
 
 #: modules/mux/ogg.c:50
-msgid "Ogg/ogm muxer"
+#, fuzzy
+msgid "Ogg/OGM muxer"
 msgstr "Ogg/ogm多工器"
 
 #: modules/mux/wav.c:42
@@ -12065,7 +14062,8 @@ msgid "Copy packetizer"
 msgstr ""
 
 #: modules/packetizer/h264.c:47
-msgid "H264 video packetizer"
+#, fuzzy
+msgid "H.264 video packetizer"
 msgstr "H264視訊封包器"
 
 #: modules/packetizer/mpeg4audio.c:118
@@ -12078,24 +14076,24 @@ msgstr "MPEG4視訊封包器"
 
 #: modules/packetizer/mpegvideo.c:52
 #, fuzzy
-msgid "Sync on intraframe"
+msgid "Sync on Intra Frame"
 msgstr "顯示介面"
 
 #: modules/packetizer/mpegvideo.c:53
 msgid ""
 "Normally the packetizer would sync on the next full frame. This flags "
-"instructs the packetizer to sync on the first intraframe found."
+"instructs the packetizer to sync on the first Intra Frame found."
 msgstr ""
 
 #: modules/packetizer/mpegvideo.c:66
 msgid "MPEG-I/II video packetizer"
 msgstr "MPEG-I/II視訊封包器"
 
-#: modules/services_discovery/bonjour.c:47
+#: modules/services_discovery/bonjour.c:51
 msgid "Bonjour services"
 msgstr ""
 
-#: modules/services_discovery/bonjour.c:279
+#: modules/services_discovery/bonjour.c:307
 msgid "Bonjour"
 msgstr ""
 
@@ -12108,166 +14106,200 @@ msgid "DAAP access"
 msgstr "DAAP存取"
 
 #: modules/services_discovery/hal.c:63
-msgid "HAL device detection"
+#, fuzzy
+msgid "HAL devices detection"
 msgstr "HAL裝置偵測"
 
-#: modules/services_discovery/hal.c:127
+#: modules/services_discovery/hal.c:153
 msgid "Devices"
 msgstr "裝置"
 
-#: modules/services_discovery/sap.c:80
-msgid "SAP multicast address"
+#: modules/services_discovery/podcast.c:57
+msgid "Podcast URLs list"
 msgstr ""
 
-#: modules/services_discovery/sap.c:81
-msgid "Listen for SAP announces on another address"
+#: modules/services_discovery/podcast.c:58
+msgid "Enter the list of podcasts to retrieve, separated by '|' (pipe)."
 msgstr ""
 
-#: modules/services_discovery/sap.c:82
-msgid "IPv4-SAP listening"
+#: modules/services_discovery/podcast.c:63
+#, fuzzy
+msgid "Podcasts"
+msgstr "貼上"
+
+#: modules/services_discovery/podcast.c:155
+#, fuzzy
+msgid "Podcast"
+msgstr "貼上"
+
+#: modules/services_discovery/sap.c:79
+msgid "SAP multicast address"
 msgstr ""
 
-#: modules/services_discovery/sap.c:84
+#: modules/services_discovery/sap.c:80
 msgid ""
-"Set this if you want the SAP module to listen to IPv4 announces on the "
-"standard address."
+"The SAP module normally chooses itself the right addresses to listen to. "
+"However, you can specify a specific address."
 msgstr ""
 
-#: modules/services_discovery/sap.c:86
-msgid "IPv6-SAP listening"
+#: modules/services_discovery/sap.c:83
+msgid "IPv4 SAP"
 msgstr ""
 
-#: modules/services_discovery/sap.c:88
-msgid ""
-"Set this if you want the SAP module to listen to IPv6 announces on the "
-"standard address."
+#: modules/services_discovery/sap.c:85
+msgid "Listen to IPv4 announcements on the standard address."
 msgstr ""
 
-#: modules/services_discovery/sap.c:90
-msgid "IPv6 SAP scope"
+#: modules/services_discovery/sap.c:87
+msgid "IPv6 SAP"
+msgstr ""
+
+#: modules/services_discovery/sap.c:89
+msgid "Listen to IPv6 announcements on the standard addresses."
 msgstr ""
 
-#: modules/services_discovery/sap.c:92
-msgid "Sets the scope for IPv6 announces (default is 8)."
+#: modules/services_discovery/sap.c:91
+msgid "IPv6 SAP scope"
 msgstr ""
 
 #: modules/services_discovery/sap.c:93
+msgid "Scope for IPv6 announcements (default is 8)."
+msgstr ""
+
+#: modules/services_discovery/sap.c:94
 msgid "SAP timeout (seconds)"
 msgstr ""
 
-#: modules/services_discovery/sap.c:95
+#: modules/services_discovery/sap.c:96
 msgid ""
-"Sets the time before SAP items get deleted if no new announce is received."
+"Delay after which SAP items get deleted if no new announcement is received."
 msgstr ""
 
-#: modules/services_discovery/sap.c:97
-msgid "Try to parse the SAP"
+#: modules/services_discovery/sap.c:98
+#, fuzzy
+msgid "Try to parse the announce"
 msgstr "嘗試解析SAP"
 
-#: modules/services_discovery/sap.c:99
+#: modules/services_discovery/sap.c:100
 msgid ""
-"When SAP can it will try to parse the SAP. If you don't select this, all "
-"announces will be parsed by the livedotcom module."
+"This enables actual parsing of the announces by the SAP module. Otherwise, "
+"all announcements are parsed by the \"livedotcom\" (RTP/RTSP) module."
 msgstr ""
 
-#: modules/services_discovery/sap.c:101
+#: modules/services_discovery/sap.c:103
 msgid "SAP Strict mode"
 msgstr ""
 
-#: modules/services_discovery/sap.c:103
+#: modules/services_discovery/sap.c:105
 msgid ""
-"When this is set, the SAP parser will discard some non-compliant announces."
+"When this is set, the SAP parser will discard some non-compliant "
+"announcements."
 msgstr ""
 
-#: modules/services_discovery/sap.c:105
+#: modules/services_discovery/sap.c:107
 msgid "Use SAP cache"
 msgstr "使用SAP快取"
 
-#: modules/services_discovery/sap.c:107
+#: modules/services_discovery/sap.c:109
+msgid ""
+"This enables a SAP caching mechanism. This will result in lower SAP startup "
+"time, but you could end up with items corresponding to legacy streams."
+msgstr ""
+
+#: modules/services_discovery/sap.c:113
 msgid ""
-"If this option is selected, a SAP caching mechanism will be used. This will "
-"result in lower SAP startup time, but you could end up with items "
-"corresponding to legacy streams."
+"This automatically enables timeshifting for streams discovered through SAP "
+"announcements."
 msgstr ""
 
-#: modules/services_discovery/sap.c:119
-msgid "SAP announces"
+#: modules/services_discovery/sap.c:124
+msgid "SAP Announcements"
 msgstr ""
 
-#: modules/services_discovery/sap.c:142
+#: modules/services_discovery/sap.c:151
 msgid "SDP file parser for UDP"
 msgstr ""
 
-#: modules/services_discovery/sap.c:791 modules/services_discovery/sap.c:796
+#: modules/services_discovery/sap.c:322
+msgid "Session Announcements (SAP)"
+msgstr ""
+
+#: modules/services_discovery/sap.c:820 modules/services_discovery/sap.c:825
 #, fuzzy
 msgid "Session"
 msgstr "權限"
 
-#: modules/services_discovery/sap.c:792
+#: modules/services_discovery/sap.c:821
 msgid "Tool"
 msgstr ""
 
-#: modules/services_discovery/sap.c:797
+#: modules/services_discovery/sap.c:826
 msgid "User"
 msgstr ""
 
-#: modules/services_discovery/shout.c:60
-msgid "Maximum number of shoutcast servers to be listed"
+#: modules/services_discovery/shout.c:61
+#, fuzzy
+msgid "Number of streams"
+msgstr "執行緒數量"
+
+#: modules/services_discovery/shout.c:62
+msgid "Maximum number of Shoutcast radio streams which would be listed."
 msgstr ""
 
-#: modules/services_discovery/shout.c:65
+#: modules/services_discovery/shout.c:67
 msgid "Shoutcast radio listings"
 msgstr ""
 
-#: modules/services_discovery/shout.c:137
+#: modules/services_discovery/shout.c:139
 msgid "Shoutcast"
 msgstr ""
 
-#: modules/services_discovery/upnp.cpp:58
-#: modules/services_discovery/upnp.cpp:114
-msgid "UPnP"
+#: modules/services_discovery/upnp_cc.cpp:58
+msgid "Universal Plug'n'Play discovery"
 msgstr ""
 
-#: modules/services_discovery/upnp.cpp:59
-msgid "Universal Plug'n'Play discovery"
+#: modules/services_discovery/upnp_intel.cpp:260
+msgid "Universal Plug'n'Play discovery ( Intel SDK )"
 msgstr ""
 
 #: modules/stream_out/bridge.c:38
-msgid "Specify an identifier integer for this elementary stream"
+msgid ""
+"Integer identifier for this elementary stream. This will be used to \"find\" "
+"this stream later."
 msgstr ""
 
-#: modules/stream_out/bridge.c:41
+#: modules/stream_out/bridge.c:42
 msgid ""
-"Pictures coming from the picture video outputs will be delayed accordingly "
-"(in milliseconds, >= 100 ms). For high values you will need to raise file-"
-"caching and others."
+"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."
 msgstr ""
 
-#: modules/stream_out/bridge.c:45
+#: modules/stream_out/bridge.c:46
 msgid "ID Offset"
 msgstr ""
 
-#: modules/stream_out/bridge.c:46
+#: modules/stream_out/bridge.c:47
 msgid ""
 "Offset to add to the stream IDs specified in bridge_out to obtain the stream "
 "IDs bridge_in will register."
 msgstr ""
 
-#: modules/stream_out/bridge.c:58
+#: modules/stream_out/bridge.c:59
 #, fuzzy
 msgid "Bridge"
 msgstr "亮度"
 
-#: modules/stream_out/bridge.c:59
+#: modules/stream_out/bridge.c:60
 #, fuzzy
 msgid "Bridge stream output"
 msgstr "檔案串流輸出"
 
-#: modules/stream_out/bridge.c:61
+#: modules/stream_out/bridge.c:62
 msgid "Bridge out"
 msgstr ""
 
-#: modules/stream_out/bridge.c:72
+#: modules/stream_out/bridge.c:73
 msgid "Bridge in"
 msgstr ""
 
@@ -12287,7 +14319,7 @@ msgstr ""
 msgid "Introduces a delay in the display of the stream."
 msgstr ""
 
-#: modules/stream_out/display.c:50 modules/video_filter/deinterlace.c:118
+#: modules/stream_out/display.c:50 modules/video_filter/deinterlace.c:127
 #, fuzzy
 msgid "Display"
 msgstr "延遲"
@@ -12300,87 +14332,84 @@ msgstr "顯示串流輸出"
 msgid "Duplicate stream output"
 msgstr "雙工串流輸出"
 
-#: modules/stream_out/es.c:37 modules/stream_out/standard.c:43
+#: modules/stream_out/es.c:37 modules/stream_out/standard.c:39
 msgid "Output access method"
 msgstr "輸出存取方式"
 
-#: modules/stream_out/es.c:39 modules/stream_out/standard.c:45
-msgid ""
-"Allows you to specify the output access method used for the streaming output."
-msgstr "允許你指定串流輸出的輸出存取方法"
+#: modules/stream_out/es.c:39
+#, fuzzy
+msgid "This is the default output access method that will be used."
+msgstr "預設的VCD裝置"
 
 #: modules/stream_out/es.c:41
 msgid "Audio output access method"
 msgstr "音訊輸出存取方式"
 
 #: modules/stream_out/es.c:43
-msgid ""
-"Allows you to specify the output access method used for the audio streaming "
-"output."
+#, fuzzy
+msgid "This is the output access method that will be used for audio."
 msgstr "允許你指定音訊串流輸出的輸出存取方法"
 
-#: modules/stream_out/es.c:45
+#: modules/stream_out/es.c:44
 msgid "Video output access method"
 msgstr "視訊輸出存取方式"
 
-#: modules/stream_out/es.c:47
-msgid ""
-"Allows you to specify the output access method used for the video streaming "
-"output."
+#: modules/stream_out/es.c:46
+#, fuzzy
+msgid "This is the output access method that will be used for video."
 msgstr "允許你指定視訊串流輸出的輸出存取方法"
 
-#: modules/stream_out/es.c:50 modules/stream_out/standard.c:47
+#: modules/stream_out/es.c:48 modules/stream_out/standard.c:42
 msgid "Output muxer"
 msgstr "輸出多工器"
 
-#: modules/stream_out/es.c:52 modules/stream_out/rtp.c:52
-msgid "Allows you to specify the muxer used for the streaming output."
-msgstr "允許你指定串流輸出的多工器"
+#: modules/stream_out/es.c:50
+#, fuzzy
+msgid "This is the default muxer method that will be used."
+msgstr "預設的音樂CD裝置"
 
-#: modules/stream_out/es.c:53
+#: modules/stream_out/es.c:51
 msgid "Audio output muxer"
 msgstr "音訊輸出多工器"
 
-#: modules/stream_out/es.c:55
-msgid "Allows you to specify the muxer used for the audio streaming output."
-msgstr "允許你指定音訊串流輸出的多工器"
+#: modules/stream_out/es.c:53
+msgid "This is the muxer that will be used for audio."
+msgstr ""
 
-#: modules/stream_out/es.c:56
+#: modules/stream_out/es.c:54
 msgid "Video output muxer"
 msgstr "視訊輸出多工器"
 
-#: modules/stream_out/es.c:58
-msgid "Allows you to specify the muxer used for the video streaming output."
-msgstr "允許你指定視訊串流輸出的多工器"
+#: modules/stream_out/es.c:56
+msgid "This is the muxer that will be used for video."
+msgstr ""
 
-#: modules/stream_out/es.c:60 modules/stream_out/standard.c:51
+#: modules/stream_out/es.c:58
 msgid "Output URL"
 msgstr "輸出URL"
 
-#: modules/stream_out/es.c:62 modules/stream_out/rtp.c:43
-#: modules/stream_out/standard.c:53
-msgid "Allows you to specify the output URL used for the streaming output."
-msgstr "允許你指定串流輸出的URL"
+#: modules/stream_out/es.c:60
+#, fuzzy
+msgid "This is the default output URI."
+msgstr "預設的VCD裝置"
 
-#: modules/stream_out/es.c:63
+#: modules/stream_out/es.c:61
 msgid "Audio output URL"
 msgstr "音訊輸出URL"
 
-#: modules/stream_out/es.c:65
-msgid ""
-"Allows you to specify the output URL used for the audio streaming output."
-msgstr "允許你指定音訊串流輸出的URL"
+#: modules/stream_out/es.c:63
+msgid "This is the output URI that will be used for audio."
+msgstr ""
 
-#: modules/stream_out/es.c:67
+#: modules/stream_out/es.c:64
 msgid "Video output URL"
 msgstr "視訊輸出URL"
 
-#: modules/stream_out/es.c:69
-msgid ""
-"Allows you to specify the output URL used for the video streaming output."
-msgstr "允許你指定視訊串流輸出的URL"
+#: modules/stream_out/es.c:66
+msgid "This is the output URI that will be used for video."
+msgstr ""
 
-#: modules/stream_out/es.c:79
+#: modules/stream_out/es.c:75
 msgid "Elementary stream output"
 msgstr ""
 
@@ -12388,223 +14417,263 @@ 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 "檔案串流輸出"
 
-#: modules/stream_out/rtp.c:44
+#: modules/stream_out/rtp.c:48
+msgid "This is the output URL that will be used."
+msgstr ""
+
+#: modules/stream_out/rtp.c:49
 msgid "SDP"
 msgstr ""
 
-#: modules/stream_out/rtp.c:46
+#: modules/stream_out/rtp.c:51
 msgid ""
-"Allows you to specify the SDP used for the streaming output. You must use an "
-"url: http://location to access the SDP via HTTP, rtsp://location for RTSP "
-"access, and sap:// for the SDP to be announced via SAP."
+"This allows you to specify how the SDP (Session Descriptor) for this RTP "
+"session will be made available. You must use an url: http://location to "
+"access the SDP via HTTP, rtsp://location for RTSP access, and sap:// for the "
+"SDP to be announced via SAP."
 msgstr ""
 
-#: modules/stream_out/rtp.c:50
+#: modules/stream_out/rtp.c:55
 msgid "Muxer"
 msgstr "多工器"
 
-#: modules/stream_out/rtp.c:54 modules/stream_out/standard.c:55
+#: modules/stream_out/rtp.c:57
+#, fuzzy
+msgid ""
+"This allows you to specify the muxer used for the streaming output. Default "
+"is to use no muxer (standard RTP stream)."
+msgstr "允許你指定串流輸出的URL"
+
+#: modules/stream_out/rtp.c:60 modules/stream_out/standard.c:48
 msgid "Session name"
 msgstr ""
 
-#: modules/stream_out/rtp.c:56
-msgid "Allows you to specify the session name used for the streaming output."
+#: modules/stream_out/rtp.c:62
+msgid ""
+"This is the name of the session that will be announced in the SDP (Session "
+"Descriptor)."
 msgstr ""
 
-#: modules/stream_out/rtp.c:57
+#: modules/stream_out/rtp.c:64
 msgid "Session description"
 msgstr ""
 
-#: modules/stream_out/rtp.c:59
-msgid "Allows you to give a broader description of the stream."
+#: modules/stream_out/rtp.c:66
+msgid ""
+"This allows you to give a broader description of the stream, that will be "
+"announced in the SDP (Session Descriptor)."
 msgstr ""
 
-#: modules/stream_out/rtp.c:60
+#: modules/stream_out/rtp.c:68
 msgid "Session URL"
 msgstr ""
 
-#: modules/stream_out/rtp.c:62
-msgid "Allows you to specify a URL with additional information on the stream."
+#: modules/stream_out/rtp.c:70
+msgid ""
+"This allows you to give an URL with more details about the stream (often the "
+"website of the streaming organization), that will be announced in the SDP "
+"(Session Descriptor)."
 msgstr ""
 
-#: modules/stream_out/rtp.c:63
+#: modules/stream_out/rtp.c:73
 msgid "Session email"
 msgstr ""
 
-#: modules/stream_out/rtp.c:65
-msgid "Allows you to specify contact e-mail address for this session."
+#: modules/stream_out/rtp.c:75
+msgid ""
+"This allows you to give a contact mail address for the stream, that will be "
+"announced in the SDP (Session Descriptor)."
 msgstr ""
 
-#: modules/stream_out/rtp.c:69
-msgid "Allows you to specify the base port used for the RTP streaming."
-msgstr ""
+#: modules/stream_out/rtp.c:79
+#, fuzzy
+msgid "This allows you to specify the base port for the RTP streaming."
+msgstr "允許你指定RTP串流的預設視訊埠"
 
-#: modules/stream_out/rtp.c:70
+#: modules/stream_out/rtp.c:80
 msgid "Audio port"
 msgstr "音訊埠"
 
-#: modules/stream_out/rtp.c:72
+#: modules/stream_out/rtp.c:82
+#, fuzzy
 msgid ""
-"Allows you to specify the default audio port used for the RTP streaming."
-msgstr ""
+"This allows you to specify the default audio port for the RTP streaming."
+msgstr "允許你指定RTP串流的預設視訊埠"
 
-#: modules/stream_out/rtp.c:73
+#: modules/stream_out/rtp.c:83
 msgid "Video port"
 msgstr "視訊埠"
 
-#: modules/stream_out/rtp.c:75
+#: modules/stream_out/rtp.c:85
+#, fuzzy
 msgid ""
-"Allows you to specify the default video port used for the RTP streaming."
+"This allows you to specify the default video port for the RTP streaming."
 msgstr "允許你指定RTP串流的預設視訊埠"
 
-#: modules/stream_out/rtp.c:79
-msgid "Allows you to specify the time to live for the output stream."
+#: modules/stream_out/rtp.c:89
+#, fuzzy
+msgid "This allows you to specify the Time-To-Live for the output stream."
 msgstr "允許你指定該輸出串流的有效時間"
 
-#: modules/stream_out/rtp.c:87
-msgid "RTP"
+#: modules/stream_out/rtp.c:91
+msgid "MP4A LATM"
 msgstr ""
 
-#: modules/stream_out/rtp.c:88
+#: modules/stream_out/rtp.c:93
+#, fuzzy
+msgid "This allows you to stream MPEG4 LATM audio streams (see RFC3016)."
+msgstr "允許你在串流時播放該串流"
+
+#: modules/stream_out/rtp.c:102
 msgid "RTP stream output"
 msgstr "RTP串流輸出"
 
-#: modules/stream_out/standard.c:49
-msgid ""
-"Allows you to specify the output muxer method used for the streaming output."
-msgstr "允許你指定串流輸出的輸出多工器"
+#: modules/stream_out/standard.c:41
+msgid "This is the output access method that will be used."
+msgstr ""
+
+#: modules/stream_out/standard.c:44
+#, fuzzy
+msgid "This is the muxer that will be used."
+msgstr "預設的VCD裝置"
+
+#: modules/stream_out/standard.c:45
+#, fuzzy
+msgid "Output destination"
+msgstr "輸出選項"
 
-#: modules/stream_out/standard.c:57
-msgid "Name of the session that will be announced with SAP or SLP"
+#: modules/stream_out/standard.c:47
+#, fuzzy
+msgid "This is the destination (URL) that will be used for the stream."
+msgstr "允許你指定串流輸出的目的音訊編碼器"
+
+#: modules/stream_out/standard.c:50
+msgid ""
+"This allows you to specify a name for the session, that will be announced if "
+"you choose to use SAP."
 msgstr ""
 
-#: modules/stream_out/standard.c:59
+#: modules/stream_out/standard.c:53
 msgid "Session groupname"
 msgstr ""
 
-#: modules/stream_out/standard.c:61
-msgid "Name of the group that will be announced for the session"
+#: modules/stream_out/standard.c:55
+msgid ""
+"This allows you to specify a group for the session, that will be announced "
+"if you choose to use SAP."
 msgstr ""
 
-#: modules/stream_out/standard.c:63
+#: modules/stream_out/standard.c:58
 msgid "SAP announcing"
 msgstr ""
 
-#: modules/stream_out/standard.c:64
-msgid "Announce this session with SAP"
-msgstr ""
-
-#: modules/stream_out/standard.c:66
-msgid "SLP announcing"
+#: modules/stream_out/standard.c:59
+msgid "Announce this session with SAP."
 msgstr ""
 
 #: modules/stream_out/standard.c:67
-msgid "Announce this session with SLP"
-msgstr ""
-
-#: modules/stream_out/standard.c:75
 #, fuzzy
 msgid "Standard"
 msgstr "標準播放"
 
-#: modules/stream_out/standard.c:76
+#: modules/stream_out/standard.c:68
 msgid "Standard stream output"
 msgstr "標準串流輸出"
 
-#: modules/stream_out/switcher.c:81
+#: modules/stream_out/switcher.c:82
 #, fuzzy
 msgid "Files"
 msgstr "檔案"
 
-#: modules/stream_out/switcher.c:83
+#: modules/stream_out/switcher.c:84
 #, fuzzy
 msgid "Full paths of the files separated by colons."
 msgstr "欲使用的PNG檔案完整路徑"
 
-#: modules/stream_out/switcher.c:84
+#: modules/stream_out/switcher.c:85
 #, fuzzy
 msgid "Sizes"
 msgstr "大小"
 
-#: modules/stream_out/switcher.c:86
+#: modules/stream_out/switcher.c:87
 msgid "List of sizes separated by colons (720x576:480x576)."
 msgstr ""
 
-#: modules/stream_out/switcher.c:87
+#: modules/stream_out/switcher.c:88
 msgid "Aspect ratio"
 msgstr ""
 
-#: modules/stream_out/switcher.c:89
+#: modules/stream_out/switcher.c:90
 msgid "Aspect ratio (4:3, 16:9)."
 msgstr ""
 
-#: modules/stream_out/switcher.c:90
+#: modules/stream_out/switcher.c:91
 #, fuzzy
 msgid "Command UDP port"
 msgstr "TCP指令輸入"
 
-#: modules/stream_out/switcher.c:92
+#: modules/stream_out/switcher.c:93
 msgid "UDP port to listen to for commands."
 msgstr ""
 
-#: modules/stream_out/switcher.c:93
+#: modules/stream_out/switcher.c:94
 msgid "Command"
 msgstr ""
 
-#: modules/stream_out/switcher.c:95
+#: modules/stream_out/switcher.c:96
 msgid "Initial command to execute."
 msgstr ""
 
-#: modules/stream_out/switcher.c:96
+#: modules/stream_out/switcher.c:97
 msgid "GOP size"
 msgstr ""
 
-#: modules/stream_out/switcher.c:98
+#: modules/stream_out/switcher.c:99
 #, fuzzy
 msgid "Number of P frames between two I frames."
 msgstr "頻帶間的空白像素數量"
 
-#: modules/stream_out/switcher.c:99
+#: modules/stream_out/switcher.c:100
 msgid "Quantizer scale"
 msgstr ""
 
-#: modules/stream_out/switcher.c:101
+#: modules/stream_out/switcher.c:102
 msgid "Fixed quantizer scale to use."
 msgstr ""
 
-#: modules/stream_out/switcher.c:102
+#: modules/stream_out/switcher.c:103
 #, fuzzy
 msgid "Mute audio"
 msgstr "啟動音訊"
 
-#: modules/stream_out/switcher.c:104
+#: modules/stream_out/switcher.c:105
 msgid "Mute audio when command is not 0."
 msgstr ""
 
-#: modules/stream_out/switcher.c:107
+#: modules/stream_out/switcher.c:108
 #, fuzzy
 msgid "MPEG2 video switcher stream output"
 msgstr "啟動視訊串流輸出"
@@ -12614,237 +14683,307 @@ msgid "Video encoder"
 msgstr "視訊編碼器"
 
 #: modules/stream_out/transcode.c:48
+#, fuzzy
 msgid ""
-"Allows you to specify the video encoder to use and its associated options."
-msgstr ""
+"This is the video encoder module that will be used (and its associated "
+"options)."
+msgstr "允許你指定欲使用的音訊編碼器及其相關選項"
 
 #: modules/stream_out/transcode.c:50
 msgid "Destination video codec"
 msgstr "目的視訊編碼器"
 
 #: modules/stream_out/transcode.c:52
-msgid ""
-"Allows you to specify the destination video codec used for the streaming "
-"output."
-msgstr ""
+#, fuzzy
+msgid "This is the video codec that will be used."
+msgstr "預設的DVD裝置"
 
-#: modules/stream_out/transcode.c:54
+#: modules/stream_out/transcode.c:53
 msgid "Video bitrate"
 msgstr "視訊位元率"
 
-#: modules/stream_out/transcode.c:56
-msgid "Allows you to specify the video bitrate used for the streaming output."
-msgstr "允許你指定串流輸出的視訊位元率"
+#: modules/stream_out/transcode.c:55
+msgid "Target bitrate of the transcoded video stream."
+msgstr ""
 
-#: modules/stream_out/transcode.c:58
+#: modules/stream_out/transcode.c:56
 msgid "Video scaling"
 msgstr ""
 
-#: modules/stream_out/transcode.c:60
-msgid "Allows you to scale the video before encoding."
+#: modules/stream_out/transcode.c:58
+msgid "Scale factor to apply to the video while transcoding (eg: 0.25)"
 msgstr ""
 
-#: modules/stream_out/transcode.c:61
+#: modules/stream_out/transcode.c:59
 msgid "Video frame-rate"
 msgstr ""
 
-#: modules/stream_out/transcode.c:63
-msgid "Allows you to specify an output frame rate for the video."
+#: modules/stream_out/transcode.c:61
+msgid "Target output frame rate for the video stream."
 msgstr ""
 
-#: modules/stream_out/transcode.c:66
-msgid "Allows you to deinterlace the video before encoding."
-msgstr ""
+#: modules/stream_out/transcode.c:64
+#, fuzzy
+msgid "Deinterlace the video before encoding."
+msgstr "啟用交錯編碼"
 
-#: modules/stream_out/transcode.c:76
+#: modules/stream_out/transcode.c:67
+#, fuzzy
+msgid "Specify the deinterlace module to use."
+msgstr "介面模組"
+
+#: modules/stream_out/transcode.c:74
 #, fuzzy
 msgid "Maximum video width"
 msgstr "視訊寬度"
 
-#: modules/stream_out/transcode.c:78
+#: modules/stream_out/transcode.c:76
 #, fuzzy
-msgid "Allows you to specify a maximum output video width."
-msgstr "允許你指定輸出視訊寬度"
+msgid "Maximum output video width."
+msgstr "視訊寬度"
 
-#: modules/stream_out/transcode.c:79
+#: modules/stream_out/transcode.c:77
 #, fuzzy
 msgid "Maximum video height"
 msgstr "視訊高度"
 
-#: modules/stream_out/transcode.c:81
+#: modules/stream_out/transcode.c:79
 #, fuzzy
-msgid "Allows you to specify a maximum output video height."
-msgstr "允許你指定輸出視訊高度"
+msgid "Maximum output video height."
+msgstr "視訊高度"
 
-#: modules/stream_out/transcode.c:82
+#: modules/stream_out/transcode.c:80
 #, fuzzy
 msgid "Video filter"
 msgstr "視訊過濾器"
 
-#: modules/stream_out/transcode.c:84
-#, fuzzy
+#: modules/stream_out/transcode.c:82
 msgid ""
-"Allows you to specify video filters used after the video transcoding and "
-"subpictures overlaying."
-msgstr "允許你指定視訊串流輸出的多工器"
+"Video filters will be applied to the video streams (after overlays are "
+"applied). You must enter a comma-separated list of filters."
+msgstr ""
 
-#: modules/stream_out/transcode.c:87
-msgid "Video crop top"
+#: modules/stream_out/transcode.c:85
+#, fuzzy
+msgid "Video crop (top)"
 msgstr "視訊修整(上方)"
 
-#: modules/stream_out/transcode.c:89
-msgid "Allows you to specify the top coordinate for the video cropping."
-msgstr "允許你指定視訊修整的上方座標"
+#: modules/stream_out/transcode.c:87
+msgid "Number of pixels to crop at the top of the video."
+msgstr ""
+
+#: modules/stream_out/transcode.c:88
+#, fuzzy
+msgid "Video crop (left)"
+msgstr "視訊修整(左方)"
 
 #: modules/stream_out/transcode.c:90
-msgid "Video crop left"
-msgstr "視訊修整(左方)"
+msgid "Number of pixels to crop at the left of the video."
+msgstr ""
 
-#: modules/stream_out/transcode.c:92
-msgid "Allows you to specify the left coordinate for the video cropping."
-msgstr "允許你指定視訊修整的左方座標"
+#: modules/stream_out/transcode.c:91
+#, fuzzy
+msgid "Video crop (bottom)"
+msgstr "視訊修整(下方)"
 
 #: modules/stream_out/transcode.c:93
-msgid "Video crop bottom"
-msgstr "視訊修整(下方)"
+msgid "Number of pixels to crop at the bottom of the video."
+msgstr ""
 
-#: modules/stream_out/transcode.c:95
-msgid "Allows you to specify the bottom coordinate for the video cropping."
-msgstr "允許你指定視訊修整的下方座標"
+#: modules/stream_out/transcode.c:94
+#, fuzzy
+msgid "Video crop (right)"
+msgstr "視訊修整(右方)"
 
 #: modules/stream_out/transcode.c:96
-msgid "Video crop right"
-msgstr "視訊修整(右方)"
+msgid "Number of pixels to crop at the right of the video."
+msgstr ""
 
 #: modules/stream_out/transcode.c:98
-msgid "Allows you to specify the right coordinate for the video cropping."
-msgstr "允許你指定視訊修整的右方座標"
+#, fuzzy
+msgid "Video padding (top)"
+msgstr "視訊修整(上方)"
 
 #: modules/stream_out/transcode.c:100
+msgid "Size of the black border to add at the top of the video."
+msgstr ""
+
+#: modules/stream_out/transcode.c:101
+#, fuzzy
+msgid "Video padding (left)"
+msgstr "視訊修整(左方)"
+
+#: modules/stream_out/transcode.c:103
+msgid "Size of the black border to add at the left of the video."
+msgstr ""
+
+#: modules/stream_out/transcode.c:104
+#, fuzzy
+msgid "Video padding (bottom)"
+msgstr "視訊修整(下方)"
+
+#: modules/stream_out/transcode.c:106
+msgid "Size of the black border to add at the bottom of the video."
+msgstr ""
+
+#: modules/stream_out/transcode.c:107
+#, fuzzy
+msgid "Video padding (right)"
+msgstr "視訊修整(右方)"
+
+#: modules/stream_out/transcode.c:109
+msgid "Size of the black border to add at the right of the video."
+msgstr ""
+
+#: modules/stream_out/transcode.c:111
+#, fuzzy
+msgid "Video canvas width"
+msgstr "視訊寬度"
+
+#: modules/stream_out/transcode.c:113
+msgid "This will automatically crod and pad the video to a specified width."
+msgstr ""
+
+#: modules/stream_out/transcode.c:114
+#, fuzzy
+msgid "Video canvas height"
+msgstr "視訊高度"
+
+#: modules/stream_out/transcode.c:116
+msgid "This will automatically crod and pad the video to a specified height."
+msgstr ""
+
+#: modules/stream_out/transcode.c:117
+#, fuzzy
+msgid "Video canvas aspect ratio"
+msgstr "採樣率"
+
+#: modules/stream_out/transcode.c:119
+msgid ""
+"This sets aspect (like 4:3) of the video canvas and letterbox the video "
+"accordingly."
+msgstr ""
+
+#: modules/stream_out/transcode.c:122
 msgid "Audio encoder"
 msgstr "音訊編碼器"
 
-#: modules/stream_out/transcode.c:102
+#: modules/stream_out/transcode.c:124
+#, fuzzy
 msgid ""
-"Allows you to specify the audio encoder to use and its associated options."
+"This is the audio encoder module that will be used (and its associated "
+"options)."
 msgstr "允許你指定欲使用的音訊編碼器及其相關選項"
 
-#: modules/stream_out/transcode.c:104
+#: modules/stream_out/transcode.c:126
 msgid "Destination audio codec"
 msgstr "目的音訊編碼器"
 
-#: modules/stream_out/transcode.c:106
-msgid ""
-"Allows you to specify the destination audio codec used for the streaming "
-"output."
-msgstr "允許你指定串流輸出的目的音訊編碼器"
+#: modules/stream_out/transcode.c:128
+#, fuzzy
+msgid "This is the audio codec that will be used."
+msgstr "預設的音樂CD裝置"
 
-#: modules/stream_out/transcode.c:108
+#: modules/stream_out/transcode.c:129
 msgid "Audio bitrate"
 msgstr "音訊位元率"
 
-#: modules/stream_out/transcode.c:110
-msgid "Allows you to specify the audio bitrate used for the streaming output."
-msgstr "允許你指定串流輸出的音訊位元率"
+#: modules/stream_out/transcode.c:131
+msgid "Target bitrate of the transcoded audio stream."
+msgstr ""
 
-#: modules/stream_out/transcode.c:112
+#: modules/stream_out/transcode.c:132
 msgid "Audio sample rate"
 msgstr "音訊採樣率"
 
-#: modules/stream_out/transcode.c:114
+#: modules/stream_out/transcode.c:134
 msgid ""
-"Allows you to specify the audio sample rate used for the streaming output."
-msgstr "允許你指定串流輸出的音訊採樣率"
+"Sample rate of the transcoded audio stream (11250, 22500, 44100 or 48000)."
+msgstr ""
 
-#: modules/stream_out/transcode.c:116
+#: modules/stream_out/transcode.c:135
 msgid "Audio channels"
 msgstr "音訊頻道"
 
-#: modules/stream_out/transcode.c:118
-msgid ""
-"Allows you to specify the number of audio channels used for the streaming "
-"output."
-msgstr "允許你指定串流輸出的音訊頻道數量"
+#: modules/stream_out/transcode.c:137
+msgid "Number of audio channels in the transcoded streams."
+msgstr ""
 
-#: modules/stream_out/transcode.c:121
+#: modules/stream_out/transcode.c:139
 msgid "Subtitles encoder"
 msgstr "字幕編碼器"
 
-#: modules/stream_out/transcode.c:123
+#: modules/stream_out/transcode.c:141
+#, fuzzy
 msgid ""
-"Allows you to specify the subtitles encoder to use and its associated "
-"options."
+"This is the subtitles encoder module that will be used (and its associated "
+"options)."
 msgstr "允許你指定欲使用的字幕編碼器及其相關選項"
 
-#: modules/stream_out/transcode.c:125
+#: modules/stream_out/transcode.c:143
 msgid "Destination subtitles codec"
 msgstr "目的字幕編碼器"
 
-#: modules/stream_out/transcode.c:127
-msgid ""
-"Allows you to specify the destination subtitles codec used for the streaming "
-"output."
-msgstr "允許你指定串流輸出的目的字幕編碼器"
-
-#: modules/stream_out/transcode.c:129
-msgid "Subpictures filter"
+#: modules/stream_out/transcode.c:145
+msgid "This is the subtitles coded that will be used."
 msgstr ""
 
-#: modules/stream_out/transcode.c:131
+#: modules/stream_out/transcode.c:149
 msgid ""
-"Allows you to specify subpictures filters used during the video transcoding. "
-"The subpictures produced by the filters will be overlayed directly onto the "
-"video."
+"This allows you to add overlays (also known as \"subpictures\" on the "
+"transcoded video stream. The subpictures produced by the filters will be "
+"overlayed directly onto the video. You must specify a comma-separated list "
+"of subpicture modules"
 msgstr ""
 
-#: modules/stream_out/transcode.c:135 modules/video_filter/osdmenu.c:117
+#: modules/stream_out/transcode.c:154 modules/video_filter/osdmenu.c:118
 #, fuzzy
 msgid "OSD menu"
 msgstr "DVD(選單)"
 
-#: modules/stream_out/transcode.c:137
+#: modules/stream_out/transcode.c:156
 msgid ""
-"Enable streaming of the On Screen Display. It uses the osdmenu subfilter."
+"Stream the On Screen Display menu (using the osdmenu subpicture module)."
 msgstr ""
 
-#: modules/stream_out/transcode.c:139
+#: modules/stream_out/transcode.c:158
 msgid "Number of threads"
 msgstr "執行緒數量"
 
-#: modules/stream_out/transcode.c:141
-msgid "Allows you to specify the number of threads used for the transcoding."
+#: modules/stream_out/transcode.c:160
+msgid "Number of threads used for the transcoding."
 msgstr ""
 
-#: modules/stream_out/transcode.c:142
+#: modules/stream_out/transcode.c:161
 msgid "High priority"
 msgstr ""
 
-#: modules/stream_out/transcode.c:144
+#: modules/stream_out/transcode.c:163
 msgid ""
 "Runs the optional encoder thread at the OUTPUT priority instead of VIDEO."
 msgstr ""
 
-#: modules/stream_out/transcode.c:147
+#: modules/stream_out/transcode.c:166
 msgid "Synchronise on audio track"
 msgstr ""
 
-#: modules/stream_out/transcode.c:149
+#: modules/stream_out/transcode.c:168
 msgid ""
 "This option will drop/duplicate video frames to synchronise the video track "
 "on the audio track."
 msgstr ""
 
-#: modules/stream_out/transcode.c:153
+#: modules/stream_out/transcode.c:172
 msgid ""
-"Allows you to specify if the transcoder should drop frames if your CPU can't "
-"keep up with the encoding rate."
+"The transcoder will drop frames if your CPU can't keep up with the encoding "
+"rate."
 msgstr ""
 
-#: modules/stream_out/transcode.c:168
+#: modules/stream_out/transcode.c:187
 msgid "Transcode stream output"
 msgstr "轉碼串流輸出"
 
-#: modules/stream_out/transcode.c:228
+#: modules/stream_out/transcode.c:263
 #, fuzzy
 msgid "Overlays/Subtitles"
 msgstr "開啟字幕"
@@ -12866,6 +15005,13 @@ 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 "
@@ -12876,50 +15022,66 @@ msgid "AltiVec conversions from "
 msgstr ""
 
 #: modules/video_filter/adjust.c:60
+#, fuzzy
+msgid "Brightness threshold"
+msgstr "動作閥值"
+
+#: modules/video_filter/adjust.c:61
+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
 msgid "Image contrast (0-2)"
 msgstr "影像對比(0-2)"
 
-#: modules/video_filter/adjust.c:61
-msgid "Set the image contrast, between 0 and 2. Defaults to 1"
+#: modules/video_filter/adjust.c:65
+#, fuzzy
+msgid "Set the image contrast, between 0 and 2. Defaults to 1."
 msgstr "設定影像的對比，介於0和2之間，預設值為1"
 
-#: modules/video_filter/adjust.c:62
+#: modules/video_filter/adjust.c:66
 msgid "Image hue (0-360)"
 msgstr "影像色調(0-360)"
 
-#: modules/video_filter/adjust.c:63
-msgid "Set the image hue, between 0 and 360. Defaults to 0"
+#: modules/video_filter/adjust.c:67
+#, fuzzy
+msgid "Set the image hue, between 0 and 360. Defaults to 0."
 msgstr "設定影像的色調，介於0和360之間，預設值為0"
 
-#: modules/video_filter/adjust.c:64
+#: modules/video_filter/adjust.c:68
 msgid "Image saturation (0-3)"
 msgstr "影像飽和度(0-3)"
 
-#: modules/video_filter/adjust.c:65
-msgid "Set the image saturation, between 0 and 3. Defaults to 1"
+#: modules/video_filter/adjust.c:69
+#, fuzzy
+msgid "Set the image saturation, between 0 and 3. Defaults to 1."
 msgstr "設定影像的飽和度，介於0和3之間，預設值為1"
 
-#: modules/video_filter/adjust.c:66
+#: modules/video_filter/adjust.c:70
 msgid "Image brightness (0-2)"
 msgstr "影像亮度(0-2)"
 
-#: modules/video_filter/adjust.c:67
-msgid "Set the image brightness, between 0 and 2. Defaults to 1"
+#: modules/video_filter/adjust.c:71
+#, fuzzy
+msgid "Set the image brightness, between 0 and 2. Defaults to 1."
 msgstr "設定影像的亮度，介於0和2之間，預設值為1"
 
-#: modules/video_filter/adjust.c:68
+#: modules/video_filter/adjust.c:72
 msgid "Image gamma (0-10)"
 msgstr "影像反差係數(0-10)"
 
-#: modules/video_filter/adjust.c:69
-msgid "Set the image gamma, between 0.01 and 10. Defaults to 1"
+#: modules/video_filter/adjust.c:73
+#, fuzzy
+msgid "Set the image gamma, between 0.01 and 10. Defaults to 1."
 msgstr "設定影像的反差係數，介於0和10之間，預設值為1"
 
-#: modules/video_filter/adjust.c:73
+#: modules/video_filter/adjust.c:77
 msgid "Image properties filter"
 msgstr ""
 
-#: modules/video_filter/adjust.c:74
+#: modules/video_filter/adjust.c:78
 msgid "Image adjust"
 msgstr "影像調整"
 
@@ -12932,22 +15094,25 @@ msgid "Number of clones"
 msgstr "複製數量"
 
 #: modules/video_filter/clone.c:56
-msgid "Select the number of video windows in which to clone the video."
+msgid "Number of video windows in which to clone the video."
 msgstr ""
 
 #: modules/video_filter/clone.c:59
-msgid "List of video output modules"
-msgstr "視訊輸出模組清單"
+#, fuzzy
+msgid "Video output modules"
+msgstr "視訊輸出模組"
 
 #: modules/video_filter/clone.c:60
-msgid "Select the specific video output modules that you want to activate."
+msgid ""
+"You can use specific video output modules for the clones. Use a comma-"
+"separated list of modules."
 msgstr ""
 
-#: modules/video_filter/clone.c:63
+#: modules/video_filter/clone.c:64
 msgid "Clone video filter"
 msgstr "複製視訊過濾器"
 
-#: modules/video_filter/clone.c:65
+#: modules/video_filter/clone.c:66
 msgid "Clone"
 msgstr "複製"
 
@@ -12966,51 +15131,90 @@ msgid "Automatic cropping"
 msgstr "自動修整"
 
 #: modules/video_filter/crop.c:58
-msgid "Activate automatic black border cropping."
-msgstr ""
+#, fuzzy
+msgid "Automatic black border cropping."
+msgstr "自動修整"
 
 #: modules/video_filter/crop.c:61
 msgid "Crop video filter"
 msgstr ""
 
-#: modules/video_filter/crop.c:62
-msgid "Crop"
-msgstr ""
-
-#: modules/video_filter/deinterlace.c:102
+#: modules/video_filter/deinterlace.c:108
 msgid "Deinterlace mode"
 msgstr ""
 
-#: modules/video_filter/deinterlace.c:103
-msgid "You can choose the default deinterlace mode"
-msgstr ""
+#: modules/video_filter/deinterlace.c:109
+#, fuzzy
+msgid "Deinterlace method to use for local playback."
+msgstr "選擇熱鍵以慢速重播"
+
+#: modules/video_filter/deinterlace.c:111
+#, fuzzy
+msgid "Streaming deinterlace mode"
+msgstr "介面模組"
 
 #: modules/video_filter/deinterlace.c:112
+#, fuzzy
+msgid "Deinterlace method to use for streaming."
+msgstr "選擇熱鍵以慢速重播"
+
+#: modules/video_filter/deinterlace.c:121
 msgid "Deinterlacing video filter"
 msgstr ""
 
-#: modules/video_filter/deinterlace.c:128
+#: modules/video_filter/distort.c:64
+msgid "Distort mode"
+msgstr ""
+
+#: modules/video_filter/distort.c:65
+msgid ""
+"Distort mode, one of \"wave\", \"ripple\", \"gradient\", \"edge\", \"hough\" "
+"and \"psychedelic\"."
+msgstr ""
+
+#: modules/video_filter/distort.c:67
 #, fuzzy
-msgid "Streamming"
-msgstr "串流"
+msgid "Gradient image type"
+msgstr "錯誤的項目類型"
 
-#: modules/video_filter/distort.c:59
-msgid "Distort mode"
+#: modules/video_filter/distort.c:68
+msgid ""
+"Gradient image type (0 or 1). 0 will turn the image to white while 1 will "
+"keep colors."
 msgstr ""
 
-#: modules/video_filter/distort.c:60
-msgid "Distort mode, one of \"wave\" and \"ripple\""
+#: modules/video_filter/distort.c:71
+#, fuzzy
+msgid "Apply cartoon effect"
+msgstr "選擇效果"
+
+#: modules/video_filter/distort.c:72
+msgid "Apply cartoon effect. It is only used by \"gradient\" and \"edge\"."
 msgstr ""
 
-#: modules/video_filter/distort.c:63
+#: modules/video_filter/distort.c:77
 msgid "Wave"
 msgstr ""
 
-#: modules/video_filter/distort.c:63
+#: modules/video_filter/distort.c:77
 msgid "Ripple"
 msgstr ""
 
-#: modules/video_filter/distort.c:66
+#: modules/video_filter/distort.c:77
+#, fuzzy
+msgid "Gradient"
+msgstr "畫面"
+
+#: modules/video_filter/distort.c:78
+#, fuzzy
+msgid "Edge"
+msgstr "亮度"
+
+#: modules/video_filter/distort.c:78
+msgid "Hough"
+msgstr ""
+
+#: modules/video_filter/distort.c:81
 msgid "Distort video filter"
 msgstr ""
 
@@ -13023,222 +15227,364 @@ msgid "Color inversion"
 msgstr "色彩反向"
 
 #: modules/video_filter/logo.c:68
-msgid "Logo filename"
+#, fuzzy
+msgid "Logo filenames"
 msgstr "Logo檔名"
 
 #: modules/video_filter/logo.c:69
-msgid "Full path of the PNG file to use."
-msgstr "欲使用的PNG檔案完整路徑"
+msgid ""
+"Full path of the image files to use. Format is <image>[,<delay in ms>[,"
+"<alpha>]][;<image>[,<delay>[,<alpha>]]][;...]. If you only have one file, "
+"simply enter its filename."
+msgstr ""
 
-#: modules/video_filter/logo.c:70
-msgid "X coordinate of the logo"
+#: modules/video_filter/logo.c:72
+#, fuzzy
+msgid "Logo animation # of loops"
+msgstr "Goom動畫速度"
+
+#: modules/video_filter/logo.c:73
+msgid "Number of loops for the logo animation.1 = continuous, 0 = disabled"
 msgstr ""
 
-#: modules/video_filter/logo.c:71 modules/video_filter/logo.c:73
-msgid "You can move the logo by left-clicking on it."
+#: modules/video_filter/logo.c:75
+msgid "Logo individual image time in ms"
 msgstr ""
 
-#: modules/video_filter/logo.c:72
-msgid "Y coordinate of the logo"
+#: modules/video_filter/logo.c:76
+msgid "Individual image display time of 0 - 60000 ms."
+msgstr ""
+
+#: modules/video_filter/logo.c:78 modules/video_filter/osdmenu.c:50
+#, fuzzy
+msgid "X coordinate"
+msgstr "視訊y座標"
+
+#: modules/video_filter/logo.c:79
+msgid "X coordinate of the logo. You can move the logo by left-clicking it."
+msgstr ""
+
+#: modules/video_filter/logo.c:81 modules/video_filter/osdmenu.c:53
+#, fuzzy
+msgid "Y coordinate"
+msgstr "視訊y座標"
+
+#: modules/video_filter/logo.c:82
+msgid "Y coordinate of the logo. You can move the logo by left-clicking it."
 msgstr ""
 
-#: modules/video_filter/logo.c:74
+#: modules/video_filter/logo.c:84
 msgid "Transparency of the logo"
 msgstr ""
 
-#: modules/video_filter/logo.c:75
+#: modules/video_filter/logo.c:85
 msgid ""
-"You can set the logo transparency value here (from 0 for full transparency "
-"to 255 for full opacity)."
+"Logo transparency value (from 0 for full transparency to 255 for full "
+"opacity)."
 msgstr ""
 
-#: modules/video_filter/logo.c:77
+#: modules/video_filter/logo.c:87
 msgid "Logo position"
 msgstr "Logo位置"
 
-#: modules/video_filter/logo.c:79
+#: modules/video_filter/logo.c:89
 msgid ""
-"You can enforce the logo position on the video (0=center, 1=left, 2=right, "
-"4=top, 8=bottom, you can also use combinations of these values)."
+"Enforce the logo position on the video (0=center, 1=left, 2=right, 4=top, "
+"8=bottom, you can also use combinations of these values, eg 6 = top-right)."
 msgstr ""
 
-#: modules/video_filter/logo.c:89
+#: modules/video_filter/logo.c:99
 msgid "Logo video filter"
 msgstr ""
 
-#: modules/video_filter/logo.c:91
+#: modules/video_filter/logo.c:101
 msgid "Logo overlay"
 msgstr ""
 
-#: modules/video_filter/logo.c:109
+#: modules/video_filter/logo.c:122
 msgid "Logo sub filter"
 msgstr ""
 
-#: modules/video_filter/marq.c:76
-msgid "Marquee text"
-msgstr ""
+#: modules/video_filter/magnify.c:59
+#, fuzzy
+msgid "Magnify/Zoom interactive video filter"
+msgstr "動作偵測視訊過濾器"
 
 #: modules/video_filter/marq.c:77
-msgid "Marquee text to display"
+msgid "Marquee text to display."
 msgstr ""
 
-#: modules/video_filter/marq.c:78 modules/video_filter/rss.c:120
+#: modules/video_filter/marq.c:78 modules/video_filter/rss.c:134
 #: modules/video_filter/time.c:73
-msgid "X offset, from left"
-msgstr ""
+#, fuzzy
+msgid "X offset"
+msgstr "時間補償"
 
-#: modules/video_filter/marq.c:79 modules/video_filter/rss.c:121
-#: modules/video_filter/time.c:74
-msgid "X offset, from the left screen edge"
+#: modules/video_filter/marq.c:79 modules/video_filter/rss.c:135
+msgid "X offset, from the left screen edge."
 msgstr ""
 
-#: modules/video_filter/marq.c:80 modules/video_filter/rss.c:122
+#: modules/video_filter/marq.c:80 modules/video_filter/rss.c:136
 #: modules/video_filter/time.c:75
-msgid "Y offset, from the top"
-msgstr ""
-
-#: modules/video_filter/marq.c:81 modules/video_filter/rss.c:123
-#: modules/video_filter/time.c:76
-msgid "Y offset, down from the top"
-msgstr ""
+#, fuzzy
+msgid "Y offset"
+msgstr "時間補償"
 
-#: modules/video_filter/marq.c:82
-msgid "Marquee timeout"
+#: modules/video_filter/marq.c:81 modules/video_filter/rss.c:137
+msgid "Y offset, down from the top."
 msgstr ""
 
 #: modules/video_filter/marq.c:83
 msgid ""
-"Defines the time the marquee must remain displayed, in milliseconds. Default "
-"value is 0 (remain forever)."
+"Number of milliseconds the marquee must remain displayed. Default value is 0 "
+"(remains forever)."
 msgstr ""
 
-#: modules/video_filter/marq.c:86 modules/video_filter/rss.c:124
-msgid "Opacity"
+#: modules/video_filter/marq.c:87
+msgid ""
+"Opacity (inverse of transparency) of overlayed text. 0 = transparent, 255 = "
+"totally opaque. "
 msgstr ""
 
-#: modules/video_filter/marq.c:89 modules/video_filter/rss.c:127
-#: modules/video_filter/time.c:80
+#: modules/video_filter/marq.c:89 modules/video_filter/rss.c:142
+#: modules/video_filter/time.c:81
 #, fuzzy
 msgid "Font size, pixels"
 msgstr "字型大小"
 
-#: modules/video_filter/marq.c:90 modules/video_filter/rss.c:128
-#: modules/video_filter/time.c:81
-msgid "Specify the font size, in pixels, with -1 = use freetype-fontsize"
+#: modules/video_filter/marq.c:90 modules/video_filter/rss.c:143
+#: modules/video_filter/time.c:82
+msgid "Font size, in pixels. Default is -1 (use default font size)."
+msgstr ""
+
+#: modules/video_filter/marq.c:94 modules/video_filter/rss.c:147
+#: modules/video_filter/time.c:86
+msgid ""
+"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, "
+"then blue. #000000 = black, #FF0000 = red, #00FF00 = green, #FFFF00 = yellow "
+"(red + green), #FFFFFF = white"
 msgstr ""
 
-#: modules/video_filter/marq.c:98 modules/video_filter/rss.c:136
+#: modules/video_filter/marq.c:99
 #, fuzzy
 msgid "Marquee position"
 msgstr "起始位置"
 
-#: modules/video_filter/marq.c:100 modules/video_filter/rss.c:138
+#: modules/video_filter/marq.c:101
 msgid ""
 "You can enforce the marquee position on the video (0=center, 1=left, "
-"2=right, 4=top, 8=bottom, you can also use combinations of these values by "
-"adding them)."
+"2=right, 4=top, 8=bottom, you can also use combinations of these values, eg "
+"6 = top-right)."
 msgstr ""
 
-#: modules/video_filter/marq.c:114
-msgid "Marquee"
-msgstr ""
-
-#: modules/video_filter/marq.c:134 modules/video_filter/rss.c:172
+#: modules/video_filter/marq.c:137 modules/video_filter/rss.c:189
 #, fuzzy
 msgid "Misc"
 msgstr "光碟"
 
-#: modules/video_filter/marq.c:138
-msgid "Marquee display sub filter"
-msgstr ""
+#: modules/video_filter/marq.c:141
+#, fuzzy
+msgid "Marquee display"
+msgstr "畫面上顯示(OSD)"
 
-#: modules/video_filter/mosaic.c:87
-msgid "Alpha blending"
+#: modules/video_filter/mosaic.c:90
+msgid "Transparency"
 msgstr ""
 
-#: modules/video_filter/mosaic.c:88
-msgid "Alpha blending (0 -> 255). Default is 255"
+#: modules/video_filter/mosaic.c:91
+msgid ""
+"Transparency of the mosaic foreground pictures. 0 means transparent, 255 "
+"opaque (default)."
 msgstr ""
 
-#: modules/video_filter/mosaic.c:90
-msgid "Height in pixels"
-msgstr ""
+#: modules/video_filter/mosaic.c:95
+#, fuzzy
+msgid "Total height of the mosaic, in pixels."
+msgstr "效果視窗的高度(像素)"
 
-#: modules/video_filter/mosaic.c:91
-msgid "Width in pixels"
+#: modules/video_filter/mosaic.c:97
+#, fuzzy
+msgid "Total width of the mosaic, in pixels."
+msgstr "效果視窗的寬度(像素)"
+
+#: modules/video_filter/mosaic.c:99
+#, fuzzy
+msgid "Top left corner X coordinate"
+msgstr "視訊x座標"
+
+#: modules/video_filter/mosaic.c:100
+msgid "X Coordinate of the top-left corner of the mosaic."
 msgstr ""
 
-#: modules/video_filter/mosaic.c:92
+#: modules/video_filter/mosaic.c:101
 #, fuzzy
-msgid "Top left corner x coordinate"
+msgid "Top left corner Y coordinate"
 msgstr "視訊x座標"
 
-#: modules/video_filter/mosaic.c:93
+#: modules/video_filter/mosaic.c:102
+msgid "Y Coordinate of the top-left corner of the mosaic."
+msgstr ""
+
+#: modules/video_filter/mosaic.c:103
 #, fuzzy
-msgid "Top left corner y coordinate"
-msgstr "視訊y座標"
+msgid "Vertical border width"
+msgstr "垂直補償"
 
-#: modules/video_filter/mosaic.c:94
-msgid "Vertical border width in pixels"
+#: modules/video_filter/mosaic.c:104
+msgid ""
+"Width in pixels of the border than can be drawn vertically around the mosaic."
 msgstr ""
 
-#: modules/video_filter/mosaic.c:95
-msgid "Horizontal border width in pixels"
+#: modules/video_filter/mosaic.c:106
+#, fuzzy
+msgid "Horizontal border width"
+msgstr "水平"
+
+#: modules/video_filter/mosaic.c:107
+msgid ""
+"Width in pixels of the border than can be drawn horizontally around the "
+"mosaic."
 msgstr ""
 
-#: modules/video_filter/mosaic.c:96
+#: modules/video_filter/mosaic.c:110
 #, fuzzy
 msgid "Mosaic alignment"
 msgstr "視訊對齊"
 
-#: modules/video_filter/mosaic.c:98
+#: modules/video_filter/mosaic.c:112
+msgid ""
+"You can enforce the mosaic alignment on the video (0=center, 1=left, "
+"2=right, 4=top, 8=bottom, you can also use combinations of these values, eg "
+"6 = top-right)."
+msgstr ""
+
+#: modules/video_filter/mosaic.c:116
 #, fuzzy
 msgid "Positioning method"
 msgstr "串流方式"
 
-#: modules/video_filter/mosaic.c:99
+#: modules/video_filter/mosaic.c:117
 msgid ""
-"Positioning method. auto: automatically choose the best number of rows and "
-"columns. fixed: use the user-defined number of rows and columns."
+"Positioning method for the mosaic. auto: automatically choose the best "
+"number of rows and columns. fixed: use the user-defined number of rows and "
+"columns."
 msgstr ""
 
-#: modules/video_filter/mosaic.c:102 modules/video_filter/wall.c:57
+#: modules/video_filter/mosaic.c:121 modules/video_filter/wall.c:57
 msgid "Number of rows"
 msgstr ""
 
-#: modules/video_filter/mosaic.c:103 modules/video_filter/wall.c:53
+#: modules/video_filter/mosaic.c:122
+msgid ""
+"Number of image rows in the mosaic (only used if positionning method is set "
+"to \"fixed\"."
+msgstr ""
+
+#: modules/video_filter/mosaic.c:124 modules/video_filter/wall.c:53
 msgid "Number of columns"
 msgstr ""
 
-#: modules/video_filter/mosaic.c:104
-msgid "Keep aspect ratio when resizing"
+#: modules/video_filter/mosaic.c:125
+msgid ""
+"Number of image columns in the mosaic (only used if positionning method is "
+"set to \"fixed\"."
+msgstr ""
+
+#: modules/video_filter/mosaic.c:129
+msgid "Keep the original aspect ratio when resizing mosaic elements."
 msgstr ""
 
-#: modules/video_filter/mosaic.c:105
+#: modules/video_filter/mosaic.c:131
 msgid "Keep original size"
 msgstr ""
 
-#: modules/video_filter/mosaic.c:107
-msgid "Order as a comma separated list of picture-id(s)"
+#: modules/video_filter/mosaic.c:132
+msgid "Keep the original size of mosaic elements."
 msgstr ""
 
-#: modules/video_filter/mosaic.c:110
+#: modules/video_filter/mosaic.c:134
+#, fuzzy
+msgid "Elements order"
+msgstr "靜音模式"
+
+#: modules/video_filter/mosaic.c:135
 msgid ""
-"Pictures coming from the picture video outputs will be delayed accordingly "
-"(in milliseconds). For high values you will need to raise file-caching and "
-"others."
+"You can enforce the order of the elements on the mosaic. You must give a "
+"comma-separated list of picture ID(s).These IDs are assigned in the \"mosaic-"
+"bridge\" module."
 msgstr ""
 
-#: modules/video_filter/mosaic.c:116
+#: modules/video_filter/mosaic.c:140
+msgid ""
+"Pictures coming from the mosaic elements will be delayed according to this "
+"value (in milliseconds). For high values you will need to raise caching at "
+"input."
+msgstr ""
+
+#: modules/video_filter/mosaic.c:144
+#, fuzzy
+msgid "Bluescreen"
+msgstr "全螢幕"
+
+#: modules/video_filter/mosaic.c:145
+msgid ""
+"This effect, also known as \"greenscreen\" or \"chroma key\" blends the "
+"\"blue parts\" of the foreground images of the mosaic on the background "
+"(like wheather forecast presenters). You can choose the \"key\" color for "
+"blending (blue by default)."
+msgstr ""
+
+#: modules/video_filter/mosaic.c:150
+msgid "Bluescreen U value"
+msgstr ""
+
+#: modules/video_filter/mosaic.c:151
+msgid ""
+"\"U\" value for the bluescreen key color (in YUV values). From 0 to 255. "
+"Defaults to 120 for blue."
+msgstr ""
+
+#: modules/video_filter/mosaic.c:153
+msgid "Bluescreen V value"
+msgstr ""
+
+#: modules/video_filter/mosaic.c:154
+msgid ""
+"\"V\" value for the bluescreen key color (in YUV values). From 0 to 255. "
+"Defaults to 90 for blue."
+msgstr ""
+
+#: modules/video_filter/mosaic.c:156
+msgid "Bluescreen U tolerance"
+msgstr ""
+
+#: modules/video_filter/mosaic.c:157
+msgid ""
+"Tolerance of the bluescreen blender on color variations for the U plane. A "
+"value between 10 and 20 seems sensible."
+msgstr ""
+
+#: modules/video_filter/mosaic.c:160
+msgid "Bluescreen V tolerance"
+msgstr ""
+
+#: modules/video_filter/mosaic.c:161
+msgid ""
+"Tolerance of the bluescreen blender on color variations for the V plane. A "
+"value between 10 and 20 seems sensible."
+msgstr ""
+
+#: modules/video_filter/mosaic.c:167
 msgid "fixed"
 msgstr ""
 
-#: modules/video_filter/mosaic.c:125
+#: modules/video_filter/mosaic.c:176
 #, fuzzy
 msgid "Mosaic video sub filter"
 msgstr "動作偵測視訊過濾器"
 
-#: modules/video_filter/mosaic.c:126
+#: modules/video_filter/mosaic.c:177
 msgid "Mosaic"
 msgstr ""
 
@@ -13258,138 +15604,164 @@ msgstr ""
 msgid "Motion blur filter"
 msgstr ""
 
-#: modules/video_filter/motiondetect.c:54
+#: modules/video_filter/motiondetect.c:55
 msgid "Description file"
 msgstr ""
 
-#: modules/video_filter/motiondetect.c:55
-msgid "Description file, file containing simple playlist"
+#: modules/video_filter/motiondetect.c:56
+msgid "A file containing a simple playlist"
 msgstr ""
 
-#: modules/video_filter/motiondetect.c:56
+#: modules/video_filter/motiondetect.c:57
 msgid "History parameter"
 msgstr "歷史參數"
 
-#: modules/video_filter/motiondetect.c:57
-msgid "History parameter, number of frames used for detection"
+#: modules/video_filter/motiondetect.c:58
+msgid "The umber of frames used for detection."
 msgstr ""
 
-#: modules/video_filter/motiondetect.c:60
+#: modules/video_filter/motiondetect.c:61
 msgid "Motion detect video filter"
 msgstr "動作偵測視訊過濾器"
 
-#: modules/video_filter/motiondetect.c:61
+#: modules/video_filter/motiondetect.c:62
 msgid "Motion detect"
 msgstr "動作偵測"
 
 #: modules/video_filter/osdmenu.c:42
 #, fuzzy
-msgid "OSD menu configuration file"
+msgid "Configuration file"
 msgstr "VLM設定檔"
 
 #: modules/video_filter/osdmenu.c:44
-msgid "An OSD menu configuration file that menu actions with button images"
-msgstr ""
+#, fuzzy
+msgid "Configuration file for the OSD Menu"
+msgstr "組態選項"
 
-#: modules/video_filter/osdmenu.c:46
+#: modules/video_filter/osdmenu.c:45
 msgid "Path to OSD menu images"
 msgstr ""
 
-#: modules/video_filter/osdmenu.c:48
+#: modules/video_filter/osdmenu.c:47
 msgid ""
-"Specify another path to the OSD menu images. This will override the path as "
-"defined in the OSD configuration file."
+"Path to the OSD menu images. This will override the path defined in the OSD "
+"configuration file."
 msgstr ""
 
-#: modules/video_filter/osdmenu.c:51
-msgid "X coordinate of the OSD menu"
-msgstr ""
-
-#: modules/video_filter/osdmenu.c:52 modules/video_filter/osdmenu.c:55
+#: modules/video_filter/osdmenu.c:51 modules/video_filter/osdmenu.c:54
 msgid "You can move the OSD menu by left-clicking on it."
 msgstr ""
 
-#: modules/video_filter/osdmenu.c:54
-msgid "Y coordinate of the OSD menu"
-msgstr ""
-
-#: modules/video_filter/osdmenu.c:57
+#: modules/video_filter/osdmenu.c:56
 #, fuzzy
-msgid "OSD menu position"
+msgid "Menu position"
 msgstr "Logo位置"
 
-#: modules/video_filter/osdmenu.c:59
+#: modules/video_filter/osdmenu.c:58
 msgid ""
 "You can enforce the OSD menu position on the video (0=center, 1=left, "
-"2=right, 4=top, 8=bottom, you can also use combinations of these values)."
+"2=right, 4=top, 8=bottom, you can also use combinations of these values, eg. "
+"6 = top-right)."
 msgstr ""
 
-#: modules/video_filter/osdmenu.c:63
-msgid "Timeout of OSD menu"
-msgstr ""
+#: modules/video_filter/osdmenu.c:62
+#, fuzzy
+msgid "Menu timeout"
+msgstr "時間"
 
-#: modules/video_filter/osdmenu.c:65
+#: modules/video_filter/osdmenu.c:64
 msgid ""
 "OSD menu pictures get a default timeout of 15 seconds added to their "
-"remaining time.This will ensure that they are at least the specified time "
+"remaining time. This will ensure that they are at least the specified time "
 "visible."
 msgstr ""
 
 #: modules/video_filter/osdmenu.c:68
-msgid "Update speed of OSD menu"
+msgid "Menu update interval"
 msgstr ""
 
 #: modules/video_filter/osdmenu.c:70
 msgid ""
-"Update the OSD menu picture every 200ms (default). Shorten the update time "
-"for environments that experience transmissions errors. Be carefull with this "
-"option because encoding OSD menu pictures is very computing intensive. The "
-"range is 0 - 1000 ms."
+"The default is to update the OSD menu picture every 200 ms. Shorten the "
+"update time for environments that experience transmissions errors. Be "
+"careful with this option as encoding OSD menu pictures is very computing "
+"intensive. The range is 0 - 1000 ms."
 msgstr ""
 
-#: modules/video_filter/osdmenu.c:116
+#: modules/video_filter/osdmenu.c:117
 #, fuzzy
-msgid "On Screen Display menu subfilter"
+msgid "On Screen Display menu"
 msgstr "畫面上顯示(OSD)"
 
-#: modules/video_filter/rss.c:110
-msgid "RSS feed URLs"
+#: modules/video_filter/rss.c:121
+msgid "Feed URLs"
 msgstr ""
 
-#: modules/video_filter/rss.c:111
-msgid "RSS feed '|' (pipe) seperated URLs"
+#: modules/video_filter/rss.c:122
+#, fuzzy
+msgid "RSS/Atom feed '|' (pipe) seperated URLs."
+msgstr "畫面上顯示(OSD)"
+
+#: modules/video_filter/rss.c:123
+msgid "Speed of feeds"
 msgstr ""
 
-#: modules/video_filter/rss.c:112
-msgid "RSS feed speed"
+#: modules/video_filter/rss.c:124
+msgid "Speed of the RSS/Atom feeds (bigger is slower)."
 msgstr ""
 
-#: modules/video_filter/rss.c:113
-msgid "RSS feed speed (bigger is slower)"
+#: modules/video_filter/rss.c:125
+#, fuzzy
+msgid "Max length"
+msgstr "最大等級"
+
+#: modules/video_filter/rss.c:126
+#, fuzzy
+msgid "Maximum number of characters displayed on the screen."
+msgstr "複製數量"
+
+#: modules/video_filter/rss.c:128
+#, fuzzy
+msgid "Refresh time"
+msgstr "重新整理清單"
+
+#: modules/video_filter/rss.c:129
+msgid ""
+"Number of seconds between each forced refresh of the feeds. 0 means that the "
+"feeds are never updated."
 msgstr ""
 
-#: modules/video_filter/rss.c:114 modules/video_filter/rss.c:115
-msgid "RSS feed max number of chars displayed"
+#: modules/video_filter/rss.c:131
+msgid "Feed images"
 msgstr ""
 
-#: modules/video_filter/rss.c:116
-msgid "Number of seconds between each forced refresh of the feeds"
+#: modules/video_filter/rss.c:132
+msgid "Display feed images if available."
 msgstr ""
 
-#: modules/video_filter/rss.c:117
+#: modules/video_filter/rss.c:139 modules/video_filter/time.c:78
 msgid ""
-"Number of seconds between each forced refresh of the feeds. If 0, the feeds "
-"will never be updated."
+"Opacity (inverse of transparency) of overlay text. 0 = transparent, 255 = "
+"totally opaque."
 msgstr ""
 
-#: modules/video_filter/rss.c:152
-msgid "RSS"
-msgstr ""
+#: modules/video_filter/rss.c:152 modules/video_filter/time.c:91
+#, fuzzy
+msgid "Text position"
+msgstr "Logo位置"
 
-#: modules/video_filter/rss.c:179
-msgid "RSS feed display sub filter"
+#: modules/video_filter/rss.c:154
+msgid ""
+"You can enforce the text position on the video (0=center, 1=left, 2=right, "
+"4=top, 8=bottom; you can also use combinations of these values, eg 6 = top-"
+"right)."
 msgstr ""
 
+#: modules/video_filter/rss.c:197
+#, fuzzy
+msgid "RSS and Atom feed display"
+msgstr "畫面上顯示(OSD)"
+
 #: modules/video_filter/rv32.c:52
 #, fuzzy
 msgid "RV32 conversion filter"
@@ -13404,7 +15776,7 @@ msgid "Scaling mode"
 msgstr ""
 
 #: modules/video_filter/swscale/filter.c:64
-msgid "You can choose the default scaling mode."
+msgid "Scaling mode to use."
 msgstr ""
 
 #: modules/video_filter/swscale/filter.c:68
@@ -13458,26 +15830,29 @@ msgstr ""
 #: modules/video_filter/time.c:72
 msgid ""
 "Time format string (%Y = year, %m = month, %d = day, %H = hour, %M = minute, "
-"%S = second"
+"%S = second)."
 msgstr ""
 
-#: modules/video_filter/time.c:88
-#, fuzzy
-msgid "Time position"
-msgstr "Logo位置"
+#: modules/video_filter/time.c:74
+msgid "X offset, from the left screen edge"
+msgstr ""
+
+#: modules/video_filter/time.c:76
+msgid "Y offset, down from the top"
+msgstr ""
 
-#: modules/video_filter/time.c:90
+#: modules/video_filter/time.c:93
 msgid ""
-"You can enforce the time position on the video (0=center, 1=left, 2=right, "
-"4=top, 8=bottom, you can also use combinations of these values by adding "
-"them)."
+"You can enforce the text position on the video (0=center, 1=left, 2=right, "
+"4=top, 8=bottom, you can also use combinations of these values, e.g. 6 = top-"
+"right)."
 msgstr ""
 
-#: modules/video_filter/time.c:104
+#: modules/video_filter/time.c:107
 msgid "Time overlay"
 msgstr ""
 
-#: modules/video_filter/time.c:119
+#: modules/video_filter/time.c:124
 msgid "Time display sub filter"
 msgstr ""
 
@@ -13514,13 +15889,11 @@ msgid "Video transformation filter"
 msgstr ""
 
 #: modules/video_filter/wall.c:54
-msgid ""
-"Select the number of horizontal video windows in which to split the video."
+msgid "Number of horizontal windows in which to split the video."
 msgstr ""
 
 #: modules/video_filter/wall.c:58
-msgid ""
-"Select the number of vertical video windows in which to split the video."
+msgid "Number of vertical windows in which to split the video."
 msgstr ""
 
 #: modules/video_filter/wall.c:61
@@ -13528,7 +15901,7 @@ msgid "Active windows"
 msgstr ""
 
 #: modules/video_filter/wall.c:62
-msgid "Comma separated list of active windows, defaults to all"
+msgid "Comma-separated list of active windows, defaults to all"
 msgstr ""
 
 #: modules/video_filter/wall.c:65
@@ -13536,22 +15909,20 @@ msgid "Element aspect ratio"
 msgstr ""
 
 #: modules/video_filter/wall.c:66
-msgid ""
-"The aspect ratio of the individual displays building the display wall. If \"0"
-"\", the video outputs will be evenly divided."
+msgid "Aspect ratio of the individual displays building the wall."
 msgstr ""
 
-#: modules/video_filter/wall.c:71
+#: modules/video_filter/wall.c:70
 #, fuzzy
 msgid "Wall video filter"
 msgstr "複製視訊過濾器"
 
-#: modules/video_filter/wall.c:72
+#: modules/video_filter/wall.c:71
 msgid "Image wall"
 msgstr ""
 
 #: modules/video_output/aa.c:55
-msgid "Ascii Art"
+msgid "ASCII Art"
 msgstr ""
 
 #: modules/video_output/aa.c:58
@@ -13563,21 +15934,25 @@ msgstr "ASCII-art視訊輸出"
 msgid "Color ASCII art video output"
 msgstr "彩色ASCII藝術視訊輸出"
 
-#: modules/video_output/directx/directx.c:111
+#: modules/video_output/directfb.c:69
+msgid "DirectFB video output http://www.directfb.org/"
+msgstr ""
+
+#: modules/video_output/directx/directx.c:112
 msgid "Use hardware YUV->RGB conversions"
 msgstr "使用硬體YUV->RGB轉換"
 
-#: modules/video_output/directx/directx.c:113
+#: modules/video_output/directx/directx.c:114
 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:116
+#: modules/video_output/directx/directx.c:117
 msgid "Use video buffers in system memory"
 msgstr "在系統記憶體中使用視訊緩衝區"
 
-#: modules/video_output/directx/directx.c:118
+#: modules/video_output/directx/directx.c:119
 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 "
@@ -13585,47 +15960,47 @@ msgid ""
 "doesn't have any effect when using overlays."
 msgstr ""
 
-#: modules/video_output/directx/directx.c:123
+#: modules/video_output/directx/directx.c:124
 msgid "Use triple buffering for overlays"
 msgstr ""
 
-#: modules/video_output/directx/directx.c:125
+#: modules/video_output/directx/directx.c:126
 msgid ""
 "Try to use triple buffering when using YUV overlays. That results in much "
 "better video quality (no flickering)."
 msgstr ""
 
-#: modules/video_output/directx/directx.c:128
+#: modules/video_output/directx/directx.c:129
 msgid "Name of desired display device"
 msgstr ""
 
-#: modules/video_output/directx/directx.c:129
+#: modules/video_output/directx/directx.c:130
 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, \"\\"
 "\\.\\DISPLAY1\" or \"\\\\.\\DISPLAY2\"."
 msgstr ""
 
-#: modules/video_output/directx/directx.c:134
+#: modules/video_output/directx/directx.c:135
 msgid "Enable wallpaper mode "
 msgstr "開啟桌布模式"
 
-#: modules/video_output/directx/directx.c:136
+#: modules/video_output/directx/directx.c:137
 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 "
 "desktop must not already have a wallpaper."
 msgstr ""
 
-#: modules/video_output/directx/directx.c:162
+#: modules/video_output/directx/directx.c:163
 msgid "DirectX video output"
 msgstr "DirectX視訊輸出"
 
-#: modules/video_output/directx/directx.c:301
+#: modules/video_output/directx/directx.c:303
 msgid "Wallpaper"
 msgstr "桌布"
 
-#: modules/video_output/directx/glwin32.c:65 modules/video_output/opengl.c:123
+#: modules/video_output/directx/glwin32.c:65 modules/video_output/opengl.c:135
 #: modules/video_output/x11/glx.c:115
 msgid "OpenGL video output"
 msgstr "OpenGL視訊輸出"
@@ -13635,23 +16010,22 @@ msgid "Framebuffer device"
 msgstr ""
 
 #: modules/video_output/fb.c:69
-msgid ""
-"You can select here the framebuffer device that will be used for rendering "
-"(usually /dev/fb0)."
+msgid "Framebuffer device to use for rendering (usually /dev/fb0)."
 msgstr ""
 
-#: modules/video_output/fb.c:78
+#: modules/video_output/fb.c:77
 msgid "GNU/Linux console framebuffer video output"
 msgstr ""
 
 #: modules/video_output/ggi.c:56 modules/video_output/x11/glx.c:101
 #: modules/video_output/x11/x11.c:52 modules/video_output/x11/xvideo.c:58
-msgid "X11 display name"
-msgstr ""
+#, fuzzy
+msgid "X11 display"
+msgstr "延遲"
 
 #: modules/video_output/ggi.c:58
 msgid ""
-"Specify the X11 hardware display you want to use.\n"
+"X11 hardware display to use.\n"
 "By default, VLC will use the value of the DISPLAY environment variable."
 msgstr ""
 
@@ -13668,7 +16042,8 @@ msgid "Image format"
 msgstr "影像格式"
 
 #: modules/video_output/image.c:49
-msgid "Set the format of the output image."
+#, fuzzy
+msgid "Format of the output images (png or jpg)."
 msgstr "設定輸出影像格式"
 
 #: modules/video_output/image.c:51
@@ -13677,8 +16052,7 @@ msgstr "錄製比率"
 
 #: modules/video_output/image.c:52
 msgid ""
-"Set the ratio of images that are recorded. 3 means that one image out of "
-"three is recorded."
+"Ratio of images to record. 3 means that one image out of three is recorded."
 msgstr ""
 
 #: modules/video_output/image.c:55
@@ -13687,11 +16061,21 @@ msgstr "檔案名稱修正"
 
 #: modules/video_output/image.c:56
 msgid ""
-"Set the prefix of the filename. Output filename will have the form "
-"prefixNUMBER.format"
+"Prefix of the output images filenames. Output filenames will have the "
+"\"prefixNUMBER.format\" form."
+msgstr ""
+
+#: modules/video_output/image.c:60
+msgid "Always write to the same file"
+msgstr ""
+
+#: modules/video_output/image.c:61
+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:64
+#: modules/video_output/image.c:70
 msgid "Image video output"
 msgstr "影像視訊輸出"
 
@@ -13699,103 +16083,104 @@ msgstr "影像視訊輸出"
 msgid "Matrox Graphic Array video output"
 msgstr ""
 
-#: modules/video_output/opengl.c:102 modules/video_output/opengl.c:106
+#: modules/video_output/opengl.c:114 modules/video_output/opengl.c:118
 msgid "OpenGL cube rotation speed"
 msgstr ""
 
-#: modules/video_output/opengl.c:107
-msgid "If the OpenGL cube effect is enabled, this controls its rotation speed."
+#: modules/video_output/opengl.c:119
+msgid "Rotation speed of the OpenGL cube effect, if enabled."
 msgstr ""
 
-#: modules/video_output/opengl.c:110
-msgid "Select effect"
-msgstr "選擇效果"
+#: modules/video_output/opengl.c:122
+#, fuzzy
+msgid "Effect"
+msgstr "跳出"
 
-#: modules/video_output/opengl.c:112
-msgid "Allows you to select different visual effects."
-msgstr "允許你選擇不同的視覺效果"
+#: modules/video_output/opengl.c:124
+msgid "Several visual OpenGL effects are available."
+msgstr ""
 
-#: modules/video_output/opengl.c:117
+#: modules/video_output/opengl.c:129
 msgid "Cube"
 msgstr ""
 
-#: modules/video_output/opengl.c:117
+#: modules/video_output/opengl.c:129
 msgid "Transparent Cube"
 msgstr ""
 
 #: modules/video_output/qte/qte.cpp:79
-msgid "QT Embedded display name"
-msgstr ""
+#, fuzzy
+msgid "QT Embedded display"
+msgstr "開啟播放清單"
 
 #: modules/video_output/qte/qte.cpp:81
 msgid ""
-"Specify the Qt Embedded hardware display you want to use. By default VLC "
-"will use the value of the DISPLAY environment variable."
+"Qt Embedded hardware display to use. By default VLC will use the value of "
+"the DISPLAY environment variable."
 msgstr ""
 
 #: modules/video_output/qte/qte.cpp:117
 msgid "QT Embedded video output"
 msgstr ""
 
-#: modules/video_output/sdl.c:107
+#: modules/video_output/sdl.c:108
 msgid "Simple DirectMedia Layer video output"
 msgstr ""
 
 #: modules/video_output/snapshot.c:60
-msgid "snapshot width"
+#, fuzzy
+msgid "Snapshot width"
 msgstr "快照寬度"
 
 #: modules/video_output/snapshot.c:61
-msgid "Set the width of the snapshot image."
+#, fuzzy
+msgid "Width of the snapshot image."
 msgstr "設定快照影像的寬度"
 
 #: modules/video_output/snapshot.c:63
-msgid "snapshot height"
+#, fuzzy
+msgid "Snapshot height"
 msgstr "快照高度"
 
 #: modules/video_output/snapshot.c:64
-msgid "Set the height of the snapshot image."
+#, fuzzy
+msgid "Height of the snapshot image."
 msgstr "設定快照影像的高度"
 
 #: modules/video_output/snapshot.c:66
-msgid "chroma"
+#, fuzzy
+msgid "Chroma"
 msgstr "彩度"
 
 #: modules/video_output/snapshot.c:67
-msgid "Set the desired chroma for the snapshot image (a 4 character string)."
+msgid ""
+"Output chroma for the snapshot image (a 4 character string, like \"RV32\")."
 msgstr ""
 
-#: modules/video_output/snapshot.c:69
-msgid "cache size (number of images)"
+#: modules/video_output/snapshot.c:70
+#, fuzzy
+msgid "Cache size (number of images)"
 msgstr "快取大小(影像數量)"
 
-#: modules/video_output/snapshot.c:70
-msgid "Set the cache size (number of images to keep)."
+#: modules/video_output/snapshot.c:71
+#, fuzzy
+msgid "Snapshot cache size (number of images to keep)."
 msgstr "設定快取大小(保留影像的數量)"
 
-#: modules/video_output/snapshot.c:74
-msgid "snapshot module"
+#: modules/video_output/snapshot.c:75
+#, fuzzy
+msgid "Snapshot module"
 msgstr "快照模組"
 
 #: modules/video_output/svgalib.c:56
 msgid "SVGAlib video output"
-msgstr "SVGAlib視訊輸出"
-
-#: modules/video_output/wingdi.c:216
-#, fuzzy
-msgid "Windows GAPI"
-msgstr "視窗"
+msgstr "SVGAlib視訊輸出"
 
-#: modules/video_output/wingdi.c:217
+#: modules/video_output/wingdi.c:220
 msgid "Windows GAPI video output"
 msgstr "Windows GAPI視訊輸出"
 
-#: modules/video_output/wingdi.c:220
-#, fuzzy
-msgid "Windows GDI"
-msgstr "視窗"
-
-#: modules/video_output/wingdi.c:221
+#: modules/video_output/wingdi.c:224
 msgid "Windows GDI video output"
 msgstr "Windows GDI視訊輸出"
 
@@ -13803,10 +16188,10 @@ msgstr "Windows GDI視訊輸出"
 msgid "XVideo adaptor number"
 msgstr ""
 
-#: modules/video_output/x11/glx.c:89 modules/video_output/x11/xvideo.c:46
+#: modules/video_output/x11/glx.c:89
 msgid ""
-"If you graphics card provides several adaptors, this option allows you to "
-"choose which one will be used (you shouldn't have to change this)."
+"If your graphics card provides several adaptors, you have to choose which "
+"one will be used (you shouldn't have to change this)."
 msgstr ""
 
 #: modules/video_output/x11/glx.c:92 modules/video_output/x11/x11.c:43
@@ -13828,19 +16213,20 @@ msgstr ""
 #: modules/video_output/x11/glx.c:103 modules/video_output/x11/x11.c:54
 #: modules/video_output/x11/xvideo.c:60
 msgid ""
-"Specify the X11 hardware display you want to use. By default VLC will use "
-"the value of the DISPLAY environment variable."
+"X11 hardware display to use. By default VLC will use the value of the "
+"DISPLAY environment variable."
 msgstr ""
 
-#: modules/video_output/x11/glx.c:106 modules/video_output/x11/xvideo.c:72
-msgid "Screen to be used for fullscreen mode."
+#: modules/video_output/x11/glx.c:106 modules/video_output/x11/x11.c:61
+#: modules/video_output/x11/xvideo.c:72
+msgid "Screen for fullscreen mode."
 msgstr ""
 
 #: modules/video_output/x11/glx.c:108 modules/video_output/x11/x11.c:63
 #: modules/video_output/x11/xvideo.c:74
 msgid ""
-"Choose the screen you want to use in fullscreen mode. For instance set it to "
-"0 for first screen, 1 for the second."
+"Screen to use in fullscreen mode. For instance set it to 0 for first screen, "
+"1 for the second."
 msgstr ""
 
 #: modules/video_output/x11/x11.c:57 modules/video_output/x11/xvideo.c:68
@@ -13851,14 +16237,16 @@ msgstr "使用共享記憶體"
 msgid "Use shared memory to communicate between VLC and the X server."
 msgstr ""
 
-#: modules/video_output/x11/x11.c:61
-msgid "choose the screen to be used for fullscreen mode."
-msgstr ""
-
 #: modules/video_output/x11/x11.c:78
 msgid "X11 video output"
 msgstr "X11視訊輸出"
 
+#: modules/video_output/x11/xvideo.c:46
+msgid ""
+"If your graphics card provides several adaptors, you need to choose which "
+"one will be used (you shouldn't have to change this)."
+msgstr ""
+
 #: modules/video_output/x11/xvideo.c:63
 msgid "XVimage chroma format"
 msgstr "XVimage彩度格式"
@@ -13887,7 +16275,7 @@ msgstr "Goom顯示高度"
 
 #: modules/visualization/goom.c:60
 msgid ""
-"Allows you to change the resolution of the Goom display (bigger resolution "
+"This allows you to set the resolution of the Goom display (bigger resolution "
 "will be prettier but more CPU intensive)."
 msgstr ""
 
@@ -13896,8 +16284,10 @@ msgid "Goom animation speed"
 msgstr "Goom動畫速度"
 
 #: modules/visualization/goom.c:64
-msgid "Allows you to reduce the speed of the animation (default 6, max 10)."
-msgstr ""
+#, fuzzy
+msgid ""
+"This allows you to set the animation speed (between 1 and 10, defaults to 6)."
+msgstr "設定影像的色調，介於0和360之間，預設值為0"
 
 #: modules/visualization/goom.c:70
 #, fuzzy
@@ -13915,7 +16305,7 @@ msgstr "效果清單"
 #: modules/visualization/visual/visual.c:40
 msgid ""
 "A list of visual effect, separated by commas.\n"
-"Current effects include: dummy, scope, spectrum"
+"Current effects include: dummy, scope, spectrum."
 msgstr ""
 
 #: modules/visualization/visual/visual.c:45
@@ -13935,115 +16325,121 @@ msgid "Number of bands used by spectrum analyzer, should be 20 or 80."
 msgstr "用於頻譜分析器的頻帶數量，應為20或80"
 
 #: modules/visualization/visual/visual.c:55
+#, fuzzy
+msgid "Number of bands used by the spectrometer, from 20 to 80."
+msgstr "用於頻譜分析器的頻帶數量，應為20或80"
+
+#: modules/visualization/visual/visual.c:57
 msgid "Band separator"
 msgstr "頻帶分離器"
 
-#: modules/visualization/visual/visual.c:57
+#: modules/visualization/visual/visual.c:59
 msgid "Number of blank pixels between bands."
 msgstr "頻帶間的空白像素數量"
 
-#: modules/visualization/visual/visual.c:59
+#: modules/visualization/visual/visual.c:61
 msgid "Amplification"
 msgstr ""
 
-#: modules/visualization/visual/visual.c:61
+#: modules/visualization/visual/visual.c:63
 msgid "This is a coefficient that modifies the height of the bands."
 msgstr ""
 
-#: modules/visualization/visual/visual.c:63
+#: modules/visualization/visual/visual.c:65
 msgid "Enable peaks"
 msgstr "開啟峰值"
 
-#: modules/visualization/visual/visual.c:65
-msgid "Defines whether to draw peaks."
-msgstr ""
-
 #: modules/visualization/visual/visual.c:67
-msgid "Enable original graphic spectrum"
+msgid "Draw \"peaks\" in the spectrum analyzer."
 msgstr ""
 
 #: modules/visualization/visual/visual.c:69
-msgid "Defines whether to draw the original spectrum graphic routine."
+msgid "Enable original graphic spectrum"
 msgstr ""
 
 #: modules/visualization/visual/visual.c:71
+msgid "Enable the \"flat\" spectrum analyzer in the spectrometer."
+msgstr ""
+
+#: modules/visualization/visual/visual.c:73
 #, fuzzy
 msgid "Enable bands"
 msgstr "啟動音訊"
 
-#: modules/visualization/visual/visual.c:73
-msgid "Defines whether to draw the bands."
+#: modules/visualization/visual/visual.c:75
+msgid "Draw bands in the spectrometer."
 msgstr ""
 
-#: modules/visualization/visual/visual.c:75
+#: modules/visualization/visual/visual.c:77
 #, fuzzy
 msgid "Enable base"
 msgstr "開啟峰值"
 
-#: modules/visualization/visual/visual.c:77
+#: modules/visualization/visual/visual.c:79
 msgid "Defines whether to draw the base of the bands."
 msgstr ""
 
-#: modules/visualization/visual/visual.c:79
+#: modules/visualization/visual/visual.c:81
 msgid "Base pixel radius"
 msgstr ""
 
-#: modules/visualization/visual/visual.c:81
+#: modules/visualization/visual/visual.c:83
 msgid "Defines radius size in pixels, of base of bands(beginning)."
 msgstr ""
 
-#: modules/visualization/visual/visual.c:83
+#: modules/visualization/visual/visual.c:85
 #, fuzzy
 msgid "Spectral sections"
 msgstr "選擇"
 
-#: modules/visualization/visual/visual.c:85
+#: modules/visualization/visual/visual.c:87
 msgid "Determines how many sections of spectrum will exist."
 msgstr ""
 
-#: modules/visualization/visual/visual.c:87
+#: modules/visualization/visual/visual.c:89
 #, fuzzy
 msgid "Peak height"
 msgstr "視訊高度"
 
-#: modules/visualization/visual/visual.c:89
-msgid "This is the total pixel height of the peak items."
-msgstr ""
-
 #: modules/visualization/visual/visual.c:91
+#, fuzzy
+msgid "Total pixel height of the peak items."
+msgstr "設定快照影像的高度"
+
+#: modules/visualization/visual/visual.c:93
 msgid "Peak extra width"
 msgstr ""
 
-#: modules/visualization/visual/visual.c:93
+#: modules/visualization/visual/visual.c:95
 msgid "Additions or subtractions of pixels on the peak width."
 msgstr ""
 
-#: modules/visualization/visual/visual.c:95
+#: modules/visualization/visual/visual.c:97
 msgid "V-plane color"
 msgstr ""
 
-#: modules/visualization/visual/visual.c:97
+#: modules/visualization/visual/visual.c:99
 msgid "YUV-Color cube shifting across the V-plane ( 0 - 127 )."
 msgstr ""
 
-#: modules/visualization/visual/visual.c:99
+#: modules/visualization/visual/visual.c:101
 msgid "Number of stars"
 msgstr ""
 
-#: modules/visualization/visual/visual.c:101
-msgid "Defines the number of stars to draw with random effect."
+#: modules/visualization/visual/visual.c:103
+msgid "Number of stars to draw with random effect."
 msgstr ""
 
-#: modules/visualization/visual/visual.c:107
+#: modules/visualization/visual/visual.c:109
 #, fuzzy
 msgid "Visualizer"
 msgstr "視覺化過濾器"
 
-#: modules/visualization/visual/visual.c:110
+#: modules/visualization/visual/visual.c:112
 msgid "Visualizer filter"
 msgstr "視覺化過濾器"
 
-#: modules/visualization/visual/visual.c:118
+#: modules/visualization/visual/visual.c:120
 msgid "Spectrum analyser"
 msgstr "頻譜分析器"
 
@@ -14052,7 +16448,7 @@ msgid "Flip vertical position"
 msgstr ""
 
 #: modules/visualization/xosd.c:64
-msgid "Display xosd output on the bottom of the screen instead of the top"
+msgid "Display XOSD output at the bottom of the screen instead of the top."
 msgstr ""
 
 #: modules/visualization/xosd.c:67
@@ -14060,25 +16456,455 @@ msgid "Vertical offset"
 msgstr "垂直補償"
 
 #: modules/visualization/xosd.c:68
-msgid "Vertical offset in pixels of the displayed text"
-msgstr "顯示文字的垂直補償像素"
+msgid ""
+"Vertical offset between the border of the screen and the displayed text (in "
+"pixels, defaults to 30 pixels)."
+msgstr ""
 
-#: modules/visualization/xosd.c:70
+#: modules/visualization/xosd.c:72
 msgid "Shadow offset"
 msgstr "陰影補償"
 
-#: modules/visualization/xosd.c:71
-msgid "Offset in pixels of the shadow"
-msgstr "陰影的補償像素"
+#: modules/visualization/xosd.c:73
+msgid ""
+"Offset between the text and the shadow (in pixels, defaults to 2 pixels)."
+msgstr ""
+
+#: modules/visualization/xosd.c:77
+msgid "Font used to display text in the XOSD output."
+msgstr ""
 
-#: modules/visualization/xosd.c:74
-msgid "Font used to display text in the xosd output"
+#: modules/visualization/xosd.c:79
+msgid "Color used to display text in the XOSD output."
 msgstr ""
 
-#: modules/visualization/xosd.c:82
+#: modules/visualization/xosd.c:84
 msgid "XOSD interface"
 msgstr "XOSD介面"
 
+#~ msgid "Adjust Image"
+#~ msgstr "調整影像"
+
+#~ msgid "In this page, you will select how your input stream will be sent."
+#~ msgstr "在這一頁，你可以選擇你的輸入串流的傳送方式"
+
+#, fuzzy
+#~ msgid ""
+#~ "In this page, you will define a few additionnal parameters for your "
+#~ "transcoding"
+#~ msgstr "在這一頁，你可以選擇你的輸入串流的傳送方式"
+
+#~ msgid "delay"
+#~ msgstr "延遲"
+
+#~ msgid "More info"
+#~ msgstr "更多資訊"
+
+#~ msgid "Control interface settings"
+#~ msgstr "控制介面設定"
+
+#~ msgid "Text rendering"
+#~ msgstr "字體表現"
+
+#, fuzzy
+#~ msgid "This option allows you to always open a default stream on start-up."
+#~ msgstr "這個選項允許你定義播放清單書籤"
+
+#~ msgid "You can specify a custom video window title here."
+#~ msgstr "你可以在這裡指定視訊視窗的標題"
+
+#~ msgid ""
+#~ "If this option is enabled, VLC will always start a video in fullscreen "
+#~ "mode."
+#~ msgstr "如果該選項開啟，VLC會使用全螢幕模式開啟視訊"
+
+#~ msgid ""
+#~ "Allows you to specify the image format in which the video snapshots will "
+#~ "be stored."
+#~ msgstr "允許你指定視訊快照的影像格式"
+
+#, fuzzy
+#~ msgid "Program to select"
+#~ msgstr "程式"
+
+#, fuzzy
+#~ msgid "Programs to select"
+#~ msgstr "程式"
+
+#~ msgid "Input start time (seconds)"
+#~ msgstr "輸入起始時間(秒)"
+
+#~ msgid "Input stop time (seconds)"
+#~ msgstr "輸入停止時間(秒)"
+
+#~ msgid "Preferred codecs list"
+#~ msgstr "偏好的編碼器清單"
+
+#~ msgid "Select the key to turn off audio volume."
+#~ msgstr "選擇按鍵以關閉音訊音量"
+
+#, fuzzy
+#~ msgid "Interfaces"
+#~ msgstr "介面"
+
+#~ msgid "Standard filesystem file input"
+#~ msgstr "標準檔案系統檔案輸入"
+
+#, fuzzy
+#~ msgid "GnomeVFS filesystem file input"
+#~ msgstr "標準檔案系統檔案輸入"
+
+#~ msgid "Output channels number"
+#~ msgstr "輸出頻道數量"
+
+#, fuzzy
+#~ msgid "Timeout of subpictures"
+#~ msgstr "字幕"
+
+#~ msgid "Allows you to specify the output video width."
+#~ msgstr "允許你指定輸出視訊寬度"
+
+#~ msgid "Allows you to specify the output video height."
+#~ msgstr "允許你指定輸出視訊高度"
+
+#, fuzzy
+#~ msgid "Telnet Interface host"
+#~ msgstr "一般介面設定"
+
+#, fuzzy
+#~ msgid "You have to select two bookmarks."
+#~ msgstr "你必須選擇兩個書籤"
+
+#, fuzzy
+#~ msgid "Go To Position"
+#~ msgstr "Logo位置"
+
+#, fuzzy
+#~ msgid "Go to specific position"
+#~ msgstr "Logo位置"
+
+#~ msgid "Fill fullscreen"
+#~ msgstr "放大到全螢幕"
+
+#~ msgid "Advanced output:"
+#~ msgstr "進階輸出:"
+
+#~ msgid "Output Options"
+#~ msgstr "輸出選項"
+
+#~ msgid "Transcode options"
+#~ msgstr "轉碼選項"
+
+#, fuzzy
+#~ msgid "You you need to select a file, you want to save to."
+#~ msgstr "你必須選擇檔案以另存"
+
+#~ msgid "Last skin used"
+#~ msgstr "上一個使用的面板"
+
+#~ msgid "Select the path to the last skin used."
+#~ msgstr "選擇上一個使用的面板的路徑"
+
+#~ msgid "Config of last used skin."
+#~ msgstr "組態上一次使用的面板"
+
+#~ msgid "Output methods"
+#~ msgstr "輸出方式"
+
+#~ msgid "Miscellaneous options"
+#~ msgstr "雜項選項"
+
+#~ msgid "Subtitles options"
+#~ msgstr "字幕選項"
+
+#, fuzzy
+#~ msgid "VLC media player - Updates"
+#~ msgstr "VLC多媒體播放程式"
+
+#, fuzzy
+#~ msgid "VLM configuration"
+#~ msgstr "VLM設定檔"
+
+#~ msgid "Show bookmarks dialog when the interface starts."
+#~ msgstr "介面啟動時顯示書籤對話框"
+
+#~ msgid "Font filename"
+#~ msgstr "字型檔案名稱"
+
+#~ msgid "The size of the fonts used by the osd module"
+#~ msgstr "OSD模組所使用的字型大小"
+
+#~ msgid ""
+#~ "Allows you to specify the output access method used for the streaming "
+#~ "output."
+#~ msgstr "允許你指定串流輸出的輸出存取方法"
+
+#~ msgid "Allows you to specify the muxer used for the streaming output."
+#~ msgstr "允許你指定串流輸出的多工器"
+
+#~ msgid "Allows you to specify the muxer used for the audio streaming output."
+#~ msgstr "允許你指定音訊串流輸出的多工器"
+
+#~ msgid "Allows you to specify the muxer used for the video streaming output."
+#~ msgstr "允許你指定視訊串流輸出的多工器"
+
+#~ msgid "Allows you to specify the output URL used for the streaming output."
+#~ msgstr "允許你指定串流輸出的URL"
+
+#~ msgid ""
+#~ "Allows you to specify the output URL used for the audio streaming output."
+#~ msgstr "允許你指定音訊串流輸出的URL"
+
+#~ msgid ""
+#~ "Allows you to specify the output URL used for the video streaming output."
+#~ msgstr "允許你指定視訊串流輸出的URL"
+
+#~ msgid ""
+#~ "Allows you to specify the output muxer method used for the streaming "
+#~ "output."
+#~ msgstr "允許你指定串流輸出的輸出多工器"
+
+#, fuzzy
+#~ msgid "Output URL (deprecated)"
+#~ msgstr "輸出裝置"
+
+#, fuzzy
+#~ msgid ""
+#~ "Allows you to specify the output destination used for the streaming "
+#~ "output."
+#~ msgstr "允許你指定串流輸出的URL"
+
+#~ msgid ""
+#~ "Allows you to specify the video bitrate used for the streaming output."
+#~ msgstr "允許你指定串流輸出的視訊位元率"
+
+#, fuzzy
+#~ msgid "Allows you to specify a maximum output video width."
+#~ msgstr "允許你指定輸出視訊寬度"
+
+#, fuzzy
+#~ msgid "Allows you to specify a maximum output video height."
+#~ msgstr "允許你指定輸出視訊高度"
+
+#, fuzzy
+#~ msgid ""
+#~ "Allows you to specify video filters used after the video transcoding and "
+#~ "subpictures overlaying."
+#~ msgstr "允許你指定視訊串流輸出的多工器"
+
+#~ msgid "Allows you to specify the top coordinate for the video cropping."
+#~ msgstr "允許你指定視訊修整的上方座標"
+
+#~ msgid "Allows you to specify the left coordinate for the video cropping."
+#~ msgstr "允許你指定視訊修整的左方座標"
+
+#~ msgid "Allows you to specify the bottom coordinate for the video cropping."
+#~ msgstr "允許你指定視訊修整的下方座標"
+
+#~ msgid "Allows you to specify the right coordinate for the video cropping."
+#~ msgstr "允許你指定視訊修整的右方座標"
+
+#~ msgid ""
+#~ "Allows you to specify the audio bitrate used for the streaming output."
+#~ msgstr "允許你指定串流輸出的音訊位元率"
+
+#~ msgid ""
+#~ "Allows you to specify the audio sample rate used for the streaming output."
+#~ msgstr "允許你指定串流輸出的音訊採樣率"
+
+#~ msgid ""
+#~ "Allows you to specify the number of audio channels used for the streaming "
+#~ "output."
+#~ msgstr "允許你指定串流輸出的音訊頻道數量"
+
+#~ msgid ""
+#~ "Allows you to specify the destination subtitles codec used for the "
+#~ "streaming output."
+#~ msgstr "允許你指定串流輸出的目的字幕編碼器"
+
+#~ msgid "List of video output modules"
+#~ msgstr "視訊輸出模組清單"
+
+#, fuzzy
+#~ msgid "Top left corner y coordinate"
+#~ msgstr "視訊y座標"
+
+#, fuzzy
+#~ msgid "OSD menu configuration file"
+#~ msgstr "VLM設定檔"
+
+#, fuzzy
+#~ msgid "On Screen Display menu subfilter"
+#~ msgstr "畫面上顯示(OSD)"
+
+#~ msgid "Select effect"
+#~ msgstr "選擇效果"
+
+#~ msgid "Allows you to select different visual effects."
+#~ msgstr "允許你選擇不同的視覺效果"
+
+#~ msgid "Vertical offset in pixels of the displayed text"
+#~ msgstr "顯示文字的垂直補償像素"
+
+#~ msgid "Offset in pixels of the shadow"
+#~ msgstr "陰影的補償像素"
+
+#, fuzzy
+#~ msgid "Small playlist"
+#~ msgstr "儲存播放清單"
+
+#, fuzzy
+#~ msgid "VC-1 decoder module"
+#~ msgstr "Tarkin解碼器模組"
+
+#, fuzzy
+#~ msgid "Allows you to set the desired frame rate."
+#~ msgstr "允許你指定串流輸出的多工器"
+
+#~ msgid "MPEG-I/II audio demuxer"
+#~ msgstr "MPEG-I/II音訊解多工器"
+
+#~ msgid "Ogg stream demuxer"
+#~ msgstr "Ogg串流解多工器"
+
+#, fuzzy
+#~ msgid "Podcast playlist import"
+#~ msgstr "PLS播放清單匯入"
+
+#~ msgid "Text subtitles demux"
+#~ msgstr "文字字幕解多工"
+
+#~ msgid "ID3 tag parser using libid3tag"
+#~ msgstr "ID3標籤解析器(使用libid3tag)"
+
+#~ msgid "Enable CABAC"
+#~ msgstr "啟用CABAC"
+
+#~ msgid "Enable loop filter"
+#~ msgstr "開啟迴圈過濾器"
+
+#~ msgid "Analyse mode"
+#~ msgstr "分析模式"
+
+#~ msgid "Save As..."
+#~ msgstr "另存新擋..."
+
+#~ msgid "Item Info"
+#~ msgstr "項目資訊"
+
+#, fuzzy
+#~ msgid "URL : "
+#~ msgstr "網址"
+
+#, fuzzy
+#~ msgid "file size : "
+#~ msgstr "視訊大小"
+
+#, fuzzy
+#~ msgid "Choose a mirror"
+#~ msgstr "選擇目錄"
+
+#~ msgid "Time To Live"
+#~ msgstr "有效時間"
+
+#~ msgid "Force options for separate subtitle files."
+#~ msgstr "強制分離字幕檔選項"
+
+#~ msgid " "
+#~ msgstr " "
+
+#~ msgid "CoreAudio output"
+#~ msgstr "CoreAudio輸出"
+
+#, 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 "快照"
+
+#, fuzzy
+#~ msgid "Windows GAPI"
+#~ msgstr "視窗"
+
+#, fuzzy
+#~ msgid "Windows GDI"
+#~ msgstr "視窗"
+
+#, fuzzy
+#~ msgid "Open MRL"
+#~ msgstr "開啟"
+
+#~ msgid "Audio output volume"
+#~ msgstr "輸出音量"
+
+#~ msgid "Network interface address"
+#~ msgstr "網路介面位置"
+
+#~ msgid "Choose program (SID)"
+#~ msgstr "選擇程式(SID)"
+
+#~ msgid "Choose programs"
+#~ msgstr "選擇程式"
+
+#, fuzzy
+#~ msgid "Choose audio track"
+#~ msgstr "循環音軌"
+
+#~ msgid "Choose subtitles track"
+#~ msgstr "選擇字幕軌"
+
+#~ msgid "live.com (RTSP/RTP/SDP) demuxer"
+#~ msgstr "live.com (RTSP/RTP/SDP)解多工器"
+
+#, fuzzy
+#~ msgid "Current version"
+#~ msgstr "色彩反向"
+
+#, fuzzy
+#~ msgid "Your version"
+#~ msgstr "色彩反向"
+
+#, fuzzy
+#~ msgid "Mirror"
+#~ msgstr "錯誤"
+
+#, fuzzy
+#~ msgid "Streamming"
+#~ msgstr "串流"
+
 #~ msgid "Channel mixer"
 #~ msgstr "頻道混音器"
 
@@ -14102,9 +16928,6 @@ msgstr "XOSD介面"
 #~ msgid "SLP input"
 #~ msgstr "SLP輸入"
 
-#~ msgid "Motion threshold"
-#~ msgstr "動作閥值"
-
 #~ msgid "Joystick device"
 #~ msgstr "搖桿裝置"
 
@@ -14129,12 +16952,6 @@ msgstr "XOSD介面"
 #~ msgid "Show tooltips for configuration options."
 #~ msgstr "顯示組態選項的工具提示"
 
-#~ msgid "Show text on toolbar buttons"
-#~ msgstr "顯示工具列按鈕文字"
-
-#~ msgid "Show the text below icons on the toolbar."
-#~ msgstr "在工具列圖示的下方顯示文字"
-
 #~ msgid "Interface default search path"
 #~ msgstr "介面預設搜尋路徑"
 
@@ -14177,12 +16994,6 @@ msgstr "XOSD介面"
 #~ msgid "Stop stream"
 #~ msgstr "停止串流"
 
-#~ msgid "Eject"
-#~ msgstr "跳出"
-
-#~ msgid "Play stream"
-#~ msgstr "播放串流"
-
 #~ msgid "Pause stream"
 #~ msgstr "暫停串流"
 
@@ -14207,12 +17018,6 @@ msgstr "XOSD介面"
 #~ msgid "Select previous chapter"
 #~ msgstr "選擇上一個章節"
 
-#~ msgid "Select next chapter"
-#~ msgstr "選擇下一個章節"
-
-#~ msgid "No server"
-#~ msgstr "沒有伺服器"
-
 #~ msgid "Switch program"
 #~ msgstr "切換程式"
 
@@ -14222,15 +17027,9 @@ msgstr "XOSD介面"
 #~ msgid "Open Stream"
 #~ msgstr "開啟串流"
 
-#~ msgid "Open Target:"
-#~ msgstr "開啟目標:"
-
 #~ msgid "Vertical"
 #~ msgstr "垂直"
 
-#~ msgid "Horizontal"
-#~ msgstr "水平"
-
 #~ msgid "stream output"
 #~ msgstr "串流輸出"
 
@@ -14240,9 +17039,6 @@ msgstr "XOSD介面"
 #~ msgid "Item"
 #~ msgstr "項目"
 
-#~ msgid "Jump to: "
-#~ msgstr "跳至: "
-
 #~ msgid "stream output (MRL)"
 #~ msgstr "串流輸出(MRL)"
 
@@ -14261,9 +17057,6 @@ msgstr "XOSD介面"
 #~ msgid "About this application"
 #~ msgstr "關於這個應用程式"
 
-#~ msgid "Stop Stream"
-#~ msgstr "停止串流"
-
 #~ msgid "Play Stream"
 #~ msgstr "播放串流"
 
@@ -14291,9 +17084,6 @@ msgstr "XOSD介面"
 #~ msgid "Open Target"
 #~ msgstr "開啟目標"
 
-#~ msgid "Use a subtitles file"
-#~ msgstr "使用字幕檔"
-
 #~ msgid "Select a subtitles file"
 #~ msgstr "選擇一個字幕檔"
 
@@ -14390,9 +17180,6 @@ msgstr "XOSD介面"
 #~ msgid "Opens a network stream"
 #~ msgstr "開啟網路串流"
 
-#~ msgid "Stops playback"
-#~ msgstr "停止重播"
-
 #~ msgid "Starts playback"
 #~ msgstr "開始重播"
 
@@ -14477,9 +17264,6 @@ msgstr "XOSD介面"
 #~ msgid "Time to live"
 #~ msgstr "有效時間"
 
-#~ msgid "bad item type"
-#~ msgstr "錯誤的項目類型"
-
 #, fuzzy
 #~ msgid "Showintf"
 #~ msgstr "顯示介面"
@@ -14538,14 +17322,8 @@ msgstr "XOSD介面"
 #~ msgid "Select file or directory"
 #~ msgstr "選擇檔案或目錄"
 
-#~ msgid "Loop"
-#~ msgstr "循環"
-
 #~ msgid "Repeat"
 #~ msgstr "重複"
 
 #~ msgid "SAP interface"
 #~ msgstr "SAP介面"
-
-#~ msgid "Image"
-#~ msgstr "影像"