X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=po%2Fja.po;h=c705be26ce688ba7531eb5c3c582fd1cd2359a65;hb=940d271a5dc429b4685057ca8c9610f46fef59fd;hp=13fe2700f348fe2ddaf633380d2febb718ec2369;hpb=e8279dbaed5d4ff9c2241dba701f13e671f8b252;p=vlc

diff --git a/po/ja.po b/po/ja.po
index 13fe2700f3..c705be26ce 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ja\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-12 14:02+0900\n"
+"POT-Creation-Date: 2006-07-10 23:27+0200\n"
 "PO-Revision-Date: 2005-12-12 14:01+0900\n"
 "Last-Translator: Tadashi Jokagi <elf2000@users.sourceforge.net>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -36,219 +36,232 @@ msgid "VLC preferences"
 msgstr "VLC 設定"
 
 #: 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 include/vlc_config_cat.h:122
-#: src/input/input.c:1864 src/input/input.c:1924 src/playlist/item.c:366
-#: src/playlist/playlist.c:163 modules/gui/wince/playlist.cpp:674
+#: include/vlc_config_cat.h:36 include/vlc_config_cat.h:131
+#: src/input/input.c:1842 src/playlist/item.c:546
+#: modules/gui/macosx/playlistinfo.m:62 modules/gui/wince/playlist.cpp:674
+#: modules/gui/wxwidgets/dialogs/fileinfo.cpp:82
 #: modules/visualization/visual/visual.c:113
 msgid "General"
 msgstr "一般"
 
-#: include/vlc_config_cat.h:39 src/libvlc.h:1358 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"
+#, fuzzy
+msgid "General interface settings"
 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:78
 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:992
-#: modules/gui/beos/InterfaceWindow.cpp:280 modules/gui/macosx/extended.m:81
-#: modules/gui/macosx/intf.m:507 modules/gui/macosx/output.m:170
-#: modules/gui/macosx/wizard.m:404
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:855
-#: modules/gui/wxwidgets/extrapanel.cpp:180 modules/stream_out/transcode.c:214
+#: include/vlc_config_cat.h:54 src/input/es_out.c:1585 src/libvlc.h:1191
+#: modules/gui/beos/InterfaceWindow.cpp:282 modules/gui/macosx/extended.m:81
+#: modules/gui/macosx/intf.m:554 modules/gui/macosx/output.m:170
+#: modules/gui/macosx/playlistinfo.m:96 modules/gui/macosx/wizard.m:421
+#: modules/gui/wxwidgets/dialogs/infopanels.cpp:336
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:864
+#: modules/gui/wxwidgets/extrapanel.cpp:178 modules/stream_out/transcode.c:249
 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
+#: include/vlc_config_cat.h:60 include/vlc_config_cat.h:85
 #: src/video_output/video_output.c:398
 msgid "Filters"
 msgstr "フィルター"
 
-#: include/vlc_config_cat.h:59
-msgid "Audio filters are used to postprocess the audio stream"
+#: include/vlc_config_cat.h:62
+msgid "Audio filters are used to postprocess the audio stream."
 msgstr ""
 
-#: include/vlc_config_cat.h:61 src/audio_output/input.c:78
-#: modules/gui/macosx/intf.m:517 modules/gui/macosx/intf.m:518
+#: include/vlc_config_cat.h:64 src/audio_output/input.c:78
+#: modules/gui/macosx/intf.m:564 modules/gui/macosx/intf.m:565
 msgid "Visualizations"
 msgstr "ビジュアル化"
 
-#: include/vlc_config_cat.h:63 src/audio_output/input.c:152
+#: 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:1289 src/libvlc.h:1327
-#: src/libvlc.h:1369 modules/gui/wxwidgets/menus.cpp:311
-#: modules/stream_out/transcode.c:243
+#: include/vlc_config_cat.h:71 src/libvlc.h:1524
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:578
+#: modules/gui/wxwidgets/menus.cpp:279 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:1027
-#: modules/gui/macosx/extended.m:80 modules/gui/macosx/intf.m:520
-#: modules/gui/macosx/output.m:160 modules/gui/macosx/wizard.m:405
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:816
-#: modules/gui/wxwidgets/extrapanel.cpp:178 modules/misc/dummy/dummy.c:97
-#: modules/stream_out/transcode.c:174
+#: include/vlc_config_cat.h:75 src/input/es_out.c:1613 src/libvlc.h:1226
+#: modules/gui/macosx/extended.m:80 modules/gui/macosx/intf.m:567
+#: modules/gui/macosx/output.m:160 modules/gui/macosx/playlistinfo.m:86
+#: modules/gui/macosx/wizard.m:422
+#: modules/gui/wxwidgets/dialogs/infopanels.cpp:290
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:825
+#: modules/gui/wxwidgets/extrapanel.cpp:176 modules/misc/dummy/dummy.c:95
+#: modules/stream_out/transcode.c:193
 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
 #, fuzzy
 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"
+#: include/vlc_config_cat.h:87 include/vlc_config_cat.h:91
+msgid "Video filters are used to postprocess the video stream."
 msgstr ""
 
-#: include/vlc_config_cat.h:86
+#: include/vlc_config_cat.h:89
+#, fuzzy
+msgid "Filters (v2)"
+msgstr "フィルター"
+
+#: include/vlc_config_cat.h:93
 #, fuzzy
 msgid "Subtitles/OSD"
 msgstr "字幕"
 
-#: include/vlc_config_cat.h:87
-msgid ""
-"Miscellaneous settings related to On Screen Display, subtitles and overlay "
-"subpictures"
-msgstr ""
-
-#: include/vlc_config_cat.h:89
-msgid "Text rendering"
-msgstr "テキストレンダリング"
-
-#: include/vlc_config_cat.h:91
+#: include/vlc_config_cat.h:94
 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:103
 msgid "Input / Codecs"
 msgstr "入力 / コーデック"
 
-#: include/vlc_config_cat.h:96
+#: include/vlc_config_cat.h:104
 msgid ""
 "These are the settings for the input, demultiplexing and decoding parts of "
-"VLC. Encoder settings can also be found here"
+"VLC. Encoder settings can also be found here."
 msgstr ""
 
-#: include/vlc_config_cat.h:98
+#: include/vlc_config_cat.h:107
 msgid "Access modules"
 msgstr "アクセスモジュール"
 
-#: include/vlc_config_cat.h:100
+#: include/vlc_config_cat.h:109
 msgid ""
 "Settings related to the various access methods used by VLC. Common settings "
 "you may want to alter are HTTP proxy or caching settings."
 msgstr ""
 
-#: include/vlc_config_cat.h:104
+#: include/vlc_config_cat.h:113
 msgid "Access filters"
 msgstr "アクセスフィルター"
 
-#: include/vlc_config_cat.h:106
+#: include/vlc_config_cat.h:115
 msgid ""
 "Access filters are special modules that allow advanced operations on the "
 "input side of VLC. You should not touch anything here unless you know what "
-"you are doing.\n"
+"you are doing."
 msgstr ""
 
-#: include/vlc_config_cat.h:110
+#: include/vlc_config_cat.h:119
 #, fuzzy
 msgid "Demuxers"
 msgstr "demuxモジュール"
 
-#: include/vlc_config_cat.h:111
-msgid "Demuxers are used to separate audio and video streams"
+#: include/vlc_config_cat.h:120
+msgid "Demuxers are used to separate audio and video streams."
 msgstr ""
 
-#: include/vlc_config_cat.h:113
+#: include/vlc_config_cat.h:122
 #, fuzzy
 msgid "Video codecs"
 msgstr "ビデオコーデック"
 
-#: include/vlc_config_cat.h:114
-msgid "Settings for the video-only decoders and encoders"
+#: include/vlc_config_cat.h:123
+msgid "Settings for the video-only decoders and encoders."
 msgstr ""
 
-#: include/vlc_config_cat.h:116
+#: include/vlc_config_cat.h:125
 #, fuzzy
 msgid "Audio codecs"
 msgstr "オーディオコーデック"
 
-#: include/vlc_config_cat.h:117
-msgid "Settings for the audio-only decoders and encoders"
+#: include/vlc_config_cat.h:126
+msgid "Settings for the audio-only decoders and encoders."
 msgstr ""
 
-#: include/vlc_config_cat.h:119
+#: include/vlc_config_cat.h:128
 #, fuzzy
 msgid "Other codecs"
 msgstr "ステレオ"
 
-#: include/vlc_config_cat.h:120
-msgid "Settings for audio+video and miscellaneous decoders and encoders"
+#: include/vlc_config_cat.h:129
+msgid "Settings for audio+video and miscellaneous decoders and encoders."
 msgstr ""
 
-#: include/vlc_config_cat.h:123
+#: include/vlc_config_cat.h:132
 #, fuzzy
 msgid "General input settings. Use with care."
 msgstr "ALSAオーディオ・モジュール"
 
-#: include/vlc_config_cat.h:126 src/libvlc.h:1235
-#: modules/gui/wxwidgets/dialogs/open.cpp:448
+#: include/vlc_config_cat.h:135 src/libvlc.h:1454
 #: modules/gui/wxwidgets/dialogs/streamout.cpp:152
 msgid "Stream output"
 msgstr "ストリーム出力"
 
-#: include/vlc_config_cat.h:128
+#: include/vlc_config_cat.h:137
 msgid ""
 "Stream output is what allows VLC to act as a streaming server or to save "
 "incoming streams.\n"
@@ -256,45 +269,46 @@ 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:136
+#: include/vlc_config_cat.h:145
 #, fuzzy
 msgid "General stream output settings"
 msgstr "ストリームの出力先の選択"
 
-#: include/vlc_config_cat.h:138
+#: include/vlc_config_cat.h:147
 #, fuzzy
 msgid "Muxers"
 msgstr "ミュートする"
 
-#: include/vlc_config_cat.h:139
+#: include/vlc_config_cat.h:149
 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:144
+#: include/vlc_config_cat.h:155
 #, fuzzy
 msgid "Access output"
 msgstr "オーディオ出力モジュールアクセス"
 
-#: include/vlc_config_cat.h:145
+#: include/vlc_config_cat.h:157
 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:150
+#: include/vlc_config_cat.h:162
 #, fuzzy
 msgid "Packetizers"
 msgstr "準備されているパケッタライザー一覧の選択"
 
-#: include/vlc_config_cat.h:151
+#: include/vlc_config_cat.h:164
 msgid ""
 "Packetizers are used to \"preprocess\" the elementary streams before muxing. "
 "This setting allows you to always force a packetizer. You should probably "
@@ -302,336 +316,267 @@ msgid ""
 "You can also set default parameters for each packetizer."
 msgstr ""
 
-#: include/vlc_config_cat.h:157
+#: include/vlc_config_cat.h:170
 #, fuzzy
 msgid "Sout stream"
 msgstr "ストリームの停止"
 
-#: include/vlc_config_cat.h:158
+#: include/vlc_config_cat.h:171
 msgid ""
 "Sout stream modules allow to build a sout processing chain. Please refer to "
 "the Streaming Howto for more information. You can configure default options "
 "for each sout stream module here."
 msgstr ""
 
-#: include/vlc_config_cat.h:163 modules/services_discovery/sap.c:121
+#: include/vlc_config_cat.h:176 modules/services_discovery/sap.c:123
 #, fuzzy
 msgid "SAP"
 msgstr "SDP"
 
-#: include/vlc_config_cat.h:164
+#: include/vlc_config_cat.h:178
 msgid ""
 "SAP is a way to publically announce streams that are being sent using "
 "multicast UDP or RTP."
 msgstr ""
 
-#: include/vlc_config_cat.h:167
-#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:66
+#: include/vlc_config_cat.h:181
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:67
 msgid "VOD"
 msgstr "VOD"
 
-#: include/vlc_config_cat.h:168
+#: include/vlc_config_cat.h:182
 msgid "VLC's implementation of Video On Demand"
 msgstr ""
 
-#: include/vlc_config_cat.h:172 src/libvlc.h:1339
-#: 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:452
-#: modules/gui/macosx/intf.m:546 modules/gui/pda/pda_interface.c:1264
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:195
-#: modules/gui/wxwidgets/interface.cpp:663
+#: include/vlc_config_cat.h:186 src/libvlc.h:1579 src/playlist/engine.c:79
+#: src/playlist/engine.c:81 modules/demux/playlist/playlist.c:56
+#: modules/demux/playlist/playlist.c:57
+#: modules/gui/beos/InterfaceWindow.cpp:231
+#: modules/gui/beos/InterfaceWindow.cpp:324 modules/gui/macosx/intf.m:499
+#: modules/gui/macosx/intf.m:597 modules/gui/pda/pda_interface.c:1264
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:208
+#: modules/gui/wxwidgets/interface.cpp:679
+#: modules/gui/wxwidgets/interface.cpp:690
 msgid "Playlist"
 msgstr "再生一覧"
 
-#: include/vlc_config_cat.h:173
+#: include/vlc_config_cat.h:187
 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:175
+#: include/vlc_config_cat.h:191
 #, fuzzy
 msgid "General playlist behaviour"
 msgstr "再生一覧を開く"
 
-#: include/vlc_config_cat.h:176 modules/gui/macosx/playlist.m:508
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:233
+#: include/vlc_config_cat.h:192 modules/gui/macosx/playlist.m:445
 #, fuzzy
 msgid "Services discovery"
 msgstr "ソースディレクトリ"
 
-#: include/vlc_config_cat.h:177
+#: include/vlc_config_cat.h:193
 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:180 src/libvlc.h:1199
+#: include/vlc_config_cat.h:197 src/libvlc.h:1415
 #: modules/gui/macosx/prefs.m:124
 msgid "Advanced"
 msgstr ""
 
-#: include/vlc_config_cat.h:181
+#: include/vlc_config_cat.h:198
 #, fuzzy
 msgid "Advanced settings. Use with care."
 msgstr "ALSAオーディオ・モジュール"
 
-#: include/vlc_config_cat.h:183
+#: include/vlc_config_cat.h:200
 msgid "CPU features"
 msgstr ""
 
-#: include/vlc_config_cat.h:184
+#: include/vlc_config_cat.h:201
 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:186 modules/demux/util/id3genres.h:40
-msgid "Other"
-msgstr "その他"
+#: include/vlc_config_cat.h:204
+#, fuzzy
+msgid "Advanced settings"
+msgstr "高度なオプション..."
 
-#: include/vlc_config_cat.h:187
+#: include/vlc_config_cat.h:205
 #, fuzzy
 msgid "Other advanced settings"
 msgstr "ALSAオーディオ・モジュール"
 
-#: include/vlc_config_cat.h:189 modules/gui/macosx/open.m:162
+#: include/vlc_config_cat.h:207 modules/gui/macosx/open.m:162
 #: modules/gui/macosx/open.m:379 modules/gui/pda/pda_interface.c:548
 #: modules/gui/wxwidgets/dialogs/open.cpp:506
 msgid "Network"
 msgstr "ネットワーク"
 
-#: include/vlc_config_cat.h:190
-msgid "These modules provide network functions to all other parts of VLC"
+#: include/vlc_config_cat.h:208
+msgid "These modules provide network functions to all other parts of VLC."
 msgstr ""
 
-#: include/vlc_config_cat.h:195
+#: include/vlc_config_cat.h:213
 msgid "Chroma modules settings"
 msgstr "クロマモジュール設定"
 
-#: include/vlc_config_cat.h:196
+#: include/vlc_config_cat.h:214
 msgid "These settings affect chroma transformation modules."
 msgstr ""
 
-#: include/vlc_config_cat.h:198
+#: include/vlc_config_cat.h:216
 #, fuzzy
 msgid "Packetizer modules settings"
 msgstr "デコードモジュール設定"
 
-#: include/vlc_config_cat.h:201
+#: include/vlc_config_cat.h:220
 #, fuzzy
 msgid "Encoders settings"
 msgstr "オーディオエンコーダー設定"
 
-#: include/vlc_config_cat.h:203
+#: include/vlc_config_cat.h:222
 msgid "These are general settings for video/audio/subtitles encoding modules."
 msgstr ""
 
-#: include/vlc_config_cat.h:207
+#: include/vlc_config_cat.h:225
 msgid "Dialog providers settings"
 msgstr "ダイアログ提供設定"
 
-#: include/vlc_config_cat.h:209
+#: include/vlc_config_cat.h:227
 msgid "Dialog providers can be configured here."
 msgstr ""
 
-#: include/vlc_config_cat.h:211
+#: include/vlc_config_cat.h:229
 #, fuzzy
 msgid "Subtitle demuxer settings"
 msgstr "設定"
 
-#: include/vlc_config_cat.h:213
+#: include/vlc_config_cat.h:231
 msgid ""
 "In this section you can force the behavior of the subtitle demuxer, for "
 "example by setting the subtitles type or file name."
 msgstr ""
 
-#: include/vlc_config_cat.h:216
+#: include/vlc_config_cat.h:234
 msgid "Video filters settings"
 msgstr "ビデオフィルター設定"
 
-#: include/vlc_config_cat.h:223
+#: include/vlc_config_cat.h:241
 msgid "No help available"
 msgstr "有効なヘルプがありません。"
 
-#: include/vlc_config_cat.h:224
+#: include/vlc_config_cat.h:242
 #, fuzzy
-msgid "No help is available for these modules"
+msgid "There is no help available for these modules."
 msgstr "有効なモジュールのリストを印刷"
 
 #: include/vlc_interface.h:137
 #, fuzzy
 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 ""
 "\n"
 "警告：もし、GUIがアクセスできないなら、DOSのコマンド・プロンプトを開いて、VLC"
 "がインストールされているディレクトリに移動し、\"vlc -I win32\"を実行してくだ"
 "さい。\n"
 
-#: include/vlc_meta.h:28 src/input/var.c:136 modules/demux/mpc.c:53
-#: modules/gui/beos/MediaControlView.cpp:1233 modules/gui/macosx/intf.m:502
-#: modules/gui/macosx/intf.m:503 modules/gui/macosx/open.m:168
-#: modules/gui/macosx/playlistinfo.m:55 modules/gui/macosx/wizard.m:374
-#: modules/gui/wxwidgets/dialogs/open.cpp:735
-#: modules/gui/wxwidgets/dialogs/open.cpp:1598 modules/mux/asf.c:48
+#: include/vlc_meta.h:28 modules/gui/macosx/playlist.m:1222
+msgid "Meta-information"
+msgstr "メタ情報"
+
+#: include/vlc_meta.h:29 src/input/var.c:136 modules/demux/mpc.c:55
+#: modules/gui/beos/MediaControlView.cpp:1233 modules/gui/macosx/intf.m:549
+#: modules/gui/macosx/intf.m:550 modules/gui/macosx/open.m:168
+#: modules/gui/macosx/playlistinfo.m:57 modules/gui/macosx/wizard.m:391
+#: modules/gui/wxwidgets/dialogs/open.cpp:760
+#: modules/gui/wxwidgets/dialogs/open.cpp:1661 modules/mux/asf.c:48
 msgid "Title"
 msgstr "タイトル"
 
-#: include/vlc_meta.h:29 src/input/input.c:1865
-#: modules/gui/macosx/playlist.m:133 modules/gui/macosx/playlistinfo.m:56
-#: modules/gui/macosx/wizard.m:376 modules/gui/wince/playlist.cpp:674
-#: modules/mux/asf.c:51
+#: include/vlc_meta.h:30 modules/gui/macosx/playlist.m:130
+#: 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/playlist.m:316
-#: modules/gui/macosx/playlist.m:1245 modules/gui/macosx/playlistinfo.m:118
-#: modules/gui/macosx/playlistinfo.m:152
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:496
-#: modules/gui/wxwidgets/playlist_manager.cpp:294
-#: modules/misc/playlist/m3u.c:68 modules/services_discovery/daap.c:608
+#: include/vlc_meta.h:31 modules/gui/macosx/playlist.m:1222
 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
+#: include/vlc_meta.h:34
+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/dialogs/open.cpp:849
+#: include/vlc_meta.h:40 modules/gui/macosx/open.m:181
+#: modules/gui/wxwidgets/dialogs/open.cpp:874
 msgid "URL"
 msgstr ""
 
-#: include/vlc_meta.h:38 src/input/es_out.c:1538 src/libvlc.h:81
-#: modules/gui/beos/InterfaceWindow.cpp:276
+#: include/vlc_meta.h:41 src/input/es_out.c:1577 src/libvlc.h:95
+#: modules/gui/beos/InterfaceWindow.cpp:278
 msgid "Language"
 msgstr "言語"
 
-#: include/vlc_meta.h:39
+#: include/vlc_meta.h:42 modules/misc/notify.c:179
 #, fuzzy
 msgid "Now Playing"
 msgstr "再生"
 
-#: include/vlc_meta.h:41
-msgid "CDDB Artist"
-msgstr "CDDB アーティスト"
-
-#: include/vlc_meta.h:42
-msgid "CDDB Category"
-msgstr "CDDB カテゴリ"
-
-#: include/vlc_meta.h:43
-msgid "CDDB Disc ID"
-msgstr "CDDB ディスク ID"
+#: include/vlc_meta.h:43 modules/access/vcdx/info.c:98
+msgid "Publisher"
+msgstr ""
 
 #: include/vlc_meta.h:44
-msgid "CDDB Extended Data"
-msgstr "CDDB 拡張データ"
-
-#: include/vlc_meta.h:45
-msgid "CDDB Genre"
-msgstr "CDDB ジャンル"
+msgid "Encoded by"
+msgstr ""
 
 #: include/vlc_meta.h:46
-#, fuzzy
-msgid "CDDB Year"
-msgstr "CDDB å¹´"
-
-#: include/vlc_meta.h:47
-msgid "CDDB Title"
-msgstr "CDDB タイトル"
-
-#: include/vlc_meta.h:49
-msgid "CD-Text Arranger"
-msgstr "CD テキストアレンジャー"
-
-#: include/vlc_meta.h:50
-msgid "CD-Text Composer"
-msgstr "CD テキストコンポーサー"
-
-#: include/vlc_meta.h:51
-msgid "CD-Text Disc ID"
-msgstr "CD テキストディスク ID"
-
-#: include/vlc_meta.h:52
-msgid "CD-Text Genre"
-msgstr "CD テキストジャンル"
-
-#: include/vlc_meta.h:53
-msgid "CD-Text Message"
-msgstr "CD テキストメッセージ"
-
-#: include/vlc_meta.h:54
-msgid "CD-Text Songwriter"
-msgstr "CD テキストソングライター"
-
-#: include/vlc_meta.h:55
-msgid "CD-Text Performer"
-msgstr "<CD テキストパフォーマー"
-
-#: include/vlc_meta.h:56
-msgid "CD-Text Title"
-msgstr "CD テキストタイトル"
-
-#: include/vlc_meta.h:58
-msgid "ISO-9660 Application ID"
-msgstr "ISO-9660 アプリケーション ID"
-
-#: include/vlc_meta.h:59
-msgid "ISO-9660 Preparer"
-msgstr "ISO-9660 準備"
-
-#: include/vlc_meta.h:60
-msgid "ISO-9660 Publisher"
-msgstr "ISO-9660 出版社"
-
-#: include/vlc_meta.h:61
-msgid "ISO-9660 Volume"
-msgstr "ISO-9660 ボリューム"
-
-#: include/vlc_meta.h:62
-#, fuzzy
-msgid "ISO-9660 Volume Set"
-msgstr "音量設定"
-
-#: include/vlc_meta.h:64
 msgid "Codec Name"
 msgstr "コーデック名デバイス名"
 
-#: include/vlc_meta.h:65
+#: include/vlc_meta.h:47
 msgid "Codec Description"
 msgstr "コーデック説明"
 
 #: src/audio_output/input.c:80 src/audio_output/input.c:126
-#: src/input/es_out.c:355 src/libvlc.h:337 src/video_output/video_output.c:374
+#: src/input/es_out.c:361 src/libvlc.h:399 src/video_output/video_output.c:374
 #: modules/codec/ffmpeg/postprocess.c:94
 msgid "Disable"
 msgstr "無効"
@@ -649,47 +594,47 @@ msgstr "スコープ"
 msgid "Spectrum"
 msgstr "スペクトラム"
 
-#: src/audio_output/input.c:123 modules/audio_filter/equalizer.c:66
-#: modules/gui/macosx/equalizer.m:140 modules/gui/macosx/equalizer.m:154
-#: modules/gui/macosx/intf.m:543 modules/gui/wxwidgets/extrapanel.cpp:179
+#: src/audio_output/input.c:123 modules/audio_filter/equalizer.c:71
+#: modules/gui/macosx/equalizer.m:140 modules/gui/macosx/equalizer.m:155
+#: modules/gui/macosx/intf.m:594 modules/gui/wxwidgets/extrapanel.cpp:177
 msgid "Equalizer"
 msgstr "イコライザー"
 
-#: src/audio_output/input.c:145 src/libvlc.h:173
-#: modules/gui/macosx/extended.m:82 modules/gui/wxwidgets/extrapanel.cpp:392
+#: src/audio_output/input.c:145 src/libvlc.h:203
+#: modules/gui/macosx/extended.m:82 modules/gui/wxwidgets/extrapanel.cpp:390
 msgid "Audio filters"
 msgstr "オーディオフィルター"
 
 #: src/audio_output/output.c:102 src/audio_output/output.c:129
-#: modules/access/vcdx/info.c:118 modules/gui/macosx/intf.m:513
-#: modules/gui/macosx/intf.m:514
+#: modules/access/vcdx/info.c:118 modules/gui/macosx/intf.m:560
+#: modules/gui/macosx/intf.m:561
 msgid "Audio Channels"
 msgstr "オーディオチャンネル"
 
 #: src/audio_output/output.c:105 src/audio_output/output.c:140
 #: modules/access/v4l/v4l.c:125 modules/audio_output/alsa.c:191
-#: modules/audio_output/alsa.c:222 modules/audio_output/directx.c:467
+#: 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/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:232 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:77 modules/video_filter/rss.c:144
-#: modules/video_filter/time.c:96
+#: src/libvlc.h:266 modules/codec/dvbsub.c:64 modules/codec/subsdec.c:129
+#: modules/control/gestures.c:86 modules/video_filter/logo.c:95
+#: modules/video_filter/marq.c:107 modules/video_filter/mosaic.c:172
+#: modules/video_filter/osdmenu.c:78 modules/video_filter/rss.c:160
+#: modules/video_filter/time.c:99
 msgid "Left"
 msgstr "å·¦"
 
 #: src/audio_output/output.c:109 src/audio_output/output.c:145
-#: src/libvlc.h:232 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:77 modules/video_filter/rss.c:144
-#: modules/video_filter/time.c:96
+#: src/libvlc.h:266 modules/codec/dvbsub.c:64 modules/codec/subsdec.c:129
+#: modules/control/gestures.c:86 modules/video_filter/logo.c:95
+#: modules/video_filter/marq.c:107 modules/video_filter/mosaic.c:172
+#: modules/video_filter/osdmenu.c:78 modules/video_filter/rss.c:160
+#: modules/video_filter/time.c:99
 msgid "Right"
 msgstr "右"
 
@@ -761,116 +706,85 @@ 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/info.c:980
+#: modules/access/cdda/info.c:1012
 #, 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:125 modules/gui/macosx/intf.m:500
-#: modules/gui/macosx/intf.m:501
+#: 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:425
+#: modules/gui/macosx/intf.m:547 modules/gui/macosx/intf.m:548
 msgid "Program"
 msgstr "プログラム"
 
-#: src/input/es_out.c:459 src/input/es_out.c:627 src/input/input.c:224
-#: src/input/input.c:1867 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/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
-#: modules/gui/macosx/playlist.m:316 modules/gui/macosx/playlist.m:1245
-#: modules/gui/macosx/playlistinfo.m:118 modules/gui/macosx/playlistinfo.m:152
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:495
-#: modules/gui/wxwidgets/input_manager.cpp:148
-#: modules/gui/wxwidgets/playlist_manager.cpp:294
-#: 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:1572
 #, c-format
 msgid "Stream %d"
 msgstr "ストリーム %d"
 
-#: src/input/es_out.c:1535 modules/gui/macosx/wizard.m:409
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:825
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:865
+#: src/input/es_out.c:1574 modules/gui/macosx/wizard.m:426
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:834
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:874
 msgid "Codec"
 msgstr "コーデック"
 
-#: src/input/es_out.c:1546 src/input/es_out.c:1568 src/input/es_out.c:1591
+#: src/input/es_out.c:1585 src/input/es_out.c:1613 src/input/es_out.c:1640
 #: modules/gui/macosx/output.m:153
 msgid "Type"
 msgstr "タイプ"
 
-#: src/input/es_out.c:1549 modules/gui/macosx/output.m:176
-#: modules/gui/wxwidgets/dialogs/streamout.cpp:855
+#: src/input/es_out.c:1588 modules/gui/macosx/output.m:176
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:857
 msgid "Channels"
 msgstr "チャンネル"
 
-#: src/input/es_out.c:1553
+#: src/input/es_out.c:1593
 msgid "Sample rate"
 msgstr "サンプルレート"
 
-#: src/input/es_out.c:1554
+#: src/input/es_out.c:1594
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: src/input/es_out.c:1558
+#: src/input/es_out.c:1600
 msgid "Bits per sample"
 msgstr "ビット/サンプル"
 
-#: src/input/es_out.c:1562 modules/access/pvr/pvr.c:83
-#: modules/demux/playlist/b4s.c:349
+#: src/input/es_out.c:1605 modules/access/pvr/pvr.c:84
 msgid "Bitrate"
 msgstr "ビットレート"
 
-#: src/input/es_out.c:1563
+#: src/input/es_out.c:1606
 #, c-format
 msgid "%d kb/s"
 msgstr ""
 
-#: src/input/es_out.c:1572
+#: src/input/es_out.c:1617
 msgid "Resolution"
 msgstr "解像度"
 
-#: src/input/es_out.c:1578
+#: src/input/es_out.c:1623
 msgid "Display resolution"
 msgstr "ディスプレイ解像度選択"
 
-#: src/input/es_out.c:1584 modules/access/screen/screen.c:41
+#: src/input/es_out.c:1633 modules/access/screen/screen.c:41
 msgid "Frame rate"
 msgstr "フレームレート"
 
-#: src/input/es_out.c:1591
+#: src/input/es_out.c:1640
 msgid "Subtitle"
 msgstr "字幕"
 
-#: src/input/input.c:1878 src/input/input.c:1882
-#: 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:1924 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:1842 src/playlist/item.c:546
+#: modules/access/cdda/info.c:328 modules/access/cdda/info.c:396
+#: modules/gui/macosx/playlist.m:131
 msgid "Duration"
 msgstr "持続期間"
 
-#: src/input/input.c:2099 src/input/input.c:2169
+#: src/input/input.c:2021 src/input/input.c:2091
 #, fuzzy
 msgid "Errors"
 msgstr "エラー"
@@ -879,33 +793,33 @@ msgstr "エラー"
 msgid "Bookmark"
 msgstr "ブックマーク"
 
-#: src/input/var.c:131
+#: src/input/var.c:131 src/libvlc.h:431
 msgid "Programs"
 msgstr "プログラム"
 
 #: src/input/var.c:142 modules/gui/beos/MediaControlView.cpp:1234
-#: modules/gui/macosx/intf.m:504 modules/gui/macosx/intf.m:505
-#: modules/gui/macosx/open.m:169 modules/gui/wxwidgets/dialogs/open.cpp:740
+#: modules/gui/macosx/intf.m:551 modules/gui/macosx/intf.m:552
+#: modules/gui/macosx/open.m:169 modules/gui/wxwidgets/dialogs/open.cpp:765
 msgid "Chapter"
 msgstr "チャプター"
 
 #: src/input/var.c:148 modules/access/vcdx/info.c:302
-#: modules/access/vcdx/info.c:303 modules/gui/beos/InterfaceWindow.cpp:291
+#: modules/access/vcdx/info.c:303 modules/gui/beos/InterfaceWindow.cpp:293
 msgid "Navigation"
 msgstr "ナビゲーション"
 
-#: src/input/var.c:163 modules/gui/macosx/intf.m:528
-#: modules/gui/macosx/intf.m:529
+#: src/input/var.c:163 modules/gui/macosx/intf.m:575
+#: modules/gui/macosx/intf.m:576
 msgid "Video Track"
 msgstr "ビデオトラック"
 
-#: src/input/var.c:169 modules/gui/macosx/intf.m:511
-#: modules/gui/macosx/intf.m:512
+#: src/input/var.c:169 modules/gui/macosx/intf.m:558
+#: modules/gui/macosx/intf.m:559
 msgid "Audio Track"
 msgstr "オーディオトラック"
 
-#: src/input/var.c:175 modules/gui/macosx/intf.m:532
-#: modules/gui/macosx/intf.m:533
+#: src/input/var.c:175 modules/gui/macosx/intf.m:583
+#: modules/gui/macosx/intf.m:584
 msgid "Subtitles Track"
 msgstr "字幕トラック"
 
@@ -927,92 +841,81 @@ msgstr "タイトル %i"
 msgid "Chapter %i"
 msgstr "チャプター %i"
 
-#: src/input/var.c:346 modules/gui/beos/InterfaceWindow.cpp:288
-#: modules/gui/wxwidgets/input_manager.cpp:216
+#: src/input/var.c:346 modules/gui/beos/InterfaceWindow.cpp:290
+#: modules/gui/wxwidgets/input_manager.cpp:227
 msgid "Next chapter"
 msgstr "次のチャプター"
 
-#: src/input/var.c:351 modules/gui/beos/InterfaceWindow.cpp:287
-#: modules/gui/wxwidgets/input_manager.cpp:215
+#: src/input/var.c:351 modules/gui/beos/InterfaceWindow.cpp:289
+#: modules/gui/wxwidgets/input_manager.cpp:226
 msgid "Previous chapter"
 msgstr "前のチャプター"
 
-#: src/interface/interaction.c:326
-#, fuzzy
-msgid "Login"
-msgstr "グルジア語"
-
-#: src/interface/interaction.c:334 modules/access_output/http.c:63
-msgid "Password"
-msgstr "パスワード"
-
-#: src/interface/interface.c:327
+#: src/interface/interface.c:348
 msgid "Switch interface"
 msgstr "インターフェースを切り替え"
 
-#: src/interface/interface.c:354 modules/gui/macosx/intf.m:463
-#: modules/gui/macosx/intf.m:464
+#: src/interface/interface.c:375 modules/gui/macosx/intf.m:510
+#: modules/gui/macosx/intf.m:511
 msgid "Add Interface"
 msgstr "インタフェースを追加"
 
-#: src/libvlc.c:325 src/libvlc.c:475 src/misc/modules.c:1678
-#: src/misc/modules.c:1982
+#: src/libvlc.c:331 src/libvlc.c:506 src/misc/modules.c:1684
+#: src/misc/modules.c:1988
 msgid "C"
 msgstr "ja"
 
-#: src/libvlc.c:342
+#: src/libvlc.c:348
 msgid "Help options"
 msgstr "ヘルプオプション"
 
-#: src/libvlc.c:2205 src/misc/configuration.c:1265
+#: src/libvlc.c:2207 src/misc/configuration.c:1248
 msgid "string"
 msgstr "文字列"
 
-#: src/libvlc.c:2222 src/misc/configuration.c:1229
+#: src/libvlc.c:2224 src/misc/configuration.c:1212
 msgid "integer"
 msgstr "整数"
 
-#: src/libvlc.c:2240 src/misc/configuration.c:1254
+#: src/libvlc.c:2242 src/misc/configuration.c:1237
 msgid "float"
 msgstr "浮動小数点"
 
-#: src/libvlc.c:2246
+#: src/libvlc.c:2248
 msgid " (default enabled)"
 msgstr " (デフォルト有効)"
 
-#: src/libvlc.c:2247
+#: src/libvlc.c:2249
 msgid " (default disabled)"
 msgstr " (デフォルト無効)"
 
-#: src/libvlc.c:2429
+#: src/libvlc.c:2431
 #, c-format
 msgid "VLC version %s\n"
 msgstr "VLC バージョン %s\n"
 
-#: src/libvlc.c:2430
+#: src/libvlc.c:2432
 #, fuzzy, c-format
 msgid "Compiled by %s@%s.%s\n"
 msgstr "エラー"
 
-#: src/libvlc.c:2432
+#: src/libvlc.c:2434
 #, c-format
 msgid "Compiler: %s\n"
 msgstr "コンパイラー: %s\n"
 
-#: src/libvlc.c:2434
+#: src/libvlc.c:2437
 #, c-format
 msgid "Based upon svn changeset [%s]\n"
 msgstr ""
 
-#: src/libvlc.c:2465
-#, c-format
+#: src/libvlc.c:2469
 msgid ""
 "\n"
 "Dumped content to vlc-help.txt file.\n"
 msgstr ""
 
-#: src/libvlc.c:2486
-#, c-format
+#: src/libvlc.c:2490
 msgid ""
 "\n"
 "Press the RETURN key to continue...\n"
@@ -1020,270 +923,322 @@ msgstr ""
 "\n"
 "続けるにはEnterキーを押してください。\n"
 
-#: src/libvlc.h:34 src/libvlc.h:170
+#: src/libvlc.h:37 src/libvlc.h:200
 msgid "Auto"
 msgstr "自動"
 
-#: src/libvlc.h:34
+#: src/libvlc.h:37
 #, fuzzy
 msgid "American English"
 msgstr "アメリカ英語"
 
-#: src/libvlc.h:34
+#: src/libvlc.h:37
 #, fuzzy
 msgid "British English"
 msgstr "英語"
 
-#: src/libvlc.h:34 src/misc/iso-639_def.h:59
+#: src/libvlc.h:38 src/misc/iso-639_def.h:59
 #, fuzzy
 msgid "Catalan"
 msgstr "文字列"
 
-#: src/libvlc.h:34 src/misc/iso-639_def.h:68
+#: src/libvlc.h:38 src/misc/iso-639_def.h:67
+msgid "Czech"
+msgstr "チェコ語"
+
+#: src/libvlc.h:38 src/misc/iso-639_def.h:68
 #, fuzzy
 msgid "Danish"
 msgstr "ディスク"
 
-#: src/libvlc.h:34 src/misc/iso-639_def.h:80
+#: src/libvlc.h:38 src/misc/iso-639_def.h:80
 msgid "German"
 msgstr "ドイツ語"
 
-#: src/libvlc.h:34 src/misc/iso-639_def.h:169
+#: src/libvlc.h:38 src/misc/iso-639_def.h:169
 msgid "Spanish"
 msgstr "スペイン語"
 
-#: src/libvlc.h:34 src/misc/iso-639_def.h:77
+#: src/libvlc.h:39 src/misc/iso-639_def.h:77
 msgid "French"
 msgstr "フランス語"
 
-#: src/libvlc.h:34 src/misc/iso-639_def.h:99
+#: src/libvlc.h:39
+#, fuzzy
+msgid "Galician"
+msgstr "イタリア語"
+
+#: src/libvlc.h:39 src/misc/iso-639_def.h:88
+msgid "Hebrew"
+msgstr "ヘブライ語"
+
+#: src/libvlc.h:39 src/misc/iso-639_def.h:92
+msgid "Hungarian"
+msgstr "ハンガリー語"
+
+#: src/libvlc.h:39 src/misc/iso-639_def.h:99
 msgid "Italian"
 msgstr "イタリア語"
 
-#: src/libvlc.h:34 src/misc/iso-639_def.h:101
+#: src/libvlc.h:40 src/misc/iso-639_def.h:101
 msgid "Japanese"
 msgstr "日本語"
 
-#: src/libvlc.h:34 src/misc/iso-639_def.h:111
+#: src/libvlc.h:40 src/misc/iso-639_def.h:79
+msgid "Georgian"
+msgstr "グルジア語"
+
+#: src/libvlc.h:40 src/misc/iso-639_def.h:111
 #, fuzzy
 msgid "Korean"
 msgstr "韓国語"
 
-#: src/libvlc.h:34 src/misc/iso-639_def.h:69
+#: src/libvlc.h:40 src/misc/iso-639_def.h:69
 msgid "Dutch"
 msgstr ""
 
-#: src/libvlc.h:34
+#: src/libvlc.h:40
+msgid "Occitan"
+msgstr ""
+
+#: src/libvlc.h:41
 #, fuzzy
 msgid "Brazilian Portuguese"
 msgstr "ポルトガル語"
 
-#: src/libvlc.h:34 src/misc/iso-639_def.h:153
+#: src/libvlc.h:41 src/misc/iso-639_def.h:153
 msgid "Romanian"
 msgstr "ルーマニア語"
 
-#: src/libvlc.h:34 src/misc/iso-639_def.h:155
+#: src/libvlc.h:41 src/misc/iso-639_def.h:155
 msgid "Russian"
 msgstr "ロシア語"
 
-#: src/libvlc.h:34 src/misc/iso-639_def.h:187
+#: src/libvlc.h:41 src/misc/iso-639_def.h:174
+msgid "Swedish"
+msgstr ""
+
+#: src/libvlc.h:42 src/misc/iso-639_def.h:187
 #, fuzzy
 msgid "Turkish"
 msgstr "キャンセル"
 
-#: src/libvlc.h:34
+#: src/libvlc.h:42
 msgid "Simplified Chinese"
 msgstr ""
 
-#: src/libvlc.h:34
+#: src/libvlc.h:42
 msgid "Chinese Traditional"
 msgstr ""
 
-#: src/libvlc.h:47
+#: src/libvlc.h:61
 #, fuzzy
 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:1359
+#: src/libvlc.h:65
 msgid "Interface module"
 msgstr "インタフェースモジュール"
 
-#: src/libvlc.h:53
+#: src/libvlc.h:67
 #, fuzzy
 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:1364 modules/control/ntservice.c:53
+#: src/libvlc.h:71 modules/control/ntservice.c:53
 msgid "Extra interface modules"
 msgstr "その他のインタフェースモジュール"
 
-#: src/libvlc.h:59
+#: src/libvlc.h:73
 #, fuzzy
 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
+#: src/libvlc.h:80
 #, fuzzy
-msgid "This option allows you to select control interfaces. "
-msgstr "VLCがプラグインを見つけるときに検索される追加のパスを設定します。"
+msgid "You can select control interfaces for VLC."
+msgstr "赤外線リモート・コントロール・モジュール"
 
-#: src/libvlc.h:68
+#: src/libvlc.h:82
 #, fuzzy
 msgid "Verbosity (0,1,2)"
 msgstr "冗長 (0,1,2)"
 
-#: src/libvlc.h:70
+#: src/libvlc.h:84
 #, fuzzy
 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 ""
 "冗長レベルを指定します (0=エラーと標準メッセージのみ、1=警告、2=デバッグ)"
 
-#: src/libvlc.h:73
+#: src/libvlc.h:87
 #, fuzzy
 msgid "Be quiet"
 msgstr "エラーのみ"
 
-#: src/libvlc.h:75
+#: src/libvlc.h:89
 #, 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:91
 msgid "Default stream"
 msgstr "デフォルトストリーム"
 
-#: src/libvlc.h:79
-#, fuzzy
-msgid "This option allows you to always open a default stream on start-up."
-msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+#: src/libvlc.h:93
+msgid "This stream will always be opened at VLC startup."
+msgstr ""
 
-#: src/libvlc.h:82
+#: src/libvlc.h:96
 #, fuzzy
 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:100
 msgid "Color messages"
 msgstr "色メッセージ"
 
-#: src/libvlc.h:88
+#: src/libvlc.h:102
+#, fuzzy
 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 ""
 "このオプションを設定すると、コンソールに送信されるメッセージはカラー化されま"
 "す。この動作は端末がLinuxカラーをサポートしている必要があります。"
 
-#: src/libvlc.h:91
+#: src/libvlc.h:105
 msgid "Show advanced options"
 msgstr "高度なオプションを表示する"
 
-#: src/libvlc.h:93
+#: src/libvlc.h:107
+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:111 modules/control/showintf.c:68
+#, fuzzy
+msgid "Show interface with mouse"
+msgstr "インターフェースを表示する"
+
+#: src/libvlc.h:113
+msgid ""
+"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:116
+#, fuzzy
+msgid "Interface interaction"
+msgstr "字幕・デコーダ・モジュール"
+
+#: src/libvlc.h:118
 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 will show a dialog box each time some "
+"user input is required."
 msgstr ""
 
-#: src/libvlc.h:98
+#: src/libvlc.h:128
 msgid ""
 "These options allow you to modify the behavior of the audio subsystem, and "
 "to add audio filters which can be used for post processing or visual effects "
-"(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:134
 msgid "Audio output module"
 msgstr "オーディオ出力モジュール"
 
-#: src/libvlc.h:106
+#: src/libvlc.h:136
+#, fuzzy
 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:140 modules/stream_out/display.c:37
 msgid "Enable audio"
 msgstr "オーディオを有効にする"
 
-#: src/libvlc.h:112
+#: src/libvlc.h:142
 #, fuzzy
 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:145
 msgid "Force mono audio"
 msgstr "強制的にモノラル音声"
 
-#: src/libvlc.h:116
+#: src/libvlc.h:146
 #, fuzzy
 msgid "This will force a mono audio output."
 msgstr "オーディオ出力を強制的にモノラルにします。"
 
-#: src/libvlc.h:118
+#: src/libvlc.h:148
 msgid "Default audio volume"
 msgstr "デフォルトのオーディオボリューム"
 
-#: src/libvlc.h:120
+#: src/libvlc.h:150
 msgid ""
 "You can set the default audio output volume here, in a range from 0 to 1024."
 msgstr "オーディオ・ボリュームの既定値を0から1024の間で設定可能です。"
 
-#: src/libvlc.h:123
+#: src/libvlc.h:153
 #, fuzzy
 msgid "Audio output saved volume"
 msgstr "オーディオ・ボリューム"
 
-#: src/libvlc.h:125
-msgid "This saves the audio output volume when you select mute."
+#: src/libvlc.h:155
+msgid ""
+"This saves the audio output volume when you use the mute function. You "
+"should not change this option manually."
 msgstr ""
 
-#: src/libvlc.h:127
+#: src/libvlc.h:158
 #, fuzzy
 msgid "Audio output volume step"
 msgstr "オーディオ出力ボリューム"
 
-#: src/libvlc.h:129
+#: src/libvlc.h:160
 #, 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:163
 msgid "Audio output frequency (Hz)"
 msgstr "オーディオ出力周波数(Hz)"
 
-#: src/libvlc.h:134
+#: src/libvlc.h:165
 #, fuzzy
 msgid ""
 "You can force the audio output frequency here. Common values are -1 "
@@ -1292,95 +1247,94 @@ msgstr ""
 "オーディオ出力の周波数を強制的に設定可能です。\n"
 "一般的な値は、48000, 44100, 32000, 22050, 16000, 11025, 8000です。"
 
-#: src/libvlc.h:138
+#: src/libvlc.h:169
 msgid "High quality audio resampling"
 msgstr "高品質オーディオリサンプリング"
 
-#: src/libvlc.h:140
+#: src/libvlc.h:171
 msgid ""
 "This uses a high quality audio resampling algorithm. High quality audio "
 "resampling can be processor intensive so you can disable it and a cheaper "
 "resampling algorithm will be used instead."
 msgstr ""
 
-#: src/libvlc.h:145
+#: src/libvlc.h:176
 #, fuzzy
 msgid "Audio desynchronization compensation"
 msgstr "AltiVec モーション補正モジュール"
 
-#: src/libvlc.h:147
+#: src/libvlc.h:178
 #, fuzzy
 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
+#: src/libvlc.h:181
 #, fuzzy
-msgid "Preferred audio output channels mode"
+msgid "Audio output channels mode"
 msgstr "準備されているコーデックの一覧の選択"
 
-#: src/libvlc.h:153
+#: src/libvlc.h:183
 #, fuzzy
 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:187
+#, fuzzy
+msgid "Use S/PDIF when available"
 msgstr "有効なら S/PDIF オーディオ出力を使う"
 
-#: src/libvlc.h:159
+#: src/libvlc.h:189
 #, fuzzy
 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:192
 msgid "Force detection of Dolby Surround"
 msgstr "ドルビーサラウンドの強制検知"
 
-#: src/libvlc.h:164
+#: src/libvlc.h:194
 msgid ""
 "Use this when you know your stream is (or is not) encoded with Dolby "
-"Surround but fails to be detected as such. And even if the stream is not "
+"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:170
+#: src/libvlc.h:200
 msgid "On"
 msgstr "オン"
 
-#: src/libvlc.h:170
+#: src/libvlc.h:200
 msgid "Off"
 msgstr "オフ"
 
-#: src/libvlc.h:175
-msgid ""
-"This allows you to add audio post processing filters, to modify the sound"
+#: src/libvlc.h:205
+msgid "This adds audio post processing filters, to modify the sound rendering."
 msgstr ""
 
-#: src/libvlc.h:178
+#: src/libvlc.h:208
 #, fuzzy
 msgid "Audio visualizations "
 msgstr "ビジュアル化"
 
-#: src/libvlc.h:180
-msgid "This allows you to add visualization modules (spectrum analyzer, etc.)."
+#: src/libvlc.h:210
+msgid "This adds visualization modules (spectrum analyzer, etc.)."
 msgstr ""
 
-#: src/libvlc.h:184
+#: src/libvlc.h:218
 msgid ""
 "These options allow you to modify the behavior of the video output "
 "subsystem. You can for example enable video filters (deinterlacing, image "
@@ -1389,269 +1343,280 @@ msgid ""
 "options."
 msgstr ""
 
-#: src/libvlc.h:190
+#: src/libvlc.h:224
 msgid "Video output module"
 msgstr "ビデオ出力モジュール"
 
-#: src/libvlc.h:192
+#: src/libvlc.h:226
+#, fuzzy
 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:196 modules/stream_out/display.c:39
+#: src/libvlc.h:229 modules/stream_out/display.c:39
 msgid "Enable video"
 msgstr "ビデオを有効にする"
 
-#: src/libvlc.h:198
+#: src/libvlc.h:231
 #, fuzzy
 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:201 modules/codec/fake.c:47
-#: modules/stream_out/mosaic_bridge.c:107 modules/stream_out/transcode.c:70
+#: src/libvlc.h:234 modules/codec/fake.c:48
+#: modules/stream_out/mosaic_bridge.c:107 modules/stream_out/transcode.c:68
 #: modules/visualization/visual/visual.c:43
 msgid "Video width"
 msgstr "ビデオの幅"
 
-#: src/libvlc.h:203
+#: src/libvlc.h:236
 #, fuzzy
 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 ""
 "ビデオの幅を強制的に指定することができます。\n"
 "※VLCはデフォルトでビデオの特性に合わせます。"
 
-#: src/libvlc.h:206 modules/codec/fake.c:50
-#: modules/stream_out/mosaic_bridge.c:110 modules/stream_out/transcode.c:73
+#: src/libvlc.h:239 modules/codec/fake.c:51
+#: modules/stream_out/mosaic_bridge.c:110 modules/stream_out/transcode.c:71
 #: modules/visualization/visual/visual.c:47
 msgid "Video height"
 msgstr "ビデオの高さ"
 
-#: src/libvlc.h:208
+#: src/libvlc.h:241
 #, fuzzy
 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 ""
 "ビデオの高さを強制的に指定することができます。\n"
 "※VLCはデフォルトでビデオの特性に合わせます。"
 
-#: src/libvlc.h:211
-msgid "Video x coordinate"
-msgstr "ビデオ x コーディネート"
+#: src/libvlc.h:244
+#, fuzzy
+msgid "Video X coordinate"
+msgstr "ビデオ y コーディネート"
 
-#: src/libvlc.h:213
+#: src/libvlc.h:246
 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:216
-msgid "Video y coordinate"
+#: src/libvlc.h:249
+#, fuzzy
+msgid "Video Y coordinate"
 msgstr "ビデオ y コーディネート"
 
-#: src/libvlc.h:218
+#: src/libvlc.h:251
 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:221
+#: src/libvlc.h:254
 msgid "Video title"
 msgstr "ビデオの題名"
 
-#: src/libvlc.h:223
-msgid "You can specify a custom video window title here."
-msgstr "ここでカスタムビデオウィンドウの題名を指定できます。"
+#: src/libvlc.h:256
+msgid ""
+"Custom title for the video window (in case the video is not embedded in the "
+"interface)."
+msgstr ""
 
-#: src/libvlc.h:225
+#: src/libvlc.h:259
 msgid "Video alignment"
 msgstr "ビデオの位置あわせ"
 
-#: src/libvlc.h:227
+#: src/libvlc.h:261
 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:232 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:77
-#: modules/video_filter/rss.c:144 modules/video_filter/time.c:96
+#: src/libvlc.h:266 modules/codec/dvbsub.c:64 modules/codec/subsdec.c:129
+#: modules/video_filter/logo.c:95 modules/video_filter/marq.c:107
+#: modules/video_filter/mosaic.c:172 modules/video_filter/osdmenu.c:78
+#: modules/video_filter/rss.c:160 modules/video_filter/time.c:99
 msgid "Center"
 msgstr "中央"
 
-#: src/libvlc.h:232 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:77 modules/video_filter/rss.c:144
-#: modules/video_filter/time.c:96
+#: src/libvlc.h:266 modules/codec/dvbsub.c:64 modules/video_filter/logo.c:95
+#: modules/video_filter/marq.c:107 modules/video_filter/mosaic.c:172
+#: modules/video_filter/osdmenu.c:78 modules/video_filter/rss.c:160
+#: modules/video_filter/time.c:99
 msgid "Top"
 msgstr "上"
 
-#: src/libvlc.h:232 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:77 modules/video_filter/rss.c:144
-#: modules/video_filter/time.c:96
+#: src/libvlc.h:266 modules/codec/dvbsub.c:64 modules/video_filter/logo.c:95
+#: modules/video_filter/marq.c:107 modules/video_filter/mosaic.c:172
+#: modules/video_filter/osdmenu.c:78 modules/video_filter/rss.c:160
+#: modules/video_filter/time.c:99
 msgid "Bottom"
 msgstr "下"
 
-#: src/libvlc.h:233 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:78 modules/video_filter/rss.c:145
-#: modules/video_filter/time.c:97
+#: src/libvlc.h:267 modules/codec/dvbsub.c:65 modules/video_filter/logo.c:96
+#: modules/video_filter/marq.c:108 modules/video_filter/mosaic.c:173
+#: modules/video_filter/osdmenu.c:79 modules/video_filter/rss.c:161
+#: modules/video_filter/time.c:100
 msgid "Top-Left"
 msgstr "左上"
 
-#: src/libvlc.h:233 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:78 modules/video_filter/rss.c:145
-#: modules/video_filter/time.c:97
+#: src/libvlc.h:267 modules/codec/dvbsub.c:65 modules/video_filter/logo.c:96
+#: modules/video_filter/marq.c:108 modules/video_filter/mosaic.c:173
+#: modules/video_filter/osdmenu.c:79 modules/video_filter/rss.c:161
+#: modules/video_filter/time.c:100
 msgid "Top-Right"
 msgstr "右上"
 
-#: src/libvlc.h:233 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:78 modules/video_filter/rss.c:145
-#: modules/video_filter/time.c:97
+#: src/libvlc.h:267 modules/codec/dvbsub.c:65 modules/video_filter/logo.c:96
+#: modules/video_filter/marq.c:108 modules/video_filter/mosaic.c:173
+#: modules/video_filter/osdmenu.c:79 modules/video_filter/rss.c:161
+#: modules/video_filter/time.c:100
 msgid "Bottom-Left"
 msgstr "左下"
 
-#: src/libvlc.h:233 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:78 modules/video_filter/rss.c:145
-#: modules/video_filter/time.c:97
+#: src/libvlc.h:267 modules/codec/dvbsub.c:65 modules/video_filter/logo.c:96
+#: modules/video_filter/marq.c:108 modules/video_filter/mosaic.c:173
+#: modules/video_filter/osdmenu.c:79 modules/video_filter/rss.c:161
+#: modules/video_filter/time.c:100
 msgid "Bottom-Right"
 msgstr "右下"
 
-#: src/libvlc.h:235
+#: src/libvlc.h:269
 msgid "Zoom video"
 msgstr "ビデオズーム"
 
-#: src/libvlc.h:237
+#: src/libvlc.h:271
 msgid "You can zoom the video by the specified factor."
 msgstr "任意にビデオをズームすることができます。"
 
-#: src/libvlc.h:239
+#: src/libvlc.h:273
 msgid "Grayscale video output"
 msgstr "グレースケールビデオ出力"
 
-#: src/libvlc.h:241
+#: src/libvlc.h:275
+#, fuzzy
 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 ""
 "このオプションを使用すると、VLCはカラー情報をデコードしません。(これにより、"
 "いくらかの処理パワーをセーブすることができます。)"
 
-#: src/libvlc.h:244
+#: src/libvlc.h:278
 msgid "Fullscreen video output"
 msgstr "フルスクリーンビデオ出力"
 
-#: src/libvlc.h:246
-msgid ""
-"If this option is enabled, VLC will always start a video in fullscreen mode."
-msgstr ""
-"このオプションを指定すると、VLCは常にビデオをフルスクリーン・モードにします。"
+#: src/libvlc.h:280
+#, fuzzy
+msgid "Start video in fullscreen mode"
+msgstr "代替えフルスクリーン方法"
 
-#: src/libvlc.h:249
+#: src/libvlc.h:282
 msgid "Overlay video output"
 msgstr "オーバーレイビデオ出力"
 
-#: src/libvlc.h:251
-#, fuzzy
+#: src/libvlc.h:284
 msgid ""
-"If enabled, VLC will try to take advantage of the overlay capabilities of "
-"your graphics card (hardware acceleration)."
-msgstr "VLCはデフォルトでグラフィックカードのオーバレイ機能の使用を試みます。"
+"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:254 src/video_output/vout_intf.c:316
+#: src/libvlc.h:287 src/video_output/vout_intf.c:393
 msgid "Always on top"
 msgstr "常に最前面"
 
-#: src/libvlc.h:255
+#: src/libvlc.h:289
 #, fuzzy
 msgid "Always place the video window on top of other windows."
 msgstr "ビデオをクローンするためにビデオ・ウィンドウ数を選択する"
 
-#: src/libvlc.h:258
+#: src/libvlc.h:291
 msgid "Disable screensaver"
 msgstr "スクリーンセーバーを無効にする"
 
-#: src/libvlc.h:259
+#: src/libvlc.h:292
 msgid "Disable the screensaver during video playback."
 msgstr "ビデオ再生中のスクリーンセーバーを無効にします。"
 
-#: src/libvlc.h:261
+#: src/libvlc.h:294
 msgid "Window decorations"
 msgstr ""
 
-#: src/libvlc.h:263
+#: src/libvlc.h:296
 #, 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:266
+#: src/libvlc.h:299
 msgid "Video filter module"
 msgstr "ビデオフィルターモジュール"
 
-#: src/libvlc.h:268
+#: src/libvlc.h:301
+#, fuzzy
 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:272
+#: src/libvlc.h:305
 msgid "Video snapshot directory"
 msgstr "ビデオスナップショットのディレクトリ"
 
-#: src/libvlc.h:274
+#: src/libvlc.h:307
 #, fuzzy
-msgid ""
-"Allows you to specify the directory where the video snapshots will be stored."
+msgid "Directory where the video snapshots will be stored."
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: src/libvlc.h:277
+#: src/libvlc.h:309
 msgid "Video snapshot format"
 msgstr "ビデオスナップショットの形式"
 
-#: src/libvlc.h:279
+#: src/libvlc.h:311
+msgid "Image format which will be used to store the video snapshots"
+msgstr ""
+
+#: src/libvlc.h:313
 #, fuzzy
-msgid ""
-"Allows you to specify the image format in which the video snapshots will be "
-"stored."
-msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+msgid "Display video snapshot preview"
+msgstr "ビデオのスナップショットを取る"
 
-#: src/libvlc.h:282
+#: src/libvlc.h:315
+msgid "Display the snapshot preview in the screen's top-left corner."
+msgstr ""
+
+#: src/libvlc.h:317
 msgid "Video cropping"
 msgstr "ビデオ縁取り"
 
-#: src/libvlc.h:284
+#: src/libvlc.h:319
 msgid ""
-"This will force the cropping of the source video. Accepted formats are x:y "
-"(4:3, 16:9, etc.) expressing the global image aspect."
+"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:288
+#: src/libvlc.h:323
 msgid "Source aspect ratio"
 msgstr "ソースのアスペクト比"
 
-#: src/libvlc.h:290
+#: src/libvlc.h:325
+#, fuzzy
 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 "
@@ -1663,253 +1628,328 @@ msgstr ""
 "x:y (4:3, 16:9, etc.)の形式でアスペクトを指定するか、浮動小数点値 (1.25, "
 "1.3333, etc.)の形式でピクセルの矩形を指定します。"
 
-#: src/libvlc.h:297
-msgid "Fix HDTV height"
-msgstr "HDTV の高さを固定にする"
+#: src/libvlc.h:332
+msgid "Custom crop ratios list"
+msgstr ""
 
-#: src/libvlc.h:299
+#: src/libvlc.h:334
 msgid ""
-"This option allows proper handling of HDTV-1080 video format even if broken "
-"encoder incorrectly set height to 1088 lines. Disable this option only if "
-"your video has non-standard format requiring all 1088 lines."
+"Comma seperated list of crop ratios which will be added in the interface's "
+"crop ratios list."
 msgstr ""
 
-#: src/libvlc.h:304
-msgid "Monitor pixel aspect ratio"
+#: src/libvlc.h:337
+#, fuzzy
+msgid "Custom aspect ratios list"
+msgstr "ソースのアスペクト比"
+
+#: src/libvlc.h:339
+msgid ""
+"Comma seperated list of aspect ratios which will be added in the interface's "
+"aspect ratio list."
+msgstr ""
+
+#: src/libvlc.h:342
+msgid "Fix HDTV height"
+msgstr "HDTV の高さを固定にする"
+
+#: src/libvlc.h:344
+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:349
+msgid "Monitor pixel aspect ratio"
 msgstr "モニターのピクセルアスペクト比"
 
-#: src/libvlc.h:306
+#: src/libvlc.h:351
 msgid ""
-"This will force the monitor aspect ratio. Most monitors have square pixels "
+"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:310
+#: src/libvlc.h:356
 msgid "Skip frames"
 msgstr "フレームを飛ばす"
 
-#: src/libvlc.h:312
+#: src/libvlc.h:358
 msgid ""
 "This option enables framedropping on MPEG2 stream. Framedropping occurs when "
 "your computer is not powerful enough"
 msgstr ""
 
-#: src/libvlc.h:315
+#: src/libvlc.h:361
+#, fuzzy
+msgid "Drop late frames"
+msgstr "フレームを飛ばす"
+
+#: src/libvlc.h:363
+msgid ""
+"This drops frames that are late (arrive to the video output after their "
+"intended display date)."
+msgstr ""
+
+#: src/libvlc.h:366
 msgid "Quiet synchro"
 msgstr ""
 
-#: src/libvlc.h:317
+#: src/libvlc.h:368
 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:321
+#: src/libvlc.h:377
 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:325
+#: src/libvlc.h:381
 msgid "Clock reference average counter"
 msgstr "平均カウンターの参照クロック"
 
-#: src/libvlc.h:327
+#: src/libvlc.h:383
 msgid ""
 "When using the PVR input (or a very irregular source), you should set this "
 "to 10000."
 msgstr ""
 
-#: src/libvlc.h:330
+#: src/libvlc.h:386
 msgid "Clock synchronisation"
 msgstr "時刻同期"
 
-#: src/libvlc.h:332
+#: src/libvlc.h:388
+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:392 modules/control/netsync.c:71
+msgid "Network synchronisation"
+msgstr ""
+
+#: src/libvlc.h:393
 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:337 src/video_output/vout_intf.c:232
-#: src/video_output/vout_intf.c:293 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/sfilters.m:135 modules/gui/macosx/vout.m:174
+#: src/libvlc.h:399 src/libvlc.h:946 src/video_output/vout_intf.c:255
+#: src/video_output/vout_intf.c:342 modules/access/dshow/dshow.cpp:73
+#: modules/access/dshow/dshow.cpp:75 modules/access/dshow/dshow.cpp:78
+#: modules/access/dshow/dshow.cpp:84 modules/audio_output/alsa.c:101
+#: modules/gui/macosx/prefs_widgets.m:1292 modules/gui/macosx/sfilters.m:120
+#: modules/gui/macosx/vout.m:199
 #: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:275
 #: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:325
-#: modules/video_filter/marq.c:52 modules/video_filter/rss.c:55
+#: 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:337 modules/gui/macosx/equalizer.m:144
-#: modules/gui/macosx/extended.m:106 modules/gui/macosx/wizard.m:378
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:624
-#: modules/gui/wxwidgets/extrapanel.cpp:218
-#: modules/gui/wxwidgets/extrapanel.cpp:467
+#: src/libvlc.h:399 modules/gui/macosx/equalizer.m:145
+#: modules/gui/macosx/extended.m:109 modules/gui/macosx/wizard.m:395
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:633
+#: modules/gui/wxwidgets/extrapanel.cpp:216
+#: modules/gui/wxwidgets/extrapanel.cpp:465
 msgid "Enable"
 msgstr "有効"
 
-#: src/libvlc.h:339
+#: src/libvlc.h:401
 msgid "UDP port"
 msgstr "UDP ポート"
 
-#: src/libvlc.h:341
-msgid "This is the port used for UDP streams. By default, we chose 1234."
+#: src/libvlc.h:403
+#, fuzzy
+msgid "This is the default port used for UDP streams. Default is 1234."
 msgstr "UDPストリームで使用されるポートを指定します。既定値は1234です。"
 
-#: src/libvlc.h:343
+#: src/libvlc.h:405
 msgid "MTU of the network interface"
 msgstr "ネットワークインタフェースの MTU"
 
-#: src/libvlc.h:345
+#: src/libvlc.h:407
 #, fuzzy
 msgid ""
-"This is the maximum packet size that can be transmitted over network "
+"This is the maximum packet size that can be transmitted over the network "
 "interface. On Ethernet it is usually 1500 bytes."
 msgstr ""
 "期待する典型的なUDPパケットのサイズです。イーサネットでは、その値は、通常1500"
 "です。"
 
-#: src/libvlc.h:348
+#: src/libvlc.h:410
 msgid "Hop limit (TTL)"
 msgstr ""
 
-#: src/libvlc.h:350
+#: src/libvlc.h:412
 msgid ""
-"Specify the hop limit (TTL) of the multicast packets sent by the stream "
-"output."
+"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:353
-msgid "Multicast output interface"
+#: src/libvlc.h:416
+#, fuzzy
+msgid "IPv6 multicast output interface"
 msgstr "マルチキャスト出力インターフェース)"
 
-#: src/libvlc.h:355
-msgid ""
-"Indicate here the multicast output interface. This overrides the routing "
-"table."
+#: src/libvlc.h:418
+msgid "Default IPv6 multicast interface. This overrides the routing table."
 msgstr ""
 
-#: src/libvlc.h:358
+#: src/libvlc.h:420
 #, fuzzy
-msgid "Program to select"
-msgstr "デコードのプログラム"
+msgid "IPv4 multicast output interface address"
+msgstr "マルチキャスト出力インターフェース)"
 
-#: src/libvlc.h:360
+#: src/libvlc.h:422
 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:364
-#, fuzzy
-msgid "Programs to select"
-msgstr "デコードのプログラム"
+#: src/libvlc.h:427
+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:366
+#: src/libvlc.h:433
 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:371 modules/gui/wxwidgets/dialogs/open.cpp:754
+#: src/libvlc.h:439 modules/gui/wxwidgets/dialogs/open.cpp:779
 msgid "Audio track"
 msgstr "オーディオトラック"
 
-#: src/libvlc.h:373
+#: src/libvlc.h:441
 #, 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 ""
 "DVDの中で使用したいオーディオのチャンネル番号を指定します。(1からnまで)"
 
-#: src/libvlc.h:376 modules/gui/wxwidgets/dialogs/open.cpp:746
+#: src/libvlc.h:444 modules/gui/wxwidgets/dialogs/open.cpp:771
 msgid "Subtitles track"
 msgstr "字幕トラック"
 
-#: src/libvlc.h:378
+#: src/libvlc.h:446
 #, 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 "DVDの中で使用したい字幕のチャンネル番号を指定します。(1からnまで)"
 
-#: src/libvlc.h:381
+#: src/libvlc.h:449
 msgid "Audio language"
 msgstr "オーディオ言語"
 
-#: src/libvlc.h:383
+#: src/libvlc.h:451
 #, 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 ""
 "DVDの中で使用したいオーディオのチャンネル番号を指定します。(1からnまで)"
 
-#: src/libvlc.h:386
+#: src/libvlc.h:454
 msgid "Subtitle language"
 msgstr "字幕言語"
 
-#: src/libvlc.h:388
+#: src/libvlc.h:456
 #, fuzzy
 msgid ""
-"Give the language of the subtitle track you want to use (comma separted, two "
-"or tree letter country code)."
+"Language of the subtitle track you want to use (comma separated, two or tree "
+"letter country code)."
+msgstr "DVDの中で使用したい字幕のチャンネル番号を指定します。(1からnまで)"
+
+#: src/libvlc.h:460
+#, fuzzy
+msgid "Audio track ID"
+msgstr "オーディオトラック"
+
+#: src/libvlc.h:462
+#, fuzzy
+msgid "Stream ID of the audio track to use."
+msgstr ""
+"DVDの中で使用したいオーディオのチャンネル番号を指定します。(1からnまで)"
+
+#: src/libvlc.h:464
+#, fuzzy
+msgid "Subtitles track ID"
+msgstr "字幕トラック"
+
+#: src/libvlc.h:466
+#, fuzzy
+msgid "Stream ID of the subtitle track to use."
 msgstr "DVDの中で使用したい字幕のチャンネル番号を指定します。(1からnまで)"
 
-#: src/libvlc.h:391
+#: src/libvlc.h:468
 #, fuzzy
 msgid "Input repetitions"
 msgstr "出力オプション"
 
-#: src/libvlc.h:392
+#: src/libvlc.h:470
 msgid "Number of time the same input will be repeated"
 msgstr ""
 
-#: src/libvlc.h:395 src/libvlc.h:396
-msgid "Input start time (seconds)"
-msgstr "入力開始時間 (秒)"
+#: src/libvlc.h:472
+#, fuzzy
+msgid "Start time"
+msgstr "開始!"
+
+#: src/libvlc.h:474
+msgid "The stream will start at this position (in seconds)."
+msgstr ""
 
-#: src/libvlc.h:398 src/libvlc.h:399
-msgid "Input stop time (seconds)"
-msgstr "入力停止時間 (秒)"
+#: src/libvlc.h:476
+#, fuzzy
+msgid "Stop time"
+msgstr "ストリームの停止"
 
-#: src/libvlc.h:401
+#: src/libvlc.h:478
+msgid "The stream will stop at this position (in seconds)."
+msgstr ""
+
+#: src/libvlc.h:480
 msgid "Input list"
 msgstr "入力一覧"
 
-#: src/libvlc.h:402
+#: src/libvlc.h:482
 #, fuzzy
 msgid ""
-"Allows you to specify a comma-separated list of inputs that will be "
-"concatenated after the normal one."
+"You can give a comma-separated list of inputs that will be concatenated "
+"together after the normal one."
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: src/libvlc.h:405
+#: src/libvlc.h:485
 msgid "Input slave (experimental)"
 msgstr "スレーブ入力 (実験)"
 
-#: src/libvlc.h:406
+#: src/libvlc.h:487
 msgid ""
-"Allows you to play from several streams 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:410
+#: src/libvlc.h:491
 msgid "Bookmarks list for a stream"
 msgstr "ストリームのブックマーク一覧"
 
-#: src/libvlc.h:411
+#: src/libvlc.h:493
 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:416
+#: src/libvlc.h:499
 msgid ""
 "These options allow you to modify the behavior of the subpictures subsystem. "
 "You can for example enable subpictures filters (logo, etc.). Enable these "
@@ -1917,11 +1957,11 @@ msgid ""
 "section. You can also set many miscellaneous subpictures options."
 msgstr ""
 
-#: src/libvlc.h:422
+#: src/libvlc.h:505
 msgid "Force subtitle position"
 msgstr "強制的な字幕の位置"
 
-#: src/libvlc.h:424
+#: src/libvlc.h:507
 msgid ""
 "You can use this option to place the subtitles under the movie, instead of "
 "over the movie. Try several positions."
@@ -1929,42 +1969,63 @@ msgstr ""
 "このオプションは映像中の字幕の位置を指定できます。いくつかの位置を試してみて"
 "ください。"
 
-#: src/libvlc.h:427 src/libvlc.h:1089 src/misc/iso-639_def.h:143
-#: modules/stream_out/transcode.c:239
+#: src/libvlc.h:510
+#, fuzzy
+msgid "Enable sub-pictures"
+msgstr "字幕"
+
+#: src/libvlc.h:512
+msgid "You can completely disable the sub-picture processing."
+msgstr ""
+
+#: src/libvlc.h:514 src/libvlc.h:1297 src/misc/iso-639_def.h:143
+#: modules/stream_out/transcode.c:274
 msgid "On Screen Display"
 msgstr "オンスクリーンディスプレイ"
 
-#: src/libvlc.h:429
+#: src/libvlc.h:516
 msgid ""
 "VLC can display messages on the video. This is called OSD (On Screen "
-"Display). You can disable this feature here."
+"Display)."
+msgstr ""
+
+#: src/libvlc.h:519
+#, fuzzy
+msgid "Text rendering module"
+msgstr "テキストレンダリング"
+
+#: src/libvlc.h:521
+msgid ""
+"VLC normally uses Freetype for rendering, but this allows you to use svg for "
+"instance."
 msgstr ""
 
-#: src/libvlc.h:432
+#: src/libvlc.h:524
 msgid "Subpictures filter module"
 msgstr "字幕フィルターモジュール"
 
-#: src/libvlc.h:434
+#: src/libvlc.h:526
 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:437
+#: src/libvlc.h:529
 msgid "Autodetect subtitle files"
 msgstr "字幕ファイルの自動検知"
 
-#: src/libvlc.h:439
+#: src/libvlc.h:531
 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:442
+#: src/libvlc.h:534
 #, fuzzy
 msgid "Subtitle autodetection fuzziness"
 msgstr "字幕"
 
-#: src/libvlc.h:444
+#: src/libvlc.h:536
 msgid ""
 "This determines how fuzzy subtitle and movie filename matching will be. "
 "Options are:\n"
@@ -1975,32 +2036,32 @@ msgid ""
 "4 = subtitle file matching the movie name exactly"
 msgstr ""
 
-#: src/libvlc.h:452
+#: src/libvlc.h:544
 #, fuzzy
 msgid "Subtitle autodetection paths"
 msgstr "字幕"
 
-#: src/libvlc.h:454
+#: src/libvlc.h:546
 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:457
+#: src/libvlc.h:549
 msgid "Use subtitle file"
 msgstr "字幕ファイルを使用"
 
-#: src/libvlc.h:459
+#: src/libvlc.h:551
 msgid ""
 "Load this subtitle file. To be used when autodetect cannot detect your "
 "subtitle file."
 msgstr ""
 
-#: src/libvlc.h:462
+#: src/libvlc.h:554
 msgid "DVD device"
 msgstr "DVD デバイス"
 
-#: src/libvlc.h:465
+#: src/libvlc.h:557
 #, fuzzy
 msgid ""
 "This is the default DVD drive (or file) to use. Don't forget the colon after "
@@ -2009,331 +2070,337 @@ msgstr ""
 "使用する既定のDVDドライブ(またはファイル)です。ドライブ文字の後にコロンを付加"
 "することを忘れないでください。(例 D:)"
 
-#: src/libvlc.h:469
+#: src/libvlc.h:561
 msgid "This is the default DVD device to use."
 msgstr "DVDデバイスの既定値を設定します。"
 
-#: src/libvlc.h:472
+#: src/libvlc.h:564
 msgid "VCD device"
 msgstr "VCD デバイス"
 
-#: src/libvlc.h:475
+#: src/libvlc.h:567
 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:479
+#: src/libvlc.h:571
 msgid "This is the default VCD device to use."
 msgstr "VCDデバイスの既定値を指定します。"
 
-#: src/libvlc.h:482
+#: src/libvlc.h:574
 #, fuzzy
 msgid "Audio CD device"
 msgstr "オーディオ CD デバイス"
 
-#: src/libvlc.h:485
+#: src/libvlc.h:577
 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 ""
 
-#: src/libvlc.h:489
+#: src/libvlc.h:581
 #, fuzzy
 msgid "This is the default Audio CD device to use."
 msgstr "VCDデバイスの既定値を指定します。"
 
-#: src/libvlc.h:492 modules/gui/wxwidgets/dialogs/open.cpp:816
+#: src/libvlc.h:584 modules/gui/wxwidgets/dialogs/open.cpp:841
 msgid "Force IPv6"
 msgstr "強制的に IPv6"
 
-#: src/libvlc.h:494
-msgid ""
-"If you check this box, IPv6 will be used by default for all UDP and HTTP "
-"connections."
+#: src/libvlc.h:586
+#, fuzzy
+msgid "IPv6 will be used by default for all connections."
 msgstr ""
 "このチェックボックスをオンにすると、IPv6がすべてのUDPとHTTPの接続で既定値とし"
 "て使用されます。"
 
-#: src/libvlc.h:497
+#: src/libvlc.h:588
 msgid "Force IPv4"
 msgstr "強制的に IPv4"
 
-#: src/libvlc.h:499
-msgid ""
-"If you check this box, IPv4 will be used by default for all UDP and HTTP "
-"connections."
+#: src/libvlc.h:590
+#, fuzzy
+msgid "IPv4 will be used by default for all connections."
 msgstr ""
 "このチェックボックスをオンにすると、IPv4がすべてのUDPとHTTPの接続で既定値とし"
 "て使用されます。"
 
-#: src/libvlc.h:502
-msgid "TCP connection timeout in ms"
+#: src/libvlc.h:592
+msgid "TCP connection timeout"
 msgstr ""
 
-#: src/libvlc.h:504
+#: src/libvlc.h:594
 #, fuzzy
-msgid ""
-"Allows you to modify the default TCP connection timeout. This value should "
-"be set in millisecond units."
-msgstr ""
-"udpストリームで使用される既定のキャッシング値が変更可能です。単位はミリ秒で指"
-"定します。"
+msgid "Default TCP connection timeout (in milliseconds). "
+msgstr "キャッシング値 (ms)"
 
-#: src/libvlc.h:507
+#: src/libvlc.h:596
 #, fuzzy
 msgid "SOCKS server"
 msgstr "CDDB サーバー"
 
-#: src/libvlc.h:509
+#: src/libvlc.h:598
 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:512
+#: src/libvlc.h:601
 msgid "SOCKS user name"
 msgstr "SOCKS ユーザー名"
 
-#: src/libvlc.h:513
+#: src/libvlc.h:603
 #, fuzzy
-msgid ""
-"Allows you to modify the user name that will be used for the connection to "
-"the SOCKS server."
+msgid "User name to be used for connection to the SOCKS proxy."
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: src/libvlc.h:516
+#: src/libvlc.h:605
 msgid "SOCKS password"
 msgstr "SOCKS パスワード"
 
-#: src/libvlc.h:517
+#: src/libvlc.h:607
 #, fuzzy
-msgid ""
-"Allows you to modify the password that will be used for the connection to "
-"the SOCKS server."
+msgid "Password to be used for connection to the SOCKS proxy."
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: src/libvlc.h:520
+#: src/libvlc.h:609
 msgid "Title metadata"
 msgstr "タイトルメタデータ"
 
-#: src/libvlc.h:522
+#: src/libvlc.h:611
 msgid "Allows you to specify a \"title\" metadata for an input."
 msgstr ""
 
-#: src/libvlc.h:524
+#: src/libvlc.h:613
 msgid "Author metadata"
 msgstr "製作者メタデータ"
 
-#: src/libvlc.h:526
+#: src/libvlc.h:615
 msgid "Allows you to specify an \"author\" metadata for an input."
 msgstr ""
 
-#: src/libvlc.h:528
+#: src/libvlc.h:617
 msgid "Artist metadata"
 msgstr "アーティストメタデータ"
 
-#: src/libvlc.h:530
+#: src/libvlc.h:619
 msgid "Allows you to specify an \"artist\" metadata for an input."
 msgstr ""
 
-#: src/libvlc.h:532
+#: src/libvlc.h:621
 msgid "Genre metadata"
 msgstr "ジャンルメタデータ"
 
-#: src/libvlc.h:534
+#: src/libvlc.h:623
 msgid "Allows you to specify a \"genre\" metadata for an input."
 msgstr ""
 
-#: src/libvlc.h:536
+#: src/libvlc.h:625
 msgid "Copyright metadata"
 msgstr "著作権メタデータ"
 
-#: src/libvlc.h:538
+#: src/libvlc.h:627
 msgid "Allows you to specify a \"copyright\" metadata for an input."
 msgstr ""
 
-#: src/libvlc.h:540
+#: src/libvlc.h:629
 msgid "Description metadata"
 msgstr "説明メタデータ"
 
-#: src/libvlc.h:542
+#: src/libvlc.h:631
 msgid "Allows you to specify a \"description\" metadata for an input."
 msgstr ""
 
-#: src/libvlc.h:544
+#: src/libvlc.h:633
 msgid "Date metadata"
 msgstr "日付メタデータ"
 
-#: src/libvlc.h:546
+#: src/libvlc.h:635
 msgid "Allows you to specify a \"date\" metadata for an input."
 msgstr ""
 
-#: src/libvlc.h:548
+#: src/libvlc.h:637
 msgid "URL metadata"
 msgstr "URL メタデータ"
 
-#: src/libvlc.h:550
+#: src/libvlc.h:639
 msgid "Allows you to specify a \"url\" metadata for an input."
 msgstr ""
 
-#: src/libvlc.h:553
+#: src/libvlc.h:643
 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:557
-msgid "Preferred codecs list"
-msgstr "準備されているコーデックの一覧"
+#: src/libvlc.h:647
+#, fuzzy
+msgid "Preferred decoders list"
+msgstr "準備されているエンコーダー一覧"
 
-#: src/libvlc.h:559
+#: src/libvlc.h:649
 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:563
+#: src/libvlc.h:654
 msgid "Preferred encoders list"
 msgstr "準備されているエンコーダー一覧"
 
-#: src/libvlc.h:565
+#: src/libvlc.h:656
 #, 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:569
+#: src/libvlc.h:665
 msgid ""
 "These options allow you to set default global options for the stream output "
 "subsystem."
 msgstr ""
 
-#: src/libvlc.h:572
+#: src/libvlc.h:668
 msgid "Default stream output chain"
 msgstr "デフォルトのストリーム出力チェイン"
 
-#: src/libvlc.h:574
+#: src/libvlc.h:670
 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:578
+#: src/libvlc.h:674
 msgid "Enable streaming of all ES"
 msgstr "全 ES のストリーミングを有効にする"
 
-#: src/libvlc.h:580
+#: src/libvlc.h:676
 #, fuzzy
-msgid "This allows you to stream all ES (video, audio and subtitles)"
+msgid "Stream all elementary streams (video, audio and subtitles)"
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: src/libvlc.h:582
+#: src/libvlc.h:678
 msgid "Display while streaming"
 msgstr "ストリーミング中の表示"
 
-#: src/libvlc.h:584
+#: src/libvlc.h:680
 #, fuzzy
-msgid "This allows you to play the stream while streaming it."
+msgid "Play locally the stream while streaming it."
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: src/libvlc.h:586
+#: src/libvlc.h:682
 msgid "Enable video stream output"
 msgstr "ビデオストリームの出力を有効にする"
 
-#: src/libvlc.h:588
+#: src/libvlc.h:684
+#, fuzzy
 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:591
+#: src/libvlc.h:687
 msgid "Enable audio stream output"
 msgstr "オーディオストリームの出力を有効にする"
 
-#: src/libvlc.h:593
+#: src/libvlc.h:689
 #, fuzzy
 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:596
+#: src/libvlc.h:692
+#, fuzzy
+msgid "Enable SPU stream output"
+msgstr "オーディオストリームの出力を有効にする"
+
+#: src/libvlc.h:694
+#, fuzzy
+msgid ""
+"Choose whether the SPU streams should be redirected to the stream output "
+"facility when this last one is enabled."
+msgstr ""
+"ビデオ・ストリーム出力機構の最後のものが有効になっているとビデオ・ストリーム"
+"が出力機構にリダイレクトされるべき場合、選択可能です。"
+
+#: src/libvlc.h:697
 #, fuzzy
 msgid "Keep stream output open"
 msgstr "ストリームの出力先の選択"
 
-#: src/libvlc.h:598
+#: src/libvlc.h:699
 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:602
+#: src/libvlc.h:703
 #, fuzzy
 msgid "Preferred packetizer list"
 msgstr "準備されているパケッタライザー一覧の選択"
 
-#: src/libvlc.h:604
+#: src/libvlc.h:705
 msgid ""
 "This allows you to select the order in which VLC will choose its packetizers."
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: src/libvlc.h:607
+#: src/libvlc.h:708
 msgid "Mux module"
 msgstr "Mux モジュール"
 
-#: src/libvlc.h:609
+#: src/libvlc.h:710
 msgid "This is a legacy entry to let you configure mux modules"
 msgstr "muxモジュールを設定するレガシー・エントリです。"
 
-#: src/libvlc.h:611
+#: src/libvlc.h:712
 msgid "Access output module"
 msgstr "オーディオ出力モジュールアクセス"
 
-#: src/libvlc.h:613
+#: src/libvlc.h:714
 msgid "This is a legacy entry to let you configure access output modules"
 msgstr "アクセス出力モジュールを設定するレガシー・エントリです。"
 
-#: src/libvlc.h:615
+#: src/libvlc.h:716
 msgid "Control SAP flow"
 msgstr "コントロール SAP フロー"
 
-#: src/libvlc.h:616
+#: src/libvlc.h:718
 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:620
+#: src/libvlc.h:722
 msgid "SAP announcement interval"
 msgstr ""
 
-#: src/libvlc.h:621
+#: src/libvlc.h:724
 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:625
+#: src/libvlc.h:734
 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:628
+#: src/libvlc.h:737
 msgid "Enable FPU support"
 msgstr "FPU サポートを有効にする"
 
-#: src/libvlc.h:630
+#: src/libvlc.h:739
 #, fuzzy
 msgid ""
 "If your processor has a floating point calculation unit, VLC can take "
@@ -2342,11 +2409,11 @@ msgstr ""
 "プロセッサがAltiVecの機能セットをサポートしている場合には、そのアドバンテージ"
 "を利用することができます。"
 
-#: src/libvlc.h:633
+#: src/libvlc.h:742
 msgid "Enable CPU MMX support"
 msgstr "CPU の MMX サポートを有効にする"
 
-#: src/libvlc.h:635
+#: src/libvlc.h:744
 msgid ""
 "If your processor supports the MMX instructions set, VLC can take advantage "
 "of them."
@@ -2354,11 +2421,11 @@ msgstr ""
 "プロセッサがMMXの機能セットをサポートしている場合には、VLCはそのアドバンテー"
 "ジを利用できます。"
 
-#: src/libvlc.h:638
+#: src/libvlc.h:747
 msgid "Enable CPU 3D Now! support"
 msgstr "CPU の 3D Now! サポートを有効にする"
 
-#: src/libvlc.h:640
+#: src/libvlc.h:749
 msgid ""
 "If your processor supports the 3D Now! instructions set, VLC can take "
 "advantage of them."
@@ -2366,11 +2433,11 @@ msgstr ""
 "プロセッサが3D Now!機能をサポートしている場合には、VLCはそのアドバンテージを"
 "利用できます。"
 
-#: src/libvlc.h:643
+#: src/libvlc.h:752
 msgid "Enable CPU MMX EXT support"
 msgstr "CPU の MMX 拡張機能サポートを有効にする"
 
-#: src/libvlc.h:645
+#: src/libvlc.h:754
 msgid ""
 "If your processor supports the MMX EXT instructions set, VLC can take "
 "advantage of them."
@@ -2378,11 +2445,11 @@ msgstr ""
 "プロセッサがMMXの拡張機能セットをサポートしている場合には、VLCはそのアドバン"
 "テージを利用することができます。"
 
-#: src/libvlc.h:648
+#: src/libvlc.h:757
 msgid "Enable CPU SSE support"
 msgstr "CPU の SSE サポートを有効にする"
 
-#: src/libvlc.h:650
+#: src/libvlc.h:759
 msgid ""
 "If your processor supports the SSE instructions set, VLC can take advantage "
 "of them."
@@ -2390,11 +2457,11 @@ msgstr ""
 "プロセッサがSSEの機能セットをサポートしている場合には、VLCはそのアドバンテー"
 "ジを利用することができます。"
 
-#: src/libvlc.h:653
+#: src/libvlc.h:762
 msgid "Enable CPU SSE2 support"
 msgstr "CPU の SSE2 サポートを有効にする"
 
-#: src/libvlc.h:655
+#: src/libvlc.h:764
 #, fuzzy
 msgid ""
 "If your processor supports the SSE2 instructions set, VLC can take advantage "
@@ -2403,11 +2470,11 @@ msgstr ""
 "プロセッサがSSEの機能セットをサポートしている場合には、VLCはそのアドバンテー"
 "ジを利用することができます。"
 
-#: src/libvlc.h:658
+#: src/libvlc.h:767
 msgid "Enable CPU AltiVec support"
 msgstr "CPU の AltiVec サポートを有効にする"
 
-#: src/libvlc.h:660
+#: src/libvlc.h:769
 msgid ""
 "If your processor supports the AltiVec instructions set, VLC can take "
 "advantage of them."
@@ -2415,75 +2482,17 @@ msgstr ""
 "プロセッサがAltiVecの機能セットをサポートしている場合には、そのアドバンテージ"
 "を利用することができます。"
 
-#: src/libvlc.h:664
-msgid ""
-"These options define the behavior of the playlist. Some of them can be "
-"overridden in the playlist dialog box."
-msgstr ""
-
-#: src/libvlc.h:667
-#, fuzzy
-msgid "Services discovery modules"
-msgstr "MPEG 1/2ビデオ・デコーダ・モジュール"
-
-#: src/libvlc.h:669
-msgid ""
-"Specifies the services discovery modules to load, separated by semi-colons. "
-"Typical values are sap, hal, ..."
-msgstr ""
-
-#: src/libvlc.h:672
-#, fuzzy
-msgid "Play files randomly forever"
-msgstr "ファイルをランダムに再生"
-
-#: src/libvlc.h:674
-msgid ""
-"When selected, VLC will randomly play files in the playlist until "
-"interrupted."
-msgstr ""
-"このオプションが選択されるとVLCは再生一覧のファイルをランダムに再生します。"
-
-#: src/libvlc.h:677
-msgid "Repeat all"
-msgstr "すべて繰り返す"
-
-#: src/libvlc.h:679
-msgid ""
-"If you want VLC to keep playing the playlist indefinitely then enable this "
-"option."
-msgstr ""
-"再生一覧の再生を繰り返して行いたい場合には、このオプションを選択します。"
-
-#: src/libvlc.h:682
-msgid "Repeat current item"
-msgstr "現在の項目を繰り返す"
-
-#: src/libvlc.h:684
-msgid ""
-"When this is active, VLC will keep playing the current playlist item over "
-"and over again."
-msgstr ""
-
-#: src/libvlc.h:687
-msgid "Play and stop"
-msgstr "再生と停止"
-
-#: src/libvlc.h:689
-msgid "Stop the playlist after each played playlist item. "
-msgstr ""
-
-#: src/libvlc.h:692
+#: src/libvlc.h:774
 msgid ""
 "These options allow you to select default modules. Leave these alone unless "
 "you really know what you are doing."
 msgstr ""
 
-#: src/libvlc.h:695
+#: src/libvlc.h:777
 msgid "Memory copy module"
 msgstr "メモリコピーモジュール"
 
-#: src/libvlc.h:697
+#: src/libvlc.h:779
 msgid ""
 "You can select which memory copy module you want to use. By default VLC will "
 "select the fastest one supported by your hardware."
@@ -2491,42 +2500,46 @@ msgstr ""
 "使用したいメモリー・コピー・モジュールを選択します。VLCはデフォルトでハード"
 "ウェアがサポートしている最も速いものを選択します。"
 
-#: src/libvlc.h:700
+#: src/libvlc.h:782
 msgid "Access module"
 msgstr "アクセスモジュール"
 
-#: src/libvlc.h:702
+#: src/libvlc.h:784
 msgid ""
 "This allows you to force an access module. You can use it if the correct "
 "access is not automatically detected. You should not set this as a global "
 "option unless you really know what you are doing."
 msgstr ""
 
-#: src/libvlc.h:706
+#: src/libvlc.h:788
 #, fuzzy
 msgid "Access filter module"
 msgstr "アクセスモジュール"
 
-#: src/libvlc.h:708
-#, fuzzy
-msgid "This is a legacy entry to let you configure access filter modules."
-msgstr "アクセス・モジュールを選択するレガシー・エントリです。"
+#: src/libvlc.h:790
+msgid ""
+"Access filters are used to modify the stream that is being read. This is "
+"used for instance for timeshifting."
+msgstr ""
 
-#: src/libvlc.h:710
+#: src/libvlc.h:793
 #, fuzzy
 msgid "Demux module"
 msgstr "demuxモジュール"
 
-#: src/libvlc.h:712
-#, fuzzy
-msgid "This is a legacy entry to let you configure demux modules."
-msgstr "demuxモジュールを選択するレガシー・エントリです。"
+#: src/libvlc.h:795
+msgid ""
+"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:714
+#: src/libvlc.h:800
 msgid "Allow real-time priority"
 msgstr "リアルタイム優先度を許可する"
 
-#: src/libvlc.h:716
+#: src/libvlc.h:802
 msgid ""
 "Running VLC in real-time priority will allow for much more precise "
 "scheduling and yield better, especially when streaming content. It can "
@@ -2534,107 +2547,142 @@ msgid ""
 "only activate this if you know what you're doing."
 msgstr ""
 
-#: src/libvlc.h:722
+#: src/libvlc.h:808
 msgid "Adjust VLC priority"
 msgstr "VLC 優先度調整"
 
-#: src/libvlc.h:724
+#: src/libvlc.h:810
 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:728
+#: src/libvlc.h:814
 msgid "Minimize number of threads"
 msgstr "スレッドの最少数"
 
-#: src/libvlc.h:730
-msgid "This option minimizes the number of threads needed to run VLC"
+#: src/libvlc.h:816
+msgid "This option minimizes the number of threads needed to run VLC."
 msgstr ""
 
-#: src/libvlc.h:732
+#: src/libvlc.h:818
 msgid "Modules search path"
 msgstr "モジュールの検索パス"
 
-#: src/libvlc.h:734
+#: src/libvlc.h:820
 #, fuzzy
-msgid ""
-"This option allows you to specify an additional path for VLC to look for its "
-"modules."
+msgid "Additional path for VLC to look for its modules."
 msgstr "VLCがプラグインを見つけるときに検索される追加のパスを設定します。"
 
-#: src/libvlc.h:737
+#: src/libvlc.h:822
 msgid "VLM configuration file"
 msgstr "VLM 設定ファイル"
 
-#: src/libvlc.h:739
-#, fuzzy
-msgid ""
-"This option allows you to specify a VLM configuration file that will be read "
-"when VLM is launched."
-msgstr "VLCがプラグインを見つけるときに検索される追加のパスを設定します。"
+#: src/libvlc.h:824
+msgid "Read a VLM configuration file as soon as VLM is started."
+msgstr ""
 
-#: src/libvlc.h:742
+#: src/libvlc.h:826
 msgid "Use a plugins cache"
 msgstr "プラグインキャッシュを使う"
 
-#: src/libvlc.h:744
-msgid ""
-"This option allows you to use a plugins cache which will greatly improve the "
-"start time of VLC."
+#: src/libvlc.h:828
+msgid "Use a plugins cache which will greatly improve the startup time of VLC."
 msgstr ""
 
-#: src/libvlc.h:747
+#: src/libvlc.h:830
+msgid "Collect statistics"
+msgstr ""
+
+#: src/libvlc.h:832
+#, fuzzy
+msgid "Collect miscellaneous statistics."
+msgstr "VLCがプラグインを見つけるときに検索される追加のパスを設定します。"
+
+#: src/libvlc.h:834
 msgid "Run as daemon process"
 msgstr "デーモンプロセスとして実行する"
 
-#: src/libvlc.h:749
+#: src/libvlc.h:836
 msgid "Runs VLC as a background daemon process."
 msgstr "バックグラウンドデーモンプロセスとして実行する"
 
-#: src/libvlc.h:751
+#: src/libvlc.h:838
+msgid "Write process id to file"
+msgstr ""
+
+#: src/libvlc.h:840
+msgid "Writes process id into specified file."
+msgstr ""
+
+#: src/libvlc.h:842
+#, fuzzy
+msgid "Log to file"
+msgstr "ファイル"
+
+#: src/libvlc.h:844
+msgid "Log all VLC messages to a text file."
+msgstr ""
+
+#: src/libvlc.h:846
+msgid "Log to syslog"
+msgstr ""
+
+#: src/libvlc.h:848
+msgid "Log all VLC messages to syslog (UNIX systems)."
+msgstr ""
+
+#: src/libvlc.h:850
 msgid "Allow only one running instance"
 msgstr "ひとつだけ実行を許可する"
 
-#: src/libvlc.h:753
+#: src/libvlc.h:852
 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 "
+"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:760
-msgid "Enqueue items to playlist when in one instance mode"
+#: src/libvlc.h:858
+msgid "VLC is started from file association"
 msgstr ""
 
-#: src/libvlc.h:762
-msgid ""
-"When using the one instance only option, enqueue items to playlist and keep "
-"playing current item."
+#: src/libvlc.h:860
+msgid "Tell VLC that it is being launched due to a file association in the OS"
 msgstr ""
 
-#: src/libvlc.h:765
+#: src/libvlc.h:863
+#, fuzzy
+msgid "One instance when started from file"
+msgstr "ひとつだけ実行を許可する"
+
+#: src/libvlc.h:865
+#, fuzzy
+msgid "Allow only one running instance when started from file."
+msgstr "ひとつだけ実行を許可する"
+
+#: src/libvlc.h:867
 msgid "Increase the priority of the process"
 msgstr "プロセスの優先度を増やす"
 
-#: src/libvlc.h:767
+#: src/libvlc.h:869
 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:774
+#: src/libvlc.h:876
 msgid "Fast mutex on NT/2K/XP (developers only)"
 msgstr "NT/2K/XP での高速 mutex (開発者のみ)"
 
-#: src/libvlc.h:776
+#: src/libvlc.h:878
 #, fuzzy
 msgid ""
 "On Windows NT/2K/XP we use a slow mutex implementation but which allows us "
@@ -2645,11 +2693,11 @@ msgstr ""
 "し、より速いmutexの実装を使用することも可能です。その場合、問題が発生する可能"
 "性があります。"
 
-#: src/libvlc.h:781
+#: src/libvlc.h:883
 msgid "Condition variables implementation for Win9x (developers only)"
 msgstr "Win9x 向け条件値の実装 (開発者向け)"
 
-#: src/libvlc.h:784
+#: src/libvlc.h:886
 #, fuzzy
 msgid ""
 "On Windows 9x/Me you can use a fast but incorrect condition variables "
@@ -2662,595 +2710,809 @@ msgstr ""
 "る可能性があります)を使用します。しかし、代替えとなる遅くても安定した実装を選"
 "択することも可能です。現時点では、0(既定値の最速のもの), 1, 2が選択可能です。"
 
-#: src/libvlc.h:792
+#: src/libvlc.h:895
+msgid "Enqueue items to playlist when in one instance mode"
+msgstr ""
+
+#: src/libvlc.h:897
+msgid ""
+"When using the one instance only option, enqueue items to playlist and keep "
+"playing current item."
+msgstr ""
+
+#: src/libvlc.h:906
+msgid ""
+"These options define the behavior of the playlist. Some of them can be "
+"overridden in the playlist dialog box."
+msgstr ""
+
+#: src/libvlc.h:909
+#, fuzzy
+msgid "Automatically preparse files"
+msgstr "ファイルの自動再生"
+
+#: src/libvlc.h:911
+msgid ""
+"Automatically preparse files added to the playlist (to retrieve some "
+"metadata)."
+msgstr ""
+
+#: src/libvlc.h:914
+#, fuzzy
+msgid "Services discovery modules"
+msgstr "MPEG 1/2ビデオ・デコーダ・モジュール"
+
+#: src/libvlc.h:916
+msgid ""
+"Specifies the services discovery modules to load, separated by semi-colons. "
+"Typical values are sap, hal, ..."
+msgstr ""
+
+#: src/libvlc.h:919
+#, fuzzy
+msgid "Play files randomly forever"
+msgstr "ファイルをランダムに再生"
+
+#: src/libvlc.h:921
+#, fuzzy
+msgid "VLC will randomly play files in the playlist until interrupted."
+msgstr ""
+"このオプションが選択されるとVLCは再生一覧のファイルをランダムに再生します。"
+
+#: src/libvlc.h:923
+msgid "Repeat all"
+msgstr "すべて繰り返す"
+
+#: src/libvlc.h:925
+#, fuzzy
+msgid "VLC will keep playing the playlist indefinitely."
+msgstr ""
+"再生一覧の再生を繰り返して行いたい場合には、このオプションを選択します。"
+
+#: src/libvlc.h:927
+msgid "Repeat current item"
+msgstr "現在の項目を繰り返す"
+
+#: src/libvlc.h:929
+#, fuzzy
+msgid "VLC will keep playing the current playlist item."
+msgstr "再生一覧を開く"
+
+#: src/libvlc.h:931
+msgid "Play and stop"
+msgstr "再生と停止"
+
+#: src/libvlc.h:933
+msgid "Stop the playlist after each played playlist item."
+msgstr ""
+
+#: src/libvlc.h:935
+#, fuzzy
+msgid "Use media library"
+msgstr "VLC メディアプレイヤー"
+
+#: src/libvlc.h:937
+msgid ""
+"The media library is automatically saved and reloaded each time you start "
+"VLC."
+msgstr ""
+
+#: src/libvlc.h:940
+#, fuzzy
+msgid "Use playlist tree"
+msgstr "次の再生一覧項目再生一覧を開く"
+
+#: src/libvlc.h:942
+msgid ""
+"The playlist can use a tree to categorize some items, like the contents of a "
+"directory. \"Default\" means that the tree will only be used when really "
+"needed."
+msgstr ""
+
+#: src/libvlc.h:946
+#, fuzzy
+msgid "Always"
+msgstr "常に最前面"
+
+#: src/libvlc.h:946
+#, fuzzy
+msgid "Never"
+msgstr "リバーブ"
+
+#: src/libvlc.h:955
 msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
 msgstr ""
 
-#: src/libvlc.h:795 src/video_output/vout_intf.c:325
-#: 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:449
-#: modules/gui/macosx/intf.m:525
+#: src/libvlc.h:958 src/video_output/vout_intf.c:402
+#: modules/gui/beos/VideoOutput.cpp:1057 modules/gui/macosx/applescript.m:126
+#: modules/gui/macosx/controls.m:338 modules/gui/macosx/controls.m:754
+#: modules/gui/macosx/controls.m:784 modules/gui/macosx/embeddedwindow.m:44
+#: modules/gui/macosx/intf.m:496 modules/gui/macosx/intf.m:572
 msgid "Fullscreen"
 msgstr "全画面化"
 
-#: src/libvlc.h:796
+#: src/libvlc.h:959
 msgid "Select the hotkey to use to swap fullscreen state."
 msgstr ""
 
-#: src/libvlc.h:797 modules/gui/wxwidgets/dialogs/vlm/vlm_streampanel.cpp:81
-#: modules/gui/wxwidgets/interface.cpp:1447
+#: src/libvlc.h:960 modules/gui/wxwidgets/dialogs/vlm/vlm_streampanel.cpp:82
+#: modules/gui/wxwidgets/interface.cpp:1510
 msgid "Play/Pause"
 msgstr "再生/一時停止"
 
-#: src/libvlc.h:798
+#: src/libvlc.h:961
 msgid "Select the hotkey to use to swap paused state."
 msgstr ""
 
-#: src/libvlc.h:799
+#: src/libvlc.h:962
 msgid "Pause only"
 msgstr "一時停止のみ"
 
-#: src/libvlc.h:800
+#: src/libvlc.h:963
 msgid "Select the hotkey to use to pause."
 msgstr "一時停止に使うホットキーを選択"
 
-#: src/libvlc.h:801
+#: src/libvlc.h:964
 msgid "Play only"
 msgstr "再生のみ"
 
-#: src/libvlc.h:802
+#: src/libvlc.h:965
 msgid "Select the hotkey to use to play."
 msgstr "再生に使うホットキーを選択"
 
-#: src/libvlc.h:803 modules/control/hotkeys.c:641
-#: modules/gui/macosx/controls.m:558 modules/gui/macosx/intf.m:490
+#: src/libvlc.h:966 modules/control/hotkeys.c:713
+#: modules/gui/macosx/controls.m:687 modules/gui/macosx/intf.m:537
+#: modules/gui/wxwidgets/interface.cpp:695
 msgid "Faster"
 msgstr "早送り"
 
-#: src/libvlc.h:804
+#: src/libvlc.h:967
 msgid "Select the hotkey to use for fast forward playback."
 msgstr "早送りに使うホットキーを選択"
 
-#: src/libvlc.h:805 modules/control/hotkeys.c:648
-#: modules/gui/macosx/controls.m:559 modules/gui/macosx/intf.m:491
+#: src/libvlc.h:968 modules/control/hotkeys.c:721
+#: modules/gui/macosx/controls.m:688 modules/gui/macosx/intf.m:538
+#: modules/gui/wxwidgets/interface.cpp:694
 msgid "Slower"
 msgstr "スロー"
 
-#: src/libvlc.h:806
+#: src/libvlc.h:969
 msgid "Select the hotkey to use for slow motion playback."
 msgstr "スローモーションに使うホットキーを選択"
 
-#: src/libvlc.h:807 modules/control/hotkeys.c:610
-#: modules/gui/macosx/controls.m:579 modules/gui/macosx/intf.m:448
-#: modules/gui/macosx/intf.m:493 modules/gui/macosx/intf.m:564
-#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:348
-#: modules/gui/macosx/wizard.m:1398 modules/gui/wxwidgets/interface.cpp:1452
-#: modules/gui/wxwidgets/menus.cpp:287
+#: src/libvlc.h:970 modules/control/hotkeys.c:680
+#: modules/gui/macosx/controls.m:708 modules/gui/macosx/intf.m:495
+#: modules/gui/macosx/intf.m:540 modules/gui/macosx/intf.m:615
+#: modules/gui/macosx/wizard.m:313 modules/gui/macosx/wizard.m:364
+#: modules/gui/macosx/wizard.m:1606 modules/gui/wxwidgets/interface.cpp:693
+#: modules/gui/wxwidgets/interface.cpp:1515
+#: modules/gui/wxwidgets/menus.cpp:258
 msgid "Next"
 msgstr "次"
 
-#: src/libvlc.h:808
+#: src/libvlc.h:971
 msgid "Select the hotkey to use to skip to the next item in the playlist."
 msgstr ""
 
-#: src/libvlc.h:809 modules/control/hotkeys.c:621
-#: modules/gui/macosx/controls.m:578 modules/gui/macosx/intf.m:443
-#: modules/gui/macosx/intf.m:492 modules/gui/macosx/intf.m:565
-#: modules/gui/wxwidgets/interface.cpp:1451
-#: modules/gui/wxwidgets/menus.cpp:286
+#: src/libvlc.h:972 modules/control/hotkeys.c:692
+#: modules/gui/macosx/controls.m:707 modules/gui/macosx/intf.m:490
+#: modules/gui/macosx/intf.m:539 modules/gui/macosx/intf.m:616
+#: modules/gui/wxwidgets/interface.cpp:692
+#: modules/gui/wxwidgets/interface.cpp:1514
+#: modules/gui/wxwidgets/menus.cpp:257
 msgid "Previous"
 msgstr "前"
 
-#: src/libvlc.h:810
+#: src/libvlc.h:973
 msgid "Select the hotkey to use to skip to the previous item in the playlist."
 msgstr ""
 
-#: src/libvlc.h:811 modules/gui/macosx/controls.m:570
-#: modules/gui/macosx/intf.m:446 modules/gui/macosx/intf.m:489
-#: modules/gui/macosx/intf.m:563 modules/gui/pda/pda_interface.c:274
+#: src/libvlc.h:974 modules/gui/macosx/controls.m:699
+#: modules/gui/macosx/intf.m:493 modules/gui/macosx/intf.m:536
+#: modules/gui/macosx/intf.m:614 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:660
-#: modules/gui/wxwidgets/interface.cpp:1453
-#: modules/gui/wxwidgets/menus.cpp:285 modules/visualization/xosd.c:235
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_streampanel.cpp:87
+#: modules/gui/wxwidgets/interface.cpp:676
+#: modules/gui/wxwidgets/interface.cpp:687
+#: modules/gui/wxwidgets/interface.cpp:1516
+#: modules/gui/wxwidgets/menus.cpp:256 modules/visualization/xosd.c:237
 msgid "Stop"
 msgstr "停止"
 
-#: src/libvlc.h:812
-msgid "Select the hotkey to stop the playback."
+#: src/libvlc.h:975
+#, fuzzy
+msgid "Select the hotkey to stop playback."
 msgstr "最低を停止するホットキーを選択する"
 
-#: src/libvlc.h:813 modules/gui/macosx/intf.m:451
-#: modules/gui/macosx/sfilters.m:80 modules/gui/macosx/sfilters.m:93
-#: modules/gui/macosx/sfilters.m:106 modules/video_filter/marq.c:121
-#: modules/video_filter/rss.c:158
+#: src/libvlc.h:976 modules/gui/macosx/bookmarks.m:101
+#: modules/gui/macosx/bookmarks.m:110 modules/gui/macosx/embeddedwindow.m:46
+#: modules/gui/macosx/intf.m:498 modules/video_filter/marq.c:122
+#: modules/video_filter/rss.c:174
 msgid "Position"
 msgstr "位置"
 
-#: src/libvlc.h:814
+#: src/libvlc.h:977
 msgid "Select the hotkey to display the position."
 msgstr ""
 
-#: src/libvlc.h:816
+#: src/libvlc.h:979
 msgid "Very short backwards jump"
 msgstr ""
 
-#: src/libvlc.h:818
+#: src/libvlc.h:981
 #, fuzzy
 msgid "Select the hotkey to make a very short backwards jump."
 msgstr "5 分前に戻るホットキーを選択する<"
 
-#: src/libvlc.h:819
+#: src/libvlc.h:982
 #, fuzzy
 msgid "Short backwards jump"
 msgstr "逆転再生"
 
-#: src/libvlc.h:821
+#: src/libvlc.h:984
 #, fuzzy
 msgid "Select the hotkey to make a short backwards jump."
 msgstr "3 秒前に戻るホットキーを選択する"
 
-#: src/libvlc.h:823
+#: src/libvlc.h:985
 msgid "Medium backwards jump"
 msgstr ""
 
-#: src/libvlc.h:825
+#: src/libvlc.h:987
 #, fuzzy
 msgid "Select the hotkey to make a medium backwards jump."
 msgstr "1 分前に戻るホットキーを選択する"
 
-#: src/libvlc.h:826
+#: src/libvlc.h:988
 #, fuzzy
 msgid "Long backwards jump"
 msgstr "逆転再生"
 
-#: src/libvlc.h:828
+#: src/libvlc.h:990
 #, fuzzy
 msgid "Select the hotkey to make a long backwards jump."
 msgstr "3 秒前に戻るホットキーを選択する"
 
-#: src/libvlc.h:830
+#: src/libvlc.h:992
 msgid "Very short forward jump"
 msgstr ""
 
-#: src/libvlc.h:832
+#: src/libvlc.h:994
 #, fuzzy
 msgid "Select the hotkey to make a very short forward jump."
 msgstr "早送りに使うホットキーを選択"
 
-#: src/libvlc.h:833
+#: src/libvlc.h:995
 #, fuzzy
 msgid "Short forward jump"
 msgstr "転送"
 
-#: src/libvlc.h:835
+#: src/libvlc.h:997
 #, fuzzy
 msgid "Select the hotkey to make a short forward jump."
 msgstr "3 秒進むホットキーを選択する"
 
-#: src/libvlc.h:837
+#: src/libvlc.h:998
 msgid "Medium forward jump"
 msgstr ""
 
-#: src/libvlc.h:839
+#: src/libvlc.h:1000
 #, fuzzy
 msgid "Select the hotkey to make a medium forward jump."
 msgstr "1 分先に進むホットキーを選択する<"
 
-#: src/libvlc.h:840
+#: src/libvlc.h:1001
 msgid "Long forward jump"
 msgstr ""
 
-#: src/libvlc.h:842
+#: src/libvlc.h:1003
 #, fuzzy
 msgid "Select the hotkey to make a long forward jump."
 msgstr "3 秒進むホットキーを選択する"
 
-#: src/libvlc.h:844
-msgid "Very short jump size"
+#: src/libvlc.h:1005
+msgid "Very short jump length"
 msgstr ""
 
-#: src/libvlc.h:845
-msgid "Very short jump \"size\", in seconds"
+#: src/libvlc.h:1006
+msgid "Very short jump length, in seconds."
 msgstr ""
 
-#: src/libvlc.h:846
-msgid "Short jump size"
+#: src/libvlc.h:1007
+msgid "Short jump length"
 msgstr ""
 
-#: src/libvlc.h:847
-msgid "Short jump \"size\", in seconds"
+#: src/libvlc.h:1008
+msgid "Short jump length, in seconds."
 msgstr ""
 
-#: src/libvlc.h:848
-msgid "Medium jump size"
+#: src/libvlc.h:1009
+msgid "Medium jump length"
 msgstr ""
 
-#: src/libvlc.h:849
-msgid "Medium jump \"size\", in seconds"
+#: src/libvlc.h:1010
+msgid "Medium jump length, in seconds."
 msgstr ""
 
-#: src/libvlc.h:850
+#: src/libvlc.h:1011
 #, fuzzy
-msgid "Long jump size"
+msgid "Long jump length"
 msgstr "フォントサイズ"
 
-#: src/libvlc.h:851
-msgid "Long jump \"size\", in seconds"
+#: src/libvlc.h:1012
+msgid "Long jump length, in seconds."
 msgstr ""
 
-#: src/libvlc.h:853 modules/control/hotkeys.c:275
-#: modules/gui/beos/InterfaceWindow.cpp:274
+#: src/libvlc.h:1014 modules/control/hotkeys.c:258
+#: modules/gui/beos/InterfaceWindow.cpp:276
 msgid "Quit"
 msgstr "終了"
 
-#: src/libvlc.h:854
+#: src/libvlc.h:1015
 msgid "Select the hotkey to quit the application."
 msgstr "アプリケーションを終了するホットキーを選択します。"
 
-#: src/libvlc.h:855
+#: src/libvlc.h:1016
 #, fuzzy
 msgid "Navigate up"
 msgstr "ナビゲーション(_N)"
 
-#: src/libvlc.h:856
+#: src/libvlc.h:1017
 msgid "Select the key to move the selector up in DVD menus."
 msgstr ""
 
-#: src/libvlc.h:857
+#: src/libvlc.h:1018
 #, fuzzy
 msgid "Navigate down"
 msgstr "ナビゲーション(_N)"
 
-#: src/libvlc.h:858
+#: src/libvlc.h:1019
 msgid "Select the key to move the selector down in DVD menus."
 msgstr ""
 
-#: src/libvlc.h:859
+#: src/libvlc.h:1020
 #, fuzzy
 msgid "Navigate left"
 msgstr "ナビゲーション(_N)"
 
-#: src/libvlc.h:860
+#: src/libvlc.h:1021
 msgid "Select the key to move the selector left in DVD menus."
 msgstr ""
 
-#: src/libvlc.h:861
+#: src/libvlc.h:1022
 #, fuzzy
 msgid "Navigate right"
 msgstr "ナビゲーション(_N)"
 
-#: src/libvlc.h:862
+#: src/libvlc.h:1023
 #, fuzzy
 msgid "Select the key to move the selector right in DVD menus."
 msgstr "再生一覧を開く"
 
-#: src/libvlc.h:863
+#: src/libvlc.h:1024
 msgid "Activate"
 msgstr ""
 
-#: src/libvlc.h:864
+#: src/libvlc.h:1025
 msgid "Select the key to activate selected item in DVD menus."
 msgstr ""
 
-#: src/libvlc.h:865
+#: src/libvlc.h:1026
 msgid "Go to the DVD menu"
 msgstr "DVD メニューに移動する"
 
-#: src/libvlc.h:866
+#: src/libvlc.h:1027
 #, fuzzy
 msgid "Select the key to take you to the DVD menu"
 msgstr "再生一覧を開く"
 
-#: src/libvlc.h:867
+#: src/libvlc.h:1028
 msgid "Select previous DVD title"
 msgstr "前の DVD の題名を選択する"
 
-#: src/libvlc.h:868
+#: src/libvlc.h:1029
 #, fuzzy
 msgid "Select the key to choose the previous title from the DVD"
 msgstr "再生一覧を開く"
 
-#: src/libvlc.h:869
+#: src/libvlc.h:1030
 msgid "Select next DVD title"
 msgstr "次の DVD の題名を選択する"
 
-#: src/libvlc.h:870
+#: src/libvlc.h:1031
 #, fuzzy
 msgid "Select the key to choose the next title from the DVD"
 msgstr "再生一覧を開く"
 
-#: src/libvlc.h:871
+#: src/libvlc.h:1032
 msgid "Select prev DVD chapter"
 msgstr "前の DVD チャプターを選択する"
 
-#: src/libvlc.h:872
+#: src/libvlc.h:1033
 #, fuzzy
 msgid "Select the key to choose the previous chapter from the DVD"
 msgstr "再生一覧を開く"
 
-#: src/libvlc.h:873
+#: src/libvlc.h:1034
 #, fuzzy
 msgid "Select next DVD chapter"
 msgstr "次のチャプターを選択"
 
-#: src/libvlc.h:874
+#: src/libvlc.h:1035
 #, fuzzy
 msgid "Select the key to choose the next chapter from the DVD"
 msgstr "再生一覧を開く"
 
-#: src/libvlc.h:875
+#: src/libvlc.h:1036
 msgid "Volume up"
 msgstr "ボリュームを上げる"
 
-#: src/libvlc.h:876
+#: src/libvlc.h:1037
 msgid "Select the key to increase audio volume."
 msgstr ""
 
-#: src/libvlc.h:877
+#: src/libvlc.h:1038
 msgid "Volume down"
 msgstr "ボリュームを下げる"
 
-#: src/libvlc.h:878
+#: src/libvlc.h:1039
 msgid "Select the key to decrease audio volume."
 msgstr ""
 
-#: src/libvlc.h:879 modules/gui/macosx/controls.m:613
-#: modules/gui/macosx/intf.m:510 modules/gui/macosx/intf.m:566
+#: src/libvlc.h:1040 modules/gui/macosx/controls.m:744
+#: modules/gui/macosx/intf.m:557 modules/gui/macosx/intf.m:617
 msgid "Mute"
 msgstr "ミュートする"
 
-#: src/libvlc.h:880
-msgid "Select the key to turn off audio volume."
-msgstr "オーディオボリュームを生オンするキーを選択します。"
+#: src/libvlc.h:1041
+#, fuzzy
+msgid "Select the key to mute audio."
+msgstr "一時停止に使うホットキーを選択"
 
-#: src/libvlc.h:881
+#: src/libvlc.h:1042
 #, fuzzy
 msgid "Subtitle delay up"
 msgstr "字幕"
 
-#: src/libvlc.h:882
+#: src/libvlc.h:1043
 #, fuzzy
 msgid "Select the key to increase the subtitle delay."
 msgstr "再生一覧を開く"
 
-#: src/libvlc.h:883
+#: src/libvlc.h:1044
 #, fuzzy
 msgid "Subtitle delay down"
 msgstr "字幕・デコーダ・モジュール"
 
-#: src/libvlc.h:884
+#: src/libvlc.h:1045
 #, fuzzy
 msgid "Select the key to decrease the subtitle delay."
 msgstr "再生一覧を開く"
 
-#: src/libvlc.h:885
+#: src/libvlc.h:1046
 #, fuzzy
 msgid "Audio delay up"
 msgstr "字幕"
 
-#: src/libvlc.h:886
+#: src/libvlc.h:1047
 #, fuzzy
 msgid "Select the key to increase the audio delay."
 msgstr "再生一覧を開く"
 
-#: src/libvlc.h:887
+#: src/libvlc.h:1048
 #, fuzzy
 msgid "Audio delay down"
 msgstr "字幕・デコーダ・モジュール"
 
-#: src/libvlc.h:888
+#: src/libvlc.h:1049
 #, fuzzy
 msgid "Select the key to decrease the audio delay."
 msgstr "再生一覧を開く"
 
-#: src/libvlc.h:889
+#: src/libvlc.h:1050
 msgid "Play playlist bookmark 1"
 msgstr "再生一覧ブックマーク 1 を再生する"
 
-#: src/libvlc.h:890
+#: src/libvlc.h:1051
 msgid "Play playlist bookmark 2"
 msgstr "再生一覧ブックマーク 2 を再生する"
 
-#: src/libvlc.h:891
+#: src/libvlc.h:1052
 msgid "Play playlist bookmark 3"
 msgstr "再生一覧ブックマーク 3 を再生する"
 
-#: src/libvlc.h:892
+#: src/libvlc.h:1053
 msgid "Play playlist bookmark 4"
 msgstr "再生一覧ブックマーク 4 を再生する"
 
-#: src/libvlc.h:893
+#: src/libvlc.h:1054
 msgid "Play playlist bookmark 5"
 msgstr "再生一覧ブックマーク 5 を再生する"
 
-#: src/libvlc.h:894
+#: src/libvlc.h:1055
 msgid "Play playlist bookmark 6"
 msgstr "再生一覧ブックマーク 6 を再生する"
 
-#: src/libvlc.h:895
+#: src/libvlc.h:1056
 msgid "Play playlist bookmark 7"
 msgstr "再生一覧ブックマーク 7 を再生する"
 
-#: src/libvlc.h:896
+#: src/libvlc.h:1057
 msgid "Play playlist bookmark 8"
 msgstr "再生一覧ブックマーク 8 を再生する"
 
-#: src/libvlc.h:897
+#: src/libvlc.h:1058
 msgid "Play playlist bookmark 9"
 msgstr "再生一覧ブックマーク 9 を再生する"
 
-#: src/libvlc.h:898
+#: src/libvlc.h:1059
 msgid "Play playlist bookmark 10"
 msgstr "再生一覧ブックマーク 10 を再生する"
 
-#: src/libvlc.h:899
+#: src/libvlc.h:1060
 #, fuzzy
 msgid "Select the key to play this bookmark."
 msgstr "このブックマークを再生するキーを選択します。"
 
-#: src/libvlc.h:900
+#: src/libvlc.h:1061
 msgid "Set playlist bookmark 1"
 msgstr "再生一覧ブックマーク 1 を設定する"
 
-#: src/libvlc.h:901
+#: src/libvlc.h:1062
 msgid "Set playlist bookmark 2"
 msgstr "再生一覧ブックマーク 2 を設定する"
 
-#: src/libvlc.h:902
+#: src/libvlc.h:1063
 msgid "Set playlist bookmark 3"
 msgstr "再生一覧ブックマーク 3 を設定する"
 
-#: src/libvlc.h:903
+#: src/libvlc.h:1064
 msgid "Set playlist bookmark 4"
 msgstr "再生一覧ブックマーク 4 を設定する"
 
-#: src/libvlc.h:904
+#: src/libvlc.h:1065
 msgid "Set playlist bookmark 5"
 msgstr "再生一覧ブックマーク 5 を設定する"
 
-#: src/libvlc.h:905
+#: src/libvlc.h:1066
 msgid "Set playlist bookmark 6"
 msgstr "再生一覧ブックマーク 6 を設定する"
 
-#: src/libvlc.h:906
+#: src/libvlc.h:1067
 msgid "Set playlist bookmark 7"
 msgstr "再生一覧ブックマーク 7 を設定する"
 
-#: src/libvlc.h:907
+#: src/libvlc.h:1068
 msgid "Set playlist bookmark 8"
 msgstr "再生一覧ブックマーク 8 を設定する"
 
-#: src/libvlc.h:908
+#: src/libvlc.h:1069
 msgid "Set playlist bookmark 9"
 msgstr "再生一覧ブックマーク 9 を設定する"
 
-#: src/libvlc.h:909
+#: src/libvlc.h:1070
 msgid "Set playlist bookmark 10"
 msgstr "再生一覧ブックマーク 10 を設定する"
 
-#: src/libvlc.h:910
+#: src/libvlc.h:1071
 msgid "Select the key to set this playlist bookmark."
 msgstr "この再生一覧ブックマークを設定するキーを選択します。"
 
-#: src/libvlc.h:912
+#: src/libvlc.h:1073 modules/control/hotkeys.c:84
+#, fuzzy
+msgid "Playlist bookmark 1"
+msgstr "リスト"
+
+#: src/libvlc.h:1074 modules/control/hotkeys.c:85
+#, fuzzy
+msgid "Playlist bookmark 2"
+msgstr "リスト"
+
+#: src/libvlc.h:1075 modules/control/hotkeys.c:86
+#, fuzzy
+msgid "Playlist bookmark 3"
+msgstr "リスト"
+
+#: src/libvlc.h:1076 modules/control/hotkeys.c:87
+#, fuzzy
+msgid "Playlist bookmark 4"
+msgstr "リスト"
+
+#: src/libvlc.h:1077 modules/control/hotkeys.c:88
+#, fuzzy
+msgid "Playlist bookmark 5"
+msgstr "リスト"
+
+#: src/libvlc.h:1078 modules/control/hotkeys.c:89
+#, fuzzy
+msgid "Playlist bookmark 6"
+msgstr "リスト"
+
+#: src/libvlc.h:1079 modules/control/hotkeys.c:90
+#, fuzzy
+msgid "Playlist bookmark 7"
+msgstr "リスト"
+
+#: src/libvlc.h:1080 modules/control/hotkeys.c:91
+#, fuzzy
+msgid "Playlist bookmark 8"
+msgstr "リスト"
+
+#: src/libvlc.h:1081 modules/control/hotkeys.c:92
+#, fuzzy
+msgid "Playlist bookmark 9"
+msgstr "リスト"
+
+#: src/libvlc.h:1082 modules/control/hotkeys.c:93
+#, fuzzy
+msgid "Playlist bookmark 10"
+msgstr "リスト"
+
+#: src/libvlc.h:1084
+#, fuzzy
+msgid "This allows you to define playlist bookmarks."
+msgstr "この再生一覧ブックマークを設定するキーを選択します。"
+
+#: src/libvlc.h:1086
 msgid "Go back in browsing history"
 msgstr ""
 
-#: src/libvlc.h:913
+#: src/libvlc.h:1087
 msgid ""
 "Select the key to go back (to the previous media item) in the browsing "
 "history."
 msgstr ""
 
-#: src/libvlc.h:914
+#: src/libvlc.h:1088
 msgid "Go forward in browsing history"
 msgstr ""
 
-#: src/libvlc.h:915
+#: src/libvlc.h:1089
 msgid ""
 "Select the key to go forward (to the next media item) in the browsing "
 "history."
 msgstr ""
 
-#: src/libvlc.h:917
+#: src/libvlc.h:1091
 #, fuzzy
 msgid "Cycle audio track"
 msgstr "オーディオトラック"
 
-#: src/libvlc.h:918
-msgid "Cycle through the available audio tracks(languages)"
+#: src/libvlc.h:1092
+msgid "Cycle through the available audio tracks(languages)."
 msgstr ""
 
-#: src/libvlc.h:919
+#: src/libvlc.h:1093
 #, fuzzy
 msgid "Cycle subtitle track"
 msgstr "字幕トラックの選択"
 
-#: src/libvlc.h:920
-msgid "Cycle through the available subtitle tracks"
-msgstr ""
+#: src/libvlc.h:1094
+#, fuzzy
+msgid "Cycle through the available subtitle tracks."
+msgstr "字幕トラックの選択"
 
-#: src/libvlc.h:921
+#: src/libvlc.h:1095
 #, fuzzy
 msgid "Cycle source aspect ratio"
 msgstr "ソースのアスペクト比"
 
-#: src/libvlc.h:922
-msgid "Cycle through a predefined list of source aspect ratios"
-msgstr ""
+#: src/libvlc.h:1096
+#, fuzzy
+msgid "Cycle through a predefined list of source aspect ratios."
+msgstr "ソースのアスペクト比"
 
-#: src/libvlc.h:923
+#: src/libvlc.h:1097
 #, fuzzy
 msgid "Cycle video crop"
 msgstr "グレースケールビデオ出力"
 
-#: src/libvlc.h:924
-msgid "Cycle through a predefined list of crop formats"
+#: src/libvlc.h:1098
+msgid "Cycle through a predefined list of crop formats."
 msgstr ""
 
-#: src/libvlc.h:925
+#: src/libvlc.h:1099
 #, fuzzy
 msgid "Cycle deinterlace modes"
 msgstr "ノンインタレース化モード"
 
-#: src/libvlc.h:926
-msgid "Cycle through all the deinterlace modes"
-msgstr ""
+#: src/libvlc.h:1100
+#, fuzzy
+msgid "Cycle through deinterlace modes."
+msgstr "ノンインタレース化モード"
 
-#: src/libvlc.h:927
+#: src/libvlc.h:1101
 msgid "Show interface"
 msgstr "インターフェースを表示する"
 
-#: src/libvlc.h:928
+#: src/libvlc.h:1102
 #, fuzzy
-msgid "Raise the interface above all other windows"
+msgid "Raise the interface above all other windows."
 msgstr "インタフェースウィンドウを隠す"
 
-#: src/libvlc.h:929
+#: src/libvlc.h:1103
 #, fuzzy
 msgid "Hide interface"
 msgstr "インタフェースを隠す(_H)"
 
-#: src/libvlc.h:930
+#: src/libvlc.h:1104
 #, fuzzy
-msgid "Lower the interface below all other windows"
+msgid "Lower the interface below all other windows."
 msgstr "インタフェースウィンドウを隠す"
 
-#: src/libvlc.h:931
+#: src/libvlc.h:1105
 msgid "Take video snapshot"
 msgstr "ビデオのスナップショットを取る"
 
-#: src/libvlc.h:932
+#: src/libvlc.h:1106
 msgid "Takes a video snapshot and writes it to disk."
 msgstr "ビデオのスナップショットを取ってディスクに書き込みます。"
 
-#: src/libvlc.h:934 modules/access_filter/record.c:50
-#: modules/access_filter/record.c:51
+#: src/libvlc.h:1108 modules/access_filter/record.c:51
+#: modules/access_filter/record.c:52
 msgid "Record"
 msgstr "レコード"
 
-#: src/libvlc.h:935
+#: src/libvlc.h:1109
 msgid "Record access filter start/stop."
 msgstr ""
 
-#: src/libvlc.h:939
+#: src/libvlc.h:1111 src/libvlc.h:1112 src/video_output/vout_intf.c:205
+msgid "Zoom"
+msgstr "ズーム"
+
+#: src/libvlc.h:1114 src/libvlc.h:1115
+#, fuzzy
+msgid "Un-Zoom"
+msgstr "ズーム"
+
+#: src/libvlc.h:1117 src/libvlc.h:1118
+msgid "Crop one pixel from the top of the video"
+msgstr ""
+
+#: src/libvlc.h:1119 src/libvlc.h:1120
+msgid "Uncrop one pixel from the top of the video"
+msgstr ""
+
+#: src/libvlc.h:1122 src/libvlc.h:1123
+msgid "Crop one pixel from the left of the video"
+msgstr ""
+
+#: src/libvlc.h:1124 src/libvlc.h:1125
+msgid "Uncrop one pixel from the left of the video"
+msgstr ""
+
+#: src/libvlc.h:1127 src/libvlc.h:1128
+msgid "Crop one pixel from the bottom of the video"
+msgstr ""
+
+#: src/libvlc.h:1129 src/libvlc.h:1130
+msgid "Uncrop one pixel from the bottom of the video"
+msgstr ""
+
+#: src/libvlc.h:1132 src/libvlc.h:1133
+msgid "Crop one pixel from the right of the video"
+msgstr ""
+
+#: src/libvlc.h:1134 src/libvlc.h:1135
+msgid "Uncrop one pixel from the right of the video"
+msgstr ""
+
+#: src/libvlc.h:1139
 #, fuzzy, 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"
+"Stream MRL syntax:\n"
 "  [[access][/demux]://]URL[@[title][:chapter][-[title][:chapter]]] [:"
 "option=value ...]\n"
 "\n"
@@ -3287,136 +3549,149 @@ msgstr ""
 "  vlc:pause                      再生一覧項目の再生停止\n"
 "  vlc:quit                       VLC を終了\n"
 
-#: src/libvlc.h:1047 src/video_output/vout_intf.c:337
-#: modules/gui/macosx/controls.m:288 modules/gui/macosx/controls.m:622
-#: modules/gui/macosx/intf.m:527 modules/video_output/snapshot.c:75
+#: src/libvlc.h:1249 src/video_output/vout_intf.c:414
+#: modules/gui/macosx/controls.m:322 modules/gui/macosx/controls.m:753
+#: modules/gui/macosx/intf.m:574 modules/video_output/snapshot.c:76
 msgid "Snapshot"
 msgstr "スナップショット"
 
-#: src/libvlc.h:1054
+#: src/libvlc.h:1258
 msgid "Window properties"
 msgstr "ウィンドウのプロパティ"
 
-#: src/libvlc.h:1090
+#: src/libvlc.h:1298
 #, fuzzy
 msgid "Subpictures"
 msgstr "字幕"
 
-#: src/libvlc.h:1093 modules/codec/subsdec.c:92 modules/demux/subtitle.c:61
-#: modules/gui/beos/InterfaceWindow.cpp:277
+#: src/libvlc.h:1305 modules/codec/subsdec.c:144 modules/demux/subtitle.c:63
+#: modules/gui/beos/InterfaceWindow.cpp:279
 msgid "Subtitles"
 msgstr "字幕"
 
-#: src/libvlc.h:1110
+#: src/libvlc.h:1322 modules/stream_out/transcode.c:147
 msgid "Overlays"
 msgstr "オーバーレイ"
 
-#: src/libvlc.h:1118
+#: src/libvlc.h:1330
 msgid "Track settings"
 msgstr "トラック設定"
 
-#: src/libvlc.h:1136
+#: src/libvlc.h:1352
 msgid "Playback control"
 msgstr "再生制御"
 
-#: src/libvlc.h:1151
+#: src/libvlc.h:1367
 msgid "Default devices"
 msgstr "デフォルトデバイス"
 
-#: src/libvlc.h:1160
+#: src/libvlc.h:1376
 msgid "Network settings"
 msgstr "ネットワーク設定"
 
-#: src/libvlc.h:1172
+#: src/libvlc.h:1388
 msgid "Socks proxy"
 msgstr "Sock プロキシ"
 
-#: src/libvlc.h:1181
+#: src/libvlc.h:1397
 msgid "Metadata"
 msgstr "メタデータ"
 
-#: src/libvlc.h:1208
+#: src/libvlc.h:1427
 msgid "Decoders"
 msgstr "デコーダ"
 
-#: src/libvlc.h:1215 modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:375
+#: src/libvlc.h:1434 modules/gui/macosx/playlistinfo.m:80
+#: modules/gui/wxwidgets/dialogs/infopanels.cpp:265
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:378
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:106
 msgid "Input"
 msgstr "入力"
 
-#: src/libvlc.h:1273
+#: src/libvlc.h:1470 modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:522
+msgid "VLM"
+msgstr ""
+
+#: src/libvlc.h:1501
 msgid "CPU"
 msgstr "CPU"
 
-#: src/libvlc.h:1288
+#: src/libvlc.h:1523
 msgid "Special modules"
 msgstr "特殊モジュール"
 
-#: src/libvlc.h:1294
+#: src/libvlc.h:1530
 msgid "Plugins"
 msgstr "プラグイン"
 
-#: src/libvlc.h:1300
+#: src/libvlc.h:1538
 msgid "Performance options"
 msgstr "パフォーマンスオプションストリームの一時停止"
 
-#: src/libvlc.h:1388
+#: src/libvlc.h:1671
 msgid "Hot keys"
 msgstr "ホットキー"
 
-#: src/libvlc.h:1711
+#: src/libvlc.h:1982
+#, fuzzy
+msgid "Jump sizes"
+msgstr "フォントサイズ"
+
+#: src/libvlc.h:2061
 msgid "main program"
 msgstr "メインプログラム"
 
-#: src/libvlc.h:1718
+#: src/libvlc.h:2068
 msgid "print help for VLC (can be combined with --advanced)"
 msgstr "VLC のヘルプを表示する (--advanced と併用できます)"
 
-#: src/libvlc.h:1720
+#: src/libvlc.h:2070
+#, fuzzy
 msgid ""
-"print help for VLC and all it's modules (can be combined with --advanced)"
+"print help for VLC and all its modules (can be combined with --advanced)"
 msgstr "VLC とすべてのモジュールのヘルプを表示する (--advanced と併用できます)"
 
-#: src/libvlc.h:1722
+#: src/libvlc.h:2072
 msgid "print help for the advanced options"
 msgstr "高度なオプションのヘルプを表示する"
 
-#: src/libvlc.h:1724
+#: src/libvlc.h:2074
 msgid "ask for extra verbosity when displaying help"
 msgstr ""
 
-#: src/libvlc.h:1726
+#: src/libvlc.h:2076
 msgid "print a list of available modules"
 msgstr "有効なモジュールの一覧を表示する"
 
-#: src/libvlc.h:1728
+#: src/libvlc.h:2078
 msgid "print help on a specific module (can be combined with --advanced)"
 msgstr "モジュールのヘルプを表示する (--advanced と併用できます)"
 
-#: src/libvlc.h:1730
+#: src/libvlc.h:2080
 msgid "save the current command line options in the config"
 msgstr ""
 
-#: src/libvlc.h:1732
+#: src/libvlc.h:2082
 msgid "reset the current config to the default values"
 msgstr ""
 
-#: src/libvlc.h:1734
+#: src/libvlc.h:2084
 msgid "use alternate config file"
 msgstr ""
 
-#: src/libvlc.h:1736
+#: src/libvlc.h:2086
 msgid "resets the current plugins cache"
 msgstr "現在のプラグインキャッシュをリセットする"
 
-#: src/libvlc.h:1738
+#: src/libvlc.h:2088
 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 "キー"
 
@@ -3533,10 +3808,6 @@ msgstr "コーニシュ語"
 msgid "Corsican"
 msgstr "コルシカ語"
 
-#: src/misc/iso-639_def.h:67
-msgid "Czech"
-msgstr "チェコ語"
-
 #: src/misc/iso-639_def.h:70
 msgid "Dzongkha"
 msgstr ""
@@ -3569,10 +3840,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 "ゲール語 (スコットランド)"
@@ -3601,10 +3868,6 @@ msgstr "グアラニー語"
 msgid "Gujarati"
 msgstr "グジャラート語"
 
-#: src/misc/iso-639_def.h:88
-msgid "Hebrew"
-msgstr "ヘブライ語"
-
 #: src/misc/iso-639_def.h:89
 msgid "Herero"
 msgstr "ヘレロ語"
@@ -3617,10 +3880,6 @@ msgstr ""
 msgid "Hiri Motu"
 msgstr ""
 
-#: src/misc/iso-639_def.h:92
-msgid "Hungarian"
-msgstr "ハンガリー語"
-
 #: src/misc/iso-639_def.h:93
 msgid "Icelandic"
 msgstr ""
@@ -3924,10 +4183,6 @@ msgstr ""
 msgid "Swahili"
 msgstr ""
 
-#: src/misc/iso-639_def.h:174
-msgid "Swedish"
-msgstr ""
-
 #: src/misc/iso-639_def.h:175
 msgid "Tahitian"
 msgstr ""
@@ -4041,132 +4296,142 @@ msgstr ""
 msgid "Zulu"
 msgstr ""
 
-#: src/misc/iso_lang.c:70 modules/gui/wxwidgets/dialogs/preferences.cpp:960
+#: src/misc/iso_lang.c:70 modules/gui/wxwidgets/dialogs/preferences.cpp:976
 msgid "Unknown"
 msgstr "不明"
 
-#: src/playlist/playlist.c:37
-#, fuzzy
-msgid "By category"
-msgstr "CDDB カテゴリ"
-
-#: src/playlist/playlist.c:38
-msgid "Manually added"
-msgstr ""
-
-#: src/playlist/playlist.c:39
-msgid "All items, unsorted"
+#: src/misc/vlm.c:1140 src/misc/vlm.c:1247
+#, c-format
+msgid "Media: %s"
 msgstr ""
 
-#: src/playlist/sort.c:233 src/playlist/sort.c:236 src/playlist/sort.c:333
-msgid "Album/movie/show title"
+#: src/playlist/engine.c:92 src/playlist/engine.c:94
+msgid "Media Library"
 msgstr ""
 
-#: src/playlist/sort.c:344 src/playlist/view.c:79 src/playlist/view.c:280
+#: src/playlist/sort.c:287 src/playlist/tree.c:57
 msgid "Undefined"
 msgstr "未定義"
 
-#: src/video_output/video_output.c:372 modules/gui/macosx/intf.m:534
-#: modules/gui/macosx/intf.m:535 modules/video_filter/deinterlace.c:116
+#: src/video_output/video_output.c:372 modules/gui/macosx/intf.m:585
+#: modules/gui/macosx/intf.m:586 modules/video_filter/deinterlace.c:122
 msgid "Deinterlace"
 msgstr "ノンインタレース化"
 
-#: src/video_output/video_output.c:376 modules/video_filter/deinterlace.c:111
+#: src/video_output/video_output.c:376 modules/video_filter/deinterlace.c:117
 msgid "Discard"
 msgstr "破棄する"
 
-#: src/video_output/video_output.c:378 modules/video_filter/deinterlace.c:111
+#: src/video_output/video_output.c:378 modules/video_filter/deinterlace.c:117
 msgid "Blend"
 msgstr "ブレンド"
 
-#: src/video_output/video_output.c:380 modules/video_filter/deinterlace.c:111
+#: src/video_output/video_output.c:380 modules/video_filter/deinterlace.c:117
 #, fuzzy
 msgid "Mean"
 msgstr "メディア"
 
-#: src/video_output/video_output.c:382 modules/video_filter/deinterlace.c:112
+#: src/video_output/video_output.c:382 modules/video_filter/deinterlace.c:118
 msgid "Bob"
 msgstr ""
 
-#: src/video_output/video_output.c:384 modules/video_filter/deinterlace.c:112
+#: src/video_output/video_output.c:384 modules/video_filter/deinterlace.c:118
 msgid "Linear"
 msgstr "リニア"
 
-#: src/video_output/vout_intf.c:198
-msgid "Zoom"
-msgstr "ズーム"
-
-#: src/video_output/vout_intf.c:210
+#: src/video_output/vout_intf.c:217
 msgid "1:4 Quarter"
 msgstr "1:4 1/4"
 
-#: src/video_output/vout_intf.c:212
+#: src/video_output/vout_intf.c:219
 msgid "1:2 Half"
 msgstr "1:2 半分"
 
-#: src/video_output/vout_intf.c:214
+#: src/video_output/vout_intf.c:221
 msgid "1:1 Original"
 msgstr "1:1 オリジナル"
 
-#: src/video_output/vout_intf.c:216
+#: src/video_output/vout_intf.c:223
 msgid "2:1 Double"
 msgstr "2:1 二倍"
 
-#: src/video_output/vout_intf.c:227 modules/video_filter/crop.c:62
+#: src/video_output/vout_intf.c:250 modules/gui/macosx/intf.m:579
+#: modules/gui/macosx/intf.m:580 modules/video_filter/crop.c:62
 msgid "Crop"
 msgstr "縁取り"
 
-#: src/video_output/vout_intf.c:288
+#: src/video_output/vout_intf.c:337 modules/gui/macosx/intf.m:577
+#: modules/gui/macosx/intf.m:578
 msgid "Aspect-ratio"
 msgstr "アスペクト比"
 
-#: modules/access/cdda.c:42 modules/access/dshow/dshow.cpp:79
-#: modules/access/dv.c:68 modules/access/dvb/access.c:67
+#: modules/access/cdda.c:58 modules/access/dshow/dshow.cpp:90
+#: modules/access/dv.c:68 modules/access/dvb/access.c:72
 #: modules/access/dvdnav.c:63 modules/access/dvdread.c:61
-#: modules/access/fake.c:40 modules/access/file.c:80 modules/access/ftp.c:48
-#: modules/access/gnomevfs.c:44 modules/access/http.c:52
-#: modules/access/mms/mms.c:46 modules/access/pvr/pvr.c:46
+#: modules/access/fake.c:40 modules/access/file.c:79 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:47
 #: modules/access/screen/screen.c:37 modules/access/smb.c:59
 #: modules/access/tcp.c:37 modules/access/udp.c:42 modules/access/v4l/v4l.c:73
 #: modules/access/vcd/vcd.c:40
 msgid "Caching value in ms"
 msgstr "キャッシング値 (ミリ秒)"
 
-#: modules/access/cdda.c:44 modules/access/vcd/vcd.c:42
+#: modules/access/cdda.c:60
 #, fuzzy
 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 ""
 "udpストリームで使用される既定のキャッシング値が変更可能です。単位はミリ秒で指"
 "定します。"
 
-#: modules/access/cdda.c:48 modules/gui/macosx/open.m:176
+#: modules/access/cdda.c:64 modules/gui/macosx/open.m:176
 #: modules/gui/macosx/open.m:496 modules/gui/macosx/open.m:587
-#: modules/gui/wxwidgets/dialogs/open.cpp:677
+#: modules/gui/wxwidgets/dialogs/open.cpp:699
 msgid "Audio CD"
 msgstr "オーディオ CD"
 
-#: modules/access/cdda.c:49
+#: modules/access/cdda.c:65
 msgid "Audio CD input"
 msgstr "オーディオ CD 入力"
 
-#: modules/access/cdda.c:55
+#: modules/access/cdda.c:71
 msgid "[cdda:][device][@[track]]"
 msgstr "[cdda:][device][@[track]]"
 
-#: modules/access/cdda.c:380
+#: modules/access/cdda.c:83
+#, fuzzy
+msgid "CDDB Server"
+msgstr "CDDB サーバー"
+
+#: modules/access/cdda.c:83
+#, fuzzy
+msgid "Address of the CDDB server to use."
+msgstr "電子メールアドレスを CDDB サーバーに報告する"
+
+#: modules/access/cdda.c:86
+#, fuzzy
+msgid "CDDB port"
+msgstr "CDDB サーバーポート"
+
+#: modules/access/cdda.c:86
+#, fuzzy
+msgid "CDDB Server port to use."
+msgstr "CDDB サーバーポート"
+
+#: modules/access/cdda.c:463
 #, fuzzy
 msgid "Audio CD - Track "
 msgstr "オーディオトラック"
 
-#: modules/access/cdda.c:381
+#: modules/access/cdda.c:480
 #, fuzzy, c-format
 msgid "Audio CD - Track %i"
 msgstr "オーディオトラック"
 
 #: modules/access/cdda/cdda.c:42 modules/access/directory.c:77
-#: modules/codec/x264.c:156
+#: modules/codec/x264.c:278 modules/codec/x264.c:285 modules/codec/x264.c:290
 msgid "none"
 msgstr "なし"
 
@@ -4196,18 +4461,18 @@ msgstr ""
 #: modules/access/cdda/cdda.c:59
 #, fuzzy
 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 ""
 "udpストリームで使用される既定のキャッシング値が変更可能です。単位はミリ秒で指"
 "定します。"
 
 #: 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
@@ -4271,8 +4536,8 @@ msgstr "コンパクトディスクデジタルオーディオ (CD-DA)入力"
 msgid "Audio Compact Disc"
 msgstr "オーディオオプション"
 
-#: 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
@@ -4313,8 +4578,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
@@ -4327,8 +4591,9 @@ msgid "Format to use in playlist \"title\" field when using CDDB"
 msgstr "CDDB がある場合の再生一覧の \"title\" フィールドで使用するフォーマット"
 
 #: modules/access/cdda/cdda.c:181
-msgid "Do CDDB lookups?"
-msgstr ""
+#, fuzzy
+msgid "CDDB lookups"
+msgstr "CDDB 検索をキャッシュしますか?"
 
 #: modules/access/cdda/cdda.c:182
 msgid "If set, lookup CD-DA track information using the CDDB protocol"
@@ -4392,34 +4657,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:328 modules/access/cdda/info.c:333
+#: modules/access/cdda/info.c:337 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/dialogs/open.cpp:504
 msgid "Disc"
 msgstr "ディスク"
 
-#: modules/access/cdda/info.c:330
+#: modules/access/cdda/info.c:333
 msgid "Media Catalog Number (MCN)"
 msgstr ""
 
-#: modules/access/cdda/info.c:334 modules/access/vcdx/info.c:103
+#: modules/access/cdda/info.c:337 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/access.c:472
+#: modules/access/cdda/info.c:393 modules/access/cdda/info.c:815
+#: modules/access/cdda/info.c:862 modules/access/vcdx/access.c:472
 #: modules/access/vcdx/info.c:286 modules/access/vcdx/info.c:287
-#: modules/gui/wxwidgets/dialogs/open.cpp:1645
-#: modules/gui/wxwidgets/dialogs/open.cpp:1663
+#: modules/gui/wxwidgets/dialogs/open.cpp:1710
+#: modules/gui/wxwidgets/dialogs/open.cpp:1730
 msgid "Track"
 msgstr "トラック"
 
-#: modules/access/cdda/info.c:397
+#: modules/access/cdda/info.c:400
 msgid "MRL"
 msgstr ""
 
-#: modules/access/cdda/info.c:857
+#: modules/access/cdda/info.c:862
 msgid "Track Number"
 msgstr "トラック番号"
 
@@ -4444,173 +4709,239 @@ 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
 #, fuzzy
 msgid "Directory"
 msgstr "DirectShow"
 
-#: modules/access/directory.c:90
+#: modules/access/directory.c:91
 #, fuzzy
 msgid "Standard filesystem directory input"
 msgstr "標準的なファイルシステムのファイルを読む"
 
-#: modules/access/dshow/dshow.cpp:72 modules/access/dshow/dshow.cpp:74
-#: modules/codec/ffmpeg/ffmpeg.c:75 modules/demux/mpc.c:53
-#: modules/video_output/opengl.c:129
+#: modules/access/dshow/dshow.cpp:73 modules/access/dshow/dshow.cpp:75
+#: modules/codec/ffmpeg/ffmpeg.c:75 modules/demux/mpc.c:55
+#: modules/video_output/opengl.c:122 modules/video_output/opengl.c:173
 msgid "None"
 msgstr "なし"
 
-#: modules/access/dshow/dshow.cpp:77
+#: modules/access/dshow/dshow.cpp:78
 #, fuzzy
 msgid "Cable"
 msgstr "有効"
 
-#: modules/access/dshow/dshow.cpp:77
+#: modules/access/dshow/dshow.cpp:78
 msgid "Antenna"
 msgstr ""
 
-#: modules/access/dshow/dshow.cpp:81
+#: modules/access/dshow/dshow.cpp:85
+msgid "TV"
+msgstr ""
+
+#: modules/access/dshow/dshow.cpp:86
+#, fuzzy
+msgid "FM radio"
+msgstr "暗号オーディオオーディオ"
+
+#: modules/access/dshow/dshow.cpp:87
+#, fuzzy
+msgid "AM radio"
+msgstr "暗号オーディオオーディオ"
+
+#: modules/access/dshow/dshow.cpp:88
+#, fuzzy
+msgid "DSS"
+msgstr "TS"
+
+#: modules/access/dshow/dshow.cpp:92
 #, fuzzy
 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
+#: modules/access/dshow/dshow.cpp:94 modules/access/v4l/v4l.c:77
 msgid "Video device name"
 msgstr "ビデオデバイス名"
 
-#: modules/access/dshow/dshow.cpp:85
+#: modules/access/dshow/dshow.cpp:96
 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
+#: modules/access/dshow/dshow.cpp:100 modules/access/v4l/v4l.c:81
 msgid "Audio device name"
 msgstr "オーディオデバイス名"
 
-#: modules/access/dshow/dshow.cpp:90
+#: modules/access/dshow/dshow.cpp:102
 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
+#: modules/access/dshow/dshow.cpp:105
 msgid "Video size"
 msgstr "ビデオサイズ"
 
-#: modules/access/dshow/dshow.cpp:95
+#: modules/access/dshow/dshow.cpp:107
 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
+#: modules/access/dshow/dshow.cpp:110 modules/access/v4l/v4l.c:85
 msgid "Video input chroma format"
 msgstr "ビデオ入力のクロマフォーマット"
 
-#: modules/access/dshow/dshow.cpp:100
+#: modules/access/dshow/dshow.cpp:112
 msgid ""
 "Force the DirectShow video input to use a specific chroma format (eg. I420 "
 "(default), RV24, etc.)"
 msgstr ""
 
-#: modules/access/dshow/dshow.cpp:102
+#: modules/access/dshow/dshow.cpp:114
 #, fuzzy
 msgid "Video input frame rate"
 msgstr "ビデオフレームレート"
 
-#: modules/access/dshow/dshow.cpp:104
+#: modules/access/dshow/dshow.cpp:116
 msgid ""
 "Force the DirectShow video input to use a specific frame rate(eg. 0 means "
 "default, 25, 29.97, 50, 59.94, etc.)"
 msgstr ""
 
-#: modules/access/dshow/dshow.cpp:106
+#: modules/access/dshow/dshow.cpp:118
 msgid "Device properties"
 msgstr "デバイスのプロパティ"
 
-#: modules/access/dshow/dshow.cpp:108
+#: modules/access/dshow/dshow.cpp:120
 msgid ""
 "Show the properties dialog of the selected device before starting the stream."
 msgstr ""
 
-#: modules/access/dshow/dshow.cpp:110
+#: modules/access/dshow/dshow.cpp:122
 msgid "Tuner properties"
 msgstr "チューナーのプロパティ"
 
-#: modules/access/dshow/dshow.cpp:112
+#: modules/access/dshow/dshow.cpp:124
 msgid "Show the tuner properties [channel selection] page."
 msgstr ""
 
-#: modules/access/dshow/dshow.cpp:113
+#: modules/access/dshow/dshow.cpp:125
 #, fuzzy
 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)."
+#: modules/access/dshow/dshow.cpp:127
+msgid "Set the TV channel the tuner will set to (0 means default)."
 msgstr ""
 
-#: modules/access/dshow/dshow.cpp:117
+#: modules/access/dshow/dshow.cpp:129
 msgid "Tuner country code"
 msgstr ""
 
-#: modules/access/dshow/dshow.cpp:119
+#: modules/access/dshow/dshow.cpp:131
 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
+#: modules/access/dshow/dshow.cpp:133
 #, fuzzy
 msgid "Tuner input type"
 msgstr "チューナー番号"
 
-#: modules/access/dshow/dshow.cpp:123
+#: modules/access/dshow/dshow.cpp:135
 #, fuzzy
-msgid "Allows you to select the tuner input type (Cable/Antenna)."
+msgid "Select the tuner input type (Cable/Antenna)."
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: modules/access/dshow/dshow.cpp:135
+#: modules/access/dshow/dshow.cpp:136
+#, fuzzy
+msgid "Video input pin"
+msgstr "ビデオオプション"
+
+#: modules/access/dshow/dshow.cpp:138
+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:142
+#, fuzzy
+msgid "Audio input pin"
+msgstr "オーディオ CD 入力"
+
+#: modules/access/dshow/dshow.cpp:144
+msgid "Select the audio input source. See the \"video input\" option."
+msgstr ""
+
+#: modules/access/dshow/dshow.cpp:145
+#, fuzzy
+msgid "Video output pin"
+msgstr "ビデオ出力 URL"
+
+#: modules/access/dshow/dshow.cpp:147
+msgid "Select the video output type. See the \"video input\" option."
+msgstr ""
+
+#: modules/access/dshow/dshow.cpp:148
+#, fuzzy
+msgid "Audio output pin"
+msgstr "オーディオ出力 URL"
+
+#: modules/access/dshow/dshow.cpp:150
+msgid "Select the audio output type. See the \"video input\" option."
+msgstr ""
+
+#: modules/access/dshow/dshow.cpp:152
+#, fuzzy
+msgid "AM Tuner mode"
+msgstr "FTP ユーザー名"
+
+#: modules/access/dshow/dshow.cpp:154
+msgid "AM Tuner mode. Can be one of DEFAULT, TV, AM_RADIO, FM_RADIO or DSS."
+msgstr ""
+
+#: modules/access/dshow/dshow.cpp:166
 msgid "DirectShow"
 msgstr "DirectShow"
 
-#: modules/access/dshow/dshow.cpp:136 modules/access/dshow/dshow.cpp:181
+#: modules/access/dshow/dshow.cpp:167 modules/access/dshow/dshow.cpp:228
 #, fuzzy
 msgid "DirectShow input"
 msgstr "DirectShow 入力"
 
-#: modules/access/dshow/dshow.cpp:144 modules/access/dshow/dshow.cpp:149
+#: modules/access/dshow/dshow.cpp:175 modules/access/dshow/dshow.cpp:180
 #: modules/audio_output/alsa.c:110 modules/video_output/directx/directx.c:158
 msgid "Refresh list"
 msgstr "一覧の再描画"
 
-#: modules/access/dshow/dshow.cpp:145 modules/access/dshow/dshow.cpp:150
+#: modules/access/dshow/dshow.cpp:176 modules/access/dshow/dshow.cpp:181
 msgid "Configure"
 msgstr "設定"
 
-#: modules/access/dv.c:70 modules/access/file.c:82
+#: modules/access/dv.c:70
 #, fuzzy
-msgid ""
-"Allows you to modify the default caching value for file streams. This value "
-"should be set in millisecond units."
-msgstr "ファイル・ストリームの既定のキャッシング値を変更できます。単位はミリ秒"
+msgid "Caching value for DV streams. Thisvalue should be set in milliseconds."
+msgstr ""
+"udpストリームで使用される既定のキャッシング値が変更可能です。単位はミリ秒で指"
+"定します。"
 
 #: modules/access/dv.c:74
 msgid "Digital Video (Firewire/ieee1394)  input"
@@ -4621,185 +4952,265 @@ msgstr ""
 msgid "dv"
 msgstr "追加"
 
-#: modules/access/dvb/access.c:69
+#: modules/access/dvb/access.c:74
 #, fuzzy
 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 ""
 "udpストリームで使用される既定のキャッシング値が変更可能です。単位はミリ秒で指"
 "定します。"
 
-#: modules/access/dvb/access.c:72
+#: modules/access/dvb/access.c:77
 msgid "Adapter card to tune"
 msgstr ""
 
-#: modules/access/dvb/access.c:73
+#: modules/access/dvb/access.c:78
 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:80
 msgid "Device number to use on adapter"
 msgstr ""
 
-#: modules/access/dvb/access.c:78
+#: modules/access/dvb/access.c:83
 msgid "Transponder/multiplex frequency"
 msgstr ""
 
-#: modules/access/dvb/access.c:79
+#: modules/access/dvb/access.c:84
 msgid "In kHz for DVB-S or Hz for DVB-C/T"
 msgstr ""
 
-#: modules/access/dvb/access.c:81
+#: modules/access/dvb/access.c:86
 msgid "Inversion mode"
 msgstr "反転モード"
 
-#: modules/access/dvb/access.c:82
+#: modules/access/dvb/access.c:87
 msgid "Inversion mode [0=off, 1=on, 2=auto]"
 msgstr "反転モード [0=オフ 1=オン 2=自動]"
 
-#: modules/access/dvb/access.c:84
+#: modules/access/dvb/access.c:89
 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:90
+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:92
 #, fuzzy
 msgid "Budget mode"
 msgstr "ネットワーク"
 
-#: modules/access/dvb/access.c:88
+#: modules/access/dvb/access.c:93
 #, fuzzy
-msgid "This allows you to stream an entire transponder with a budget card."
+msgid "This allows you to stream an entire transponder with a \"budget\" card."
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: modules/access/dvb/access.c:91
+#: modules/access/dvb/access.c:96
 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:97
+msgid "[0=no diseqc, 1-4=satellite number]."
 msgstr ""
 
-#: modules/access/dvb/access.c:94
+#: modules/access/dvb/access.c:99
 msgid "LNB voltage"
 msgstr "LNB 電圧"
 
-#: modules/access/dvb/access.c:95
-msgid "In Volts [0, 13=vertical, 18=horizontal]"
+#: modules/access/dvb/access.c:100
+msgid "In Volts [0, 13=vertical, 18=horizontal]."
 msgstr ""
 
-#: modules/access/dvb/access.c:97
+#: modules/access/dvb/access.c:102
 #, fuzzy
 msgid "High LNB voltage"
 msgstr "LNB 電圧"
 
-#: modules/access/dvb/access.c:98
+#: modules/access/dvb/access.c:103
 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:106
 msgid "22 kHz tone"
 msgstr "22 kHz トーン"
 
-#: modules/access/dvb/access.c:102
-msgid "[0=off, 1=on, -1=auto]"
+#: modules/access/dvb/access.c:107
+#, fuzzy
+msgid "[0=off, 1=on, -1=auto]."
 msgstr "[0:オフ 1:オン -1:自動]"
 
-#: modules/access/dvb/access.c:104
+#: modules/access/dvb/access.c:109
 #, fuzzy
 msgid "Transponder FEC"
 msgstr "衛星 既定転送FEC"
 
-#: modules/access/dvb/access.c:105
-msgid "FEC=Forward Error Correction mode [9=auto]"
+#: modules/access/dvb/access.c:110
+msgid "FEC=Forward Error Correction mode [9=auto]."
 msgstr ""
 
-#: modules/access/dvb/access.c:107
+#: modules/access/dvb/access.c:112
 #, fuzzy
 msgid "Transponder symbol rate in kHz"
 msgstr "衛星 既定転送シンボル・レート"
 
-#: modules/access/dvb/access.c:110
+#: modules/access/dvb/access.c:115
 #, fuzzy
 msgid "Antenna lnb_lof1 (kHz)"
 msgstr "アンテナ lnb_lof1 (kHz)"
 
-#: modules/access/dvb/access.c:113
+#: modules/access/dvb/access.c:118
 #, fuzzy
 msgid "Antenna lnb_lof2 (kHz)"
 msgstr "アンテナ lnb_lof2 (kHz)"
 
-#: modules/access/dvb/access.c:116
+#: modules/access/dvb/access.c:121
 #, fuzzy
 msgid "Antenna lnb_slof (kHz)"
 msgstr "アンテナ lnb_slof (kHz)"
 
-#: modules/access/dvb/access.c:120
+#: modules/access/dvb/access.c:125
 msgid "Modulation type"
 msgstr "モジュレーションタイプ"
 
-#: modules/access/dvb/access.c:121
+#: modules/access/dvb/access.c:126
 msgid "Modulation type for front-end device."
 msgstr "フロントエンドデバイスのモジュレーションタイプ"
 
-#: modules/access/dvb/access.c:124
+#: modules/access/dvb/access.c:129
 msgid "Terrestrial high priority stream code rate (FEC)"
 msgstr ""
 
-#: modules/access/dvb/access.c:127
+#: modules/access/dvb/access.c:132
 msgid "Terrestrial low priority stream code rate (FEC)"
 msgstr ""
 
-#: modules/access/dvb/access.c:130
+#: modules/access/dvb/access.c:135
 msgid "Terrestrial bandwidth"
 msgstr ""
 
-#: modules/access/dvb/access.c:131
+#: modules/access/dvb/access.c:136
 msgid "Terrestrial bandwidth [0=auto,6,7,8 in MHz]"
 msgstr ""
 
-#: modules/access/dvb/access.c:133
+#: modules/access/dvb/access.c:138
 msgid "Terrestrial guard interval"
 msgstr ""
 
-#: modules/access/dvb/access.c:136
+#: modules/access/dvb/access.c:141
 msgid "Terrestrial transmission mode"
 msgstr ""
 
-#: modules/access/dvb/access.c:139
+#: modules/access/dvb/access.c:144
 msgid "Terrestrial hierarchy mode"
 msgstr ""
 
-#: modules/access/dvb/access.c:143
+#: modules/access/dvb/access.c:147
+#, fuzzy
+msgid "HTTP Host address"
+msgstr "ホストアドレス"
+
+#: modules/access/dvb/access.c:149
+msgid "To enable the internal HTTP server, set its address and port here."
+msgstr ""
+
+#: modules/access/dvb/access.c:151
+msgid "HTTP user name"
+msgstr "HTTP ユーザー名"
+
+#: modules/access/dvb/access.c:153
+msgid ""
+"User name the administrator will use to log into the internal HTTP server."
+msgstr ""
+
+#: modules/access/dvb/access.c:156
+msgid "HTTP password"
+msgstr "HTTP パスワード"
+
+#: modules/access/dvb/access.c:158
+msgid ""
+"Password the administrator will use to log into the internal HTTP server."
+msgstr ""
+
+#: modules/access/dvb/access.c:161
+#, fuzzy
+msgid "HTTP ACL"
+msgstr "HTTP SSL"
+
+#: modules/access/dvb/access.c:163
+msgid ""
+"Access control list (equivalent to .hosts) file path, which will limit the "
+"range of IPs entitled to log into the internal HTTP server."
+msgstr ""
+
+#: modules/access/dvb/access.c:167 modules/access_output/http.c:72
+#: modules/control/http/http.c:49
+msgid "Certificate file"
+msgstr "証明書ファイル"
+
+#: modules/access/dvb/access.c:168
+msgid "HTTP interface x509 PEM certificate file (enables SSL)"
+msgstr "HTTP インターフェースの x509 PEM 証明書ファイル (SSL 有効)"
+
+#: modules/access/dvb/access.c:171 modules/access_output/http.c:75
+#: modules/control/http/http.c:52
+msgid "Private key file"
+msgstr "秘密鍵のファイル"
+
+#: modules/access/dvb/access.c:172
+msgid "HTTP interface x509 PEM private key file"
+msgstr "HTTP インターフェースの x509 PEM 秘密鍵ファイル"
+
+#: modules/access/dvb/access.c:174 modules/access_output/http.c:79
+#: modules/control/http/http.c:54
+msgid "Root CA file"
+msgstr "ルート CA ファイル"
+
+#: modules/access/dvb/access.c:175
+msgid "HTTP interface x509 PEM trusted root CA certificates file"
+msgstr ""
+
+#: modules/access/dvb/access.c:178 modules/access_output/http.c:84
+#: modules/control/http/http.c:57
+msgid "CRL file"
+msgstr "CRL ファイル"
+
+#: modules/access/dvb/access.c:179
+#, fuzzy
+msgid "HTTP interface Certificates Revocation List file"
+msgstr "HTTP インターフェースの x509 PEM 秘密鍵ファイル"
+
+#: modules/access/dvb/access.c:182
 msgid "DVB"
 msgstr "DVB"
 
-#: modules/access/dvb/access.c:144
+#: modules/access/dvb/access.c:183
 msgid "DVB input with v4l2 support"
 msgstr "DVB 入力と v4l2 サポート"
 
+#: modules/access/dvb/access.c:235
+#, fuzzy
+msgid "HTTP server"
+msgstr "HTTP ユーザー名"
+
 #: modules/access/dvdnav.c:59 modules/access/dvdread.c:57
 msgid "DVD angle"
 msgstr "DVD アングル"
 
 #: modules/access/dvdnav.c:61 modules/access/dvdread.c:59
 #, fuzzy
-msgid "Allows you to select the default DVD angle."
-msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+msgid "Default DVD angle."
+msgstr "DVD アングル"
 
-#: modules/access/dvdnav.c:65
+#: modules/access/dvdnav.c:65 modules/access/dvdread.c:63
 #, fuzzy
-msgid ""
-"Allows you to modify the default caching value for DVDnav streams. This "
-"value should be set in millisecond units."
+msgid "Caching value for DVDs. This value should be set in milliseconds."
 msgstr ""
 "udpストリームで使用される既定のキャッシング値が変更可能です。単位はミリ秒で指"
 "定します。"
@@ -4810,8 +5221,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
@@ -4822,15 +5233,6 @@ msgstr "DVD とメニュー"
 msgid "DVDnav Input"
 msgstr "DVDnav 入力"
 
-#: modules/access/dvdread.c:63
-#, fuzzy
-msgid ""
-"Allows you to modify the default caching value for DVDread streams. This "
-"value should be set in millisecond units."
-msgstr ""
-"udpストリームで使用される既定のキャッシング値が変更可能です。単位はミリ秒で指"
-"定します。"
-
 #: modules/access/dvdread.c:66
 #, fuzzy
 msgid "Method used by libdvdcss for decryption"
@@ -4884,17 +5286,16 @@ msgstr ""
 #: modules/access/fake.c:42
 #, fuzzy
 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:72
+#: modules/access/fake.c:44 modules/access/pvr/pvr.c:73
 #: 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
@@ -4904,8 +5305,8 @@ 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
@@ -4915,11 +5316,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
 #, fuzzy
 msgid "Fake"
 msgstr "疑似 TTY"
@@ -4929,152 +5330,163 @@ msgstr "疑似 TTY"
 msgid "Fake input"
 msgstr "FTP 入力"
 
-#: modules/access/file.c:84
+#: modules/access/file.c:81
+#, fuzzy
+msgid "Caching value for files. This value should be set in milliseconds."
+msgstr "ファイル・ストリームの既定のキャッシング値を変更できます。単位はミリ秒"
+
+#: modules/access/file.c:83
 msgid "Concatenate with additional files"
 msgstr ""
 
-#: modules/access/file.c:86
+#: modules/access/file.c:85
 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/file.c:89
 #, fuzzy
-msgid "Standard filesystem file input"
-msgstr "標準的なファイルシステムのファイルを読む"
+msgid "File input"
+msgstr "FTP 入力"
 
-#: modules/access/file.c:91 modules/access_output/file.c:71
-#: modules/audio_output/file.c:111 modules/gui/beos/InterfaceWindow.cpp:261
+#: modules/access/file.c:90 modules/access_output/file.c:67
+#: modules/audio_output/file.c:112 modules/gui/beos/InterfaceWindow.cpp:263
 #: 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:230 modules/gui/macosx/output.m:369
 #: modules/gui/pda/pda_interface.c:366
 #: modules/gui/wxwidgets/dialogs/open.cpp:502
-#: modules/gui/wxwidgets/dialogs/streamout.cpp:472
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:471
 msgid "File"
 msgstr "ファイル"
 
-#: modules/access/ftp.c:50
+#: modules/access/ftp.c:44
 #, fuzzy
 msgid ""
-"Allows you to modify the default caching value for FTP streams. This value "
-"should be set in millisecond units."
+"Caching value for FTP streams. This value should be set in milliseconds."
 msgstr ""
 "udpストリームで使用される既定のキャッシング値が変更可能です。単位はミリ秒で指"
 "定します。"
 
-#: modules/access/ftp.c:52
+#: modules/access/ftp.c:46
 msgid "FTP user name"
 msgstr "FTP ユーザー名"
 
-#: 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:47 modules/access/smb.c:64
+#, fuzzy
+msgid "User name that will be used for the connection."
+msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: modules/access/ftp.c:55
+#: modules/access/ftp.c:49
 msgid "FTP password"
 msgstr "FTP パスワード"
 
-#: 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:50 modules/access/smb.c:67
+#, fuzzy
+msgid "Password that will be used for the connection."
+msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: modules/access/ftp.c:58
+#: modules/access/ftp.c:52
 msgid "FTP account"
 msgstr "FTP アカウント"
 
-#: modules/access/ftp.c:59
-msgid "Allows you to modify the account that will be used for the connection."
-msgstr ""
+#: modules/access/ftp.c:53
+#, fuzzy
+msgid "Account that will be used for the connection."
+msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: modules/access/ftp.c:64
+#: modules/access/ftp.c:58
 msgid "FTP input"
 msgstr "FTP 入力"
 
 #: modules/access/gnomevfs.c:46
 #, fuzzy
 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 ""
 "udpストリームで使用される既定のキャッシング値が変更可能です。単位はミリ秒で指"
 "定します。"
 
 #: modules/access/gnomevfs.c:50
 #, fuzzy
-msgid "GnomeVFS filesystem file input"
-msgstr "標準的なファイルシステムのファイルを読む"
+msgid "GnomeVFS input"
+msgstr "入力がありません。\n"
 
-#: modules/access/http.c:46
+#: modules/access/http.c:47
 msgid "HTTP proxy"
 msgstr "HTTP プロキシ"
 
-#: modules/access/http.c:48
+#: modules/access/http.c:49
 #, fuzzy
 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 ""
 "使用するHTTPプロキシを http://myproxy.mydomain:myport/ の形式で指定してくださ"
 "い。none が指定された場合には、HTTP_PROXYenvironment変数が試みられます。"
 
-#: modules/access/http.c:54
+#: modules/access/http.c:55
 #, fuzzy
 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 ""
-"httpストリームで使用される既定のキャッシング値が変更可能です。単位はミリ秒で"
-"指定します。"
+"udpストリームで使用される既定のキャッシング値が変更可能です。単位はミリ秒で指"
+"定します。"
 
-#: modules/access/http.c:57
+#: modules/access/http.c:58
 msgid "HTTP user agent"
 msgstr "HTTP ユーザーエージェント"
 
-#: modules/access/http.c:58
-msgid ""
-"Allows you to modify the user agent that will be used for the connection."
-msgstr ""
+#: modules/access/http.c:59
+#, fuzzy
+msgid "User agent that will be used for the connection."
+msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: modules/access/http.c:61
+#: modules/access/http.c:62
 msgid "Auto re-connect"
 msgstr "自動再接続"
 
-#: modules/access/http.c:62
+#: 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:65
+#: modules/access/http.c:68
 #, fuzzy
 msgid "Continuous stream"
 msgstr "ストリームの停止"
 
-#: modules/access/http.c:66
+#: modules/access/http.c:69
 msgid ""
-"This allows you to read a file that is being constantly updated (for "
-"example, a JPG file on a server).You should not globally enable this option "
-"as it will break all other types of HTTP streams."
+"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:72
+#: modules/access/http.c:75
 msgid "HTTP input"
 msgstr "HTTP 入力"
 
-#: modules/access/http.c:74
+#: modules/access/http.c:77
 #, fuzzy
 msgid "HTTP(S)"
 msgstr "HTTP"
 
-#: modules/access/mms/mms.c:48
-#, fuzzy
-msgid ""
-"Allows you to modify the default caching value for MMS streams. This value "
-"should be set in millisecond units."
+#: modules/access/http.c:295
+msgid "HTTP authentication"
+msgstr ""
+
+#: modules/access/http.c:296
+msgid "Please enter a valid login name and a password."
+msgstr ""
+
+#: modules/access/mms/mms.c:48
+#, fuzzy
+msgid ""
+"Caching value for MMS streams. This value should be set in milliseconds."
 msgstr ""
 "httpストリームで使用される既定のキャッシング値が変更可能です。単位はミリ秒で"
 "指定します。"
@@ -5084,194 +5496,200 @@ msgid "Force selection of all streams"
 msgstr ""
 
 #: modules/access/mms/mms.c:53
+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:56
 #, fuzzy
 msgid "Maximum bitrate"
 msgstr "エンコードの最大ビットレート"
 
-#: modules/access/mms/mms.c:55
-msgid ""
-"If this is set, the stream with the maximum bitrate under that limit      "
-"will be selected"
+#: modules/access/mms/mms.c:58
+msgid "Select the stream with the maximum bitrate under that limit."
 msgstr ""
 
-#: modules/access/mms/mms.c:60
+#: modules/access/mms/mms.c:62
 msgid "Microsoft Media Server (MMS) input"
 msgstr "マイクロソフトメディアサーバー (MMS) 入力"
 
-#: modules/access/pvr/pvr.c:48
+#: modules/access/pvr/pvr.c:49
 #, fuzzy
 msgid ""
-"Allows you to modify the default caching value for pvr streams. This value "
-"should be set in millisecond units."
-msgstr "ファイル・ストリームの既定のキャッシング値を変更できます。単位はミリ秒"
+"Default caching value for PVR streams. This value should be set in "
+"milliseconds."
+msgstr ""
+"udpストリームで使用される既定のキャッシング値が変更可能です。単位はミリ秒で指"
+"定します。"
 
-#: modules/access/pvr/pvr.c:51
+#: modules/access/pvr/pvr.c:52
 msgid "Device"
 msgstr "デバイス"
 
-#: modules/access/pvr/pvr.c:52
+#: modules/access/pvr/pvr.c:53
 #, fuzzy
 msgid "PVR video device"
 msgstr "DVDデバイス"
 
-#: modules/access/pvr/pvr.c:54
+#: modules/access/pvr/pvr.c:55
 #, fuzzy
 msgid "Radio device"
 msgstr "DVDデバイス"
 
-#: modules/access/pvr/pvr.c:55
+#: modules/access/pvr/pvr.c:56
 #, fuzzy
 msgid "PVR radio device"
 msgstr "DVDデバイス"
 
-#: modules/access/pvr/pvr.c:57 modules/access/v4l/v4l.c:96
+#: modules/access/pvr/pvr.c:58 modules/access/v4l/v4l.c:96
 #, fuzzy
 msgid "Norm"
 msgstr "なし"
 
-#: modules/access/pvr/pvr.c:58 modules/access/v4l/v4l.c:98
-msgid "Defines the norm of the stream (Automatic, SECAM, PAL, or NTSC)"
+#: modules/access/pvr/pvr.c:59 modules/access/v4l/v4l.c:98
+msgid "Norm of the stream (Automatic, SECAM, PAL, or NTSC)."
 msgstr ""
 
-#: modules/access/pvr/pvr.c:61 modules/access/v4l/v4l.c:102
+#: modules/access/pvr/pvr.c:62 modules/access/v4l/v4l.c:102
+#: modules/video_filter/mosaic.c:96
 msgid "Width"
 msgstr "幅"
 
-#: modules/access/pvr/pvr.c:62 modules/access/v4l/v4l.c:103
-msgid "Width of the stream to capture (-1 for autodetect)"
+#: modules/access/pvr/pvr.c:63
+msgid "Width of the stream to capture (-1 for autodetection)."
 msgstr ""
 
-#: modules/access/pvr/pvr.c:65 modules/access/v4l/v4l.c:105
+#: modules/access/pvr/pvr.c:66 modules/access/v4l/v4l.c:105
+#: modules/video_filter/mosaic.c:94
 #, fuzzy
 msgid "Height"
 msgstr "右"
 
-#: modules/access/pvr/pvr.c:66 modules/access/v4l/v4l.c:106
-msgid "Height of the stream to capture (-1 for autodetect)"
+#: modules/access/pvr/pvr.c:67
+msgid "Height of the stream to capture (-1 for autodetection)."
 msgstr ""
 
-#: modules/access/pvr/pvr.c:69 modules/access/v4l/v4l.c:89
+#: modules/access/pvr/pvr.c:70 modules/access/v4l/v4l.c:89
 msgid "Frequency"
 msgstr "周波数"
 
-#: modules/access/pvr/pvr.c:70 modules/access/v4l/v4l.c:91
-msgid "Frequency to capture (in kHz), if applicable"
+#: modules/access/pvr/pvr.c:71 modules/access/v4l/v4l.c:91
+msgid "Frequency to capture (in kHz), if applicable."
 msgstr ""
 
-#: modules/access/pvr/pvr.c:73 modules/access/v4l/v4l.c:137
-msgid "Framerate to capture, if applicable (-1 for autodetect)"
+#: modules/access/pvr/pvr.c:74 modules/access/v4l/v4l.c:137
+msgid "Framerate to capture, if applicable (-1 for autodetect)."
 msgstr ""
 
-#: modules/access/pvr/pvr.c:76
+#: modules/access/pvr/pvr.c:77
 msgid "Key interval"
 msgstr "キー間隔:"
 
-#: modules/access/pvr/pvr.c:77
-msgid "Interval between keyframes (-1 for autodetect)"
+#: modules/access/pvr/pvr.c:78
+msgid "Interval between keyframes (-1 for autodetect)."
 msgstr ""
 
-#: modules/access/pvr/pvr.c:79
+#: modules/access/pvr/pvr.c:80
 msgid "B Frames"
 msgstr "B フレーム"
 
-#: modules/access/pvr/pvr.c:80
+#: modules/access/pvr/pvr.c:81
 msgid ""
 "If this option is set, B-Frames will be used. Use this option to set the "
 "number of B-Frames."
 msgstr ""
 
-#: modules/access/pvr/pvr.c:84
-msgid "Bitrate to use (-1 for default)"
+#: modules/access/pvr/pvr.c:85
+msgid "Bitrate to use (-1 for default)."
 msgstr ""
 
-#: modules/access/pvr/pvr.c:86
+#: modules/access/pvr/pvr.c:87
 #, fuzzy
 msgid "Bitrate peak"
 msgstr "ビットレート"
 
-#: modules/access/pvr/pvr.c:87
-msgid "Peak bitrate in VBR mode"
+#: modules/access/pvr/pvr.c:88
+msgid "Peak bitrate in VBR mode."
 msgstr ""
 
-#: modules/access/pvr/pvr.c:89
-msgid "Bitrate mode (vbr or cbr)"
-msgstr ""
+#: modules/access/pvr/pvr.c:91
+#, fuzzy
+msgid "Bitrate mode)"
+msgstr "湾曲モード"
 
-#: modules/access/pvr/pvr.c:90
-msgid "Bitrate mode to use"
+#: modules/access/pvr/pvr.c:92
+msgid "Bitrate mode to use (VBR or CBR)."
 msgstr ""
 
-#: modules/access/pvr/pvr.c:92
+#: modules/access/pvr/pvr.c:94
 #, fuzzy
 msgid "Audio bitmask"
 msgstr "オーディオビットレート"
 
-#: modules/access/pvr/pvr.c:93
-msgid ""
-"This option allows setting of bitmask that will get used by the audio part "
-"of the card."
+#: modules/access/pvr/pvr.c:95
+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:450 modules/gui/wxwidgets/interface.cpp:1319
+#: modules/access/pvr/pvr.c:98 modules/access/vcdx/info.c:97
+#: modules/gui/macosx/intf.m:497 modules/gui/wxwidgets/interface.cpp:1380
 msgid "Volume"
 msgstr "音量"
 
-#: modules/access/pvr/pvr.c:97
-msgid "This option allows setting of the audio volume (0-65535)."
+#: modules/access/pvr/pvr.c:99
+msgid "Audio volume (0-65535)."
 msgstr ""
 
-#: modules/access/pvr/pvr.c:100 modules/access/v4l/v4l.c:92
+#: modules/access/pvr/pvr.c:101 modules/access/v4l/v4l.c:92
 msgid "Channel"
 msgstr "チャンネル"
 
-#: modules/access/pvr/pvr.c:101 modules/access/v4l/v4l.c:94
+#: modules/access/pvr/pvr.c:102
 msgid ""
 "Channel of the card to use (Usually, 0 = tuner, 1 = composite, 2 = svideo)"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:107 modules/access/v4l/v4l.c:143
+#: modules/access/pvr/pvr.c:108 modules/access/v4l/v4l.c:143
 msgid "Automatic"
 msgstr "自動"
 
-#: modules/access/pvr/pvr.c:107 modules/access/v4l/v4l.c:143
+#: modules/access/pvr/pvr.c:108 modules/access/v4l/v4l.c:143
 msgid "SECAM"
 msgstr "SECAM"
 
-#: modules/access/pvr/pvr.c:107 modules/access/v4l/v4l.c:143
+#: modules/access/pvr/pvr.c:108 modules/access/v4l/v4l.c:143
 msgid "PAL"
 msgstr "PAL"
 
-#: modules/access/pvr/pvr.c:107 modules/access/v4l/v4l.c:143
+#: modules/access/pvr/pvr.c:108 modules/access/v4l/v4l.c:143
 msgid "NTSC"
 msgstr "NTSC"
 
-#: modules/access/pvr/pvr.c:110
+#: modules/access/pvr/pvr.c:111
 msgid "vbr"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:110
+#: modules/access/pvr/pvr.c:111
 msgid "cbr"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:115
+#: modules/access/pvr/pvr.c:116
 msgid "PVR"
 msgstr "PVR"
 
-#: modules/access/pvr/pvr.c:116
-msgid "MPEG Encoding cards input (with ivtv drivers)"
+#: modules/access/pvr/pvr.c:117
+msgid "IVTV MPEG Encoding cards input"
 msgstr ""
 
 #: modules/access/rtsp/access.c:40 modules/access_output/udp.c:75
-#: modules/demux/livedotcom.cpp:61
+#: modules/demux/live555.cpp:61
 msgid "Caching value (ms)"
 msgstr "キャッシング値 (ミリ秒)"
 
-#: modules/access/rtsp/access.c:42 modules/demux/livedotcom.cpp:63
+#: modules/access/rtsp/access.c:42
 #, fuzzy
 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 ""
 "udpストリームで使用される既定のキャッシング値が変更可能です。単位はミリ秒で指"
 "定します。"
@@ -5284,16 +5702,15 @@ msgstr "RTSP"
 #: modules/access/screen/screen.c:39
 #, fuzzy
 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 ""
 "udpストリームで使用される既定のキャッシング値が変更可能です。単位はミリ秒で指"
 "定します。"
 
 #: modules/access/screen/screen.c:43
 #, fuzzy
-msgid "Allows you to set the desired frame rate for the capture."
-msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+msgid "Desired frame rate for the capture."
+msgstr "ストリームをナビゲートする"
 
 #: modules/access/screen/screen.c:46
 msgid "Capture fragment size"
@@ -5301,23 +5718,22 @@ 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
 #, fuzzy
 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 ""
 "httpストリームで使用される既定のキャッシング値が変更可能です。単位はミリ秒で"
 "指定します。"
@@ -5339,9 +5755,7 @@ msgstr "なし"
 
 #: modules/access/smb.c:70
 #, fuzzy
-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 "VLCが選択するパケッタライザーの順序を選択します。"
 
 #: modules/access/smb.c:75
@@ -5352,8 +5766,7 @@ msgstr "SLP 入力"
 #: modules/access/tcp.c:39
 #, fuzzy
 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 ""
 "udpストリームで使用される既定のキャッシング値が変更可能です。単位はミリ秒で指"
 "定します。"
@@ -5367,11 +5780,10 @@ msgstr "RTP"
 msgid "TCP input"
 msgstr "TCP 入力"
 
-#: modules/access/udp.c:44 modules/access_output/udp.c:77
+#: modules/access/udp.c:44
 #, fuzzy
 msgid ""
-"Allows you to modify the default caching value for UDP streams. This value "
-"should be set in millisecond units."
+"Caching value for UDP streams. This value should be set in milliseconds."
 msgstr ""
 "udpストリームで使用される既定のキャッシング値が変更可能です。単位はミリ秒で指"
 "定します。"
@@ -5381,25 +5793,27 @@ 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:51
+#: modules/access/udp.c:52
 msgid "RTP reordering timeout in ms"
 msgstr ""
 
-#: modules/access/udp.c:53
+#: modules/access/udp.c:54
 #, fuzzy
 msgid ""
-"Allows you to modify the RTP reordering behaviour. RTP input will wait for "
-"late packets upto the specified timeout in milisecond units."
+"VLC reorders RTP packets. The input will wait for late packets at most the "
+"time specified here (in milliseconds)."
 msgstr ""
 "udpストリームで使用される既定のキャッシング値が変更可能です。単位はミリ秒で指"
 "定します。"
 
 #: 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/dialogs/open.cpp:779
+#: modules/gui/wxwidgets/dialogs/open.cpp:804
 msgid "UDP/RTP"
 msgstr ""
 
@@ -5410,20 +5824,19 @@ msgstr "UDP/RTP 入力"
 #: modules/access/v4l/v4l.c:75
 #, fuzzy
 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
 msgid ""
-"Specify the name of the video device that will be used. If you don't specify "
-"anything, no video device will be used."
+"Name of the video device to use. If you don't specify anything, no video "
+"device will be used."
 msgstr ""
 
 #: modules/access/v4l/v4l.c:83
 msgid ""
-"Specify the name of the audio device that will be used. If you don't specify "
-"anything, no audio device will be used."
+"Name of the audio device to use. If you don't specify anything, no audio "
+"device will be used."
 msgstr ""
 
 #: modules/access/v4l/v4l.c:87
@@ -5432,51 +5845,67 @@ 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
 #, fuzzy
 msgid "Audio Channel"
 msgstr "オーディオチャンネル"
 
 #: modules/access/v4l/v4l.c:101
-msgid "Audio Channel to use, if there are several audio input"
+msgid "Audio Channel to use, if there are several audio inputs."
+msgstr ""
+
+#: 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:107
-#: modules/gui/wxwidgets/extrapanel.cpp:236
+#: modules/access/v4l/v4l.c:108 modules/gui/macosx/extended.m:110
+#: modules/gui/wxwidgets/extrapanel.cpp:234
 msgid "Brightness"
 msgstr "ブライトネス"
 
 #: modules/access/v4l/v4l.c:110
-msgid "Set the Brightness of the video input"
+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:113
+#: modules/gui/wxwidgets/extrapanel.cpp:224
 #, fuzzy
 msgid "Hue"
 msgstr "閉じる"
 
 #: modules/access/v4l/v4l.c:113
-msgid "Set the Hue of the video input"
-msgstr ""
+#, fuzzy
+msgid "Hue of the video input."
+msgstr "ビデオ・ストリームの出力を有効にする"
 
-#: modules/access/v4l/v4l.c:114 modules/gui/macosx/sfilters.m:89
-#: modules/gui/macosx/sfilters.m:97
+#: modules/access/v4l/v4l.c:114 modules/video_filter/marq.c:93
+#: modules/video_filter/rss.c:146 modules/video_filter/time.c:85
+#: modules/visualization/xosd.c:78
 #, fuzzy
 msgid "Color"
 msgstr "閉じる"
 
 #: modules/access/v4l/v4l.c:116
-msgid "Set the Color of the video input"
-msgstr ""
+#, fuzzy
+msgid "Color of the video input."
+msgstr "ASCIIアート・ビデオ出力モジュール"
 
-#: 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:111
+#: modules/gui/wxwidgets/extrapanel.cpp:229
 msgid "Contrast"
 msgstr "コントラスト"
 
 #: modules/access/v4l/v4l.c:119
-msgid "Set the Contrast of the video input"
+msgid "Contrast of the video input."
 msgstr ""
 
 #: modules/access/v4l/v4l.c:120
@@ -5485,7 +5914,7 @@ msgid "Tuner"
 msgstr "チューナー:"
 
 #: modules/access/v4l/v4l.c:121
-msgid "Tuner to use, if there are several ones"
+msgid "Tuner to use, if there are several ones."
 msgstr ""
 
 #: modules/access/v4l/v4l.c:122
@@ -5494,11 +5923,12 @@ 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
@@ -5516,7 +5946,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
@@ -5526,7 +5956,7 @@ msgstr "品質:"
 
 #: modules/access/v4l/v4l.c:135
 #, fuzzy
-msgid "Set the quality of the stream"
+msgid "Quality of the stream."
 msgstr "ストリームをナビゲートする"
 
 #: modules/access/v4l/v4l.c:146
@@ -5537,9 +5967,16 @@ msgstr "Video4Linux"
 msgid "Video4Linux input"
 msgstr "Video4Linux 入力"
 
+#: modules/access/vcd/vcd.c:42
+#, fuzzy
+msgid "Caching value for VCDs. This value should be set in milliseconds."
+msgstr ""
+"udpストリームで使用される既定のキャッシング値が変更可能です。単位はミリ秒で指"
+"定します。"
+
 #: 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/dialogs/open.cpp:676
+#: modules/gui/wxwidgets/dialogs/open.cpp:698
 msgid "VCD"
 msgstr "VCD"
 
@@ -5572,7 +6009,7 @@ msgstr "分割"
 
 #: 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:5194
+#: modules/demux/mkv.cpp:5176
 msgid "Segment"
 msgstr "分割"
 
@@ -5585,8 +6022,7 @@ msgstr "PBC LID"
 msgid "VCD Format"
 msgstr "VCD フォーマット"
 
-#: modules/access/vcdx/info.c:91 modules/demux/mpc.c:53
-#: modules/services_discovery/daap.c:610
+#: modules/access/vcdx/info.c:91 modules/demux/mpc.c:55
 msgid "Album"
 msgstr "アルバム"
 
@@ -5610,10 +6046,6 @@ msgstr "最大音量 #"
 msgid "Volume Set"
 msgstr "音量設定"
 
-#: modules/access/vcdx/info.c:98
-msgid "Publisher"
-msgstr ""
-
 #: modules/access/vcdx/info.c:99
 msgid "System Id"
 msgstr "システム ID"
@@ -5682,6 +6114,10 @@ msgstr "Video CD (VCD 1.0, 1.1, 2.0, SVCD, HQVCD) 入力"
 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
 #, fuzzy
 msgid "Number of CD blocks to get in a single read."
@@ -5727,35 +6163,47 @@ msgstr "再生一覧の \"author\" フィールドで使用するフォーマッ
 msgid "Format to use in the playlist's \"title\" field."
 msgstr "再生一覧の \"author\" フィールドで使用するフォーマット"
 
-#: modules/access_filter/record.c:42
+#: modules/access_filter/record.c:43
 #, fuzzy
 msgid "Record directory"
 msgstr "ソースディレクトリ"
 
-#: modules/access_filter/record.c:44
+#: modules/access_filter/record.c:45
 #, fuzzy
-msgid "Allows you to specify the directory where the record will be stored"
+msgid "Directory where the record will be stored."
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: modules/access_filter/timeshift.c:42
+#: modules/access_filter/timeshift.c:44
 #, fuzzy
 msgid "Timeshift granularity"
 msgstr "垂直方向位置"
 
-#: modules/access_filter/timeshift.c:43
-msgid "Size of the temporary files use to store the timeshifted stream."
+#: modules/access_filter/timeshift.c:46
+msgid ""
+"This is the size of the temporary files tha will be used to store the "
+"timeshifted streams."
 msgstr ""
 
-#: modules/access_filter/timeshift.c:45
+#: modules/access_filter/timeshift.c:48
 #, fuzzy
 msgid "Timeshift directory"
 msgstr "ディレクトリを選択する"
 
-#: modules/access_filter/timeshift.c:46
+#: modules/access_filter/timeshift.c:49
 msgid "Directory used to store the timeshift temporary files."
 msgstr ""
 
-#: modules/access_filter/timeshift.c:50 modules/access_filter/timeshift.c:51
+#: modules/access_filter/timeshift.c:51
+msgid "Force use of the timeshift module"
+msgstr ""
+
+#: modules/access_filter/timeshift.c:52
+msgid ""
+"Force use of the timeshift module even if the access declares that it can "
+"control pace or pause."
+msgstr ""
+
+#: modules/access_filter/timeshift.c:56 modules/access_filter/timeshift.c:57
 msgid "Timeshift"
 msgstr "タイムシフト"
 
@@ -5767,15 +6215,15 @@ msgstr "ダミーストリーム出力"
 msgid "Dummy"
 msgstr "ダミー"
 
-#: modules/access_output/file.c:65
+#: modules/access_output/file.c:61
 msgid "Append to file"
 msgstr "ファイルに追加する"
 
-#: modules/access_output/file.c:66
+#: modules/access_output/file.c:62
 msgid "Append to file if it exists instead of replacing it."
 msgstr ""
 
-#: modules/access_output/file.c:70
+#: modules/access_output/file.c:66
 msgid "File stream output"
 msgstr "ファイルストリーム出力"
 
@@ -5784,115 +6232,121 @@ 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."
+msgid "User name that will be requested to access the stream."
 msgstr ""
 
+#: modules/access_output/http.c:63 modules/control/telnet.c:81
+msgid "Password"
+msgstr "パスワード"
+
 #: modules/access_output/http.c:64
-msgid ""
-"Allows you to give a password that will be requested to access the stream."
+msgid "Password that will be requested to access the stream."
 msgstr ""
 
-#: modules/access_output/http.c:66
+#: modules/access_output/http.c:68
 msgid "Mime"
 msgstr "Mime"
 
-#: modules/access_output/http.c:67
-#, fuzzy
-msgid "Allows you to give the mime returned by the server."
+#: modules/access_output/http.c:69
+msgid "MIME returned by the server (autodetected if not specified."
 msgstr ""
-"ファイルを見つけるときにオープンされるインタフェースの既定のパスを設定しま"
-"す。"
 
-#: modules/access_output/http.c:69 modules/control/http/http.c:46
-msgid "Certificate file"
-msgstr "証明書ファイル"
+#: modules/access_output/http.c:73
+#, fuzzy
+msgid "Path to the x509 PEM certificate file that will be used for HTTPS."
+msgstr "HTTP インターフェースの x509 PEM 証明書ファイル (SSL 有効)"
 
-#: modules/access_output/http.c:70
+#: modules/access_output/http.c:76
+#, fuzzy
 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 "秘密鍵のファイル"
+"Path to the x509 PEM private key file that will be used for HTTPS. Leave "
+"empty if you don't have one."
+msgstr "HTTP インターフェースの x509 PEM 証明書ファイル (SSL 有効)"
 
-#: modules/access_output/http.c:73
+#: modules/access_output/http.c:80
+#, fuzzy
 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 "ルート CA ファイル"
+"Path to the x509 PEM trusted root CA certificates (certificate authority) "
+"file that will be used for HTTPS. Leave empty if you don't have one."
+msgstr "HTTP インターフェースの x509 PEM 証明書ファイル (SSL 有効)"
 
-#: modules/access_output/http.c:77
+#: modules/access_output/http.c:85
 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."
+"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:81 modules/control/http/http.c:54
-msgid "CRL file"
-msgstr "CRL ファイル"
+#: modules/access_output/http.c:88
+msgid "Advertise with Bonjour"
+msgstr ""
 
-#: modules/access_output/http.c:82
-msgid ""
-"Path to the x509 PEM Certificates Revocation List file that will be HTTP/SSL "
-"stream output. Leave empty if you don't have one."
+#: modules/access_output/http.c:89
+msgid "Advertise the stream with the Bonjour protocol."
 msgstr ""
 
-#: modules/access_output/http.c:87
+#: modules/access_output/http.c:93
 msgid "HTTP stream output"
 msgstr "HTTP ストリーム出力"
 
-#: modules/access_output/http.c:89 modules/control/http/http.c:58
-#: modules/gui/wxwidgets/dialogs/streamout.cpp:473
+#: modules/access_output/http.c:95 modules/control/http/http.c:61
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:472
 msgid "HTTP"
 msgstr "HTTP"
 
 #: modules/access_output/shout.c:58
-msgid "Stream-name"
+#, fuzzy
+msgid "Stream name"
 msgstr "ストリーム名"
 
 #: modules/access_output/shout.c:59
-msgid "The name this stream/channel will get on the icecast server."
+msgid "Name to give to this stream/channel on the icecast server."
 msgstr ""
 
-#: modules/access_output/shout.c:61
+#: modules/access_output/shout.c:62
 #, fuzzy
-msgid "Stream-description"
+msgid "Stream description"
 msgstr "コーデック説明"
 
-#: modules/access_output/shout.c:62
-msgid "A description of the stream content. (Information about your channel)."
+#: modules/access_output/shout.c:63
+msgid "Description of the stream content or information about your channel."
 msgstr ""
 
-#: modules/access_output/shout.c:65
+#: modules/access_output/shout.c:66
 msgid "Stream MP3"
 msgstr "ストリーム MP3"
 
-#: modules/access_output/shout.c:66
+#: modules/access_output/shout.c:67
 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."
+"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:71
-msgid "libshout (icecast) output"
+#: modules/access_output/shout.c:73
+#, fuzzy
+msgid "IceCAST output"
+msgstr "オーディオ出力モジュールアクセス"
+
+#: modules/access_output/udp.c:77
+#, fuzzy
+msgid ""
+"Default caching value for outbound UDP streams. This value should be set in "
+"milliseconds."
 msgstr ""
+"udpストリームで使用される既定のキャッシング値が変更可能です。単位はミリ秒で指"
+"定します。"
 
-#: modules/access_output/udp.c:80 modules/stream_out/rtp.c:80
-msgid "Time To Live"
-msgstr "生存時間"
+#: modules/access_output/udp.c:80 modules/gui/macosx/wizard.m:442
+#: modules/gui/macosx/wizard.m:1848
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:610
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:1340 modules/stream_out/rtp.c:87
+msgid "Time-To-Live (TTL)"
+msgstr "生存時間 (TTL):"
 
 #: modules/access_output/udp.c:81
-msgid "Allows you to define the time to live of the outgoing stream."
-msgstr ""
+#, fuzzy
+msgid "Time-To-Live of the outgoing stream."
+msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
 #: modules/access_output/udp.c:84
 msgid "Group packets"
@@ -5900,9 +6354,9 @@ 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."
+"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
@@ -5911,9 +6365,8 @@ 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)."
+"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
@@ -5921,17 +6374,17 @@ msgid "UDP stream output"
 msgstr "UDP ストリーム出力"
 
 #: modules/access_output/udp.c:98
-#: modules/gui/wxwidgets/dialogs/streamout.cpp:476
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:475
 msgid "UDP"
 msgstr "UDP"
 
 #: modules/audio_filter/channel_mixer/dolby.c:47
-msgid "Simple decoder for dolby surround encoded streams"
+msgid "Simple decoder for Dolby Surround encoded streams"
 msgstr ""
 
 #: modules/audio_filter/channel_mixer/dolby.c:48
 #, fuzzy
-msgid "Dolby surround decoder"
+msgid "Dolby Surround decoder"
 msgstr "ドルビーサラウンド"
 
 #: modules/audio_filter/channel_mixer/headphone.c:49
@@ -5968,7 +6421,8 @@ 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 lipsync. In that case, turn this on to compensate."
+"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
@@ -5978,26 +6432,27 @@ msgstr "ドルビーサラウンド"
 
 #: modules/audio_filter/channel_mixer/headphone.c:68
 msgid ""
-"If this option is turned on (not recommended), Dolby Surround encoded "
-"streams won't be decoded before being processed by this filter."
+"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:73
+#: modules/audio_filter/channel_mixer/headphone.c:72
 #, fuzzy
-msgid "Headphone channel mixer with virtual spatialization effect"
+msgid "Headphone virtual spatialization effect"
 msgstr "ヘッドホーンの仮想的な音の広がり効果"
 
-#: modules/audio_filter/channel_mixer/headphone.c:74
+#: modules/audio_filter/channel_mixer/headphone.c:73
 msgid "Headphone effect"
 msgstr "ヘッドフォンエフェクト"
 
 #: modules/audio_filter/channel_mixer/simple.c:46
 #, fuzzy
-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"
+#, fuzzy
+msgid "Audio filter for trivial channel mixing"
 msgstr "微妙なチャンネル・ミキシングのためのオーディオ・フィルター"
 
 #: modules/audio_filter/converter/a52tofloat32.c:94
@@ -6034,18 +6489,14 @@ msgid "ATSC A/52 (AC-3) audio decoder"
 msgstr "a52 ATSC A/52(AC-3)オーディオ・デコーダ・モジュール"
 
 #: modules/audio_filter/converter/a52tospdif.c:53
-msgid "audio filter for A/52->S/PDIF encapsulation"
+#, fuzzy
+msgid "Audio filter for A/52->S/PDIF encapsulation"
 msgstr "A/52->S/PDIFのカプセル化のためのオーディオ・フィルター"
 
 #: modules/audio_filter/converter/dtstofloat32.c:81
 msgid "DTS dynamic range compression"
 msgstr "DTS ダイナミック・レンジ圧縮"
 
-#: modules/audio_filter/converter/dtstofloat32.c:92
-#, fuzzy
-msgid "DTS"
-msgstr "TS"
-
 #: modules/audio_filter/converter/dtstofloat32.c:93
 #: modules/audio_filter/converter/dtstofloat32.c:99
 #, fuzzy
@@ -6054,31 +6505,37 @@ msgstr "字幕・デコーダ・モジュール"
 
 #: modules/audio_filter/converter/dtstospdif.c:70
 #, fuzzy
-msgid "audio filter for DTS->S/PDIF encapsulation"
+msgid "Audio filter for DTS->S/PDIF encapsulation"
 msgstr "A/52->S/PDIFのカプセル化のためのオーディオ・フィルター"
 
 #: modules/audio_filter/converter/fixed32tofloat32.c:50
-msgid "audio filter for fixed32<->float32 conversion"
+#, fuzzy
+msgid "Audio filter for fixed32<->float32 conversion"
 msgstr "fixed32<->float32変換のためのオーディオ・フィルター"
 
 #: modules/audio_filter/converter/fixed32tos16.c:48
-msgid "audio filter for fixed32->s16 conversion"
+#, fuzzy
+msgid "Audio filter for fixed32->s16 conversion"
 msgstr "fixed32->s16変換のためのオーディオ・フィルター"
 
 #: modules/audio_filter/converter/float32tos16.c:48
-msgid "audio filter for float32->s16 conversion"
+#, fuzzy
+msgid "Audio filter for float32->s16 conversion"
 msgstr "float32->s16変換のためのオーディオ・フィルター"
 
 #: modules/audio_filter/converter/float32tos8.c:48
-msgid "audio filter for float32->s8 conversion"
+#, fuzzy
+msgid "Audio filter for float32->s8 conversion"
 msgstr "float32->s8変換のためのオーディオ・フィルター"
 
 #: modules/audio_filter/converter/float32tou16.c:48
-msgid "audio filter for float32->u16 conversion"
+#, fuzzy
+msgid "Audio filter for float32->u16 conversion"
 msgstr "float32->u16変換のためのオーディオ・フィルター"
 
 #: modules/audio_filter/converter/float32tou8.c:48
-msgid "audio filter for float32->u8 conversion"
+#, fuzzy
+msgid "Audio filter for float32->u8 conversion"
 msgstr "float32->u8変換のためのオーディオ・フィルター"
 
 #: modules/audio_filter/converter/mpgatofixed32.c:67
@@ -6088,62 +6545,72 @@ msgstr "MPEG オーディオデコーダー"
 
 #: modules/audio_filter/converter/s16tofixed32.c:48
 #, fuzzy
-msgid "audio filter for s16->fixed32 conversion"
+msgid "Audio filter for s16->fixed32 conversion"
 msgstr "s16->float32変換のためのオーディオ・フィルター"
 
 #: modules/audio_filter/converter/s16tofloat32.c:50
-msgid "audio filter for s16->float32 conversion"
+#, fuzzy
+msgid "Audio filter for s16->float32 conversion"
 msgstr "s16->float32変換のためのオーディオ・フィルター"
 
 #: modules/audio_filter/converter/s16tofloat32swab.c:62
-msgid "audio filter for s16->float32 with endianness conversion"
+#, fuzzy
+msgid "Audio filter for s16->float32 with endianness conversion"
 msgstr "s16->float32変換のためのオーディオ・フィルター"
 
 #: modules/audio_filter/converter/s8tofloat32.c:48
 #, fuzzy
-msgid "audio filter for s8->float32 conversion"
+msgid "Audio filter for s8->float32 conversion"
 msgstr "s16->float32変換のためのオーディオ・フィルター"
 
 #: modules/audio_filter/converter/u8tofixed32.c:48
 #, fuzzy
-msgid "audio filter for u8->fixed32 conversion"
+msgid "Audio filter for u8->fixed32 conversion"
 msgstr "fixed32->s16変換のためのオーディオ・フィルター"
 
 #: modules/audio_filter/converter/u8tofloat32.c:48
 #, fuzzy
-msgid "audio filter for u8->float32 conversion"
+msgid "Audio filter for u8->float32 conversion"
 msgstr "s16->float32変換のためのオーディオ・フィルター"
 
 #: 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:58
+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:62
 msgid "Two pass"
 msgstr "2 パス"
 
-#: modules/audio_filter/equalizer.c:59
-msgid "Filter twice the audio"
+#: modules/audio_filter/equalizer.c:63
+msgid "Filter the audio twice. This provides a more intense effect."
 msgstr ""
 
-#: modules/audio_filter/equalizer.c:61
+#: modules/audio_filter/equalizer.c:66
 msgid "Global gain"
 msgstr "全体のゲイン"
 
-#: modules/audio_filter/equalizer.c:62
-msgid "Set the global gain in dB (-20 ... 20)"
+#: modules/audio_filter/equalizer.c:67
+msgid "Set the global gain in dB (-20 ... 20)."
 msgstr ""
 
-#: modules/audio_filter/equalizer.c:65
-msgid "Equalizer 10 bands"
+#: modules/audio_filter/equalizer.c:70
+#, fuzzy
+msgid "Equalizer with 10 bands"
 msgstr "10 バンドイコライザー"
 
 #: modules/audio_filter/equalizer_presets.h:39
@@ -6227,7 +6694,7 @@ msgstr "テクノ"
 
 #: modules/audio_filter/format.c:201
 #, fuzzy
-msgid "audio filter for PCM format conversion"
+msgid "Audio filter for PCM format conversion"
 msgstr "float32->s8変換のためのオーディオ・フィルター"
 
 #: modules/audio_filter/normvol.c:69
@@ -6238,7 +6705,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
@@ -6256,23 +6723,85 @@ msgstr ""
 msgid "Volume normalizer"
 msgstr "音量ノーマライザー"
 
+#: 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:58
+msgid "Low freq gain (Db)"
+msgstr ""
+
+#: modules/audio_filter/param_eq.c:59
+msgid "High freq (Hz)"
+msgstr ""
+
+#: modules/audio_filter/param_eq.c:62
+msgid "High freq gain (Db)"
+msgstr ""
+
+#: modules/audio_filter/param_eq.c:63
+#, fuzzy
+msgid "Freq 1 (Hz)"
+msgstr "周波数"
+
+#: modules/audio_filter/param_eq.c:66
+msgid "Freq 1 gain (Db)"
+msgstr ""
+
+#: modules/audio_filter/param_eq.c:68
+msgid "Freq 1 Q"
+msgstr ""
+
+#: modules/audio_filter/param_eq.c:69
+#, fuzzy
+msgid "Freq 2 (Hz)"
+msgstr "周波数"
+
+#: modules/audio_filter/param_eq.c:72
+msgid "Freq 2 gain (Db)"
+msgstr ""
+
+#: modules/audio_filter/param_eq.c:74
+msgid "Freq 2 Q"
+msgstr ""
+
+#: modules/audio_filter/param_eq.c:75
+#, fuzzy
+msgid "Freq 3 (Hz)"
+msgstr "周波数"
+
+#: modules/audio_filter/param_eq.c:78
+msgid "Freq 3 gain (Db)"
+msgstr ""
+
+#: modules/audio_filter/param_eq.c:80
+msgid "Freq 3 Q"
+msgstr ""
+
 #: modules/audio_filter/resampler/bandlimited.c:84
 #, fuzzy
-msgid "audio filter for band-limited interpolation resampling"
+msgid "Audio filter for band-limited interpolation resampling"
 msgstr "微妙な再サンプリングのためのオーディオ・フィルター"
 
 #: modules/audio_filter/resampler/linear.c:65
 #: modules/audio_filter/resampler/linear.c:72
 #, fuzzy
-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"
+#, fuzzy
+msgid "Audio filter for trivial resampling"
 msgstr "微妙な再サンプリングのためのオーディオ・フィルター"
 
 #: modules/audio_filter/resampler/ugly.c:46
-msgid "audio filter for ugly resampling"
+#, fuzzy
+msgid "Audio filter for ugly resampling"
 msgstr "荒れた再サンプリングのためのオーディオ・フィルター"
 
 #: modules/audio_mixer/float32.c:47
@@ -6290,8 +6819,8 @@ msgstr "ダミーのspdifオーディオ・ミキサー・モジュール"
 msgid "Trivial audio mixer"
 msgstr "微妙なオーディオ・ミキサー・モジュール"
 
-#: modules/audio_output/alsa.c:84 modules/codec/x264.c:149
-#: modules/codec/x264.c:155
+#: modules/audio_output/alsa.c:84 modules/codec/x264.c:272
+#: modules/codec/x264.c:278 modules/codec/x264.c:285 modules/codec/x264.c:290
 msgid "default"
 msgstr "デフォルト"
 
@@ -6304,135 +6833,136 @@ msgstr "ALSAオーディオ・モジュール"
 msgid "ALSA Device Name"
 msgstr "ALSA デバイス名"
 
-#: modules/audio_output/alsa.c:128 modules/audio_output/auhal.c:118
-#: modules/audio_output/auhal.c:1030 modules/audio_output/directx.c:403
+#: 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:179 modules/audio_output/sdl.c:197
-#: modules/audio_output/waveout.c:371 modules/gui/macosx/intf.m:515
-#: modules/gui/macosx/intf.m:516
+#: modules/audio_output/sdl.c:177 modules/audio_output/sdl.c:195
+#: modules/audio_output/waveout.c:371 modules/gui/macosx/intf.m:562
+#: modules/gui/macosx/intf.m:563
 msgid "Audio Device"
 msgstr "オーディオデバイス"
 
-#: modules/audio_output/alsa.c:185 modules/audio_output/directx.c:480
+#: 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/sdl.c:183 modules/audio_output/sdl.c:202
 #: modules/audio_output/waveout.c:433
 msgid "Mono"
 msgstr "モノラル"
 
-#: modules/audio_output/alsa.c:198 modules/audio_output/directx.c:453
+#: 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:405
 msgid "2 Front 2 Rear"
 msgstr "フロント 2, リア 2"
 
-#: modules/audio_output/alsa.c:204 modules/audio_output/directx.c:417
-#: modules/audio_output/oss.c:170 modules/audio_output/portaudio.c:435
-#: modules/audio_output/waveout.c:386
-msgid "5.1"
-msgstr "5.1"
-
-#: modules/audio_output/alsa.c:246 modules/audio_output/directx.c:526
+#: 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 "A/52 over S/PDIF"
 
-#: modules/audio_output/alsa.c:928
+#: modules/audio_output/alsa.c:924
 #, fuzzy
 msgid "Unknown soundcard"
 msgstr "不明のビデオ"
 
-#: modules/audio_output/arts.c:67
+#: modules/audio_output/arts.c:65
 #, fuzzy
 msgid "aRts audio output"
 msgstr "aRtsオーディオ・モジュール"
 
-#: modules/audio_output/auhal.c:119
+#: 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:125
+#: modules/audio_output/auhal.c:136
 #, fuzzy
 msgid "HAL AudioUnit output"
 msgstr "ALSAオーディオ・モジュール"
 
-#: modules/audio_output/directx.c:207 modules/audio_output/portaudio.c:107
+#: modules/audio_output/auhal.c:1011
+#, c-format
+msgid "%s (Encoded Output)"
+msgstr ""
+
+#: modules/audio_output/directx.c:205 modules/audio_output/portaudio.c:107
 msgid "Output device"
 msgstr "出力デバイス"
 
-#: modules/audio_output/directx.c:209
+#: 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:211 modules/audio_output/waveout.c:137
+#: modules/audio_output/directx.c:209 modules/audio_output/waveout.c:137
 msgid "Use float32 output"
 msgstr "32 ビット浮動小数点を使う"
 
-#: modules/audio_output/directx.c:213 modules/audio_output/waveout.c:139
+#: 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:217
+#: modules/audio_output/directx.c:215
 msgid "DirectX audio output"
 msgstr "DirectX オーディオ出力"
 
-#: modules/audio_output/directx.c:435 modules/audio_output/portaudio.c:427
+#: modules/audio_output/directx.c:433 modules/audio_output/portaudio.c:427
 msgid "3 Front 2 Rear"
 msgstr "フロント 3, リア 2"
 
-#: 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
 msgid "Esound server"
 msgstr "Esound サーバー"
 
-#: 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
+#, fuzzy
+msgid "Add WAVE header"
 msgstr "wave ヘッダーを追加"
 
-#: modules/audio_output/file.c:89
+#: modules/audio_output/file.c:90
 #, fuzzy
-msgid "Instead of writing a raw file, you can add a WAV header to the file"
+msgid "Instead of writing a raw file, you can add a WAV header to the file."
 msgstr "rawファイルを書き出す代わりに、wavヘッダをファイルに追加する。"
 
-#: 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 "ファイルオーディオ出力"
 
@@ -6440,6 +6970,11 @@ msgstr "ファイルオーディオ出力"
 msgid "Roku HD1000 audio output"
 msgstr "Roku HD1000 オーディオ出力"
 
+#: 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 "OSS ドライバのバグの回避を試みる"
@@ -6471,7 +7006,7 @@ msgstr ""
 msgid "PORTAUDIO audio output"
 msgstr "ALSAオーディオ・モジュール"
 
-#: modules/audio_output/sdl.c:69
+#: modules/audio_output/sdl.c:67
 #, fuzzy
 msgid "Simple DirectMedia Layer audio output"
 msgstr "シンプル DirectMedia レイヤオーディオ出力"
@@ -6480,6 +7015,10 @@ msgstr "シンプル DirectMedia レイヤオーディオ出力"
 msgid "Win32 waveOut extension output"
 msgstr "Win32 wave 出力用拡張モジュール"
 
+#: modules/audio_output/waveout.c:386
+msgid "5.1"
+msgstr "5.1"
+
 #: modules/codec/a52.c:91
 msgid "A/52 parser"
 msgstr "A/52 パーサー"
@@ -6525,7 +7064,7 @@ msgstr "エンコード品質"
 
 #: modules/codec/dirac.c:68
 #, fuzzy
-msgid "Allows you to specify a quality between 1.0 (low) and 10.0 (high)."
+msgid "Quality of the encoding between 1.0 (low) and 10.0 (high)."
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
 #: modules/codec/dirac.c:73
@@ -6554,16 +7093,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
@@ -6573,33 +7117,34 @@ 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"
-msgstr ""
+#, fuzzy
+msgid "Encoding X coordinate"
+msgstr "ビデオ y コーディネート"
 
-#: modules/codec/dvbsub.c:60
-msgid "Y coordinate of encoded the subpicture"
+#: modules/codec/dvbsub.c:58
+msgid "X coordinate of the encoded subtitle"
 msgstr ""
 
-#: modules/codec/dvbsub.c:63
-msgid "Timeout of subpictures"
-msgstr "字幕のタイムアウト"
+#: modules/codec/dvbsub.c:59
+#, fuzzy
+msgid "Encoding Y coordinate"
+msgstr "ビデオ y コーディネート"
 
-#: modules/codec/dvbsub.c:65
-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."
+#: modules/codec/dvbsub.c:60
+msgid "Y coordinate of the encoded subtitle"
 msgstr ""
 
-#: modules/codec/dvbsub.c:86
+#: modules/codec/dvbsub.c:80
 #, fuzzy
 msgid "DVB subtitles decoder"
 msgstr "DVB 字幕デコーダ"
 
-#: modules/codec/dvbsub.c:99
+#: modules/codec/dvbsub.c:93
 #, fuzzy
 msgid "DVB subtitles encoder"
 msgstr "DVB 字幕デコーダ"
@@ -6609,62 +7154,64 @@ 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:79
 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:109
-#: 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:112
-#: modules/stream_out/transcode.c:75
+#: modules/codec/fake.c:53 modules/stream_out/mosaic_bridge.c:112
+#: modules/stream_out/transcode.c:73
 #, fuzzy
-msgid "Allows you to specify the output video height."
-msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+msgid "Output video height."
+msgstr "ビデオの最大の高さ"
 
-#: modules/codec/fake.c:53
+#: modules/codec/fake.c:54 modules/video_filter/mosaic.c:129
 #, 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
 #, fuzzy
 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 "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: 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 "DV ビデオデコーダ"
@@ -6703,12 +7250,12 @@ msgstr "シンプル"
 #: modules/codec/ffmpeg/ffmpeg.c:89
 #, fuzzy
 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 "ffmpeg オーディオ/ビデオデコーダー((MS)MPEG4,SVQ1,H263,WMV,WMA)"
 
 #: modules/codec/ffmpeg/ffmpeg.c:93
 #, fuzzy
-msgid "ffmpeg audio/video decoder/encoder ((MS)MPEG4,SVQ1,H263,WMV,WMA)"
+msgid "FFmpeg audio/video decoder/encoder ((MS)MPEG4,SVQ1,H263,WMV,WMA)"
 msgstr "ffmpeg オーディオ/ビデオデコーダー((MS)MPEG4,SVQ1,H263,WMV,WMA)"
 
 #: modules/codec/ffmpeg/ffmpeg.c:96
@@ -6716,372 +7263,386 @@ msgid "Decoding"
 msgstr "出k-土中"
 
 #: modules/codec/ffmpeg/ffmpeg.c:127
-msgid "ffmpeg chroma conversion"
+#, fuzzy
+msgid "FFmpeg chroma conversion"
 msgstr "ffmpeg クロマ変換"
 
 #: modules/codec/ffmpeg/ffmpeg.c:131
+#: modules/gui/wxwidgets/dialogs/subtitles.cpp:97
 msgid "Encoding"
 msgstr "エンコード中"
 
 #: modules/codec/ffmpeg/ffmpeg.c:132
-msgid "ffmpeg audio/video encoder"
+#, fuzzy
+msgid "FFmpeg audio/video encoder"
 msgstr "ffmpeg オーディオ/ビデオエンコーダー"
 
 #: modules/codec/ffmpeg/ffmpeg.c:190
 #, fuzzy
-msgid "ffmpeg demuxer"
+msgid "FFmpeg demuxer"
 msgstr "MPEG 1/2レイヤ1/2オーディオ・デコーダ"
 
 #: modules/codec/ffmpeg/ffmpeg.c:198
 #, fuzzy
-msgid "ffmpeg video filter"
+msgid "FFmpeg video filter"
 msgstr "ビデオ・フィルター・モジュール"
 
 #: modules/codec/ffmpeg/ffmpeg.c:204
 #, fuzzy
-msgid "ffmpeg deinterlace video filter"
+msgid "FFmpeg crop padd filter"
+msgstr "ビデオ・フィルター・モジュール"
+
+#: modules/codec/ffmpeg/ffmpeg.c:210
+#, fuzzy
+msgid "FFmpeg deinterlace video filter"
 msgstr "ビデオ逆転モジュール"
 
-#: 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:235
-#: 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
 #, fuzzy
 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 ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:121
+#: modules/codec/ffmpeg/ffmpeg.h:127
 #, fuzzy
 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
+#: modules/codec/ffmpeg/ffmpeg.h:140
 msgid "Skip the loop filter for H.264 decoding"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:132
+#: modules/codec/ffmpeg/ffmpeg.h:141
 msgid ""
 "Skipping the loop filter (aka deblocking) usually has a detrimental effect "
-"on quality. However for HDTV streams this provides a big speedup."
+"on quality. However it provides a big speedup for high definition streams."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:136
+#: modules/codec/ffmpeg/ffmpeg.h:145
 #, fuzzy
-msgid "ffmpeg post processing filter chains"
+msgid "FFmpeg post processing filter chains"
 msgstr "ffmpeg 後処理モジュール"
 
-#: modules/codec/ffmpeg/ffmpeg.h:178
+#: modules/codec/ffmpeg/ffmpeg.h:187
 msgid "Ratio of key frames"
 msgstr "キーフレームの割合"
 
-#: modules/codec/ffmpeg/ffmpeg.h:179
-msgid ""
-"Allows you to specify the number of frames that will be coded for one key "
-"frame."
+#: modules/codec/ffmpeg/ffmpeg.h:188
+msgid "Number of frames that will be coded for one key frame."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:182
+#: modules/codec/ffmpeg/ffmpeg.h:191
 msgid "Ratio of B frames"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:183
-msgid ""
-"Allows you to specify the number of B frames that will be coded between two "
-"reference frames."
+#: modules/codec/ffmpeg/ffmpeg.h:192
+msgid "Number of B frames that will be coded between two reference frames."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:186
+#: modules/codec/ffmpeg/ffmpeg.h:195
 #, fuzzy
 msgid "Video bitrate tolerance"
 msgstr "オーディオ"
 
-#: modules/codec/ffmpeg/ffmpeg.h:187
-msgid "Allows you to specify the video bitrate tolerance in kbit/s."
-msgstr ""
+#: modules/codec/ffmpeg/ffmpeg.h:196
+#, fuzzy
+msgid "Video bitrate tolerance in kbit/s."
+msgstr "オーディオ"
 
-#: modules/codec/ffmpeg/ffmpeg.h:190
+#: modules/codec/ffmpeg/ffmpeg.h:198
 #, fuzzy
-msgid "Enable interlaced encoding"
+msgid "Interlaced encoding"
 msgstr "字幕・デコーダ・モジュール"
 
-#: modules/codec/ffmpeg/ffmpeg.h:191
-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:194
+#: modules/codec/ffmpeg/ffmpeg.h:202
 #, fuzzy
-msgid "Enable interlaced motion estimation"
+msgid "Interlaced motion estimation"
 msgstr "字幕・デコーダ・モジュール"
 
-#: modules/codec/ffmpeg/ffmpeg.h:195
-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:198
-msgid "Enable pre motion estimation"
-msgstr ""
+#: modules/codec/ffmpeg/ffmpeg.h:206
+#, fuzzy
+msgid "Pre-motion estimation"
+msgstr "モーション補正モジュール"
 
-#: modules/codec/ffmpeg/ffmpeg.h:199
-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:202
-msgid "Enable strict rate control"
-msgstr ""
+#: modules/codec/ffmpeg/ffmpeg.h:210
+#, fuzzy
+msgid "Strict rate control"
+msgstr "リモート・コントロール"
 
-#: modules/codec/ffmpeg/ffmpeg.h:203
-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:206
+#: modules/codec/ffmpeg/ffmpeg.h:214
 #, fuzzy
 msgid "Rate control buffer size"
 msgstr "リモート・コントロール・インタフェース・モジュール"
 
-#: modules/codec/ffmpeg/ffmpeg.h:207
-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:210
+#: modules/codec/ffmpeg/ffmpeg.h:219
 #, fuzzy
 msgid "Rate control buffer aggressiveness"
 msgstr "リモート・コントロール・インタフェース・モジュール"
 
-#: modules/codec/ffmpeg/ffmpeg.h:211
+#: modules/codec/ffmpeg/ffmpeg.h:220
 #, fuzzy
-msgid "Allows you to specify the rate control buffer aggressiveness."
-msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+msgid "Rate control buffer aggressiveness."
+msgstr "リモート・コントロール・インタフェース・モジュール"
 
-#: modules/codec/ffmpeg/ffmpeg.h:214
+#: modules/codec/ffmpeg/ffmpeg.h:223
 msgid "I quantization factor"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:215
+#: 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:219 modules/demux/mod.c:54
+#: modules/codec/ffmpeg/ffmpeg.h:228 modules/codec/x264.c:250
+#: modules/demux/mod.c:73
 msgid "Noise reduction"
 msgstr "ノイズリダクション"
 
-#: modules/codec/ffmpeg/ffmpeg.h:220
+#: 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:224
-msgid "Enable MPEG4 quantization matrix"
+#: modules/codec/ffmpeg/ffmpeg.h:233
+msgid "MPEG4 quantization matrix"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:225
+#: 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:230
+#: modules/codec/ffmpeg/ffmpeg.h:239
 msgid "Quality level"
 msgstr "品質レベル"
 
-#: modules/codec/ffmpeg/ffmpeg.h:231
+#: 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:236
+#: 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:242
+#: modules/codec/ffmpeg/ffmpeg.h:251
 msgid "Minimum video quantizer scale"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:243
-msgid "Allows you to specify the minimum video quantizer scale."
-msgstr ""
+#: modules/codec/ffmpeg/ffmpeg.h:252
+#, fuzzy
+msgid "Minimum video quantizer scale."
+msgstr "スケールクオンタイズ"
 
-#: modules/codec/ffmpeg/ffmpeg.h:246
+#: modules/codec/ffmpeg/ffmpeg.h:255
 msgid "Maximum video quantizer scale"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:247
-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:250
-msgid "Enable trellis quantization"
-msgstr ""
+#: modules/codec/ffmpeg/ffmpeg.h:259
+#, fuzzy
+msgid "Trellis quantization"
+msgstr "ビジュアル化"
 
-#: modules/codec/ffmpeg/ffmpeg.h:251
-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:254
-msgid "Use fixed video quantizer scale"
-msgstr ""
+#: modules/codec/ffmpeg/ffmpeg.h:263
+#, fuzzy
+msgid "Fixed quantizer scale"
+msgstr "スケールクオンタイズ"
 
-#: modules/codec/ffmpeg/ffmpeg.h:255
+#: 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:258
+#: modules/codec/ffmpeg/ffmpeg.h:267
 msgid "Strict standard compliance"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:259
+#: 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:262
+#: modules/codec/ffmpeg/ffmpeg.h:271
 msgid "Luminance masking"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:263
-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:266
+#: modules/codec/ffmpeg/ffmpeg.h:275
 msgid "Darkness masking"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:267
-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:270
+#: modules/codec/ffmpeg/ffmpeg.h:279
 #, fuzzy
 msgid "Motion masking"
 msgstr "自動縁取り"
 
-#: modules/codec/ffmpeg/ffmpeg.h:271
+#: 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:274
+#: modules/codec/ffmpeg/ffmpeg.h:283
 msgid "Border masking"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:275
+#: 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:278
+#: modules/codec/ffmpeg/ffmpeg.h:287
 msgid "Luminance elimination"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:279
+#: 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:283
+#: modules/codec/ffmpeg/ffmpeg.h:292
 msgid "Chrominance elimination"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:284
+#: 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:536
-#: modules/gui/macosx/intf.m:537
+#: modules/codec/ffmpeg/postprocess.c:88 modules/gui/macosx/intf.m:587
+#: modules/gui/macosx/intf.m:588
 msgid "Post processing"
 msgstr "後処理"
 
@@ -7129,7 +7690,8 @@ msgid "Video decoder using openmash"
 msgstr "ビデオデコーダーに openmash を使用する"
 
 #: modules/codec/mpeg_audio.c:106
-msgid "MPEG audio layer I/II/III parser"
+#, fuzzy
+msgid "MPEG audio layer I/II/III decoder"
 msgstr "MPEG オーディオレイヤ I/II/III パーサー"
 
 #: modules/codec/mpeg_audio.c:117
@@ -7201,31 +7763,58 @@ msgstr "字幕・デコーダ・モジュール"
 msgid "DVD subtitles packetizer"
 msgstr "字幕・デコーダ・モジュール"
 
-#: modules/codec/subsdec.c:86
+#: modules/codec/subsdec.c:131
 #, fuzzy
 msgid "Subtitles text encoding"
 msgstr "字幕・デコーダ・モジュール"
 
-#: modules/codec/subsdec.c:87
+#: modules/codec/subsdec.c:132
 #, fuzzy
 msgid "Set the encoding used in text subtitles"
 msgstr "文字字幕で使用されるフォント"
 
-#: modules/codec/subsdec.c:88 modules/gui/macosx/open.m:252
+#: modules/codec/subsdec.c:133
 #, fuzzy
 msgid "Subtitles justification"
 msgstr "字幕"
 
-#: modules/codec/subsdec.c:89
+#: modules/codec/subsdec.c:134
 #, fuzzy
 msgid "Set the justification of subtitles"
 msgstr "文字字幕で使用されるフォント"
 
-#: modules/codec/subsdec.c:93
+#: modules/codec/subsdec.c:135
+#, fuzzy
+msgid "UTF-8 subtitles autodetection"
+msgstr "字幕"
+
+#: modules/codec/subsdec.c:136
+msgid ""
+"This enables automatic detection of UTF-8 encoding within subtitles files."
+msgstr ""
+
+#: modules/codec/subsdec.c:138
+#, fuzzy
+msgid "Formatted Subtitles"
+msgstr "Podcast 字幕"
+
+#: modules/codec/subsdec.c:139
+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:145
 #, fuzzy
 msgid "Text subtitles decoder"
 msgstr "字幕デコーダー"
 
+#: modules/codec/subsdec.c:364
+msgid ""
+"failed to convert subtitle encoding.\n"
+"Try manually setting a character-encoding before you open the file."
+msgstr ""
+
 #: modules/codec/svcdsub.c:51
 #, fuzzy
 msgid "Philips OGT (SVCD subtitle) decoder"
@@ -7248,8 +7837,8 @@ msgstr "MPEG 1/2ビデオ・デコーダ・モジュール"
 
 #: 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
@@ -7273,7 +7862,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 ""
 
@@ -7283,7 +7872,7 @@ msgid "Stereo mode"
 msgstr "ステレオ"
 
 #: modules/codec/twolame.c:56
-msgid "Select how stereo streams will be handled"
+msgid "Handling mode for stereo streams"
 msgstr ""
 
 #: modules/codec/twolame.c:57
@@ -7292,7 +7881,7 @@ msgid "VBR mode"
 msgstr "ネットワーク"
 
 #: modules/codec/twolame.c:59
-msgid "By default the encoding is CBR."
+msgid "Use Variable BitRate. Default is to use Constant BitRate (CBR)."
 msgstr ""
 
 #: modules/codec/twolame.c:60
@@ -7323,497 +7912,713 @@ 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
 #, fuzzy
 msgid "CBR encoding"
 msgstr "字幕エンコンコード中"
 
-#: 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
 #, fuzzy
 msgid "Vorbis audio packetizer"
 msgstr "字幕・デコーダ・モジュール"
 
-#: 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 "Vorbis コメント"
 
-#: modules/codec/x264.c:42
-msgid "Quantizer parameter"
-msgstr ""
-
 #: modules/codec/x264.c:44
-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."
-msgstr ""
-
-#: modules/codec/x264.c:47
-msgid "Minimum quantizer parameter"
-msgstr ""
-
-#: modules/codec/x264.c:48
-msgid "Minimum quantizer, 15/35 seems to be a useful range."
-msgstr ""
-
-#: modules/codec/x264.c:51
-msgid "Maximum quantizer parameter"
-msgstr ""
+#, fuzzy
+msgid "Maximum GOP size"
+msgstr "GOP サイズ"
 
-#: modules/codec/x264.c:52
-msgid "Maximum quantizer parameter."
+#: 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:54
+#: modules/codec/x264.c:49
 #, fuzzy
-msgid "Enable CABAC"
-msgstr "有効"
+msgid "Minimum GOP size"
+msgstr "GOP サイズ"
 
-#: modules/codec/x264.c:55
+#: modules/codec/x264.c:50
 msgid ""
-"Enable CABAC (Context-Adaptive Binary Arithmetic Coding). Slightly slows "
-"down encoding and decoding, but should save 10-15% bitrate."
+"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:59
-#, fuzzy
-msgid "Enable loop filter"
-msgstr "すべてのグループ項目を有効にする(&E)"
-
-#: modules/codec/x264.c:60
-msgid "Use deblocking loop filter (increases quality)."
+msgid "Extra I-Frames aggressivity"
 msgstr ""
 
-#: modules/codec/x264.c:62
-msgid "Analyse mode"
+#: 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:63
-msgid "This selects the analysing mode."
+#: modules/codec/x264.c:70
+msgid "B-frames between I and P"
 msgstr ""
 
-#: modules/codec/x264.c:65
-#, fuzzy
-msgid "Bitrate tolerance"
-msgstr "オーディオ"
-
-#: modules/codec/x264.c:66
-msgid "Sets the allowed variance in average bitrate."
+#: modules/codec/x264.c:71
+msgid "Number of consecutive B-frames between I and P-frames. (1 to 16)"
 msgstr ""
 
-#: modules/codec/x264.c:69
-#, fuzzy
-msgid "Maximum local bitrate"
-msgstr "エンコードの最大ビットレート"
-
-#: modules/codec/x264.c:70
-#, fuzzy
-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:75
+msgid "Adaptive B-frame decision"
 msgstr ""
 
-#: modules/codec/x264.c:73
-#, fuzzy
-msgid "Sets an averaging period for the maximum local bitrate, in kbits/s."
-msgstr "ネットワークストリームを選択する"
-
 #: modules/codec/x264.c:76
-msgid "Initial buffer occupancy"
-msgstr ""
-
-#: modules/codec/x264.c:77
-msgid "Sets the initial buffer occupancy as a fraction of the buffer size."
+msgid ""
+"Force the specified number of consecutive B-frames to be used, except "
+"possibly before an I-frame. "
 msgstr ""
 
 #: modules/codec/x264.c:80
-#, fuzzy
-msgid "Sets maximum interval between IDR-frames"
-msgstr "ネットワークストリームを選択する"
+msgid "B-frames usage"
+msgstr ""
 
 #: modules/codec/x264.c:81
 msgid ""
-"Larger values save bits, thus improve quality for a given bitrate, at the "
-"cost of seeking precision."
+"Bias the choice to use B-frames. Positive values cause more B-frames, "
+"negative values cause less B-frames. "
 msgstr ""
 
 #: modules/codec/x264.c:84
-#, fuzzy
-msgid "Sets minimum interval between IDR-frames"
-msgstr "ネットワークストリームを選択する"
+msgid "Keep some B-frames as references"
+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."
+"Allows B-frames to be used as references for predicting other frames. Keeps "
+"the middle of 2+ consecutive B-frames as a reference, and reorders frame "
+"appropriately."
+msgstr ""
+
+#: modules/codec/x264.c:89
+msgid "CABAC"
+msgstr ""
+
+#: modules/codec/x264.c:90
+msgid ""
+"CABAC (Context-Adaptive Binary Arithmetic Coding). Slightly slows down "
+"encoding and decoding, but should save 10-15% bitrate."
 msgstr ""
 
 #: modules/codec/x264.c:94
 #, fuzzy
-msgid "B frames"
-msgstr "キーフレームを使用"
+msgid "Number of reference frames"
+msgstr "行数"
 
 #: modules/codec/x264.c:95
-msgid "Number of consecutive B-Frames between I and P-frames."
+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
-msgid "B pyramid"
-msgstr ""
+#: modules/codec/x264.c:100
+#, fuzzy
+msgid "Skip loop filter"
+msgstr "ロゴサブフィルター"
 
-#: modules/codec/x264.c:99
-msgid "Allows B-frames to be used as references for predicting other frames."
+#: modules/codec/x264.c:101
+msgid "Deactivate the deblocking loop filter (decreases quality)."
 msgstr ""
 
-#: modules/codec/x264.c:102
-msgid "Number of previous frames used as predictors."
+#: modules/codec/x264.c:103
+msgid "Loop filter AlphaC0 and Beta parameters alpha:beta"
 msgstr ""
 
-#: modules/codec/x264.c:103
+#: modules/codec/x264.c:104
 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."
+"Loop filter AlphaC0 and Beta parameters. Range -6 to 6 for both alpha and "
+"beta parameters. -6 means light filter, 6 means strong."
 msgstr ""
 
-#: modules/codec/x264.c:107
-#, fuzzy
-msgid "Scene-cut detection."
-msgstr "選択"
+#: modules/codec/x264.c:110
+msgid "Set QP"
+msgstr ""
 
-#: modules/codec/x264.c:108
+#: modules/codec/x264.c:111
 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 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:116
-msgid "Sub-pixel refinement quality."
+msgid "Quality-based VBR"
 msgstr ""
 
 #: modules/codec/x264.c:117
-msgid ""
-"This parameter controls quality versus speed tradeoffs involved in the "
-"motion estimation decision process (lower = quicker and higher = better "
-"quality)."
+msgid "1-pass Quality-based VBR. From 0 to 51"
 msgstr ""
 
-#: modules/codec/x264.c:121
-msgid "Motion estimation algorithm."
+#: modules/codec/x264.c:119
+msgid "Min QP"
 msgstr ""
 
-#: modules/codec/x264.c:122
-msgid ""
-"Selects the motion estimation algorithm:  dia - diamond (fastest) \n"
-" hex - hexagon (default setting) \n"
-" umh - uneven multi-hexagon (better but slower) \n"
-" esa - exhaustive search (extremely slow, primarily for testing) "
+#: modules/codec/x264.c:120
+msgid "Minimum quantizer, 15/35 seems to be a useful range."
 msgstr ""
 
-#: modules/codec/x264.c:128
-msgid "Motion estimation search range."
+#: modules/codec/x264.c:124
+msgid "Max QP"
 msgstr ""
 
-#: modules/codec/x264.c:129
-msgid ""
-"Maximum distance to search for motion estimation, measured from predicted "
-"position(s). Default of 16 is good for most footage, high motion sequences "
-"may benefit from settings between 24-32."
+#: modules/codec/x264.c:125
+msgid "Maximum quantizer parameter."
 msgstr ""
 
-#: modules/codec/x264.c:133
-msgid "Disable PSNR calculation."
+#: modules/codec/x264.c:127
+msgid "Max QP step"
 msgstr ""
 
-#: modules/codec/x264.c:134
-msgid ""
-"This has no effect on actual encoding quality, it just prevents the stats "
-"from being calculated (for speed)."
+#: modules/codec/x264.c:128
+msgid "Max QP step between frames."
 msgstr ""
 
+#: modules/codec/x264.c:130
+#, fuzzy
+msgid "Average bitrate tolerance"
+msgstr "オーディオ"
+
+#: modules/codec/x264.c:131
+#, fuzzy
+msgid "Allowed variance in average. bitrate (in kbits/s)."
+msgstr "ネットワークストリームを選択する"
+
+#: modules/codec/x264.c:134
+#, fuzzy
+msgid "Max local bitrate"
+msgstr "エンコードの最大ビットレート"
+
+#: modules/codec/x264.c:135
+#, fuzzy
+msgid "Sets a maximum local bitrate in kbits/s."
+msgstr "ネットワークストリームを選択する"
+
 #: modules/codec/x264.c:137
-msgid "Disable adaptive B-frames."
-msgstr ""
+#, fuzzy
+msgid "VBV buffer"
+msgstr "サイズオフセット"
 
 #: modules/codec/x264.c:138
-msgid ""
-"If this is on, the specified number of consequtive B-frames will always be "
-"used, except possibly before an I-frame. "
-msgstr ""
+#, fuzzy
+msgid "Averaging period for the maximum local bitrate in kbits."
+msgstr "ネットワークストリームを選択する"
 
 #: modules/codec/x264.c:141
-msgid "Bias the choice to use B-frames."
+msgid "Initial VBV buffer occupancy"
 msgstr ""
 
 #: modules/codec/x264.c:142
-msgid ""
-"Positive values cause more= B-frames, negative values cause less B-frames. "
+msgid "Sets the initial buffer occupancy as a fraction of the buffer size."
 msgstr ""
 
-#: modules/codec/x264.c:149
-#, fuzzy
-msgid "dia"
-msgstr "ディスク"
+#: modules/codec/x264.c:145
+msgid "QP factor between I and P"
+msgstr ""
 
-#: modules/codec/x264.c:149
-msgid "hex"
+#: modules/codec/x264.c:146
+msgid "QP factor between I and P."
 msgstr ""
 
-#: modules/codec/x264.c:149
-msgid "umh"
+#: modules/codec/x264.c:148
+msgid "QP factor between P and B"
 msgstr ""
 
 #: modules/codec/x264.c:149
-#, fuzzy
-msgid "esa"
-msgstr "はい"
+msgid "QP factor between P and B."
+msgstr ""
 
-#: modules/codec/x264.c:155
-msgid "all"
-msgstr "すべて"
+#: modules/codec/x264.c:151
+msgid "QP difference between chroma and luma"
+msgstr ""
 
-#: modules/codec/x264.c:155
+#: modules/codec/x264.c:152
+msgid "QP difference between chroma and luma."
+msgstr ""
+
+#: modules/codec/x264.c:154
 #, fuzzy
-msgid "slow"
-msgstr "スロー"
+msgid "QP curve compression"
+msgstr "DTS ダイナミック・レンジ圧縮"
 
 #: modules/codec/x264.c:155
 #, fuzzy
-msgid "normal"
-msgstr "なし"
+msgid "QP curve compression. (0.0=CBR to 1.0=QCP)"
+msgstr "DTS ダイナミック・レンジ圧縮"
 
-#: modules/codec/x264.c:156
-#, fuzzy
-msgid "fast"
-msgstr "早送り"
+#: modules/codec/x264.c:157 modules/codec/x264.c:161
+msgid "Reduce fluctuations in QP"
+msgstr ""
 
-#: modules/codec/x264.c:159
-#, fuzzy
-msgid "H264 encoder (using x264 library)"
-msgstr "h264 ビデオエンコードに x264 ライブラリを使用する"
+#: modules/codec/x264.c:158
+msgid ""
+"This reduces the fluctuations in QP before curve compression. Temporally "
+"blurs complexity."
+msgstr ""
 
-#: modules/control/corba/corba.c:687
-#, fuzzy
-msgid "Corba control"
-msgstr "コントロール"
+#: modules/codec/x264.c:162
+msgid ""
+"This reduces the fluctations in QP after curve compression. Temporally blurs "
+"quants."
+msgstr ""
 
-#: modules/control/corba/corba.c:689
-#, fuzzy
-msgid "corba control module"
-msgstr "字幕・デコーダ・モジュール"
+#: modules/codec/x264.c:167
+msgid "Partitions to consider"
+msgstr ""
 
-#: modules/control/gestures.c:77
-msgid "Motion threshold (10-100)"
-msgstr "モーションスレッショルド (10〜100)"
+#: modules/codec/x264.c:168
+msgid ""
+"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/control/gestures.c:79
-msgid "Amount of movement required for a mouse gesture to be recorded."
+#: modules/codec/x264.c:177
+#, fuzzy
+msgid "Direct MV prediction mode"
+msgstr "DirectMedia オブジェクトデコーダー"
+
+#: modules/codec/x264.c:178
+#, fuzzy
+msgid "Direct MV prediction mode. "
+msgstr "DirectMedia オブジェクトデコーダー"
+
+#: modules/codec/x264.c:180
+msgid "Weighted prediction for B-frames"
 msgstr ""
 
-#: modules/control/gestures.c:82
-msgid "Trigger button"
-msgstr "トリガーボタン"
+#: modules/codec/x264.c:181
+msgid "Weighted prediction for B-frames."
+msgstr ""
+
+#: modules/codec/x264.c:183
+#, fuzzy
+msgid "Integer pixel motion estimation method"
+msgstr "字幕・デコーダ・モジュール"
+
+#: modules/codec/x264.c:184
+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/codec/x264.c:190
+msgid "Maximum motion vector search range"
+msgstr ""
+
+#: modules/codec/x264.c:191
+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/codec/x264.c:197
+msgid "Subpixel motion estimation and partition decision quality"
+msgstr ""
+
+#: modules/codec/x264.c:201
+msgid ""
+"This parameter controls quality versus speed tradeoffs involved in the "
+"motion estimation decision process (lower = quicker and higher = better "
+"quality). Range 1 to 7."
+msgstr ""
+
+#: modules/codec/x264.c:206
+msgid ""
+"This parameter controls quality versus speed tradeoffs involved in the "
+"motion estimation decision process (lower = quicker and higher = better "
+"quality). Range 1 to 6."
+msgstr ""
+
+#: modules/codec/x264.c:211
+msgid ""
+"This parameter controls quality versus speed tradeoffs involved in the "
+"motion estimation decision process (lower = quicker and higher = better "
+"quality). Range 1 to 5."
+msgstr ""
+
+#: modules/codec/x264.c:216
+msgid "RD based mode decision for B-frames."
+msgstr ""
 
-#: modules/control/gestures.c:84
-msgid "You can set the trigger button for mouse gestures here."
+#: modules/codec/x264.c:217
+msgid "RD based mode decision for B-frames. This requires subme 6."
 msgstr ""
 
-#: modules/control/gestures.c:87
+#: modules/codec/x264.c:220
+msgid "Decide references on a per partition basis"
+msgstr ""
+
+#: modules/codec/x264.c:221
+msgid ""
+"Allows each 8x8 or 16x8 partition to independently select a reference frame, "
+"as opposed to only one ref per macroblock."
+msgstr ""
+
+#: modules/codec/x264.c:225
 #, fuzzy
-msgid "Middle"
-msgstr "モジュール"
+msgid "Ignore chroma in motion estimation"
+msgstr "字幕・デコーダ・モジュール"
+
+#: modules/codec/x264.c:226
+msgid "Chroma ME for subpel and mode decision in P-frames."
+msgstr ""
+
+#: modules/codec/x264.c:229
+msgid "Jointly optimize both MVs in B-frames"
+msgstr ""
+
+#: modules/codec/x264.c:230
+msgid "Joint bidirectional motion refinement."
+msgstr ""
+
+#: modules/codec/x264.c:232
+msgid "Adaptive spatial transform size"
+msgstr ""
 
-#: modules/control/gestures.c:90
+#: modules/codec/x264.c:234
+msgid "SATD-based decision for 8x8 transform in inter-MBs."
+msgstr ""
+
+#: modules/codec/x264.c:236
+msgid "Trellis RD quantization"
+msgstr ""
+
+#: modules/codec/x264.c:237
+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/codec/x264.c:243
+msgid "Early SKIP detection on P-frames"
+msgstr ""
+
+#: modules/codec/x264.c:244
+msgid "Early SKIP detection on P-frames."
+msgstr ""
+
+#: modules/codec/x264.c:246
+msgid "Coefficient thresholding on P-frames"
+msgstr ""
+
+#: modules/codec/x264.c:247
+msgid ""
+"Coefficient thresholding on P-frames.Eliminate dct blocks containing only a "
+"small single coefficient."
+msgstr ""
+
+#: modules/codec/x264.c:251
+msgid "Dct-domain noise reduction. Adaptive pseudo-deadzone."
+msgstr ""
+
+#: modules/codec/x264.c:255
 #, fuzzy
-msgid "Gestures"
-msgstr "ジャンル"
+msgid "CPU optimizations"
+msgstr "極性"
 
-#: modules/control/gestures.c:97
+#: modules/codec/x264.c:256
 #, fuzzy
-msgid "Mouse gestures control interface"
-msgstr "赤外線リモート・コントロール・モジュール"
+msgid "Use assembler CPU optimizations."
+msgstr "極性"
 
-#: modules/control/hotkeys.c:84
+#: modules/codec/x264.c:258
 #, fuzzy
-msgid "Playlist bookmark 1"
-msgstr "リスト"
+msgid "PSNR calculation"
+msgstr "持続期間"
+
+#: modules/codec/x264.c:259
+msgid ""
+"This has no effect on actual encoding quality, it just prevents the stats "
+"from being calculated (for speed)."
+msgstr ""
 
-#: modules/control/hotkeys.c:85
+#: modules/codec/x264.c:262
 #, fuzzy
-msgid "Playlist bookmark 2"
-msgstr "リスト"
+msgid "Quiet mode"
+msgstr "ネットワーク"
 
-#: modules/control/hotkeys.c:86
+#: modules/codec/x264.c:263
 #, fuzzy
-msgid "Playlist bookmark 3"
-msgstr "リスト"
+msgid "Quiet mode."
+msgstr "ネットワーク"
+
+#: modules/codec/x264.c:265 modules/gui/macosx/playlistinfo.m:64
+#: modules/gui/wxwidgets/dialogs/fileinfo.cpp:85
+msgid "Statistics"
+msgstr ""
+
+#: modules/codec/x264.c:266
+msgid "Print stats for each frame."
+msgstr ""
 
-#: modules/control/hotkeys.c:87
+#: modules/codec/x264.c:272
 #, fuzzy
-msgid "Playlist bookmark 4"
-msgstr "リスト"
+msgid "dia"
+msgstr "ディスク"
+
+#: modules/codec/x264.c:272
+msgid "hex"
+msgstr ""
 
-#: modules/control/hotkeys.c:88
+#: modules/codec/x264.c:272
+msgid "umh"
+msgstr ""
+
+#: modules/codec/x264.c:272
 #, fuzzy
-msgid "Playlist bookmark 5"
-msgstr "リスト"
+msgid "esa"
+msgstr "はい"
 
-#: modules/control/hotkeys.c:89
+#: modules/codec/x264.c:278
 #, fuzzy
-msgid "Playlist bookmark 6"
-msgstr "リスト"
+msgid "fast"
+msgstr "早送り"
 
-#: modules/control/hotkeys.c:90
+#: modules/codec/x264.c:278
 #, fuzzy
-msgid "Playlist bookmark 7"
-msgstr "リスト"
+msgid "normal"
+msgstr "なし"
 
-#: modules/control/hotkeys.c:91
+#: modules/codec/x264.c:279
 #, fuzzy
-msgid "Playlist bookmark 8"
-msgstr "リスト"
+msgid "slow"
+msgstr "スロー"
+
+#: modules/codec/x264.c:279
+msgid "all"
+msgstr "すべて"
+
+#: modules/codec/x264.c:285 modules/codec/x264.c:290
+msgid "spatial"
+msgstr ""
 
-#: modules/control/hotkeys.c:92
+#: modules/codec/x264.c:285 modules/codec/x264.c:290
+msgid "temporal"
+msgstr ""
+
+#: modules/codec/x264.c:285 modules/gui/pda/pda_interface.c:743
+#: modules/video_filter/mosaic.c:168
+msgid "auto"
+msgstr "自動"
+
+#: modules/codec/x264.c:294
 #, fuzzy
-msgid "Playlist bookmark 9"
-msgstr "リスト"
+msgid "H.264/MPEG4 AVC encoder (using x264 library)"
+msgstr "h264 ビデオエンコードに x264 ライブラリを使用する"
 
-#: modules/control/hotkeys.c:93
+#: modules/control/corba/corba.c:687
 #, fuzzy
-msgid "Playlist bookmark 10"
-msgstr "リスト"
+msgid "Corba control"
+msgstr "コントロール"
 
-#: modules/control/hotkeys.c:95
-msgid "This option allows you to define playlist bookmarks."
+#: modules/control/corba/corba.c:689
+msgid "Reactivity"
 msgstr ""
 
-#: modules/control/hotkeys.c:98
+#: 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
+#, fuzzy
+msgid "corba control module"
+msgstr "字幕・デコーダ・モジュール"
+
+#: modules/control/gestures.c:77
+msgid "Motion threshold (10-100)"
+msgstr "モーションスレッショルド (10〜100)"
+
+#: 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
+#, fuzzy
+msgid "Middle"
+msgstr "モジュール"
+
+#: modules/control/gestures.c:89
+#, fuzzy
+msgid "Gestures"
+msgstr "ジャンル"
+
+#: modules/control/gestures.c:97
+#, fuzzy
+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:99
+#: modules/control/hotkeys.c:98
 #, fuzzy
 msgid "Hotkeys management interface"
 msgstr "Gtk+インタフェース・モジュール"
 
-#: modules/control/hotkeys.c:481
+#: modules/control/hotkeys.c:475
 #, c-format
 msgid "Audio track: %s"
 msgstr "オーディオトラック: %s"
 
-#: modules/control/hotkeys.c:495 modules/control/hotkeys.c:523
+#: modules/control/hotkeys.c:490 modules/control/hotkeys.c:519
 #, c-format
 msgid "Subtitle track: %s"
 msgstr "字幕 トラック: %s"
 
-#: modules/control/hotkeys.c:495
+#: modules/control/hotkeys.c:490
 msgid "N/A"
 msgstr ""
 
-#: modules/control/hotkeys.c:547
+#: modules/control/hotkeys.c:543
 #, fuzzy, c-format
 msgid "Aspect ratio: %s"
 msgstr "アスペクト比"
 
-#: modules/control/hotkeys.c:573
+#: modules/control/hotkeys.c:569
 #, fuzzy, c-format
 msgid "Crop: %s"
 msgstr "縁取り"
 
-#: modules/control/hotkeys.c:599
+#: modules/control/hotkeys.c:595
 #, fuzzy, c-format
 msgid "Deinterlace mode: %s"
 msgstr "ノンインタレース化モード"
 
-#: modules/control/http/http.c:34 modules/misc/rtsp.c:46
+#: modules/control/hotkeys.c:625
+#, fuzzy, c-format
+msgid "Zoom 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 HTTP 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
 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
+#: modules/control/http/http.c:47
 msgid ""
-"List of extensions and executable paths (for instance: php=/usr/bin/php,pl=/"
-"usr/bin/perl)."
+"List of handler 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)"
+#: modules/control/http/http.c:50
+#, fuzzy
+msgid "HTTP interface x509 PEM certificate file (enables SSL)."
 msgstr "HTTP インターフェースの x509 PEM 証明書ファイル (SSL 有効)"
 
-#: modules/control/http/http.c:50
-msgid "HTTP interface x509 PEM private key file"
+#: modules/control/http/http.c:53
+#, fuzzy
+msgid "HTTP interface x509 PEM private key file."
 msgstr "HTTP インターフェースの x509 PEM 秘密鍵ファイル"
 
-#: modules/control/http/http.c:52
-msgid "HTTP interface x509 PEM trusted root CA certificates file"
-msgstr ""
-
 #: modules/control/http/http.c:55
-msgid "HTTP interace Certificates Revocation List file"
-msgstr ""
+#, fuzzy
+msgid "HTTP interface x509 PEM trusted root CA certificates file."
+msgstr "HTTP インターフェースの x509 PEM 証明書ファイル (SSL 有効)"
+
+#: modules/control/http/http.c:58
+#, fuzzy
+msgid "HTTP interace Certificates Revocation List file."
+msgstr "HTTP インターフェースの x509 PEM 秘密鍵ファイル"
 
-#: modules/control/http/http.c:59
+#: modules/control/http/http.c:62
 msgid "HTTP remote control interface"
 msgstr "HTTP リモート制御インターフェース"
 
-#: modules/control/http/http.c:68
+#: modules/control/http/http.c:71
 msgid "HTTP SSL"
 msgstr "HTTP SSL"
 
@@ -7822,51 +8627,56 @@ msgstr "HTTP SSL"
 msgid "Infrared remote control interface"
 msgstr "赤外線リモート・コントロール・モジュール"
 
-#: modules/control/netsync.c:59
-msgid "Act as master for network synchronisation"
-msgstr ""
+#: modules/control/motion.c:62
+#, fuzzy
+msgid "motion"
+msgstr "選択"
+
+#: modules/control/motion.c:64
+#, fuzzy
+msgid "motion control interface"
+msgstr "リモート制御インターフェース"
 
 #: modules/control/netsync.c:60
-msgid ""
-"Allows you to specify if this client should act as the master client for the "
-"network synchronisation."
+msgid "Act as master"
 msgstr ""
 
-#: modules/control/netsync.c:63
+#: modules/control/netsync.c:61
+#, fuzzy
+msgid "Should act as the master client for the network synchronisation?"
+msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+
+#: modules/control/netsync.c:65
 msgid "Master client ip address"
 msgstr ""
 
-#: modules/control/netsync.c:64
+#: modules/control/netsync.c:66
 #, fuzzy
-msgid ""
-"Allows you to specify the ip address of the master client used for the "
-"network synchronisation."
+msgid "IP address of the master client used for the network synchronisation."
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: modules/control/netsync.c:68
+#: modules/control/netsync.c:70
 #, fuzzy
-msgid "Netsync"
-msgstr "ネット"
-
-#: modules/control/netsync.c:69
-msgid "Network synchronisation"
-msgstr ""
+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"
@@ -7874,10 +8684,8 @@ msgstr "サービスの名前を表示"
 
 #: modules/control/ntservice.c:47
 #, fuzzy
-msgid "This allows you to change the display name of the Service."
-msgstr ""
-"ファイルを見つけるときにオープンされるインタフェースの既定のパスを設定しま"
-"す。"
+msgid "Change the display name of the Service."
+msgstr "サービスの名前を表示"
 
 #: modules/control/ntservice.c:48
 msgid "Configuration options"
@@ -7886,9 +8694,9 @@ msgstr "設定オプション"
 #: modules/control/ntservice.c:50
 #, fuzzy
 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 ""
 "使用するインタフェースが選択可能です。デフォルトで自動的に最適なモジュールが"
 "選択されます。"
@@ -7896,10 +8704,9 @@ msgstr ""
 #: modules/control/ntservice.c:55
 #, fuzzy
 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 ""
 "使用するインタフェースが選択可能です。デフォルトで自動的に最適なモジュールが"
 "選択されます。"
@@ -7913,396 +8720,436 @@ msgstr "サーバーなし"
 msgid "Windows Service interface"
 msgstr "Windows サービスインターフェース"
 
-#: modules/control/rc.c:151
+#: modules/control/rc.c:154
 msgid "Show stream position"
 msgstr "ストリーム位置表示"
 
-#: modules/control/rc.c:152
+#: modules/control/rc.c:155
 msgid ""
 "Show the current position in seconds within the stream from time to time."
 msgstr "直ちに現在の位置を示します。"
 
-#: modules/control/rc.c:155
+#: modules/control/rc.c:158
 msgid "Fake TTY"
 msgstr "疑似 TTY"
 
-#: modules/control/rc.c:156
+#: modules/control/rc.c:159
 #, fuzzy
 msgid "Force the rc module to use stdin as if it was a TTY."
 msgstr "TTYの場合、強制的に標準入力をrcプラグインで使用します。"
 
-#: modules/control/rc.c:158
+#: modules/control/rc.c:161
 msgid "UNIX socket command input"
 msgstr "UNIX ソケットのコマンド入力"
 
-#: modules/control/rc.c:159
+#: modules/control/rc.c:162
 msgid "Accept commands over a Unix socket rather than stdin."
 msgstr ""
 
-#: modules/control/rc.c:162
+#: modules/control/rc.c:165
 msgid "TCP command input"
 msgstr "TCP のコマンド入力"
 
-#: modules/control/rc.c:163
+#: 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:167 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:169
+#: 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:176
+#: modules/control/rc.c:179
 msgid "RC"
 msgstr "RC"
 
-#: modules/control/rc.c:179
+#: modules/control/rc.c:182
 msgid "Remote control interface"
 msgstr "リモート制御インターフェース"
 
-#: modules/control/rc.c:332
-msgid "Remote control interface initialized, `h' for help"
+#: modules/control/rc.c:323
+#, fuzzy
+msgid "Remote control interface initialized. Type `help' for help."
 msgstr "リモート制御インターフェースを初期化しました。「h」でヘルプです。"
 
-#: modules/control/rc.c:840
-#, c-format
-msgid "unknown command `%s', type `help' for help"
+#: modules/control/rc.c:837
+#, fuzzy, c-format
+msgid "Unknown command `%s'. Type `help' for help."
 msgstr "不明のコマンド「%s」です。「help」を入力するとヘルプです。"
 
-#: modules/control/rc.c:873
+#: modules/control/rc.c:870
 msgid "+----[ Remote control commands ]"
 msgstr "+----[ リモート制御コマンド ]"
 
-#: modules/control/rc.c:875
+#: modules/control/rc.c:872
 msgid "| add XYZ  . . . . . . . . . . add XYZ to playlist"
 msgstr "| add XYZ  . . . . . . . . . . XYZ を再生一覧に追加"
 
-#: modules/control/rc.c:876
+#: modules/control/rc.c:873
 msgid "| playlist . . .  show items currently in playlist"
 msgstr "| playlist . . . 現在の再生一覧中の項目を表示する"
 
-#: modules/control/rc.c:877
+#: modules/control/rc.c:874
 msgid "| play . . . . . . . . . . . . . . . . play stream"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生"
 
-#: modules/control/rc.c:878
+#: modules/control/rc.c:875
 msgid "| stop . . . . . . . . . . . . . . . . stop stream"
 msgstr "| stop . . . . . . . . . . . . . . . . ストリーム停止"
 
-#: modules/control/rc.c:879
+#: modules/control/rc.c:876
 msgid "| next . . . . . . . . . . . .  next playlist item"
 msgstr "| next . . . . . . . . . . . .  次の再生一覧項目"
 
-#: modules/control/rc.c:880
+#: modules/control/rc.c:877
 msgid "| prev . . . . . . . . . .  previous playlist item"
 msgstr "| prev  . . . . . . . . . . 前の再生一覧の項目"
 
-#: modules/control/rc.c:881
+#: modules/control/rc.c:878
 #, fuzzy
 msgid "| goto . . . . . . . . . . . .  goto item at index"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:882
+#: modules/control/rc.c:879
 #, fuzzy
 msgid "| clear . . . . . . . . . . .   clear the playlist"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:883
+#: modules/control/rc.c:880
 #, fuzzy
 msgid "| status . . . . . . . . . current playlist status"
 msgstr "| add XYZ  . . . . . . . . . . XYZ を再生一覧に追加\n"
 
-#: modules/control/rc.c:884
+#: modules/control/rc.c:881
 msgid "| title [X]  . . . . set/get title in current item"
 msgstr ""
 
-#: modules/control/rc.c:885
+#: modules/control/rc.c:882
 #, fuzzy
 msgid "| title_n  . . . . . .  next title in current item"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:886
+#: modules/control/rc.c:883
 msgid "| title_p  . . . .  previous title in current item"
 msgstr ""
 
-#: modules/control/rc.c:887
+#: modules/control/rc.c:884
 msgid "| chapter [X]  . . set/get chapter in current item"
 msgstr ""
 
-#: modules/control/rc.c:888
+#: modules/control/rc.c:885
 msgid "| chapter_n  . . . .  next chapter in current item"
 msgstr ""
 
-#: modules/control/rc.c:889
+#: modules/control/rc.c:886
 msgid "| chapter_p  . .  previous chapter in current item"
 msgstr ""
 
-#: modules/control/rc.c:891
+#: modules/control/rc.c:888
 msgid "| seek X . seek in seconds, for instance `seek 12'"
 msgstr ""
 
-#: modules/control/rc.c:892
+#: modules/control/rc.c:889
 #, fuzzy
 msgid "| pause  . . . . . . . . . . . . . .  toggle pause"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:893
+#: modules/control/rc.c:890
 #, fuzzy
 msgid "| fastforward  . . . . . .  .  set to maximum rate"
 msgstr "| add XYZ  . . . . . . . . . . XYZ を再生一覧に追加\n"
 
-#: modules/control/rc.c:894
+#: modules/control/rc.c:891
 #, fuzzy
 msgid "| rewind  . . . . . . . . . .  set to minimum rate"
 msgstr "| add XYZ  . . . . . . . . . . XYZ を再生一覧に追加\n"
 
-#: modules/control/rc.c:895
+#: modules/control/rc.c:892
 #, fuzzy
 msgid "| faster . . . . . . . .  faster playing of stream"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:896
+#: modules/control/rc.c:893
 #, fuzzy
 msgid "| slower . . . . . . . .  slower playing of stream"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:897
+#: modules/control/rc.c:894
 #, fuzzy
 msgid "| normal . . . . . . . .  normal playing of stream"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:898
+#: modules/control/rc.c:895
 #, fuzzy
 msgid "| f [on|off] . . . . . . . . . . toggle fullscreen"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:899
+#: modules/control/rc.c:896
 msgid "| info . . .  information about the current stream"
 msgstr ""
 
-#: modules/control/rc.c:901
+#: modules/control/rc.c:897
+msgid "| get_time . . seconds elapsed since stream's beginning"
+msgstr ""
+
+#: modules/control/rc.c:898
+msgid "| is_playing . .  1 if a stream plays, 0 otherwise"
+msgstr ""
+
+#: modules/control/rc.c:899
+#, fuzzy
+msgid "| get_title . . .  the title of the current stream"
+msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
+
+#: modules/control/rc.c:900
+#, fuzzy
+msgid "| get_length . .  the length of the current stream"
+msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
+
+#: modules/control/rc.c:902
 #, fuzzy
 msgid "| volume [X] . . . . . . . .  set/get audio volume"
 msgstr "| add XYZ  . . . . . . . . . . XYZ を再生一覧に追加\n"
 
-#: modules/control/rc.c:902
+#: modules/control/rc.c:903
 msgid "| volup [X]  . . . . .  raise audio volume X steps"
 msgstr ""
 
-#: modules/control/rc.c:903
+#: modules/control/rc.c:904
 msgid "| voldown [X]  . . . .  lower audio volume X steps"
 msgstr ""
 
-#: modules/control/rc.c:904
+#: modules/control/rc.c:905
 #, fuzzy
 msgid "| adev [X] . . . . . . . . .  set/get audio device"
 msgstr "| add XYZ  . . . . . . . . . . XYZ を再生一覧に追加\n"
 
-#: modules/control/rc.c:905
+#: modules/control/rc.c:906
 msgid "| achan [X]. . . . . . . .  set/get audio channels"
 msgstr ""
 
-#: modules/control/rc.c:906
+#: modules/control/rc.c:907
 msgid "| menu [on|off|up|down|left|right|select] use menu"
 msgstr ""
 
-#: modules/control/rc.c:911
+#: modules/control/rc.c:912
 msgid "| marq-marquee STRING  . . overlay STRING in video"
 msgstr ""
 
-#: modules/control/rc.c:912
+#: modules/control/rc.c:913
 #, fuzzy
 msgid "| marq-x X . . . . . . . . . . . .offset from left"
 msgstr "| add XYZ  . . . . . . . . . . XYZ を再生一覧に追加\n"
 
-#: modules/control/rc.c:913
+#: modules/control/rc.c:914
 #, fuzzy
 msgid "| marq-y Y . . . . . . . . . . . . offset from top"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:914
+#: modules/control/rc.c:915
 #, fuzzy
 msgid "| marq-position #. . .  .relative position control"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:915
+#: modules/control/rc.c:916
 #, fuzzy
 msgid "| marq-color # . . . . . . . . . . font color, RGB"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:916
+#: modules/control/rc.c:917
 #, fuzzy
 msgid "| marq-opacity # . . . . . . . . . . . . . opacity"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:917
+#: modules/control/rc.c:918
 #, fuzzy
 msgid "| marq-timeout T. . . . . . . . . . timeout, in ms"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:918
+#: modules/control/rc.c:919
 #, fuzzy
 msgid "| marq-size # . . . . . . . . font size, in pixels"
 msgstr "| add XYZ  . . . . . . . . . . XYZ を再生一覧に追加\n"
 
-#: modules/control/rc.c:920
+#: modules/control/rc.c:921
 msgid "| time-format STRING . . . overlay STRING in video"
 msgstr ""
 
-#: modules/control/rc.c:921
+#: modules/control/rc.c:922
 #, fuzzy
 msgid "| time-x X . . . . . . . . . . . .offset from left"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:922
+#: modules/control/rc.c:923
 #, fuzzy
 msgid "| time-y Y . . . . . . . . . . . . offset from top"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:923
+#: modules/control/rc.c:924
 #, fuzzy
 msgid "| time-position #. . . . . . . . relative position"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:924
+#: modules/control/rc.c:925
 #, fuzzy
 msgid "| time-color # . . . . . . . . . . font color, RGB"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:925
+#: modules/control/rc.c:926
 #, fuzzy
 msgid "| time-opacity # . . . . . . . . . . . . . opacity"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:926
+#: modules/control/rc.c:927
 #, fuzzy
 msgid "| time-size # . . . . . . . . font size, in pixels"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:928
-msgid "| logo-file STRING . . . the overlay file path/name"
+#: modules/control/rc.c:929
+msgid "| logo-file STRING . . .the overlay file path/name"
 msgstr ""
 
-#: modules/control/rc.c:929
+#: modules/control/rc.c:930
 #, fuzzy
 msgid "| logo-x X . . . . . . . . . . . .offset from left"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:930
+#: modules/control/rc.c:931
 #, fuzzy
 msgid "| logo-y Y . . . . . . . . . . . . offset from top"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:931
+#: modules/control/rc.c:932
 #, fuzzy
 msgid "| logo-position #. . . . . . . . relative position"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:932
+#: modules/control/rc.c:933
 #, fuzzy
 msgid "| logo-transparency #. . . . . . . . .transparency"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:934
+#: modules/control/rc.c:935
 #, fuzzy
 msgid "| mosaic-alpha # . . . . . . . . . . . . . . alpha"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:935
+#: modules/control/rc.c:936
 #, fuzzy
 msgid "| mosaic-height #. . . . . . . . . . . . . .height"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:936
+#: modules/control/rc.c:937
 #, fuzzy
 msgid "| mosaic-width # . . . . . . . . . . . . . . width"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:937
+#: modules/control/rc.c:938
 msgid "| mosaic-xoffset # . . . .top left corner position"
 msgstr ""
 
-#: modules/control/rc.c:938
+#: modules/control/rc.c:939
 msgid "| mosaic-yoffset # . . . .top left corner position"
 msgstr ""
 
-#: modules/control/rc.c:939
+#: modules/control/rc.c:940
 msgid "| mosaic-align 0..2,4..6,8..10. . .mosaic alignment"
 msgstr ""
 
-#: modules/control/rc.c:940
+#: modules/control/rc.c:941
 #, fuzzy
 msgid "| mosaic-vborder # . . . . . . . . vertical border"
 msgstr "| add XYZ  . . . . . . . . . . XYZ を再生一覧に追加\n"
 
-#: modules/control/rc.c:941
+#: modules/control/rc.c:942
 #, fuzzy
 msgid "| mosaic-hborder # . . . . . . . horizontal border"
 msgstr "| add XYZ  . . . . . . . . . . XYZ を再生一覧に追加\n"
 
-#: modules/control/rc.c:942
+#: modules/control/rc.c:943
 msgid "| mosaic-position {0=auto,1=fixed} . . . .position"
 msgstr ""
 
-#: modules/control/rc.c:943
+#: modules/control/rc.c:944
 #, fuzzy
 msgid "| mosaic-rows #. . . . . . . . . . .number of rows"
 msgstr "| add XYZ  . . . . . . . . . . XYZ を再生一覧に追加\n"
 
-#: modules/control/rc.c:944
+#: modules/control/rc.c:945
 #, fuzzy
 msgid "| mosaic-cols #. . . . . . . . . . .number of cols"
 msgstr "| add XYZ  . . . . . . . . . . XYZ を再生一覧に追加\n"
 
-#: modules/control/rc.c:945
+#: modules/control/rc.c:946
+#, fuzzy
+msgid "| mosaic-order id(,id)* . . . . order of pictures "
+msgstr "| add XYZ  . . . . . . . . . . XYZ を再生一覧に追加\n"
+
+#: modules/control/rc.c:947
 msgid "| mosaic-keep-aspect-ratio {0,1} . . .aspect ratio"
 msgstr ""
 
-#: modules/control/rc.c:948
+#: modules/control/rc.c:949
+msgid ""
+"| check-updates [newer] [equal] [older]\n"
+"|               [undef] [info] [source] [binary] [plugin]"
+msgstr ""
+
+#: modules/control/rc.c:953
 #, fuzzy
 msgid "| help . . . . . . . . . . . . . this help message"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:949
+#: modules/control/rc.c:954
 #, fuzzy
 msgid "| longhelp . . . . . . . . . a longer help message"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:950
+#: modules/control/rc.c:955
 msgid "| logout . . . . .  exit (if in socket connection)"
 msgstr "| logout . . . . .  終了する (ソケット接続の場合)"
 
-#: modules/control/rc.c:951
+#: modules/control/rc.c:956
 msgid "| quit . . . . . . . . . . . . . . . . .  quit vlc"
 msgstr "| quit . . . . . . . . . . . . . . . . .  VLC を終了する"
 
-#: modules/control/rc.c:953
+#: modules/control/rc.c:958
 msgid "+----[ end of help ]"
 msgstr "+----[ ヘルプの終り ]"
 
-#: modules/control/rc.c:1060 modules/control/rc.c:1228
-#: modules/control/rc.c:1715 modules/control/rc.c:1785
-#: modules/control/rc.c:1834 modules/control/rc.c:1933
-msgid "press menu select or pause to continue"
+#: modules/control/rc.c:1065
+#, fuzzy
+msgid "Press menu select or pause to continue."
+msgstr ""
+"\n"
+"続けるにはEnterキーを押してください。\n"
+
+#: modules/control/rc.c:1234 modules/control/rc.c:1700
+#: modules/control/rc.c:1770 modules/control/rc.c:1819
+#: modules/control/rc.c:1918
+#, fuzzy
+msgid "Type 'menu select' or 'pause' to continue."
 msgstr ""
+"\n"
+"続けるにはEnterキーを押してください。\n"
 
-#: modules/control/rc.c:1375
+#: modules/control/rc.c:1352
 #, fuzzy
-msgid "press pause to continue"
+msgid "Type 'pause' to continue."
 msgstr ""
 "\n"
 "続けるにはEnterキーを押してください。\n"
 
-#: modules/control/rc.c:1918 modules/control/rc.c:1957
-msgid "please provide one of the following paramaters"
+#: modules/control/rc.c:1903 modules/control/rc.c:1942
+msgid "Please provide one of the following parameters:"
 msgstr ""
 
 #: modules/control/showintf.c:62
@@ -8311,41 +9158,42 @@ msgstr "閾値"
 
 #: modules/control/showintf.c:63
 #, fuzzy
-msgid "Height of the zone triggering the interface"
+msgid "Height of the zone triggering the interface."
 msgstr "ネットワーク・インタフェースのMTU"
 
-#: modules/control/showintf.c:70
+#: modules/control/telnet.c:72
 #, fuzzy
-msgid "Interface showing control interface"
-msgstr "赤外線リモート・コントロール・モジュール"
+msgid "Host"
+msgstr "ハウス"
 
-#: modules/control/telnet.c:79
-msgid "Telnet Interface host"
-msgstr "Telnet インターフェースのホスト"
+#: 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:80
-#, fuzzy
-msgid "Default to listen on all network interfaces"
-msgstr "ネットワーク・インタフェースのMTU"
+#: 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:830
+#: modules/gui/wxwidgets/dialogs/open.cpp:857
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:531 modules/stream_out/rtp.c:77
+msgid "Port"
+msgstr "ポート番号"
 
-#: modules/control/telnet.c:81
-msgid "Telnet Interface port"
-msgstr "Telnet インターフェースポート"
+#: 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:82
-msgid "Default to 4212"
+msgid ""
+"A single administration password is used to protect this interface. The "
+"default value is \"admin\"."
 msgstr ""
 
-#: modules/control/telnet.c:84
-msgid "Telnet Interface password"
-msgstr "Telnet インターフェースパスワード"
-
-#: modules/control/telnet.c:85
-#, fuzzy
-msgid "Default to admin"
-msgstr "削除"
-
-#: modules/control/telnet.c:98
+#: modules/control/telnet.c:96
 msgid "VLM remote control interface"
 msgstr "VLM リモート制御インターフェース"
 
@@ -8368,47 +9216,81 @@ msgstr "MPEG 1/2レイヤ1/2オーディオ・デコーダ"
 msgid "AU demuxer"
 msgstr ""
 
-#: modules/demux/avi/avi.c:40 modules/demux/avi/avi.c:41
+#: modules/demux/avi/avi.c:43
 #, fuzzy
 msgid "Force interleaved method"
 msgstr "ノンインタレース化モード"
 
-#: modules/demux/avi/avi.c:43
+#: modules/demux/avi/avi.c:44
+#, fuzzy
+msgid "Force interleaved method."
+msgstr "ノンインタレース化モード"
+
+#: modules/demux/avi/avi.c:46
 #, fuzzy
 msgid "Force index creation"
 msgstr "ソースのアスペクト・レシオ"
 
-#: modules/demux/avi/avi.c:45
+#: modules/demux/avi/avi.c:48
 msgid ""
 "Recreate a index for the AVI file. Use this if your AVI file is damaged or "
-"incomplete (not seekable)"
+"incomplete (not seekable)."
 msgstr ""
 
-#: modules/demux/avi/avi.c:53
-msgid "AVI demuxer"
+#: modules/demux/avi/avi.c:56
+msgid "Ask"
 msgstr ""
 
-#: modules/demux/demuxdump.c:37 modules/demux/ts.c:110
-msgid "Filename of dump"
-msgstr "ダンプのファイル名"
+#: modules/demux/avi/avi.c:56
+#, fuzzy
+msgid "Always fix"
+msgstr "常に最前面"
 
-#: modules/demux/demuxdump.c:39
-msgid "Specify a file name to which the raw stream will be dumped."
+#: modules/demux/avi/avi.c:57
+msgid "Never fix"
 msgstr ""
 
-#: modules/demux/demuxdump.c:40 modules/demux/ts.c:113
-msgid "Append"
-msgstr "追加する"
+#: modules/demux/avi/avi.c:61
+msgid "AVI demuxer"
+msgstr ""
+
+#: modules/demux/avi/avi.c:558
+#, fuzzy
+msgid "AVI Index"
+msgstr "インデックス"
 
-#: modules/demux/demuxdump.c:42 modules/demux/ts.c:115
+#: modules/demux/avi/avi.c:559
 msgid ""
-"If the file exists and this option is selected, the existing file will not "
-"be overwritten."
+"This AVI file is broken. Seeking will not work correctly.\n"
+"Do you want to try to repair it (this might take a long time) ?"
+msgstr ""
+
+#: modules/demux/avi/avi.c:2278 modules/demux/avi/avi.c:2301
+#, fuzzy
+msgid "Fixing AVI Index..."
+msgstr "インデックス"
+
+#: 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: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 "Filedump demuxer"
+msgid "File dumpper"
 msgstr "MPEG 1/2レイヤ1/2オーディオ・デコーダ"
 
 #: modules/demux/dts.c:40
@@ -8421,33 +9303,85 @@ msgstr "MPEG 1/2レイヤ1/2オーディオ・デコーダ"
 msgid "FLAC demuxer"
 msgstr "MPEG 1/2レイヤ1/2オーディオ・デコーダ"
 
-#: modules/demux/livedotcom.cpp:66
+#: modules/demux/gme.cpp:52
+msgid "GME demuxer (Game_Music_Emu)"
+msgstr ""
+
+#: modules/demux/live555.cpp:63
+#, fuzzy
+msgid ""
+"Allows you to modify the default caching value for RTSP streams. This value "
+"should be set in millisecond units."
+msgstr ""
+"udpストリームで使用される既定のキャッシング値が変更可能です。単位はミリ秒で指"
+"定します。"
+
+#: modules/demux/live555.cpp:66
 msgid "Kasenna RTSP dialect"
 msgstr ""
 
-#: modules/demux/livedotcom.cpp:67
+#: modules/demux/live555.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 "RTP/RTSP/SDP demuxer (using Live555.com)"
+#: modules/demux/live555.cpp:71
+#, fuzzy
+msgid "RTSP user name"
+msgstr "FTP ユーザー名"
+
+#: modules/demux/live555.cpp:72
+#, fuzzy
+msgid ""
+"Allows you to modify the user name that will be used for authenticating the "
+"connection."
+msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+
+#: modules/demux/live555.cpp:74
+#, fuzzy
+msgid "RTSP password"
+msgstr "FTP パスワード"
+
+#: modules/demux/live555.cpp:75
+#, fuzzy
+msgid "Allows you to modify the password that will be used for the connection."
+msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+
+#: modules/demux/live555.cpp:79
+msgid "RTP/RTSP/SDP demuxer (using Live555)"
 msgstr ""
 
-#: modules/demux/livedotcom.cpp:81
+#: modules/demux/live555.cpp:89
 msgid "RTSP/RTP access and demux"
 msgstr ""
 
-#: modules/demux/livedotcom.cpp:87 modules/demux/livedotcom.cpp:88
+#: modules/demux/live555.cpp:95 modules/demux/live555.cpp:96
 msgid "Use RTP over RTSP (TCP)"
 msgstr "RTP オーバー RTSP (TCP)を使う"
 
-#: modules/demux/m3u.c:68
+#: modules/demux/live555.cpp:98
 #, fuzzy
-msgid "Playlist metademux"
-msgstr "再生一覧を開く"
+msgid "Client port"
+msgstr "ビデオポート"
+
+#: modules/demux/live555.cpp:99
+msgid "Port to use for the RTP source of the session"
+msgstr ""
+
+#: modules/demux/live555.cpp:102 modules/demux/live555.cpp:103
+msgid "Tunnel RTSP and RTP over HTTP"
+msgstr ""
+
+#: modules/demux/live555.cpp:105
+#, fuzzy
+msgid "HTTP tunnel port"
+msgstr "HTTP 入力"
+
+#: modules/demux/live555.cpp:106
+msgid "Port to use for tunneling the RTSP/RTP over HTTP."
+msgstr ""
 
 #: modules/demux/mjpeg.c:43 modules/demux/mpeg/h264.c:39
 msgid "Frames per Second"
@@ -8455,13 +9389,13 @@ 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
+#: modules/demux/mjpeg.c:50
 #, fuzzy
-msgid "JPEG camera demuxer"
+msgid "M-JPEG camera demuxer"
 msgstr "MPEG 1/2レイヤ1/2オーディオ・デコーダ"
 
 #: modules/demux/mkv.cpp:394
@@ -8514,119 +9448,134 @@ msgstr "ダミー要素"
 msgid "Read and discard unknown EBML elements (not good for broken files)."
 msgstr ""
 
-#: modules/demux/mkv.cpp:3153
+#: modules/demux/mkv.cpp:3159
 msgid "---  DVD Menu"
 msgstr "---  DVD メニュー"
 
-#: modules/demux/mkv.cpp:3159
+#: modules/demux/mkv.cpp:3165
 msgid "First Played"
 msgstr ""
 
-#: modules/demux/mkv.cpp:3161
+#: modules/demux/mkv.cpp:3167
 msgid "Video Manager"
 msgstr "ビデオ管理"
 
-#: modules/demux/mkv.cpp:3167
+#: modules/demux/mkv.cpp:3173
 msgid "----- Title"
 msgstr "--- 題名"
 
-#: modules/demux/mkv.cpp:4922
-msgid "Segment filename"
-msgstr "分割ファイル名"
+#: modules/demux/mod.c:48
+msgid "Enable noise reduction algorithm"
+msgstr ""
 
-#: modules/demux/mkv.cpp:4926
+#: modules/demux/mod.c:49
 #, fuzzy
-msgid "Muxing application"
-msgstr "このアプリケーションについて"
+msgid "Enable reverberation"
+msgstr "オーディオを有効にする"
 
-#: modules/demux/mkv.cpp:4930
+#: modules/demux/mod.c:50
 #, fuzzy
-msgid "Writing application"
-msgstr "垂直方向位置"
+msgid "Reverberation level (from 0 to 100, default value is 0)."
+msgstr "リバーブレベル (0〜100 デフォルト:0)"
 
-#: modules/demux/mod.c:49
+#: modules/demux/mod.c:52
+msgid "Reverberation delay, in ms. Usual values are from to 40 to 200ms."
+msgstr ""
+
+#: modules/demux/mod.c:54
+#, fuzzy
+msgid "Enable megabass mode"
+msgstr "ピークを有効にする"
+
+#: modules/demux/mod.c:55
+#, fuzzy
+msgid "Megabass mode level (from 0 to 100, default value is 0)."
+msgstr "メガバスレベル (0〜100 デフォルト:0)"
+
+#: modules/demux/mod.c:58
+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:61
+#, fuzzy
+msgid "Surround effect level (from 0 to 100, default value is 0)."
+msgstr "サラウンドレベル (0〜100 デフォルト:0)"
+
+#: modules/demux/mod.c:63
+msgid "Surround delay, in ms. Usual values are from 5 to 40 ms"
+msgstr ""
+
+#: modules/demux/mod.c:68
 msgid "MOD demuxer (libmodplug)"
 msgstr ""
 
-#: modules/demux/mod.c:56
+#: modules/demux/mod.c:76
 msgid "Reverb"
 msgstr "リバーブ"
 
-#: modules/demux/mod.c:57
-msgid "Reverb level (0-100)"
+#: modules/demux/mod.c:79
+msgid "Reverberation level"
 msgstr ""
 
-#: modules/demux/mod.c:57
-msgid "Reverb level (0-100 defaults to 0)"
-msgstr "リバーブレベル (0〜100 デフォルト:0)"
-
-#: modules/demux/mod.c:58
-msgid "Reverb delay (ms)"
+#: modules/demux/mod.c:81
+#, fuzzy
+msgid "Reverberation delay"
 msgstr "リバーブディレイ(ミリ秒)"
 
-#: modules/demux/mod.c:58
-msgid "Reverb delay in ms (usually 40-200ms)"
+#: modules/demux/mod.c:83
+msgid "Mega bass"
 msgstr ""
 
-#: modules/demux/mod.c:60
-msgid "Mega bass"
-msgstr ""
-
-#: modules/demux/mod.c:61
-msgid "Mega bass level (0-100)"
+#: modules/demux/mod.c:86
+#, fuzzy
+msgid "Mega bass level"
 msgstr "メガバスレベル (0〜100)"
 
-#: modules/demux/mod.c:61
-msgid "Mega bass level (0-100 defaults to 0)"
-msgstr "メガバスレベル (0〜100 デフォルト:0)"
-
-#: modules/demux/mod.c:62
-msgid "Mega bass cut off (Hz)"
+#: modules/demux/mod.c:88
+#, fuzzy
+msgid "Mega bass cutoff"
 msgstr "メガバス カットオフ (Hz)"
 
-#: modules/demux/mod.c:62
-msgid "Mega bass cut off (10-100Hz)"
-msgstr "メガバス カットオフ (10〜100Hz)"
-
-#: modules/demux/mod.c:64
+#: modules/demux/mod.c:90
 msgid "Surround"
 msgstr "サラウンド"
 
-#: modules/demux/mod.c:65
-msgid "Surround level (0-100)"
+#: modules/demux/mod.c:93
+#, 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:95
 msgid "Surround delay (ms)"
 msgstr "サラウンドディレイ (ミリ秒)"
 
-#: modules/demux/mod.c:66
-msgid "Surround delay in ms (usually 5-40ms)"
-msgstr ""
-
 #: modules/demux/mp4/mp4.c:51
 #, fuzzy
 msgid "MP4 stream demuxer"
 msgstr "MPEG 1/2レイヤ1/2オーディオ・デコーダ"
 
-#: modules/demux/mpc.c:46 modules/demux/mpc.c:47
+#: modules/demux/mpc.c:46
 #, fuzzy
 msgid "Replay Gain type"
 msgstr "再生と停止"
 
-#: modules/demux/mpc.c:57
+#: 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 "MPC demuxer"
+msgid "MusePack demuxer"
 msgstr "MPEG 1/2レイヤ1/2オーディオ・デコーダ"
 
 #: modules/demux/mpeg/h264.c:40
 #, fuzzy
-msgid "Allows you to set the desired frame rate."
-msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+msgid "Desired frame rate for the H264 stream."
+msgstr "ストリームをナビゲートする"
 
 #: modules/demux/mpeg/h264.c:47
 #, fuzzy
@@ -8645,7 +9594,7 @@ msgstr "MPEG 1/2レイヤ1/2オーディオ・デコーダ"
 
 #: modules/demux/mpeg/mpga.c:46
 #, fuzzy
-msgid "MPEG-I/II audio demuxer"
+msgid "MPEG audio / MP3 demuxer"
 msgstr "MPEG 1/2レイヤ1/2オーディオ・デコーダ"
 
 #: modules/demux/mpeg/mpgv.c:42
@@ -8666,29 +9615,32 @@ msgstr ""
 msgid "Nuv demuxer"
 msgstr "MPEG 1/2レイヤ1/2オーディオ・デコーダ"
 
-#: modules/demux/ogg.c:43
+#: modules/demux/ogg.c:44
 #, fuzzy
-msgid "Ogg stream demuxer"
+msgid "OGG demuxer"
 msgstr "MPEG 1/2レイヤ1/2オーディオ・デコーダ"
 
-#: modules/demux/playlist/b4s.c:341
+#: modules/demux/playlist/gvp.c:205
 #, fuzzy
-msgid "Listeners"
-msgstr "リニア"
+msgid "Google Video"
+msgstr "ビデオズーム"
 
 #: modules/demux/playlist/playlist.c:36
 #, fuzzy
 msgid "Auto start"
 msgstr "製作者メタデータ"
 
-#: modules/demux/playlist/playlist.c:37
-msgid "Automatically start the playlist when it's loaded.\n"
+#: modules/demux/playlist/playlist.c:38
+msgid "Automatically start playing the playlist content once it's loaded.\n"
 msgstr ""
 
-#: modules/demux/playlist/playlist.c:55
-#, fuzzy
-msgid "Native playlist import"
-msgstr "再生一覧を開く"
+#: modules/demux/playlist/playlist.c:41
+msgid "Show shoutcast adult content"
+msgstr ""
+
+#: modules/demux/playlist/playlist.c:42
+msgid "Show NC17 rated video streams when using shoutcast video playlists."
+msgstr ""
 
 #: modules/demux/playlist/playlist.c:62
 msgid "M3U playlist import"
@@ -8709,61 +9661,117 @@ msgid "DVB playlist import"
 msgstr "PLS 再生一覧からインポート"
 
 #: modules/demux/playlist/playlist.c:83
-msgid "Podcast playlist import"
-msgstr "PLS 再生一覧をインポートする"
+#, fuzzy
+msgid "Podcast parser"
+msgstr "Podcast カテゴリ"
+
+#: modules/demux/playlist/playlist.c:88
+#, fuzzy
+msgid "XSPF playlist import"
+msgstr "PLS 再生一覧からインポート"
 
-#: modules/demux/playlist/podcast.c:290
+#: modules/demux/playlist/playlist.c:93
+msgid "New winamp 5.2 shoutcast import"
+msgstr ""
+
+#: modules/demux/playlist/playlist.c:100
+#, fuzzy
+msgid "ASX playlist import"
+msgstr "PLS 再生一覧からインポート"
+
+#: modules/demux/playlist/playlist.c:105
+msgid "Kasenna MediaBase parser"
+msgstr ""
+
+#: modules/demux/playlist/playlist.c:110
+msgid "QuickTime Media Link importer"
+msgstr ""
+
+#: modules/demux/playlist/playlist.c:115
+#, fuzzy
+msgid "Google Video Playlist importer"
+msgstr "古い再生一覧をエクスポートする"
+
+#: modules/demux/playlist/podcast.c:274 modules/demux/playlist/podcast.c:283
+#: modules/demux/playlist/podcast.c:292 modules/demux/playlist/podcast.c:301
+#: modules/demux/playlist/podcast.c:310 modules/demux/playlist/podcast.c:320
+#: modules/demux/playlist/podcast.c:348 modules/demux/playlist/podcast.c:356
+#: modules/demux/playlist/podcast.c:364 modules/demux/playlist/podcast.c:372
+#: modules/demux/playlist/podcast.c:380 modules/demux/playlist/podcast.c:388
+#: modules/demux/playlist/podcast.c:396 modules/demux/playlist/podcast.c:404
+#: modules/demux/playlist/podcast.c:412
+#, fuzzy
+msgid "Podcast Info"
+msgstr "Podcast リンク"
+
+#: modules/demux/playlist/podcast.c:275
 msgid "Podcast Link"
 msgstr "Podcast リンク"
 
-#: modules/demux/playlist/podcast.c:299
+#: modules/demux/playlist/podcast.c:284
 msgid "Podcast Copyright"
 msgstr "Podcast コピーライト"
 
-#: modules/demux/playlist/podcast.c:308
+#: modules/demux/playlist/podcast.c:293
 msgid "Podcast Category"
 msgstr "Podcast カテゴリ"
 
-#: modules/demux/playlist/podcast.c:317 modules/demux/playlist/podcast.c:405
+#: modules/demux/playlist/podcast.c:302 modules/demux/playlist/podcast.c:381
 msgid "Podcast Keywords"
 msgstr "Podcast キーワード"
 
-#: modules/demux/playlist/podcast.c:326 modules/demux/playlist/podcast.c:413
+#: modules/demux/playlist/podcast.c:311 modules/demux/playlist/podcast.c:389
 msgid "Podcast Subtitle"
 msgstr "Podcast 字幕"
 
-#: modules/demux/playlist/podcast.c:336 modules/demux/playlist/podcast.c:421
+#: modules/demux/playlist/podcast.c:321 modules/demux/playlist/podcast.c:397
 msgid "Podcast Summary"
 msgstr "Podcast 要約"
 
-#: modules/demux/playlist/podcast.c:373
+#: modules/demux/playlist/podcast.c:349
 #, fuzzy
 msgid "Podcast Publication Date"
 msgstr "モジュレーションタイプ"
 
-#: modules/demux/playlist/podcast.c:381
+#: modules/demux/playlist/podcast.c:357
 msgid "Podcast Author"
 msgstr "Podcast 作成者"
 
-#: modules/demux/playlist/podcast.c:389
+#: modules/demux/playlist/podcast.c:365
 msgid "Podcast Subcategory"
 msgstr "Podcast サブカテゴリ"
 
-#: modules/demux/playlist/podcast.c:397
+#: modules/demux/playlist/podcast.c:373
 msgid "Podcast Duration"
 msgstr "Podcast 期間"
 
-#: modules/demux/playlist/podcast.c:429
+#: modules/demux/playlist/podcast.c:405
 msgid "Podcast Size"
 msgstr "Podcast サイズ"
 
-#: modules/demux/playlist/podcast.c:437
+#: modules/demux/playlist/podcast.c:413
 msgid "Podcast Type"
 msgstr ""
 
-#: modules/demux/ps.c:47 modules/demux/ps.c:55
+#: modules/demux/playlist/shoutcast.c:443
+#: modules/services_discovery/shout.c:153
+msgid "Shoutcast"
+msgstr ""
+
+#: modules/demux/ps.c:39
+msgid "Trust MPEG timestamps"
+msgstr ""
+
+#: modules/demux/ps.c:40
+msgid ""
+"Normally we use the timestamps of the MPEG files to calculate position and "
+"duration. However sometimes this might not be usable. Disable this option to "
+"calculate from the bitrate instead."
+msgstr ""
+
+#: modules/demux/ps.c:52 modules/demux/ps.c:63
 #, fuzzy
-msgid "PS demuxer"
+msgid "MPEG-PS demuxer"
 msgstr "MPEG 1/2レイヤ1/2オーディオ・デコーダ"
 
 #: modules/demux/pva.c:43
@@ -8771,112 +9779,137 @@ msgstr "MPEG 1/2レイヤ1/2オーディオ・デコーダ"
 msgid "PVA demuxer"
 msgstr "MPEG 1/2レイヤ1/2オーディオ・デコーダ"
 
-#: modules/demux/rawdv.c:39
-#, fuzzy
-msgid "raw DV demuxer"
-msgstr "MPEG 1/2レイヤ1/2オーディオ・デコーダ"
+#: modules/demux/rawdv.c:40
+msgid "DV (Digital Video) demuxer"
+msgstr ""
 
-#: modules/demux/real.c:39
+#: modules/demux/real.c:40
 #, fuzzy
 msgid "Real demuxer"
 msgstr "MPEG 1/2レイヤ1/2オーディオ・デコーダ"
 
-#: modules/demux/sgimb.c:113
-msgid "Kasenna MediaBase metademux"
-msgstr ""
-
-#: modules/demux/subtitle.c:62
+#: modules/demux/subtitle.c:64
 #, fuzzy
-msgid "Text subtitles demux"
-msgstr "字幕の選択"
+msgid "Text subtitles parser"
+msgstr "字幕デコーダー"
 
-#: modules/demux/subtitle.c:67 modules/gui/wxwidgets/dialogs/subtitles.cpp:200
+#: 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
 #, fuzzy
 msgid "Subtitles delay"
 msgstr "字幕"
 
-#: modules/demux/ts.c:82
-msgid "Extra PMT"
-msgstr ""
+#: modules/demux/subtitle.c:74
+#, fuzzy
+msgid "Subtitles format"
+msgstr "字幕"
 
 #: modules/demux/ts.c:84
-msgid "Allows a user to specify an extra pmt (pmt_pid=pid:stream_type[,...])"
+msgid "Extra PMT"
 msgstr ""
 
 #: modules/demux/ts.c:86
-msgid "Set id of ES to PID"
+msgid "Allows a user to specify an extra pmt (pmt_pid=pid:stream_type[,...])."
 msgstr ""
 
-#: modules/demux/ts.c:87
-msgid "set id of es to pid"
+#: modules/demux/ts.c:88
+msgid "Set id of ES to PID"
 msgstr ""
 
 #: modules/demux/ts.c:89
+msgid ""
+"Set the internal ID of each elementary stream handled by VLC to the same "
+"value as the PID in the TS stream, instead of 1, 2, 3, etc. Useful to do "
+"'#duplicate{..., select=\"es=<pid>\"}'."
+msgstr ""
+
+#: modules/demux/ts.c:94
 #, fuzzy
 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:96
+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:98
 msgid "MTU for out mode"
 msgstr ""
 
-#: modules/demux/ts.c:96 modules/demux/ts.c:97
+#: modules/demux/ts.c:99
+msgid "MTU for out mode."
+msgstr ""
+
+#: modules/demux/ts.c:101
 #, fuzzy
 msgid "CSA ck"
 msgstr "CSA キー"
 
-#: modules/demux/ts.c:99
+#: modules/demux/ts.c:102
+msgid "Control word for the CSA encryption algorithm"
+msgstr ""
+
+#: modules/demux/ts.c:104
 #, fuzzy
 msgid "Silent mode"
 msgstr "湾曲モード"
 
-#: modules/demux/ts.c:100
-msgid "do not complain on encrypted PES"
+#: modules/demux/ts.c:105
+msgid "Do not complain on encrypted PES."
 msgstr ""
 
-#: modules/demux/ts.c:102
+#: modules/demux/ts.c:107
 #, fuzzy
 msgid "CAPMT System ID"
 msgstr "システム ID"
 
-#: modules/demux/ts.c:103
-msgid "only forward descriptors from this SysID to the CAM"
+#: modules/demux/ts.c:108
+msgid "Only forward descriptors from this SysID to the CAM."
 msgstr ""
 
-#: modules/demux/ts.c:105
+#: modules/demux/ts.c:110
 msgid "Packet size in bytes to decrypt"
 msgstr ""
 
-#: modules/demux/ts.c:106
+#: modules/demux/ts.c:111
 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:115
+msgid "Filename of dump"
+msgstr "ダンプのファイル名"
+
+#: modules/demux/ts.c:116
+msgid "Specify a filename where to dump the TS in."
 msgstr ""
 
 #: modules/demux/ts.c:118
+msgid "Append"
+msgstr "追加する"
+
+#: modules/demux/ts.c:120
+msgid ""
+"If the file exists and this option is selected, the existing file will not "
+"be overwritten."
+msgstr ""
+
+#: modules/demux/ts.c:123
 #, fuzzy
 msgid "Dump buffer size"
 msgstr "ログ・ファイル名"
 
-#: modules/demux/ts.c:120
+#: modules/demux/ts.c:125
 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:129
 #, fuzzy
 msgid "MPEG Transport Stream demuxer"
 msgstr "ストリームの再生"
@@ -8930,6 +9963,10 @@ msgstr "ニューエイジ"
 msgid "Oldies"
 msgstr "オールディーズ"
 
+#: modules/demux/util/id3genres.h:40
+msgid "Other"
+msgstr "その他"
+
 #: modules/demux/util/id3genres.h:42
 msgid "R&B"
 msgstr "R&B"
@@ -9130,7 +10167,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 "サイケデリック"
 
@@ -9186,12 +10223,12 @@ msgstr "ハードロック"
 
 #: modules/demux/util/id3tag.c:50
 #, fuzzy
-msgid "ID3 tag parser using libid3tag"
-msgstr "id3タグパーサでlibid3tagを使用"
+msgid "ID3 tags parser"
+msgstr "DTS パーサー"
 
 #: modules/demux/vobsub.c:48
 #, fuzzy
-msgid "Vobsub subtitles demux"
+msgid "Vobsub subtitles parser"
 msgstr "字幕の選択"
 
 #: modules/demux/voc.c:42
@@ -9222,110 +10259,107 @@ 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:49 modules/gui/macosx/interaction.m:120
+#: modules/gui/macosx/interaction.m:124 modules/gui/macosx/interaction.m:127
+#: modules/gui/macosx/interaction.m:168 modules/gui/macosx/interaction.m:177
+#: modules/gui/macosx/open.m:158 modules/gui/macosx/playlistinfo.m:60
 #: modules/gui/macosx/prefs.m:122 modules/gui/macosx/prefs.m:142
-#: modules/gui/macosx/wizard.m:347
-#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:108
-#: modules/gui/wxwidgets/dialogs/iteminfo.cpp:80
-#: modules/gui/wxwidgets/dialogs/open.cpp:324
-#: modules/gui/wxwidgets/dialogs/open.cpp:493
-#: modules/gui/wxwidgets/dialogs/preferences.cpp:205
-#: modules/gui/wxwidgets/dialogs/streamout.cpp:198
-#: modules/gui/wxwidgets/dialogs/subtitles.cpp:243
+#: 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:659
-#: modules/gui/wxwidgets/menus.cpp:315
+#: modules/gui/macosx/open.m:784 modules/gui/wxwidgets/interface.cpp:675
+#: modules/gui/wxwidgets/interface.cpp:686 modules/gui/wxwidgets/menus.cpp:348
+#: modules/gui/wxwidgets/menus.cpp:404
 msgid "Open"
 msgstr "開く"
 
 #: modules/gui/beos/InterfaceWindow.cpp:225
-#: modules/gui/beos/InterfaceWindow.cpp:326 modules/gui/macosx/prefs.m:120
-#: modules/gui/wxwidgets/dialogs/preferences.cpp:182
+#: modules/gui/beos/InterfaceWindow.cpp:329 modules/gui/macosx/prefs.m:120
+#: modules/gui/qt4/dialogs/prefs_dialog.cpp:42
+#: modules/gui/wxwidgets/dialogs/preferences.cpp:184
 msgid "Preferences"
 msgstr "設定"
 
-#: modules/gui/beos/InterfaceWindow.cpp:235
-#: modules/gui/beos/InterfaceWindow.cpp:324 modules/gui/macosx/intf.m:455
-#: modules/gui/macosx/intf.m:548 modules/gui/wxwidgets/dialogs/messages.cpp:53
+#: modules/gui/beos/InterfaceWindow.cpp:237
+#: modules/gui/beos/InterfaceWindow.cpp:326 modules/gui/macosx/intf.m:502
+#: modules/gui/macosx/intf.m:599 modules/gui/wxwidgets/dialogs/messages.cpp:47
 msgid "Messages"
 msgstr "メッセージ"
 
-#: modules/gui/beos/InterfaceWindow.cpp:263
+#: modules/gui/beos/InterfaceWindow.cpp:265
 #: modules/gui/beos/PlayListWindow.cpp:87 modules/gui/macosx/open.m:439
 #: modules/gui/macosx/open.m:737 modules/gui/macosx/open.m:783
-#: modules/gui/wxwidgets/dialogs.cpp:419
-#: modules/gui/wxwidgets/dialogs/open.cpp:1230
+#: modules/gui/wxwidgets/dialogs.cpp:430
+#: modules/gui/wxwidgets/dialogs/open.cpp:1262
 msgid "Open File"
 msgstr "ファイルを開く"
 
-#: modules/gui/beos/InterfaceWindow.cpp:265
+#: modules/gui/beos/InterfaceWindow.cpp:267
 #: modules/gui/beos/PlayListWindow.cpp:92
 msgid "Open Disc"
 msgstr "ディスクを開く"
 
-#: modules/gui/beos/InterfaceWindow.cpp:266
+#: modules/gui/beos/InterfaceWindow.cpp:268
 msgid "Open Subtitles"
 msgstr "字幕を開く"
 
-#: modules/gui/beos/InterfaceWindow.cpp:270
+#: modules/gui/beos/InterfaceWindow.cpp:272
 #: modules/gui/pda/pda_interface.c:300 modules/gui/pda/pda_interface.c:301
 #: modules/gui/pda/pda_interface.c:1362
 msgid "About"
 msgstr "VideoLAN について"
 
-#: modules/gui/beos/InterfaceWindow.cpp:285
+#: modules/gui/beos/InterfaceWindow.cpp:287
 msgid "Prev Title"
 msgstr "前のタイトル"
 
-#: modules/gui/beos/InterfaceWindow.cpp:286
+#: modules/gui/beos/InterfaceWindow.cpp:288
 msgid "Next Title"
 msgstr "次のタイトル"
 
-#: modules/gui/beos/InterfaceWindow.cpp:295
+#: modules/gui/beos/InterfaceWindow.cpp:297
 msgid "Go to Title"
 msgstr "タイトルに行く"
 
-#: modules/gui/beos/InterfaceWindow.cpp:299
+#: modules/gui/beos/InterfaceWindow.cpp:301
 msgid "Go to Chapter"
 msgstr "チャプターに行く"
 
-#: modules/gui/beos/InterfaceWindow.cpp:302
+#: modules/gui/beos/InterfaceWindow.cpp:304
 msgid "Speed"
 msgstr "速度"
 
-#: modules/gui/beos/InterfaceWindow.cpp:321 modules/gui/macosx/intf.m:539
+#: modules/gui/beos/InterfaceWindow.cpp:323 modules/gui/macosx/intf.m:590
 msgid "Window"
 msgstr "ウィンドウ"
 
-#: modules/gui/beos/InterfaceWindow.cpp:398 modules/gui/macosx/bookmarks.m:106
+#: modules/gui/beos/InterfaceWindow.cpp:404 modules/gui/macosx/bookmarks.m:106
 #: modules/gui/macosx/bookmarks.m:233 modules/gui/macosx/bookmarks.m:241
-#: modules/gui/macosx/bookmarks.m:291 modules/gui/macosx/bookmarks.m:301
-#: modules/gui/macosx/extended.m:606 modules/gui/macosx/open.m:157
+#: modules/gui/macosx/bookmarks.m:292 modules/gui/macosx/bookmarks.m:302
+#: modules/gui/macosx/controls.m:50 modules/gui/macosx/extended.m:601
+#: modules/gui/macosx/interaction.m:125 modules/gui/macosx/interaction.m:126
+#: modules/gui/macosx/interaction.m:168 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/wizard.m:467
-#: modules/gui/macosx/wizard.m:597 modules/gui/macosx/wizard.m:663
-#: modules/gui/macosx/wizard.m:1054 modules/gui/macosx/wizard.m:1120
-#: modules/gui/macosx/wizard.m:1674
-#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:105
-#: modules/gui/wxwidgets/dialogs/iteminfo.cpp:77
-#: modules/gui/wxwidgets/dialogs/open.cpp:321
-#: modules/gui/wxwidgets/dialogs/open.cpp:490
-#: modules/gui/wxwidgets/dialogs/preferences.cpp:202
-#: modules/gui/wxwidgets/dialogs/streamout.cpp:195
-#: modules/gui/wxwidgets/dialogs/subtitles.cpp:240
+#: modules/gui/macosx/playlistinfo.m:59 modules/gui/macosx/update.m:86
+#: modules/gui/macosx/wizard.m:631 modules/gui/macosx/wizard.m:695
+#: modules/gui/macosx/wizard.m:1087 modules/gui/macosx/wizard.m:1167
+#: modules/gui/macosx/wizard.m:1174 modules/gui/macosx/wizard.m:1661
+#: modules/gui/macosx/wizard.m:1669 modules/gui/macosx/wizard.m:1849
+#: modules/gui/macosx/wizard.m:1860 modules/gui/macosx/wizard.m:1873
+#: modules/gui/wxwidgets/dialogs/preferences.cpp:205
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:415
 msgid "OK"
 msgstr "OK"
 
-#: modules/gui/beos/InterfaceWindow.cpp:406
+#: modules/gui/beos/InterfaceWindow.cpp:412
 #, fuzzy
 msgid "VLC media player: Open Media Files"
 msgstr "字幕の選択"
 
-#: modules/gui/beos/InterfaceWindow.cpp:410
+#: modules/gui/beos/InterfaceWindow.cpp:416
 #, fuzzy
 msgid "VLC media player: Open Subtitle File"
 msgstr "字幕の選択"
@@ -9340,21 +10374,18 @@ msgid "playlist"
 msgstr "リスト"
 
 #: modules/gui/beos/PlayListWindow.cpp:96
-#: modules/gui/wxwidgets/dialogs/messages.cpp:78
-#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:74
 msgid "Close"
 msgstr "閉じる"
 
 #: modules/gui/beos/PlayListWindow.cpp:101 modules/gui/macosx/bookmarks.m:95
-#: modules/gui/macosx/intf.m:480
+#: modules/gui/macosx/intf.m:527
 #: modules/gui/wxwidgets/dialogs/bookmarks.cpp:165
-#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:397
-#: modules/gui/wxwidgets/dialogs/vlm/vlm_streampanel.cpp:99
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_streampanel.cpp:100
 msgid "Edit"
 msgstr "編集"
 
-#: modules/gui/beos/PlayListWindow.cpp:103 modules/gui/macosx/intf.m:485
-#: modules/gui/macosx/playlist.m:503
+#: modules/gui/beos/PlayListWindow.cpp:103 modules/gui/macosx/intf.m:532
+#: modules/gui/macosx/playlist.m:440
 msgid "Select All"
 msgstr "すべてを選択"
 
@@ -9379,7 +10410,6 @@ msgid "Randomize"
 msgstr "ランダム"
 
 #: modules/gui/beos/PlayListWindow.cpp:127 modules/gui/macosx/bookmarks.m:97
-#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:161
 msgid "Remove"
 msgstr "削除"
 
@@ -9396,11 +10426,11 @@ msgid "Path"
 msgstr "パス"
 
 #: modules/gui/beos/PlayListWindow.cpp:147 modules/gui/macosx/bookmarks.m:108
-#: modules/gui/macosx/playlist.m:132
+#: modules/gui/macosx/playlist.m:129
 #: modules/gui/wxwidgets/dialogs/bookmarks.cpp:97
-#: modules/gui/wxwidgets/dialogs/iteminfo.cpp:135
-#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:369
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:583
+#: modules/gui/wxwidgets/dialogs/infopanels.cpp:72
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:372
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:590
 msgid "Name"
 msgstr "名前"
 
@@ -9409,9 +10439,7 @@ msgid "Apply"
 msgstr "適用"
 
 #: modules/gui/beos/PreferencesWindow.cpp:254 modules/gui/macosx/output.m:526
-#: modules/gui/macosx/playlist.m:766 modules/gui/macosx/prefs.m:121
-#: modules/gui/wxwidgets/dialogs/preferences.cpp:206
-#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:77
+#: modules/gui/macosx/playlist.m:706 modules/gui/macosx/prefs.m:121
 msgid "Save"
 msgstr "保存"
 
@@ -9452,17 +10480,21 @@ msgstr "常に最前面"
 msgid "Take Screen Shot"
 msgstr "スクリーンショットを取る"
 
-#: modules/gui/macosx/about.m:73 modules/gui/macosx/intf.m:459
-#: modules/gui/wxwidgets/interface.cpp:592
+#: modules/gui/macosx/about.m:73 modules/gui/macosx/intf.m:506
 msgid "About VLC media player"
 msgstr "VLC メディア・プレイヤーについて"
 
-#: modules/gui/macosx/about.m:80
+#: modules/gui/macosx/about.m:81
 #, c-format
 msgid "Compiled by %s, based on SVN revision %s"
 msgstr ""
 
-#: modules/gui/macosx/bookmarks.m:92 modules/gui/macosx/intf.m:545
+#: modules/gui/macosx/about.m:85
+#, fuzzy, c-format
+msgid "Compiled by %s"
+msgstr "コメディ"
+
+#: modules/gui/macosx/bookmarks.m:92 modules/gui/macosx/intf.m:596
 #: modules/gui/wxwidgets/dialogs/bookmarks.cpp:139
 msgid "Bookmarks"
 msgstr "ブックマーク"
@@ -9472,10 +10504,8 @@ msgstr "ブックマーク"
 msgid "Add"
 msgstr "追加"
 
-#: modules/gui/macosx/bookmarks.m:94 modules/gui/macosx/intf.m:484
-#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:163
-#: modules/gui/wxwidgets/dialogs/messages.cpp:83
-#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:399
+#: modules/gui/macosx/bookmarks.m:94 modules/gui/macosx/intf.m:531
+#: modules/gui/wxwidgets/dialogs/messages.cpp:77
 msgid "Clear"
 msgstr "クリア"
 
@@ -9484,27 +10514,14 @@ msgstr "クリア"
 msgid "Extract"
 msgstr "展開"
 
-#: modules/gui/macosx/bookmarks.m:101
-#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:197
-msgid "Size offset"
-msgstr "サイズオフセット"
-
-#: modules/gui/macosx/bookmarks.m:103
+#: 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 offset"
-msgstr "時間オフセット"
-
-#: modules/gui/macosx/bookmarks.m:109 modules/gui/macosx/sfilters.m:73
-#: modules/gui/pda/pda.c:281 modules/gui/wxwidgets/dialogs/bookmarks.cpp:99
 msgid "Time"
 msgstr "時間"
 
-#: modules/gui/macosx/bookmarks.m:110
-#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:101
-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:702
 msgid "Untitled"
 msgstr "タイトルなし"
 
@@ -9515,9 +10532,8 @@ msgid "No input"
 msgstr "入力がありません。\n"
 
 #: modules/gui/macosx/bookmarks.m:234
-#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:441
 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
@@ -9526,550 +10542,624 @@ msgstr ""
 
 #: 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:1054
+#: modules/gui/macosx/bookmarks.m:292 modules/gui/macosx/wizard.m:1087
 #: modules/gui/wxwidgets/dialogs/bookmarks.cpp:348
 #, fuzzy
 msgid "Invalid selection"
 msgstr "選択"
 
-#: modules/gui/macosx/bookmarks.m:292
-#, fuzzy
-msgid "You have to select two bookmarks."
-msgstr "2 つのブックマークを選ばなければなりません"
+#: modules/gui/macosx/bookmarks.m:294
+msgid "Two bookmarks have to be selected."
+msgstr ""
 
-#: modules/gui/macosx/bookmarks.m:301
+#: modules/gui/macosx/bookmarks.m:302
 #: modules/gui/wxwidgets/dialogs/bookmarks.cpp:358
 #, fuzzy
 msgid "No input found"
 msgstr "%@s は見つかりません"
 
-#: modules/gui/macosx/bookmarks.m:302
+#: modules/gui/macosx/bookmarks.m:304
 msgid "The stream must be playing or paused for bookmarks to work."
 msgstr ""
 
-#: modules/gui/macosx/controls.m:126
+#: modules/gui/macosx/controls.m:48 modules/gui/macosx/controls.m:735
+#, fuzzy
+msgid "Jump To Time"
+msgstr "指定時間へジャンプ: "
+
+#: modules/gui/macosx/controls.m:51
+#, fuzzy
+msgid "sec."
+msgstr "SECAM"
+
+#: modules/gui/macosx/controls.m:52
+#, fuzzy
+msgid "Jump to time"
+msgstr "指定時間へジャンプ: "
+
+#: modules/gui/macosx/controls.m:163
 msgid "Random On"
 msgstr "ランダムオン"
 
-#: modules/gui/macosx/controls.m:130
+#: modules/gui/macosx/controls.m:167
 msgid "Random Off"
 msgstr "ランダムオフ"
 
-#: modules/gui/macosx/controls.m:158 modules/gui/macosx/controls.m:590
-#: modules/gui/macosx/intf.m:495 modules/gui/macosx/playlist.m:518
-#: modules/gui/macosx/playlist.m:1192
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:52
+#: modules/gui/macosx/controls.m:195 modules/gui/macosx/controls.m:719
+#: modules/gui/macosx/intf.m:542 modules/gui/macosx/playlist.m:455
+#: modules/gui/macosx/playlist.m:1169
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:54
 msgid "Repeat One"
 msgstr "1 回繰り返す"
 
-#: modules/gui/macosx/controls.m:162 modules/gui/macosx/controls.m:194
-#: modules/gui/macosx/playlist.m:1211
+#: modules/gui/macosx/controls.m:199 modules/gui/macosx/controls.m:231
+#: modules/gui/macosx/playlist.m:1188
 msgid "Repeat Off"
 msgstr "繰り返しオフ"
 
-#: modules/gui/macosx/controls.m:190 modules/gui/macosx/controls.m:597
-#: modules/gui/macosx/intf.m:496 modules/gui/macosx/playlist.m:519
-#: modules/gui/macosx/playlist.m:1200
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:51
+#: modules/gui/macosx/controls.m:227 modules/gui/macosx/controls.m:726
+#: modules/gui/macosx/intf.m:543 modules/gui/macosx/playlist.m:456
+#: modules/gui/macosx/playlist.m:1177
+#: 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:521
+#: modules/gui/macosx/controls.m:308 modules/gui/macosx/controls.m:749
+#: modules/gui/macosx/intf.m:568
 msgid "Half Size"
 msgstr "1/2 サイズ"
 
-#: modules/gui/macosx/controls.m:277 modules/gui/macosx/controls.m:619
-#: modules/gui/macosx/intf.m:522
+#: modules/gui/macosx/controls.m:310 modules/gui/macosx/controls.m:750
+#: modules/gui/macosx/intf.m:569
 msgid "Normal Size"
 msgstr "通常サイズ"
 
-#: modules/gui/macosx/controls.m:279 modules/gui/macosx/controls.m:620
-#: modules/gui/macosx/intf.m:523
+#: modules/gui/macosx/controls.m:312 modules/gui/macosx/controls.m:751
+#: modules/gui/macosx/intf.m:570
 msgid "Double Size"
 msgstr "2倍サイズ"
 
-#: modules/gui/macosx/controls.m:281 modules/gui/macosx/controls.m:624
-#: modules/gui/macosx/controls.m:635 modules/gui/macosx/intf.m:526
+#: modules/gui/macosx/controls.m:314 modules/gui/macosx/controls.m:755
+#: modules/gui/macosx/controls.m:766 modules/gui/macosx/intf.m:573
 msgid "Float on Top"
 msgstr "常に前面"
 
-#: modules/gui/macosx/controls.m:283 modules/gui/macosx/controls.m:621
-#: modules/gui/macosx/intf.m:524
+#: modules/gui/macosx/controls.m:316 modules/gui/macosx/controls.m:752
+#: modules/gui/macosx/intf.m:571
 msgid "Fit to Screen"
 msgstr "画面にあわせる"
 
-#: modules/gui/macosx/controls.m:583 modules/gui/macosx/intf.m:494
-#: modules/gui/macosx/playlist.m:512
+#: modules/gui/macosx/controls.m:712 modules/gui/macosx/intf.m:541
+#: modules/gui/macosx/playlist.m:449
 msgid "Random"
 msgstr "ランダム"
 
-#: modules/gui/macosx/controls.m:604 modules/gui/macosx/intf.m:497
+#: modules/gui/macosx/controls.m:733 modules/gui/macosx/intf.m:544
 #, fuzzy
 msgid "Step Forward"
 msgstr "転送"
 
-#: modules/gui/macosx/controls.m:605 modules/gui/macosx/intf.m:498
+#: modules/gui/macosx/controls.m:734 modules/gui/macosx/intf.m:545
 #, fuzzy
 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:491
+#: 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:494
+#, fuzzy
+msgid "Fast Forward"
+msgstr "転送"
+
+#: modules/gui/macosx/embeddedwindow.m:45
+#: modules/gui/macosx/embeddedwindow.m:72 modules/gui/macosx/intf.m:492
+#: modules/gui/macosx/intf.m:535 modules/gui/macosx/intf.m:613
+#: modules/gui/macosx/intf.m:1397 modules/gui/macosx/intf.m:1398
+#: modules/gui/macosx/intf.m:1399 modules/gui/macosx/playlist.m:437
+#: modules/gui/pda/pda_interface.c:262 modules/gui/pda/pda_interface.c:263
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:282
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:291
+#: modules/gui/wxwidgets/interface.cpp:677
+#: modules/gui/wxwidgets/interface.cpp:688
+#: modules/gui/wxwidgets/interface.cpp:1216
+#: modules/gui/wxwidgets/menus.cpp:263 modules/gui/wxwidgets/menus.cpp:274
+msgid "Play"
+msgstr "再生"
+
+#: modules/gui/macosx/embeddedwindow.m:66 modules/gui/macosx/intf.m:1389
+#: modules/gui/macosx/intf.m:1390 modules/gui/macosx/intf.m:1391
+#: modules/gui/pda/pda_interface.c:250 modules/gui/pda/pda_interface.c:251
+#: modules/gui/wxwidgets/interface.cpp:678
+#: modules/gui/wxwidgets/interface.cpp:689
+#: modules/gui/wxwidgets/interface.cpp:1210
+#: modules/gui/wxwidgets/menus.cpp:265 modules/visualization/xosd.c:242
+msgid "Pause"
+msgstr "一時停止"
+
+#: modules/gui/macosx/equalizer.m:141 modules/gui/wxwidgets/extrapanel.cpp:471
 #, fuzzy
 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."
+#: modules/gui/macosx/equalizer.m:146
+msgid "Enable the equalizer. Bands can be set manually or using a preset."
 msgstr ""
 
-#: modules/gui/macosx/equalizer.m:147
+#: modules/gui/macosx/equalizer.m:148
 #, fuzzy
 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
 #, fuzzy
 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"
+#: 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:355
-#: modules/gui/macosx/wizard.m:356 modules/gui/macosx/wizard.m:426
-#: modules/gui/macosx/wizard.m:428 modules/gui/macosx/wizard.m:430
-#: modules/gui/macosx/wizard.m:439
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:470
+#: 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
 #, fuzzy
 msgid "More Info"
 msgstr "デバイス名"
 
-#: modules/gui/macosx/extended.m:86 modules/gui/wxwidgets/extrapanel.cpp:153
+#: 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:153
-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:78
+#: modules/gui/macosx/extended.m:88 modules/gui/wxwidgets/extrapanel.cpp:149
+#: modules/video_filter/distort.c:82
 #, fuzzy
 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
 #, fuzzy
 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
+msgid "Creates several copies of the Video output window"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:92
+#: modules/gui/macosx/extended.m:93
 msgid "Image cropping"
 msgstr "画像縁取り"
 
-#: modules/gui/macosx/extended.m:93
-msgid "Crops the image"
+#: 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
 #, fuzzy
 msgid "Image inversion"
 msgstr "サイズ"
 
-#: modules/gui/macosx/extended.m:95 modules/gui/wxwidgets/extrapanel.cpp:152
-msgid "Inverts the image colors"
+#: modules/gui/macosx/extended.m:96 modules/gui/wxwidgets/extrapanel.cpp:150
+msgid "Inverts the colors of the image"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:96 modules/gui/wxwidgets/extrapanel.cpp:154
+#: modules/gui/macosx/extended.m:97 modules/gui/wxwidgets/extrapanel.cpp:152
 #: modules/video_filter/transform.c:67
 #, fuzzy
 msgid "Transformation"
 msgstr "バージョン情報の印刷"
 
-#: modules/gui/macosx/extended.m:97 modules/gui/wxwidgets/extrapanel.cpp:154
+#: 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
+#, fuzzy
+msgid "Interactive Zoom"
+msgstr "インターフェースメニュー"
+
+#: modules/gui/macosx/extended.m:100
+msgid "Enables an interactive Zoom feature"
+msgstr ""
+
+#: modules/gui/macosx/extended.m:101 modules/gui/wxwidgets/extrapanel.cpp:401
 #, fuzzy
 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:102
+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:104 modules/gui/wxwidgets/extrapanel.cpp:396
 #, fuzzy
 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:105 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:107 modules/gui/wxwidgets/extrapanel.cpp:406
 #, fuzzy
 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:108 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:112 modules/gui/wxwidgets/extrapanel.cpp:244
 msgid "Gamma"
 msgstr "ガンマ"
 
-#: modules/gui/macosx/extended.m:111 modules/gui/wxwidgets/extrapanel.cpp:241
+#: modules/gui/macosx/extended.m:114 modules/gui/wxwidgets/extrapanel.cpp:239
 #, fuzzy
 msgid "Saturation"
 msgstr "持続期間"
 
-#: modules/gui/macosx/extended.m:112 modules/gui/macosx/macosx.m:55
-#: modules/gui/macosx/sfilters.m:82 modules/gui/macosx/sfilters.m:91
-#: modules/gui/macosx/sfilters.m:101
+#: modules/gui/macosx/extended.m:115 modules/gui/macosx/macosx.m:59
+#: modules/gui/macosx/sfilters.m:79 modules/gui/macosx/sfilters.m:90
 msgid "Opaqueness"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:606
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:499
-#: modules/gui/wxwidgets/extrapanel.cpp:1011
+#: modules/gui/macosx/extended.m:601 modules/gui/wxwidgets/extrapanel.cpp:1007
 #, fuzzy
-msgid "More information"
+msgid "More Information"
 msgstr "バージョン情報の印刷"
 
-#: modules/gui/macosx/extended.m:607 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 individually 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:439
+#: modules/gui/macosx/interaction.m:122
 #, fuzzy
-msgid "VLC - Controller"
-msgstr "コントロール"
+msgid "Login:"
+msgstr "グルジア語"
 
-#: modules/gui/macosx/intf.m:440 modules/gui/macosx/intf.m:854
-#: modules/gui/macosx/intf.m:1163 modules/gui/pda/pda_interface.c:212
-#: modules/gui/pda/pda_interface.c:1355
-msgid "VLC media player"
-msgstr "VLC メディアプレイヤー"
+#: modules/gui/macosx/interaction.m:123
+#, fuzzy
+msgid "Password:"
+msgstr "パスワード"
 
-#: modules/gui/macosx/intf.m:444 modules/gui/pda/pda_interface.c:238
-#: modules/gui/pda/pda_interface.c:239
-msgid "Rewind"
-msgstr "巻き戻す"
+#: modules/gui/macosx/interaction.m:176
+#, fuzzy
+msgid "Yes"
+msgstr "はい"
 
-#: modules/gui/macosx/intf.m:445 modules/gui/macosx/intf.m:488
-#: modules/gui/macosx/intf.m:562 modules/gui/macosx/intf.m:1262
-#: modules/gui/macosx/intf.m:1263 modules/gui/macosx/intf.m:1264
-#: modules/gui/macosx/playlist.m:500 modules/gui/pda/pda_interface.c:262
-#: modules/gui/pda/pda_interface.c:263
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:267
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:275
-#: modules/gui/wxwidgets/interface.cpp:661
-#: modules/gui/wxwidgets/interface.cpp:1183
-#: modules/gui/wxwidgets/menus.cpp:292 modules/gui/wxwidgets/menus.cpp:306
-msgid "Play"
-msgstr "再生"
+#: modules/gui/macosx/interaction.m:176
+#, fuzzy
+msgid "No"
+msgstr "なし"
 
-#: modules/gui/macosx/intf.m:447
+#: modules/gui/macosx/intf.m:486
 #, fuzzy
-msgid "Fast Forward"
-msgstr "転送"
+msgid "VLC - Controller"
+msgstr "コントロール"
+
+#: modules/gui/macosx/intf.m:487 modules/gui/macosx/intf.m:976
+#: modules/gui/macosx/intf.m:1298 modules/gui/pda/pda_interface.c:212
+#: modules/gui/pda/pda_interface.c:1355 modules/gui/qt4/main_interface.cpp:42
+msgid "VLC media player"
+msgstr "VLC メディアプレイヤー"
 
-#: modules/gui/macosx/intf.m:456
+#: modules/gui/macosx/intf.m:503
 msgid "Open CrashLog"
 msgstr "クラッシュログを開く"
 
-#: modules/gui/macosx/intf.m:462
+#: modules/gui/macosx/intf.m:508
+msgid "Check for Update..."
+msgstr ""
+
+#: modules/gui/macosx/intf.m:509
 msgid "Preferences..."
 msgstr "設定..."
 
-#: modules/gui/macosx/intf.m:465
+#: modules/gui/macosx/intf.m:512
 msgid "Services"
 msgstr "サービス"
 
-#: modules/gui/macosx/intf.m:466
+#: modules/gui/macosx/intf.m:513
 msgid "Hide VLC"
 msgstr "VLCを隠す"
 
-#: modules/gui/macosx/intf.m:467
+#: modules/gui/macosx/intf.m:514
 msgid "Hide Others"
 msgstr "インタフェースを隠す"
 
-#: modules/gui/macosx/intf.m:468
+#: modules/gui/macosx/intf.m:515
 msgid "Show All"
 msgstr "すべてを表示"
 
-#: modules/gui/macosx/intf.m:469 modules/gui/wxwidgets/interface.cpp:1445
+#: modules/gui/macosx/intf.m:516 modules/gui/wxwidgets/interface.cpp:1508
 msgid "Quit VLC"
 msgstr "VLCを終了"
 
-#: modules/gui/macosx/intf.m:471
+#: modules/gui/macosx/intf.m:518
 msgid "1:File"
 msgstr "1:ファイル"
 
-#: modules/gui/macosx/intf.m:472
+#: modules/gui/macosx/intf.m:519
 msgid "Open File..."
 msgstr "ファイルを開く..."
 
-#: modules/gui/macosx/intf.m:473
+#: modules/gui/macosx/intf.m:520
 #, fuzzy
 msgid "Quick Open File..."
 msgstr "ファイルを開く..."
 
-#: modules/gui/macosx/intf.m:474
+#: modules/gui/macosx/intf.m:521
 msgid "Open Disc..."
 msgstr "ディスクを開く..."
 
-#: modules/gui/macosx/intf.m:475
+#: modules/gui/macosx/intf.m:522
 msgid "Open Network..."
 msgstr "ネットワークを開く"
 
-#: modules/gui/macosx/intf.m:476
+#: modules/gui/macosx/intf.m:523
 msgid "Open Recent"
 msgstr "最近使った項目を開く"
 
-#: modules/gui/macosx/intf.m:477 modules/gui/macosx/intf.m:1807
+#: modules/gui/macosx/intf.m:524 modules/gui/macosx/intf.m:1953
 msgid "Clear Menu"
 msgstr "メニューをクリアする"
 
-#: modules/gui/macosx/intf.m:478
+#: modules/gui/macosx/intf.m:525
 #, fuzzy
 msgid "Streaming/Exporting Wizard..."
 msgstr "ストリームの情報..."
 
-#: modules/gui/macosx/intf.m:481
+#: modules/gui/macosx/intf.m:528
 msgid "Cut"
 msgstr "カット"
 
-#: modules/gui/macosx/intf.m:482
+#: modules/gui/macosx/intf.m:529
 msgid "Copy"
 msgstr "コピー"
 
-#: modules/gui/macosx/intf.m:483
+#: modules/gui/macosx/intf.m:530
 msgid "Paste"
 msgstr "ペースト"
 
-#: modules/gui/macosx/intf.m:487
+#: modules/gui/macosx/intf.m:534
 #, fuzzy
 msgid "Playback"
 msgstr "再生一時停止"
 
-#: modules/gui/macosx/intf.m:508
+#: modules/gui/macosx/intf.m:555
 msgid "Volume Up"
 msgstr "ボリュームを上げる"
 
-#: modules/gui/macosx/intf.m:509
+#: modules/gui/macosx/intf.m:556
 msgid "Volume Down"
 msgstr "ボリュームを下げる"
 
-#: modules/gui/macosx/intf.m:530 modules/gui/macosx/intf.m:531
-#: modules/gui/macosx/vout.m:168
+#: modules/gui/macosx/intf.m:581 modules/gui/macosx/intf.m:582
+#: modules/gui/macosx/vout.m:193
 msgid "Video Device"
 msgstr "ビデオデバイス"
 
-#: modules/gui/macosx/intf.m:540
+#: modules/gui/macosx/intf.m:591
 msgid "Minimize Window"
 msgstr "ウィンドウを最小化"
 
-#: modules/gui/macosx/intf.m:541
+#: modules/gui/macosx/intf.m:592
 msgid "Close Window"
 msgstr "ウィンドウを閉じる"
 
-#: modules/gui/macosx/intf.m:542
+#: modules/gui/macosx/intf.m:593
 msgid "Controller"
 msgstr "コントローラー"
 
-#: modules/gui/macosx/intf.m:544
+#: modules/gui/macosx/intf.m:595
 #, fuzzy
 msgid "Extended Controls"
 msgstr "リモート・コントロール"
 
-#: modules/gui/macosx/intf.m:547 modules/gui/macosx/intf.m:578
-#: modules/gui/macosx/playlistinfo.m:202
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:272
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:278
-msgid "Info"
-msgstr "情報"
+#: modules/gui/macosx/intf.m:598 modules/gui/macosx/intf.m:629
+#: modules/gui/macosx/playlist.m:441 modules/gui/macosx/playlistinfo.m:55
+#: modules/gui/macosx/playlistinfo.m:363
+#, fuzzy
+msgid "Information"
+msgstr "バージョン情報の印刷"
 
-#: modules/gui/macosx/intf.m:550
+#: modules/gui/macosx/intf.m:601
 msgid "Bring All to Front"
 msgstr "すべてを前に"
 
-#: modules/gui/macosx/intf.m:552
+#: modules/gui/macosx/intf.m:603
 msgid "Help"
 msgstr "ヘルプ"
 
-#: modules/gui/macosx/intf.m:553
+#: modules/gui/macosx/intf.m:604
 msgid "ReadMe..."
 msgstr "読んでください..."
 
-#: modules/gui/macosx/intf.m:554
+#: modules/gui/macosx/intf.m:605
 msgid "Online Documentation"
 msgstr "オンラインドキュメント"
 
-#: modules/gui/macosx/intf.m:555
+#: modules/gui/macosx/intf.m:606
 msgid "Report a Bug"
 msgstr "バグ報告"
 
-#: modules/gui/macosx/intf.m:556
+#: modules/gui/macosx/intf.m:607
 msgid "VideoLAN Website"
 msgstr "VideoLAN ウェブサイト"
 
-#: modules/gui/macosx/intf.m:557
+#: modules/gui/macosx/intf.m:608
 msgid "License"
 msgstr "ライセンス"
 
-#: modules/gui/macosx/intf.m:558
+#: modules/gui/macosx/intf.m:609
 #, fuzzy
 msgid "Make a donation"
 msgstr "マケドニア語"
 
-#: modules/gui/macosx/intf.m:559
+#: modules/gui/macosx/intf.m:610
 #, fuzzy
 msgid "Online Forum"
 msgstr "オンラインドキュメント"
 
-#: modules/gui/macosx/intf.m:569 modules/gui/wxwidgets/dialogs/wizard.cpp:80
+#: modules/gui/macosx/intf.m:620 modules/gui/wxwidgets/dialogs/wizard.cpp:81
 msgid "Error"
 msgstr "エラー"
 
-#: modules/gui/macosx/intf.m:570
+#: modules/gui/macosx/intf.m:621
 #, fuzzy
 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:572
+#: modules/gui/macosx/intf.m:623
 #, fuzzy
 msgid "If you believe that it is a bug, please follow the instructions at:"
 msgstr "もし、バグであると思われるなら、以下の手順にしたがってください :"
 
-#: modules/gui/macosx/intf.m:574
+#: modules/gui/macosx/intf.m:625
 msgid "Open Messages Window"
 msgstr "メッセージウィンドウを表示"
 
-#: modules/gui/macosx/intf.m:575
+#: modules/gui/macosx/intf.m:626
 msgid "Dismiss"
 msgstr "やり直し"
 
-#: modules/gui/macosx/intf.m:576
-msgid "Suppress further errors"
+#: modules/gui/macosx/intf.m:627
+msgid "Do not display further errors"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:1023
+#: modules/gui/macosx/intf.m:1153
 #, fuzzy, c-format
 msgid "Volume: %d%%"
 msgstr "音量 %d%%"
 
-#: modules/gui/macosx/intf.m:1254 modules/gui/macosx/intf.m:1255
-#: modules/gui/macosx/intf.m:1256 modules/gui/pda/pda_interface.c:250
-#: modules/gui/pda/pda_interface.c:251 modules/gui/wxwidgets/interface.cpp:662
-#: modules/gui/wxwidgets/interface.cpp:1177
-#: modules/gui/wxwidgets/menus.cpp:294 modules/visualization/xosd.c:240
-msgid "Pause"
-msgstr "一時停止"
-
-#: modules/gui/macosx/intf.m:1674
+#: modules/gui/macosx/intf.m:1820
 #, fuzzy
 msgid "No CrashLog found"
 msgstr "%@s は見つかりません"
 
-#: modules/gui/macosx/intf.m:1674
-msgid "You haven't experienced any heavy crashes yet."
+#: modules/gui/macosx/intf.m:1820
+msgid "Couldn't find any trace of a previous crash."
 msgstr ""
 
 #: modules/gui/macosx/macosx.m:50
+#, fuzzy
+msgid "Embedded video output"
+msgstr "QT埋め込みモジュール"
+
+#: 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
+#: 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
+#, fuzzy
+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
-msgid "Use as Desktop Background"
+#: modules/gui/macosx/macosx.m:74
+msgid "Black screens in fullscreen"
 msgstr ""
 
-#: modules/gui/macosx/macosx.m:71
-msgid ""
-"Use the video as the Desktop Background of the Finder. Desktop icons cannot "
-"be interacted with in this mode."
+#: 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:75
+#: modules/gui/macosx/macosx.m:78
+msgid "Use as Desktop Background"
+msgstr ""
+
+#: modules/gui/macosx/macosx.m:79
+msgid ""
+"Use the video as the Desktop Background Desktop icons cannot be interacted "
+"with in this mode."
+msgstr ""
+
+#: 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 "ネットワーク・インタフェース"
 
-#: modules/gui/macosx/macosx.m:81
+#: modules/gui/macosx/macosx.m:98
 msgid "Quartz video"
 msgstr ""
 
@@ -10078,18 +11168,18 @@ msgid "Open Source"
 msgstr "ソースを開く"
 
 #: modules/gui/macosx/open.m:155 modules/gui/wince/open.cpp:130
-#: modules/gui/wxwidgets/dialogs/open.cpp:421
 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/sfilters.m:76
+#: modules/gui/macosx/prefs_widgets.m:1183 modules/gui/macosx/sfilters.m:75
 #: modules/gui/wince/preferences_widgets.cpp:512
 #: modules/gui/wxwidgets/dialogs/open.cpp:631
-#: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:660
-#: modules/gui/wxwidgets/dialogs/streamout.cpp:502
-#: modules/gui/wxwidgets/dialogs/subtitles.cpp:81
+#: modules/gui/wxwidgets/dialogs/open.cpp:665
+#: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:683
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:501
+#: modules/gui/wxwidgets/dialogs/subtitles.cpp:82
 msgid "Browse..."
 msgstr "参照..."
 
@@ -10097,7 +11187,7 @@ msgstr "参照..."
 msgid "Treat as a pipe rather than as a file"
 msgstr "ファイルとしてではなく、パイプとして扱う"
 
-#: modules/gui/macosx/open.m:167 modules/gui/wxwidgets/dialogs/open.cpp:701
+#: modules/gui/macosx/open.m:167 modules/gui/wxwidgets/dialogs/open.cpp:723
 msgid "Device name"
 msgstr "デバイス名"
 
@@ -10106,29 +11196,23 @@ msgid "Use DVD menus"
 msgstr "DVD メニューを使用"
 
 #: modules/gui/macosx/open.m:173 modules/gui/macosx/open.m:478
-msgid "VIDEO_TS folder"
-msgstr "VIDEO_TS フォルダ"
+#, fuzzy
+msgid "VIDEO_TS directory"
+msgstr "VIDEO_TSディレクトリを開く"
 
 #: modules/gui/macosx/open.m:174 modules/gui/macosx/open.m:595
-#: modules/gui/wxwidgets/dialogs/open.cpp:675
+#: modules/gui/wxwidgets/dialogs/open.cpp:697
 msgid "DVD"
 msgstr "DVD"
 
-#: modules/gui/macosx/open.m:178 modules/gui/macosx/open.m:180
-#: modules/gui/macosx/output.m:147 modules/gui/wxwidgets/dialogs/open.cpp:805
-#: modules/gui/wxwidgets/dialogs/open.cpp:832
-#: modules/gui/wxwidgets/dialogs/streamout.cpp:532 modules/stream_out/rtp.c:70
-msgid "Port"
-msgstr "ポート番号"
-
 #: modules/gui/macosx/open.m:179 modules/gui/macosx/output.m:146
-#: modules/gui/wxwidgets/dialogs/open.cpp:824
-#: modules/gui/wxwidgets/dialogs/streamout.cpp:521
+#: modules/gui/wxwidgets/dialogs/open.cpp:849
+#: 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/dialogs/open.cpp:780
+#: modules/gui/macosx/open.m:704 modules/gui/wxwidgets/dialogs/open.cpp:805
 msgid "UDP/RTP Multicast"
 msgstr "UDP/RTP マルチキャスト"
 
@@ -10137,8 +11221,8 @@ msgstr "UDP/RTP マルチキャスト"
 msgid "HTTP/FTP/MMS/RTSP"
 msgstr "HTTP/FTP/MMS/RTSP"
 
-#: modules/gui/macosx/open.m:186 modules/gui/wxwidgets/dialogs/open.cpp:798
-#: modules/services_discovery/sap.c:109
+#: modules/gui/macosx/open.m:186 modules/gui/wxwidgets/dialogs/open.cpp:823
+#: modules/services_discovery/sap.c:112
 msgid "Allow timeshifting"
 msgstr "タイムシフトを許可する"
 
@@ -10147,33 +11231,39 @@ msgid "Load subtitles file:"
 msgstr "読み込む字幕ファイル:"
 
 #: modules/gui/macosx/open.m:241 modules/gui/macosx/output.m:137
-#: modules/gui/wxwidgets/dialogs/open.cpp:454
-#: modules/gui/wxwidgets/dialogs/open.cpp:643
+#: modules/gui/wxwidgets/dialogs/open.cpp:436
 msgid "Settings..."
 msgstr "設定..."
 
 #: modules/gui/macosx/open.m:243
-msgid "Override"
-msgstr "上書き"
+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:140
+msgid "Delay"
 msgstr "ディレイ"
 
 #: modules/gui/macosx/open.m:246
-msgid "fps"
-msgstr "fps"
+#, fuzzy
+msgid "FPS"
+msgstr "PS"
 
 #: modules/gui/macosx/open.m:248
-#: modules/gui/wxwidgets/dialogs/subtitles.cpp:95
 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
 #, fuzzy
 msgid "Font Properties"
@@ -10196,46 +11286,52 @@ msgstr "VIDEO_TSディレクトリを開く"
 
 #: modules/gui/macosx/output.m:136
 #, fuzzy
-msgid "Advanced output:"
-msgstr "ALSAオーディオ・モジュール"
+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/dialogs/streamout.cpp:471
 #, fuzzy
-msgid "Play locally"
-msgstr "スロー再生"
+msgid "Display the stream locally"
+msgstr "ストリーミング中の表示"
+
+#: modules/gui/macosx/output.m:143 modules/gui/macosx/output.m:251
+#: modules/gui/macosx/output.m:391
+msgid "Stream"
+msgstr "ストリーム"
 
 #: modules/gui/macosx/output.m:144
-#: modules/gui/wxwidgets/dialogs/streamout.cpp:511
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:510
 #, fuzzy
 msgid "Dump raw input"
 msgstr "ストリームの出力先の選択"
 
 #: modules/gui/macosx/output.m:155
-#: modules/gui/wxwidgets/dialogs/streamout.cpp:659
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:661
 msgid "Encapsulation Method"
 msgstr ""
 
 #: modules/gui/macosx/output.m:159
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:711
 #, fuzzy
-msgid "Transcode options"
-msgstr "ストリームの一時停止"
+msgid "Transcoding options"
+msgstr "持続期間"
 
 #: modules/gui/macosx/output.m:163 modules/gui/macosx/output.m:173
-#: modules/gui/macosx/wizard.m:408
-#: modules/gui/wxwidgets/dialogs/streamout.cpp:774
-#: modules/gui/wxwidgets/dialogs/streamout.cpp:849
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:839
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:878
+#: 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:848
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:887
 msgid "Bitrate (kb/s)"
 msgstr "ビットレート (kb/秒)"
 
 #: modules/gui/macosx/output.m:166
-#: modules/gui/wxwidgets/dialogs/streamout.cpp:780
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:782
 msgid "Scale"
 msgstr "スケール"
 
@@ -10245,7 +11341,7 @@ msgid "Stream Announcing"
 msgstr "ストリーム出力"
 
 #: modules/gui/macosx/output.m:181
-#: modules/gui/wxwidgets/dialogs/streamout.cpp:591
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:590
 msgid "SAP announce"
 msgstr "SAP アナウンス"
 
@@ -10274,85 +11370,182 @@ msgstr "SDP URL"
 msgid "Save File"
 msgstr "ファイルの保存"
 
-#: modules/gui/macosx/playlist.m:499
+#: modules/gui/macosx/playlist.m:436
 msgid "Save Playlist..."
 msgstr "再生一覧の保存..."
 
-#: modules/gui/macosx/playlist.m:501 modules/gui/pda/pda_interface.c:1254
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:271
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:277
-#: modules/gui/wxwidgets/dialogs/vlm/vlm_streampanel.cpp:104
+#: modules/gui/macosx/playlist.m:438 modules/gui/pda/pda_interface.c:1254
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:286
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:293
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_streampanel.cpp:105
 msgid "Delete"
 msgstr "削除"
 
-#: modules/gui/macosx/playlist.m:502
+#: modules/gui/macosx/playlist.m:439
 msgid "Expand Node"
 msgstr "ノードを展開する"
 
-#: modules/gui/macosx/playlist.m:504 modules/gui/macosx/playlistinfo.m:53
-msgid "Properties"
-msgstr "プロパティ"
-
-#: modules/gui/macosx/playlist.m:505
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:269
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:276
+#: modules/gui/macosx/playlist.m:442
 #, fuzzy
-msgid "Preparse"
-msgstr "準備"
+msgid "Get Stream Information"
+msgstr "メタ情報"
 
-#: modules/gui/macosx/playlist.m:506
+#: modules/gui/macosx/playlist.m:443
 msgid "Sort Node by Name"
 msgstr "名前でノードをソートする"
 
-#: modules/gui/macosx/playlist.m:507
+#: modules/gui/macosx/playlist.m:444
 msgid "Sort Node by Author"
 msgstr "著者でノードをソートする"
 
-#: modules/gui/macosx/playlist.m:510 modules/gui/macosx/playlist.m:1518
+#: modules/gui/macosx/playlist.m:447 modules/gui/macosx/playlist.m:497
+#: modules/gui/macosx/playlist.m:1522
 msgid "No items in the playlist"
 msgstr "再生一覧に項目がありません"
 
-#: modules/gui/macosx/playlist.m:514
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:315
+#: modules/gui/macosx/playlist.m:451
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:331
 msgid "Search"
 msgstr "検索"
 
-#: modules/gui/macosx/playlist.m:516
+#: modules/gui/macosx/playlist.m:453
 #, fuzzy
 msgid "Search in Playlist"
 msgstr "再生一覧を開く"
 
-#: modules/gui/macosx/playlist.m:517
+#: modules/gui/macosx/playlist.m:454
 msgid "Standard Play"
 msgstr "標準再生"
 
-#: modules/gui/macosx/playlist.m:765
-msgid "Save Playlist"
-msgstr "再生一覧を保存"
+#: modules/gui/macosx/playlist.m:457
+#, fuzzy
+msgid "Add Folder to Playlist"
+msgstr "再生一覧に追加"
+
+#: modules/gui/macosx/playlist.m:459
+#, fuzzy
+msgid "File Format:"
+msgstr "字幕"
 
-#: modules/gui/macosx/playlist.m:1512
+#: modules/gui/macosx/playlist.m:460
+#, fuzzy
+msgid "Extended M3U"
+msgstr "拡張 GUI を表示する"
+
+#: modules/gui/macosx/playlist.m:461
+msgid "XML Shareable Playlist Format (XSPF)"
+msgstr ""
+
+#: modules/gui/macosx/playlist.m:491 modules/gui/macosx/playlist.m:1516
 #, fuzzy, c-format
 msgid "%i items in the playlist"
 msgstr "デフォルトで再生一覧に追加"
 
-#: modules/gui/macosx/playlist.m:1522
+#: modules/gui/macosx/playlist.m:501 modules/gui/macosx/playlist.m:1526
 #, fuzzy
 msgid "1 item in the playlist"
 msgstr "デフォルトで再生一覧に追加"
 
-#: modules/gui/macosx/playlistinfo.m:54
-#: modules/gui/wxwidgets/dialogs/iteminfo.cpp:124
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:584
+#: modules/gui/macosx/playlist.m:705
+msgid "Save Playlist"
+msgstr "再生一覧を保存"
+
+#: modules/gui/macosx/playlist.m:1485
+#, fuzzy
+msgid "New Node"
+msgstr "ニューエイジ"
+
+#: modules/gui/macosx/playlist.m:1486
+#, fuzzy
+msgid "Please enter a name for the new node."
+msgstr "新規グループ名前を入力:"
+
+#: modules/gui/macosx/playlist.m:1491
+msgid "Empty Folder"
+msgstr ""
+
+#: modules/gui/macosx/playlistinfo.m:56
+#: modules/gui/wxwidgets/dialogs/infopanels.cpp:63
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:591
 msgid "URI"
 msgstr "URI"
 
+#: 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 "demuxモジュール"
+
+#: 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 "キーフレームを使用"
+
+#: modules/gui/macosx/playlistinfo.m:91 modules/gui/macosx/wizard.m:404
+#: modules/gui/wxwidgets/dialogs/infopanels.cpp:314
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:139
+#: modules/video_filter/deinterlace.c:137
+msgid "Streaming"
+msgstr "すとリー民具"
+
+#: modules/gui/macosx/playlistinfo.m:92
+#, fuzzy
+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:208
+#: modules/gui/wxwidgets/dialogs/preferences.cpp:213
 msgid "Reset All"
 msgstr "すべてリセット"
 
 #: modules/gui/macosx/prefs.m:142
-#: modules/gui/wxwidgets/dialogs/preferences.cpp:289
+#: modules/gui/wxwidgets/dialogs/preferences.cpp:296
 msgid "Reset Preferences"
 msgstr "設定をリセットする"
 
@@ -10361,14 +11554,13 @@ msgid "Continue"
 msgstr "続ける"
 
 #: modules/gui/macosx/prefs.m:145
-#: modules/gui/wxwidgets/dialogs/preferences.cpp:287
 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:705
-msgid "Some options are available but hidden. Check \"Advanced\" to see them."
+#: modules/gui/macosx/prefs.m:719
+msgid "Some options are hidden. Check \"Advanced\" to display them."
 msgstr ""
 
 #: modules/gui/macosx/prefs_widgets.m:1222
@@ -10383,205 +11575,206 @@ msgstr "ファイルを瀬何託する"
 msgid "Select"
 msgstr "選択"
 
-#: modules/gui/macosx/sfilters.m:71
+#: modules/gui/macosx/sfilters.m:70
 #, fuzzy
 msgid "Subpicture Filters"
 msgstr "字幕ファイル"
 
-#: modules/gui/macosx/sfilters.m:72
+#: modules/gui/macosx/sfilters.m:71
 #, fuzzy
 msgid "Logo"
 msgstr "ループ"
 
-#: modules/gui/macosx/sfilters.m:74 modules/gui/macosx/sfilters.m:99
-#: modules/video_filter/marq.c:114
+#: modules/gui/macosx/sfilters.m:73 modules/video_filter/marq.c:115
 msgid "Marquee"
 msgstr ""
 
-#: modules/gui/macosx/sfilters.m:75
+#: modules/gui/macosx/sfilters.m:74
 #, fuzzy
 msgid "Save settings"
 msgstr "トラック設定"
 
-#: modules/gui/macosx/sfilters.m:77 modules/gui/macosx/sfilters.m:84
-#: modules/gui/macosx/sfilters.m:96
-#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:402
+#: modules/gui/macosx/sfilters.m:76 modules/gui/macosx/sfilters.m:80
+#: modules/gui/macosx/sfilters.m:87
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:399
 msgid "Enabled"
 msgstr "有効"
 
-#: modules/gui/macosx/sfilters.m:78
+#: modules/gui/macosx/sfilters.m:77
 #, fuzzy
-msgid "Image"
+msgid "Image:"
 msgstr "サイズ"
 
-#: modules/gui/macosx/sfilters.m:85
+#: modules/gui/macosx/sfilters.m:78 modules/gui/macosx/sfilters.m:85
+#: modules/gui/macosx/sfilters.m:93
+#, fuzzy
+msgid "Position:"
+msgstr "位置"
+
+#: modules/gui/macosx/sfilters.m:81
 #, fuzzy
-msgid "Timestamp"
+msgid "Timestamp:"
 msgstr "タイムシフト"
 
-#: modules/gui/macosx/sfilters.m:87 modules/gui/macosx/sfilters.m:108
-#: modules/gui/pda/pda.c:232
-msgid "Size"
-msgstr "サイズ"
+#: modules/gui/macosx/sfilters.m:82 modules/gui/macosx/sfilters.m:94
+#: modules/gui/pda/pda_interface.c:611
+msgid "Size:"
+msgstr "サイズ:"
+
+#: modules/gui/macosx/sfilters.m:83 modules/gui/macosx/sfilters.m:88
+#, fuzzy
+msgid "Color:"
+msgstr "閉じる"
+
+#: modules/gui/macosx/sfilters.m:84
+#, fuzzy
+msgid "Opaqueness:"
+msgstr "開く:"
 
-#: modules/gui/macosx/sfilters.m:95 modules/gui/macosx/sfilters.m:110
+#: modules/gui/macosx/sfilters.m:86 modules/gui/macosx/sfilters.m:95
 #, fuzzy
 msgid "(in pixels)"
 msgstr "ピクセル指定の幅"
 
-#: modules/gui/macosx/sfilters.m:103
+#: modules/gui/macosx/sfilters.m:89
 #, fuzzy
-msgid "Timeout"
+msgid "Marquee:"
+msgstr "オンスクリーンディスプレイ"
+
+#: modules/gui/macosx/sfilters.m:91
+#, fuzzy
+msgid "Timeout:"
 msgstr "時間"
 
-#: modules/gui/macosx/sfilters.m:105
+#: modules/gui/macosx/sfilters.m:92
 #, fuzzy
 msgid "ms"
 msgstr "mms"
 
-#: modules/gui/macosx/sfilters.m:136 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
+#: modules/gui/macosx/sfilters.m:121 modules/misc/freetype.c:127
+#: modules/misc/win32text.c:85 modules/video_filter/marq.c:52
+#: modules/video_filter/rss.c:63 modules/video_filter/time.c:52
 msgid "Black"
 msgstr "黒"
 
-#: modules/gui/macosx/sfilters.m:137 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
+#: modules/gui/macosx/sfilters.m:122 modules/misc/freetype.c:127
+#: modules/misc/win32text.c:85 modules/video_filter/marq.c:53
+#: modules/video_filter/rss.c:64 modules/video_filter/time.c:53
 msgid "Gray"
 msgstr "灰"
 
-#: modules/gui/macosx/sfilters.m:138 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
+#: modules/gui/macosx/sfilters.m:123 modules/misc/freetype.c:127
+#: modules/misc/win32text.c:85 modules/video_filter/marq.c:53
+#: modules/video_filter/rss.c:64 modules/video_filter/time.c:53
 msgid "Silver"
 msgstr "銀"
 
-#: modules/gui/macosx/sfilters.m:139 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
+#: modules/gui/macosx/sfilters.m:124 modules/misc/freetype.c:127
+#: modules/misc/win32text.c:85 modules/video_filter/marq.c:53
+#: modules/video_filter/rss.c:64 modules/video_filter/time.c:53
 msgid "White"
 msgstr "白"
 
-#: modules/gui/macosx/sfilters.m:140 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
+#: modules/gui/macosx/sfilters.m:125 modules/misc/freetype.c:127
+#: modules/misc/win32text.c:85 modules/video_filter/marq.c:53
+#: modules/video_filter/rss.c:64 modules/video_filter/time.c:53
 #, fuzzy
 msgid "Maroon"
 msgstr "モノラル"
 
-#: modules/gui/macosx/sfilters.m:141 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
+#: modules/gui/macosx/sfilters.m:126 modules/misc/freetype.c:128
+#: modules/misc/win32text.c:86 modules/video_filter/marq.c:53
+#: modules/video_filter/rss.c:64 modules/video_filter/time.c:53
 msgid "Red"
 msgstr "赤"
 
-#: modules/gui/macosx/sfilters.m:142 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/gui/macosx/sfilters.m:127 modules/misc/freetype.c:128
+#: modules/misc/win32text.c:86 modules/video_filter/marq.c:54
+#: modules/video_filter/rss.c:65 modules/video_filter/time.c:54
 #, fuzzy
 msgid "Fuchsia"
 msgstr "フュージョン"
 
-#: modules/gui/macosx/sfilters.m:143 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/gui/macosx/sfilters.m:128 modules/misc/freetype.c:128
+#: modules/misc/win32text.c:86 modules/video_filter/marq.c:54
+#: modules/video_filter/rss.c:65 modules/video_filter/time.c:54
 msgid "Yellow"
 msgstr "黄"
 
-#: modules/gui/macosx/sfilters.m:144 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/gui/macosx/sfilters.m:129 modules/misc/freetype.c:128
+#: modules/misc/win32text.c:86 modules/video_filter/marq.c:54
+#: modules/video_filter/rss.c:65 modules/video_filter/time.c:54
 msgid "Olive"
 msgstr "オリーブ"
 
-#: modules/gui/macosx/sfilters.m:145 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/gui/macosx/sfilters.m:130 modules/misc/freetype.c:128
+#: modules/misc/win32text.c:86 modules/video_filter/marq.c:54
+#: modules/video_filter/rss.c:65 modules/video_filter/time.c:54
 msgid "Green"
 msgstr "緑"
 
-#: modules/gui/macosx/sfilters.m:146 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
+#: modules/gui/macosx/sfilters.m:131 modules/misc/freetype.c:128
+#: modules/misc/win32text.c:86 modules/video_filter/marq.c:55
+#: modules/video_filter/rss.c:66 modules/video_filter/time.c:55
 #, fuzzy
 msgid "Teal"
 msgstr "メタル"
 
-#: modules/gui/macosx/sfilters.m:147 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/gui/macosx/sfilters.m:132 modules/misc/freetype.c:129
+#: modules/misc/win32text.c:87 modules/video_filter/marq.c:55
+#: modules/video_filter/rss.c:66 modules/video_filter/time.c:55
 msgid "Lime"
 msgstr "ライム"
 
-#: modules/gui/macosx/sfilters.m:148 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/gui/macosx/sfilters.m:133 modules/misc/freetype.c:129
+#: modules/misc/win32text.c:87 modules/video_filter/marq.c:55
+#: modules/video_filter/rss.c:66 modules/video_filter/time.c:55
 msgid "Purple"
 msgstr "ç´«"
 
-#: modules/gui/macosx/sfilters.m:149 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/gui/macosx/sfilters.m:134 modules/misc/freetype.c:129
+#: modules/misc/win32text.c:87 modules/video_filter/marq.c:55
+#: modules/video_filter/rss.c:66 modules/video_filter/time.c:55
 msgid "Navy"
 msgstr "ネイビー"
 
-#: modules/gui/macosx/sfilters.m:150 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/gui/macosx/sfilters.m:135 modules/misc/freetype.c:129
+#: modules/misc/win32text.c:87 modules/video_filter/marq.c:55
+#: modules/video_filter/rss.c:66 modules/video_filter/time.c:55
 msgid "Blue"
 msgstr "青"
 
-#: modules/gui/macosx/sfilters.m:151 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
+#: modules/gui/macosx/sfilters.m:136 modules/misc/freetype.c:129
+#: modules/misc/win32text.c:87 modules/video_filter/marq.c:56
+#: modules/video_filter/rss.c:67 modules/video_filter/time.c:56
 msgid "Aqua"
 msgstr "アクア"
 
-#: modules/gui/macosx/sfilters.m:191
-#, fuzzy
-msgid "Center-Center"
-msgstr "中央"
-
-#: modules/gui/macosx/sfilters.m:192
-#, fuzzy
-msgid "Left-Center"
-msgstr "中央"
-
-#: modules/gui/macosx/sfilters.m:193
-#, fuzzy
-msgid "Right-Center"
-msgstr "中央"
-
-#: modules/gui/macosx/sfilters.m:194
-#, fuzzy
-msgid "Center-Top"
-msgstr "中央"
+#: modules/gui/macosx/update.m:84
+msgid "Check for Updates"
+msgstr ""
 
-#: modules/gui/macosx/sfilters.m:195
+#: modules/gui/macosx/update.m:85
 #, fuzzy
-msgid "Left-Top"
-msgstr "å·¦"
+msgid "Download now"
+msgstr "ダウンロード中..."
 
-#: modules/gui/macosx/sfilters.m:196
-#, fuzzy
-msgid "Right-Top"
-msgstr "右"
+#: modules/gui/macosx/update.m:92
+msgid "Checking for Updates..."
+msgstr ""
 
-#: modules/gui/macosx/sfilters.m:197
-#, fuzzy
-msgid "Center-Bottom"
-msgstr "下"
+#: modules/gui/macosx/update.m:183
+#, c-format
+msgid "The latest VLC media player release is %s (%i MB to download)."
+msgstr ""
 
-#: modules/gui/macosx/sfilters.m:198
-#, fuzzy
-msgid "Left-Bottom"
-msgstr "下"
+#: modules/gui/macosx/update.m:198
+msgid "This version of VLC is outdated."
+msgstr ""
 
-#: modules/gui/macosx/sfilters.m:199
-#, fuzzy
-msgid "Right-Bottom"
-msgstr "下"
+#: modules/gui/macosx/update.m:211 modules/gui/macosx/update.m:259
+msgid "This version of VLC is latest available."
+msgstr ""
 
 #: modules/gui/macosx/wizard.m:114
 msgid "MPEG-1 Video codec (usable with MPEG PS, MPEG TS, MPEG1, OGG and RAW)"
@@ -10634,93 +11827,95 @@ msgid ""
 "ASF and OGG)"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:158 modules/gui/wxwidgets/streamdata.cpp:73
-msgid "Theora is a free general-purpose codec (useable with MPEG TS)"
-msgstr ""
+#: modules/gui/macosx/wizard.m:158
+#, fuzzy
+msgid "Theora is a free general-purpose codec (useable with MPEG TS and OGG)"
+msgstr "送信先のアスペクト・レシオ"
 
-#: modules/gui/macosx/wizard.m:161 modules/gui/macosx/wizard.m:212
+#: 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.cpp:84
+#: 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.cpp:88
+#: 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.cpp:92
+#: 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.cpp:95
+#: 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.cpp:99
+#: 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.cpp:101
+#: modules/gui/macosx/wizard.m:199 modules/gui/wxwidgets/streamdata.cpp:101
 msgid "FLAC is a lossless audio codec (useable with OGG and RAW)"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:202 modules/gui/wxwidgets/streamdata.cpp:104
+#: 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/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.cpp:148
+#: modules/gui/macosx/wizard.m:235 modules/gui/wxwidgets/streamdata.cpp:148
 #, fuzzy
 msgid "MPEG Program Stream"
 msgstr "ISO 13818-1 MPEGプログラム・ストリーム入力"
 
-#: modules/gui/macosx/wizard.m:236 modules/gui/wxwidgets/streamdata.cpp:149
+#: modules/gui/macosx/wizard.m:237 modules/gui/wxwidgets/streamdata.cpp:149
 #, fuzzy
 msgid "MPEG Transport Stream"
 msgstr "ストリームの再生"
 
-#: modules/gui/macosx/wizard.m:238 modules/gui/wxwidgets/streamdata.cpp:150
+#: modules/gui/macosx/wizard.m:239 modules/gui/wxwidgets/streamdata.cpp:150
 #, fuzzy
 msgid "MPEG 1 Format"
 msgstr "VCD フォーマット"
 
-#: modules/gui/macosx/wizard.m:256 modules/gui/wxwidgets/streamdata.cpp:137
+#: 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:260 modules/gui/wxwidgets/streamdata.cpp:134
+#: 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:263
+#: 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:267
+#: 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. "
@@ -10728,379 +11923,396 @@ msgid ""
 "encapsulated in HTTP)."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:272 modules/gui/macosx/wizard.m:282
-#: modules/gui/macosx/wizard.m:392 modules/gui/wxwidgets/streamdata.cpp:123
+#: 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:273 modules/gui/macosx/wizard.m:283
-#: modules/gui/macosx/wizard.m:396 modules/gui/wxwidgets/streamdata.cpp:122
+#: 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:275
+#: 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:278 modules/gui/wxwidgets/streamdata.cpp:126
+#: 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 won't work over the Internet."
+msgstr ""
+
+#: modules/gui/macosx/wizard.m:285
+#, fuzzy
+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 does not work over Internet."
+"but it won't work over Internet. RTP headers will be added to the stream"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:346
+#: modules/gui/macosx/wizard.m:362
 msgid "Back"
 msgstr "逆転"
 
-#: modules/gui/macosx/wizard.m:349 modules/gui/macosx/wizard.m:352
-#: modules/gui/macosx/wizard.m:1143
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:81
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:84
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:1400
+#: modules/gui/macosx/wizard.m:365 modules/gui/macosx/wizard.m:368
+#: modules/gui/macosx/wizard.m:1290
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:82
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:85
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:1408
 #, fuzzy
 msgid "Streaming/Transcoding Wizard"
 msgstr "ストリームの情報..."
 
-#: modules/gui/macosx/wizard.m:353 modules/gui/wxwidgets/dialogs/wizard.cpp:85
-#, fuzzy
-msgid "This wizard helps you to stream, transcode or save a stream."
-msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+#: modules/gui/macosx/wizard.m:369
+msgid "This wizard allows to configure simple streaming or transcoding setups."
+msgstr ""
 
-#: modules/gui/macosx/wizard.m:357 modules/gui/wxwidgets/dialogs/wizard.cpp:91
+#: 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:360 modules/gui/macosx/wizard.m:511
-#: modules/gui/macosx/wizard.m:1453
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:87
+#: modules/gui/macosx/wizard.m:377 modules/gui/macosx/wizard.m:525
+#: modules/gui/macosx/wizard.m:1660
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:88
 #, fuzzy
 msgid "Stream to network"
 msgstr "ネットワークを開く"
 
-#: modules/gui/macosx/wizard.m:362 modules/gui/macosx/wizard.m:1465
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:89
+#: modules/gui/macosx/wizard.m:379 modules/gui/macosx/wizard.m:1668
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:90
 #, fuzzy
 msgid "Transcode/Save to file"
 msgstr "キャンセル"
 
-#: modules/gui/macosx/wizard.m:366
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:100
+#: modules/gui/macosx/wizard.m:383
 msgid "Choose input"
 msgstr "入力の選択"
 
-#: modules/gui/macosx/wizard.m:367
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:101
+#: modules/gui/macosx/wizard.m:384
 msgid "Choose here your input stream."
 msgstr "入力ストリームをここで選択してください。"
 
-#: modules/gui/macosx/wizard.m:369 modules/gui/macosx/wizard.m:545
-#: modules/gui/macosx/wizard.m:1502
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:103
+#: modules/gui/macosx/wizard.m:386 modules/gui/macosx/wizard.m:563
+#: modules/gui/macosx/wizard.m:1701
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:109
 msgid "Select a stream"
 msgstr "ストリームを選択する"
 
-#: modules/gui/macosx/wizard.m:371
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:104
+#: modules/gui/macosx/wizard.m:388
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:110
 msgid "Existing playlist item"
 msgstr "存在する再生一覧の項目"
 
-#: modules/gui/macosx/wizard.m:372 modules/gui/macosx/wizard.m:437
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:566
+#: 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:377 modules/gui/macosx/wizard.m:451
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:618
+#: modules/gui/macosx/wizard.m:394 modules/gui/macosx/wizard.m:468
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:627
 msgid "Partial Extract"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:379
+#: 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.) 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:383
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:629
+#: modules/gui/macosx/wizard.m:400
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:638
 msgid "From"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:384
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:634
+#: modules/gui/macosx/wizard.m:401
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:643
 #, fuzzy
 msgid "To"
 msgstr "上"
 
-#: modules/gui/macosx/wizard.m:387
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:132
-#: modules/video_filter/deinterlace.c:131
-msgid "Streaming"
-msgstr "すとリー民具"
-
-#: modules/gui/macosx/wizard.m:388
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:133
-msgid "In this page, you will select how your input stream will be sent."
-msgstr ""
+#: modules/gui/macosx/wizard.m:405
+#, fuzzy
+msgid "This page allows to select how the input stream will be sent."
+msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: modules/gui/macosx/wizard.m:390 modules/gui/macosx/wizard.m:445
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:1045 modules/stream_out/rtp.c:44
+#: modules/gui/macosx/wizard.m:407 modules/gui/macosx/wizard.m:462
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:1054 modules/stream_out/rtp.c:46
 #, fuzzy
 msgid "Destination"
 msgstr "送信先のアスペクト・レシオ"
 
-#: modules/gui/macosx/wizard.m:391 modules/gui/macosx/wizard.m:457
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:1031
+#: modules/gui/macosx/wizard.m:408 modules/gui/macosx/wizard.m:474
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:1040
 #, fuzzy
 msgid "Streaming method"
 msgstr "ストリームの停止"
 
-#: modules/gui/macosx/wizard.m:394 modules/gui/macosx/wizard.m:640
+#: modules/gui/macosx/wizard.m:409
+#, fuzzy
+msgid "Address of the computer to stream to."
+msgstr "電子メールアドレスを CDDB サーバーに報告する"
+
+#: modules/gui/macosx/wizard.m:411
 msgid "UDP Unicast"
 msgstr "UDP ユニキャスト"
 
-#: modules/gui/macosx/wizard.m:395
+#: modules/gui/macosx/wizard.m:412
 msgid "UDP Multicast"
 msgstr "UDP マルチキャスト"
 
-#: modules/gui/macosx/wizard.m:400 modules/gui/pda/pda_interface.c:1221
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:118
-#: 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
 #, fuzzy
 msgid "Transcode"
 msgstr "キャンセル"
 
-#: modules/gui/macosx/wizard.m:401
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:119
+#: 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:406 modules/gui/macosx/wizard.m:459
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:861
+#: modules/gui/macosx/wizard.m:423 modules/gui/macosx/wizard.m:476
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:870
 #, fuzzy
 msgid "Transcode audio"
 msgstr "ストリームの一時停止"
 
-#: modules/gui/macosx/wizard.m:407 modules/gui/macosx/wizard.m:461
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:822
+#: modules/gui/macosx/wizard.m:424 modules/gui/macosx/wizard.m:478
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:831
 #, fuzzy
 msgid "Transcode video"
 msgstr "ストリームの一時停止"
 
-#: modules/gui/macosx/wizard.m:410 modules/gui/macosx/wizard.m:1597
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:126
-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:1803
+msgid ""
+"Enabling this allows to transcode the audio track if one is present in the "
+"stream."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:412 modules/gui/macosx/wizard.m:1614
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:121
-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:1820
+msgid ""
+"Enabling this allows to transcode the video track if one is present in the "
+"stream."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:416
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:141
+#: modules/gui/macosx/wizard.m:433
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:148
 #, fuzzy
 msgid "Encapsulation format"
 msgstr "出力フォーマット"
 
-#: modules/gui/macosx/wizard.m:417
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:142
+#: 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:422
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:155
+#: modules/gui/macosx/wizard.m:439
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:162
 msgid "Additional streaming options"
 msgstr "追加ストリーミングオプション"
 
-#: modules/gui/macosx/wizard.m:423
-msgid ""
-"In this page, you will define a few additional parameters for your stream."
+#: modules/gui/macosx/wizard.m:440
+msgid "In this page, a few additional streaming parameters can be set."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:425 modules/gui/macosx/wizard.m:1641
-#: modules/gui/wxwidgets/dialogs/streamout.cpp:607
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:1332
-msgid "Time-To-Live (TTL)"
-msgstr "生存時間 (TTL):"
-
-#: modules/gui/macosx/wizard.m:427 modules/gui/macosx/wizard.m:453
-#: modules/gui/macosx/wizard.m:1656
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:1340
+#: modules/gui/macosx/wizard.m:444 modules/gui/macosx/wizard.m:470
+#: modules/gui/macosx/wizard.m:1859
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:1348
 msgid "SAP Announce"
 msgstr "SAP アナウンス"
 
-#: modules/gui/macosx/wizard.m:429 modules/gui/macosx/wizard.m:438
-#: modules/gui/macosx/wizard.m:463 modules/gui/macosx/wizard.m:1673
+#: modules/gui/macosx/wizard.m:446 modules/gui/macosx/wizard.m:455
+#: modules/gui/macosx/wizard.m:480 modules/gui/macosx/wizard.m:1872
 msgid "Local playback"
 msgstr "ローカル再生"
 
-#: modules/gui/macosx/wizard.m:433
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:148
+#: modules/gui/macosx/wizard.m:450
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:155
 #, fuzzy
 msgid "Additional transcode options"
 msgstr "ストリームの一時停止"
 
-#: modules/gui/macosx/wizard.m:434
-msgid ""
-"In this page, you will define a few additional parameters for your "
-"transcoding."
+#: modules/gui/macosx/wizard.m:451
+msgid "In this page, a few additional transcoding parameters can be set."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:436
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:1264
+#: modules/gui/macosx/wizard.m:453 modules/gui/macosx/wizard.m:1120
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:1272
 #, fuzzy
 msgid "Select the file to save to"
 msgstr "再生に使うホットキーを選択"
 
-#: modules/gui/macosx/wizard.m:442
+#: 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:444
+#: modules/gui/macosx/wizard.m:461
 msgid "Summary"
 msgstr "要約"
 
-#: modules/gui/macosx/wizard.m:447
+#: modules/gui/macosx/wizard.m:464
 #, fuzzy
 msgid "Encap. format"
 msgstr "出力フォーマット"
 
-#: modules/gui/macosx/wizard.m:449
+#: modules/gui/macosx/wizard.m:466
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:107
 msgid "Input stream"
 msgstr "ストリーム入力"
 
-#: modules/gui/macosx/wizard.m:455
+#: modules/gui/macosx/wizard.m:472
 #, fuzzy
 msgid "Save file to"
 msgstr "ファイルの保存"
 
-#: modules/gui/macosx/wizard.m:596
+#: modules/gui/macosx/wizard.m:630
 msgid "No input selected"
 msgstr "入力は選択されていません"
 
-#: modules/gui/macosx/wizard.m:598
+#: modules/gui/macosx/wizard.m:632
 msgid ""
-"You have 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."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:662
+#: modules/gui/macosx/wizard.m:694
 #, fuzzy
 msgid "No valid destination"
 msgstr "送信先のアスペクト・レシオ"
 
-#: modules/gui/macosx/wizard.m:664
+#: modules/gui/macosx/wizard.m:696
 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 "
 "and the help texts in this window."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:1055
+#: modules/gui/macosx/wizard.m:1088
 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:1120
+#: modules/gui/macosx/wizard.m:1115
+#, fuzzy
+msgid "Select the directory to save to"
+msgstr "再生に使うホットキーを選択"
+
+#: modules/gui/macosx/wizard.m:1166
+#, fuzzy
+msgid "No folder selected"
+msgstr "ファイルは選択されていません"
+
+#: modules/gui/macosx/wizard.m:1168
+#, fuzzy
+msgid "A directory where to save the files has to be selected."
+msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+
+#: modules/gui/macosx/wizard.m:1170
+msgid ""
+"Enter either a valid path or use the \"Choose...\" button to select a "
+"location."
+msgstr ""
+
+#: modules/gui/macosx/wizard.m:1173
 msgid "No file selected"
 msgstr "ファイルは選択されていません"
 
-#: modules/gui/macosx/wizard.m:1121
+#: modules/gui/macosx/wizard.m:1175
+msgid "A file where to save the stream has to be selected."
+msgstr ""
+
+#: modules/gui/macosx/wizard.m:1177
 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:1200
+#: modules/gui/macosx/wizard.m:1373
 msgid "Finish"
 msgstr "終了"
 
-#: modules/gui/macosx/wizard.m:1205 modules/gui/macosx/wizard.m:1212
-#: modules/gui/macosx/wizard.m:1236 modules/gui/macosx/wizard.m:1248
-#: modules/gui/macosx/wizard.m:1260
+#: modules/gui/macosx/wizard.m:1378
+#, fuzzy, c-format
+msgid "%i items"
+msgstr "ビデオタイトル"
+
+#: modules/gui/macosx/wizard.m:1386 modules/gui/macosx/wizard.m:1440
 msgid "yes"
 msgstr "はい"
 
-#: modules/gui/macosx/wizard.m:1207 modules/gui/macosx/wizard.m:1219
-#: modules/gui/macosx/wizard.m:1238 modules/gui/macosx/wizard.m:1256
-#: modules/gui/macosx/wizard.m:1268
+#: modules/gui/macosx/wizard.m:1388 modules/gui/macosx/wizard.m:1398
+#: modules/gui/macosx/wizard.m:1411 modules/gui/macosx/wizard.m:1423
+#: modules/gui/macosx/wizard.m:1443
 msgid "no"
 msgstr "いいえ"
 
-#: modules/gui/macosx/wizard.m:1214
-#, fuzzy
-msgid "from "
-msgstr "オロモ語"
+#: modules/gui/macosx/wizard.m:1394
+#, objc-format
+msgid "yes: from %@ to %@ secs"
+msgstr ""
 
-#: modules/gui/macosx/wizard.m:1216 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/gui/macosx/wizard.m:1404 modules/gui/macosx/wizard.m:1416
+#, objc-format
+msgid "yes: %@ @ %@ kb/s"
+msgstr ""
 
-#: modules/gui/macosx/wizard.m:1454
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:88
+#: modules/gui/macosx/wizard.m:1662
 #, fuzzy
-msgid "Use this to stream on a network."
+msgid "This allows to stream on a network."
 msgstr "ネットワークを開く"
 
-#: modules/gui/macosx/wizard.m:1466
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:95
+#: modules/gui/macosx/wizard.m:1670
 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:1592
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:128
+#: modules/gui/macosx/wizard.m:1798
 msgid "Select your audio codec. Click one to get more information."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:1609
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:123
+#: modules/gui/macosx/wizard.m:1815
 msgid "Select your video codec. Click one to get more information."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:1642
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:159
+#: modules/gui/macosx/wizard.m:1850
 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:1657
+#: modules/gui/macosx/wizard.m:1861
 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"
@@ -11108,7 +12320,7 @@ msgid ""
 "name will be used."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:1675
+#: modules/gui/macosx/wizard.m:1874
 msgid ""
 "When this option is enabled, the stream will be both played and transcoded/"
 "streamed.\n"
@@ -11117,11 +12329,11 @@ msgid ""
 "streaming."
 msgstr ""
 
-#: modules/gui/ncurses.c:93
+#: modules/gui/ncurses.c:99
 msgid "Filebrowser starting point"
 msgstr ""
 
-#: modules/gui/ncurses.c:95
+#: modules/gui/ncurses.c:101
 #, fuzzy
 msgid ""
 "This option allows you to specify the directory the ncurses filebrowser will "
@@ -11130,7 +12342,7 @@ msgstr ""
 "ファイルを見つけるときにオープンされるインタフェースの既定のパスを設定しま"
 "す。"
 
-#: modules/gui/ncurses.c:100
+#: modules/gui/ncurses.c:106
 #, fuzzy
 msgid "Ncurses interface"
 msgstr "ncurses インタフェース"
@@ -11149,7 +12361,7 @@ msgid "PDA Linux Gtk2+ interface"
 msgstr "PDA Linux Gtk+ インタフェース"
 
 #: modules/gui/pda/pda.c:220 modules/gui/pda/pda.c:275
-#: modules/gui/wxwidgets/dialogs/streamout.cpp:498
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:497
 msgid "Filename"
 msgstr "ファイル名"
 
@@ -11157,6 +12369,10 @@ msgstr "ファイル名"
 msgid "Permissions"
 msgstr "パーミッション"
 
+#: modules/gui/pda/pda.c:232
+msgid "Size"
+msgstr "サイズ"
+
 #: modules/gui/pda/pda.c:238
 msgid "Owner"
 msgstr "所有者"
@@ -11271,10 +12487,6 @@ msgstr "チャンネル:"
 msgid "Norm:"
 msgstr "なし"
 
-#: modules/gui/pda/pda_interface.c:611
-msgid "Size:"
-msgstr "サイズ:"
-
 #: modules/gui/pda/pda_interface.c:620
 #, fuzzy
 msgid "Frequency:"
@@ -11318,10 +12530,6 @@ msgstr "NTSC"
 msgid "secam"
 msgstr "SECAM"
 
-#: modules/gui/pda/pda_interface.c:743 modules/video_filter/mosaic.c:116
-msgid "auto"
-msgstr "自動"
-
 #: modules/gui/pda/pda_interface.c:760
 msgid "240x192"
 msgstr "240x192"
@@ -11589,68 +12797,103 @@ msgstr "ピックスマップ・ファイル %s が見つかりません。"
 msgid "QNX RTOS video and audio output"
 msgstr "オーディオ出力を強制的にモノラルにします。"
 
-#: modules/gui/skins2/src/dialogs.cpp:223
+#: modules/gui/qt4/dialogs/streaminfo.cpp:35
+#, fuzzy
+msgid "Stream information"
+msgstr "メタ情報"
+
+#: modules/gui/qt4/qt4.cpp:43
+#, fuzzy
+msgid "QT interface"
+msgstr "Qtインタフェース・モジュール"
+
+#: modules/gui/skins2/src/dialogs.cpp:222
 msgid "Open a skin file"
 msgstr "スキンファイルを開く"
 
-#: modules/gui/skins2/src/dialogs.cpp:224
+#: modules/gui/skins2/src/dialogs.cpp:223
 #, fuzzy
 msgid "Skin files (*.vlt;*.wsz)|*.vlt;*.wsz|Skin files (*.xml)|*.xml"
 msgstr "スキンファイル (*.vlt)|*.vlt|Skin files (*.xml)|*.xml|"
 
-#: modules/gui/skins2/src/dialogs.cpp:231
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:936
+#: modules/gui/skins2/src/dialogs.cpp:230
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:977
 msgid "Open playlist"
 msgstr "再生一覧を開く"
 
-#: modules/gui/skins2/src/dialogs.cpp:232
-msgid "All playlists|*.pls;*.m3u;*.asx;*.b4s|M3U files|*.m3u"
+#: modules/gui/skins2/src/dialogs.cpp:231
+#, 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:239
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:920
+#: modules/gui/skins2/src/dialogs.cpp:240
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:956
 msgid "Save playlist"
 msgstr "再生一覧を保存"
 
-#: modules/gui/skins2/src/dialogs.cpp:239
-msgid "M3U file|*.m3u"
-msgstr "M3U ファイル|*.m3u"
+#: modules/gui/skins2/src/dialogs.cpp:240
+msgid "M3U file|*.m3u|XSPF playlist|*.xspf"
+msgstr ""
 
-#: modules/gui/skins2/src/skin_main.cpp:343
-msgid "Last skin used"
-msgstr "最後に使用したスキン"
+#: modules/gui/skins2/src/skin_main.cpp:418
+#, fuzzy
+msgid "Skin to use"
+msgstr "スキン"
 
-#: modules/gui/skins2/src/skin_main.cpp:344
-msgid "Select the path to the last skin used."
-msgstr "最後に使用したスキンのパスを選択します。"
+#: modules/gui/skins2/src/skin_main.cpp:419
+#, fuzzy
+msgid "Path to the skin to use."
+msgstr "出力ファイルのパス"
 
-#: modules/gui/skins2/src/skin_main.cpp:345
+#: modules/gui/skins2/src/skin_main.cpp:420
 msgid "Config of last used skin"
 msgstr "最後に使用したスキンの設定"
 
-#: modules/gui/skins2/src/skin_main.cpp:346
-msgid "Config of last used skin."
-msgstr "最後に使用したスキンの設定です。"
+#: modules/gui/skins2/src/skin_main.cpp:421
+msgid ""
+"Windows configuration of the last skin used. This option is updated "
+"automatically, do not touch it."
+msgstr ""
+
+#: modules/gui/skins2/src/skin_main.cpp:423
+#: modules/gui/wxwidgets/wxwidgets.cpp:101
+#, fuzzy
+msgid "Systray icon"
+msgstr "システムトレイアイコンを表示する"
+
+#: modules/gui/skins2/src/skin_main.cpp:424
+#: modules/gui/wxwidgets/wxwidgets.cpp:102
+#, fuzzy
+msgid "Show a systray icon for VLC"
+msgstr "システムトレイアイコンを表示する"
+
+#: modules/gui/skins2/src/skin_main.cpp:425
+#: modules/gui/skins2/src/skin_main.cpp:426
+#: modules/gui/wxwidgets/wxwidgets.cpp:95
+msgid "Show VLC on the taskbar"
+msgstr ""
 
-#: modules/gui/skins2/src/skin_main.cpp:347
+#: modules/gui/skins2/src/skin_main.cpp:427
 msgid "Enable transparency effects"
 msgstr "透過エフェクトを有効にする"
 
-#: modules/gui/skins2/src/skin_main.cpp:348
+#: modules/gui/skins2/src/skin_main.cpp:428
 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:365
+#: modules/gui/skins2/src/skin_main.cpp:453
 msgid "Skins"
 msgstr "スキン"
 
-#: modules/gui/skins2/src/skin_main.cpp:366
+#: modules/gui/skins2/src/skin_main.cpp:454
 msgid "Skinnable Interface"
 msgstr "スキン化インターフェース"
 
-#: modules/gui/skins2/src/skin_main.cpp:373
+#: modules/gui/skins2/src/skin_main.cpp:461
 msgid "Skins loader demux"
 msgstr ""
 
@@ -11672,28 +12915,29 @@ msgstr ""
 "(WinCE インタフェース)\n"
 "\n"
 
-#: modules/gui/wince/interface.cpp:497 modules/gui/wxwidgets/interface.cpp:910
+#: modules/gui/wince/interface.cpp:497 modules/gui/wxwidgets/interface.cpp:940
+#, fuzzy
 msgid ""
-"(c) 1996-2005 - the VideoLAN Team\n"
+"(c) 1996-2006 - the VideoLAN Team\n"
 "\n"
 msgstr ""
 "(c) 1996-2005 VideoLAN チーム\n"
 "\n"
 
-#: modules/gui/wince/interface.cpp:498 modules/gui/wxwidgets/interface.cpp:911
+#: modules/gui/wince/interface.cpp:498 modules/gui/wxwidgets/interface.cpp:941
 #, fuzzy
 msgid "Compiled by "
 msgstr "コメディ"
 
-#: modules/gui/wince/interface.cpp:500 modules/gui/wxwidgets/interface.cpp:913
+#: modules/gui/wince/interface.cpp:500 modules/gui/wxwidgets/interface.cpp:943
 msgid "Compiler: "
 msgstr "コンパイラー: "
 
-#: modules/gui/wince/interface.cpp:501 modules/gui/wxwidgets/interface.cpp:914
+#: modules/gui/wince/interface.cpp:502 modules/gui/wxwidgets/interface.cpp:945
 msgid "Based on SVN revision: "
 msgstr ""
 
-#: modules/gui/wince/interface.cpp:502
+#: modules/gui/wince/interface.cpp:504
 #, fuzzy
 msgid ""
 "The VideoLAN team <videolan@videolan.org>\n"
@@ -11703,11 +12947,11 @@ msgstr ""
 "http://www.videolan.org/\n"
 "\n"
 
-#: modules/gui/wince/open.cpp:134 modules/gui/wxwidgets/dialogs/open.cpp:425
+#: modules/gui/wince/open.cpp:134 modules/gui/wxwidgets/dialogs/open.cpp:626
 msgid "Open:"
 msgstr "開く:"
 
-#: modules/gui/wince/open.cpp:146 modules/gui/wxwidgets/dialogs/open.cpp:439
+#: modules/gui/wince/open.cpp:146
 msgid ""
 "Alternatively, you can build an MRL using one of the following predefined "
 "targets:"
@@ -11716,12 +12960,12 @@ msgstr ""
 "きます。:"
 
 #: modules/gui/wince/preferences_widgets.cpp:527
-#: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:675
+#: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:698
 msgid "Choose directory"
 msgstr "ディレクトリを選択する"
 
 #: modules/gui/wince/preferences_widgets.cpp:536
-#: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:684
+#: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:707
 msgid "Choose file"
 msgstr "ファイルを選択する"
 
@@ -11744,10 +12988,71 @@ msgstr "WinCE インターフェースモジュール"
 msgid "WinCE dialogs provider"
 msgstr "WinCE ダイアログ提供"
 
+#: modules/gui/wxwidgets/dialogs.cpp:433
+#: modules/gui/wxwidgets/dialogs/open.cpp:1265
+msgid "All Files (*.*)|*|Sound Files (*.mp3, *.ogg, etc.)|"
+msgstr ""
+
+#: modules/gui/wxwidgets/dialogs.cpp:435
+#: modules/gui/wxwidgets/dialogs/open.cpp:1267
+msgid "|Video Files (*.avi, *.mpg, etc.)|"
+msgstr ""
+
+#: modules/gui/wxwidgets/dialogs.cpp:436
+#: modules/gui/wxwidgets/dialogs/open.cpp:1268
+msgid "|Playlist Files (*.m3u, *.pls, etc.)|"
+msgstr ""
+
+#: modules/gui/wxwidgets/dialogs.cpp:437
+#: modules/gui/wxwidgets/dialogs/open.cpp:1269
+msgid "|Subtitle Files (*.srt, *.sub, etc.)|"
+msgstr ""
+
 #: modules/gui/wxwidgets/dialogs/bookmarks.cpp:75
 msgid "Edit bookmark"
 msgstr "ブックマーク編集"
 
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:101
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:197
+msgid "Bytes"
+msgstr "バイト"
+
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:105
+#: modules/gui/wxwidgets/dialogs/interaction.cpp:172
+#: modules/gui/wxwidgets/dialogs/iteminfo.cpp:78
+#: modules/gui/wxwidgets/dialogs/open.cpp:320
+#: modules/gui/wxwidgets/dialogs/open.cpp:490
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:195
+#: modules/gui/wxwidgets/dialogs/subtitles.cpp:242
+#, fuzzy
+msgid "&OK"
+msgstr "OK"
+
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:108
+#: modules/gui/wxwidgets/dialogs/interaction.cpp:174
+#: modules/gui/wxwidgets/dialogs/interaction.cpp:185
+#: modules/gui/wxwidgets/dialogs/iteminfo.cpp:81
+#: modules/gui/wxwidgets/dialogs/open.cpp:323
+#: modules/gui/wxwidgets/dialogs/open.cpp:493
+#: modules/gui/wxwidgets/dialogs/preferences.cpp:211
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:198
+#: modules/gui/wxwidgets/dialogs/subtitles.cpp:245
+#, fuzzy
+msgid "&Cancel"
+msgstr "取り消し"
+
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:161
+#, fuzzy
+msgid "&Delete"
+msgstr "削除"
+
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:163
+#: modules/gui/wxwidgets/dialogs/interaction.cpp:196
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:411
+#, fuzzy
+msgid "&Clear"
+msgstr "クリア"
+
 #: modules/gui/wxwidgets/dialogs/bookmarks.cpp:347
 msgid "You must select two bookmarks"
 msgstr "2 つのブックマークを選ばなければなりません"
@@ -11756,6 +13061,11 @@ msgstr "2 つのブックマークを選ばなければなりません"
 msgid "The stream must be playing or paused for bookmarks to work"
 msgstr ""
 
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:441
+msgid ""
+"No input found. The stream must be playing or paused for bookmarks to work."
+msgstr ""
+
 #: modules/gui/wxwidgets/dialogs/bookmarks.cpp:449
 msgid ""
 "Input has changed, unable to save bookmark. Use \"pause\" while editing "
@@ -11766,89 +13076,141 @@ msgstr ""
 msgid "Input has changed "
 msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/fileinfo.cpp:53
-msgid "Stream and media info"
+#: modules/gui/wxwidgets/dialogs/fileinfo.cpp:54
+#, fuzzy
+msgid "Stream and Media Info"
 msgstr "ストリームとメディアの情報"
 
-#: modules/gui/wxwidgets/dialogs/iteminfo.cpp:57
+#: modules/gui/wxwidgets/dialogs/fileinfo.cpp:83
+#, fuzzy
+msgid "Advanced information"
+msgstr "高度なオプション"
+
+#: 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/dialogs/interaction.cpp:181
+#, fuzzy
+msgid "&Yes"
+msgstr "はい"
+
+#: modules/gui/wxwidgets/dialogs/interaction.cpp:183
+#, fuzzy
+msgid "&No"
+msgstr "なし"
+
+#: modules/gui/wxwidgets/dialogs/interaction.cpp:193
+msgid "Don't show further errors"
+msgstr ""
+
+#: modules/gui/wxwidgets/dialogs/interaction.cpp:198
+#: modules/gui/wxwidgets/dialogs/messages.cpp:72
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:254
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:76
+#, fuzzy
+msgid "&Close"
+msgstr "閉じる(&C)"
+
+#: modules/gui/wxwidgets/dialogs/iteminfo.cpp:58
 msgid "Playlist item info"
 msgstr "再生一覧項目情報"
 
-#: modules/gui/wxwidgets/dialogs/iteminfo.cpp:116
-msgid "Item Info"
-msgstr "項目情報"
-
-#: modules/gui/wxwidgets/dialogs/messages.cpp:88
-msgid "Save As..."
+#: modules/gui/wxwidgets/dialogs/messages.cpp:81
+#, fuzzy
+msgid "Save &As..."
 msgstr "名前を付けて保存..."
 
-#: modules/gui/wxwidgets/dialogs/messages.cpp:206
+#: modules/gui/wxwidgets/dialogs/messages.cpp:199
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "メッセージ..."
 
-#: modules/gui/wxwidgets/dialogs/open.cpp:260
+#: modules/gui/wxwidgets/dialogs/open.cpp:259
 msgid "Advanced options..."
 msgstr "高度なオプション..."
 
-#: modules/gui/wxwidgets/dialogs/open.cpp:265
-#: modules/gui/wxwidgets/dialogs/open.cpp:276
-#: modules/gui/wxwidgets/dialogs/preferences.cpp:212
+#: 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:217
 msgid "Advanced options"
 msgstr "高度なオプション"
 
-#: modules/gui/wxwidgets/dialogs/open.cpp:280
+#: modules/gui/wxwidgets/dialogs/open.cpp:279
 msgid "Options:"
 msgstr "オプション:"
 
-#: modules/gui/wxwidgets/dialogs/open.cpp:389
-#: modules/gui/wxwidgets/dialogs/open.cpp:397
+#: modules/gui/wxwidgets/dialogs/open.cpp:388
+#: modules/gui/wxwidgets/dialogs/open.cpp:396
 msgid "Open..."
 msgstr "開く..."
 
-#: modules/gui/wxwidgets/dialogs/open.cpp:428
-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/dialogs/open.cpp:430
+#, fuzzy
+msgid "Stream/Save"
+msgstr "ストリーム名"
 
-#: modules/gui/wxwidgets/dialogs/open.cpp:449
-msgid "Use VLC as a server of streams"
+#: modules/gui/wxwidgets/dialogs/open.cpp:431
+msgid "Use VLC as a stream server"
 msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/open.cpp:475
+#: modules/gui/wxwidgets/dialogs/open.cpp:457
 #, fuzzy
 msgid "Caching"
 msgstr "評価"
 
-#: modules/gui/wxwidgets/dialogs/open.cpp:476
+#: modules/gui/wxwidgets/dialogs/open.cpp:458
 #, fuzzy
 msgid "Change the default caching value (in milliseconds)"
 msgstr "キャッシング値 (ms)"
 
+#: modules/gui/wxwidgets/dialogs/open.cpp:471
+#, fuzzy
+msgid "Customize:"
+msgstr "コンパイラー: "
+
+#: 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/dialogs/open.cpp:638
-#: modules/gui/wxwidgets/dialogs/subtitles.cpp:55
-msgid "Subtitle options"
-msgstr "字幕オプション"
+msgid "Use a subtitles file"
+msgstr "字幕ファイルを使う"
 
 #: modules/gui/wxwidgets/dialogs/open.cpp:639
-msgid "Force options for separate subtitle files."
-msgstr "分離された字幕ファイルをの強制オプション"
+#, fuzzy
+msgid "Use an external subtitles file."
+msgstr "字幕ファイルを使う"
+
+#: modules/gui/wxwidgets/dialogs/open.cpp:643
+#, fuzzy
+msgid "Advanced Settings..."
+msgstr "高度なオプション..."
 
-#: modules/gui/wxwidgets/dialogs/open.cpp:674
+#: modules/gui/wxwidgets/dialogs/open.cpp:659
+#, fuzzy
+msgid "File:"
+msgstr "ファイル"
+
+#: modules/gui/wxwidgets/dialogs/open.cpp:696
 msgid "DVD (menus)"
 msgstr "DVD(メニュー)"
 
-#: modules/gui/wxwidgets/dialogs/open.cpp:680
+#: modules/gui/wxwidgets/dialogs/open.cpp:702
 msgid "Disc type"
 msgstr "ディスクタイプ"
 
-#: modules/gui/wxwidgets/dialogs/open.cpp:687
+#: modules/gui/wxwidgets/dialogs/open.cpp:709
 msgid "Probe Disc(s)"
 msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/open.cpp:688
+#: modules/gui/wxwidgets/dialogs/open.cpp:710
 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 "
@@ -11857,208 +13219,246 @@ msgid ""
 "parameter ranges are set based on media we find."
 msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/open.cpp:781
+#: modules/gui/wxwidgets/dialogs/open.cpp:806
 msgid "HTTP/HTTPS/FTP/MMS"
 msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/open.cpp:782
+#: modules/gui/wxwidgets/dialogs/open.cpp:807
 msgid "RTSP"
 msgstr "RTSP"
 
-#: modules/gui/wxwidgets/dialogs/open.cpp:902
-msgid "Name of DVD device to read from."
-msgstr ""
+#: modules/gui/wxwidgets/dialogs/open.cpp:927
+#, fuzzy
+msgid "DVD device to use"
+msgstr "DVD デバイス"
 
-#: modules/gui/wxwidgets/dialogs/open.cpp:933
+#: modules/gui/wxwidgets/dialogs/open.cpp:957
 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/dialogs/open.cpp:942
-msgid "Name of CD-ROM device to read Video CD from."
-msgstr ""
+#: modules/gui/wxwidgets/dialogs/open.cpp:966
+#: modules/gui/wxwidgets/dialogs/open.cpp:989
+#, fuzzy
+msgid "CD-ROM device to use"
+msgstr "デバイス名"
 
-#: modules/gui/wxwidgets/dialogs/open.cpp:961
+#: modules/gui/wxwidgets/dialogs/open.cpp:984
 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/dialogs/open.cpp:966
-msgid "Name of CD-ROM device to read audio CD from."
-msgstr ""
+#: modules/gui/wxwidgets/dialogs/open.cpp:1295
+#, fuzzy
+msgid "Open subtitles file"
+msgstr "字幕の選択"
 
-#: modules/gui/wxwidgets/dialogs/open.cpp:1609
+#: modules/gui/wxwidgets/dialogs/open.cpp:1672
 #, fuzzy
 msgid "Title number."
 msgstr "チューナー番号"
 
-#: modules/gui/wxwidgets/dialogs/open.cpp:1611
+#: modules/gui/wxwidgets/dialogs/open.cpp:1675
 msgid ""
 "DVD's can have up to 32 subtitles numbered 0..31. Note this is not the same "
-"thing as a subtitle name e.g. 'en'. If a value -1 is used, no subtitle will "
-"be shown."
+"thing as a subtitle name (e.g. 'en'). If a value -1 is used, no subtitle "
+"will be shown."
 msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/open.cpp:1614
+#: modules/gui/wxwidgets/dialogs/open.cpp:1679
 msgid "Audio track number. DVD's can have up to 8 audio tracks numbered 0..7."
 msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/open.cpp:1635
+#: modules/gui/wxwidgets/dialogs/open.cpp:1700
 msgid "Playback control (PBC) usually starts with number 1."
 msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/open.cpp:1641
+#: modules/gui/wxwidgets/dialogs/open.cpp:1706
 msgid "The first entry (the beginning of the first MPEG track) is 0."
 msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/open.cpp:1646
+#: modules/gui/wxwidgets/dialogs/open.cpp:1711
 #, fuzzy
 msgid "Track number."
 msgstr "トラック番号"
 
-#: modules/gui/wxwidgets/dialogs/open.cpp:1652
+#: modules/gui/wxwidgets/dialogs/open.cpp:1718
 msgid ""
 "SVCD's can have up to 4 subtitles numbered 0..3. If a value -1 is used, no "
 "subtitle will be shown."
 msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/open.cpp:1654
+#: modules/gui/wxwidgets/dialogs/open.cpp:1721
 msgid ""
 "Audio track number. VCD's can have up to 2 audio tracks numbered 0 or 1. "
 msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/open.cpp:1666
+#: modules/gui/wxwidgets/dialogs/open.cpp:1733
 msgid ""
 "Audio CDs can have up to 100 tracks, the first track is usually 1. If 0 is "
 "given, then all tracks are played."
 msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/open.cpp:1670
+#: modules/gui/wxwidgets/dialogs/open.cpp:1737
 msgid "Audio CDs can have up to 100 tracks, the first track is usually 1."
 msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:50
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:52
 msgid "Shuffle"
 msgstr "シャッフル"
 
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:229
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:244
 #, fuzzy
 msgid "&Simple Add File..."
 msgstr "シンプル追加(&S)..."
 
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:230
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:245
 msgid "Add &Directory..."
 msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:231
-msgid "&Add MRL..."
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:246
+#, fuzzy
+msgid "&Add URL..."
 msgstr "MRL 追加(&A)..."
 
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:236
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:248
+#, fuzzy
+msgid "Services Discovery"
+msgstr "ソースディレクトリ"
+
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:251
 msgid "&Open Playlist..."
 msgstr "再生一覧を開く(&O)"
 
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:237
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:252
 msgid "&Save Playlist..."
 msgstr "再生一覧を保存(&S)..."
 
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:239
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:258
 #, fuzzy
-msgid "&Close"
-msgstr "閉じる(&C)"
-
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:243
-msgid "Sort by &title"
+msgid "Sort by &Title"
 msgstr "タイトルでソート(&T)"
 
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:244
-msgid "&Reverse sort by title"
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:259
+#, fuzzy
+msgid "&Reverse Sort by Title"
 msgstr "タイトルで逆ソート(&R)"
 
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:246
-msgid "&Shuffle Playlist"
-msgstr "再生一覧をシャッフル(&S)"
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:261
+#, fuzzy
+msgid "&Shuffle"
+msgstr "シャッフル"
 
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:250
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:265
 msgid "D&elete"
 msgstr "削除(&E)"
 
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:257
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:272
 msgid "&Manage"
 msgstr "管理(&M)"
 
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:258
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:273
 msgid "S&ort"
 msgstr "ソート(&O)"
 
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:259
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:274
 msgid "&Selection"
 msgstr "選択(&S)"
 
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:260
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:275
 #, fuzzy
 msgid "&View items"
 msgstr "ビデオタイトル"
 
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:268
-msgid "Play this branch"
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:283
+msgid "Play this Branch"
 msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:270
-msgid "Sort this branch"
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:284
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:292
+#, fuzzy
+msgid "Preparse"
+msgstr "準備"
+
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:285
+msgid "Sort this Branch"
 msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:350
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:783
-#: modules/gui/wxwidgets/dialogs/updatevlc.cpp:118
-#: modules/gui/wxwidgets/dialogs/updatevlc.cpp:501
-#: modules/gui/wxwidgets/playlist_manager.cpp:425
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:287
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:294
+msgid "Info"
+msgstr "情報"
+
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:288
+#, fuzzy
+msgid "Add Node"
+msgstr "オーディオエンコーダー"
+
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:371
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:834
+#: modules/gui/wxwidgets/playlist_manager.cpp:422
 #, fuzzy
 msgid "root"
 msgstr "ルート"
 
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:580
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:800
-#, fuzzy, c-format
-msgid "%i items in playlist (%i not shown)"
-msgstr "デフォルトで再生一覧に追加"
-
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:593
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:807
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:605
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:845
 #, fuzzy, c-format
 msgid "%i items in playlist"
 msgstr "デフォルトで再生一覧に追加"
 
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:902
-msgid "M3U file"
-msgstr "M3U ファイル"
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:937
+#, fuzzy
+msgid "XSPF playlist"
+msgstr "再生一覧を保存"
 
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:908
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:944
 msgid "Playlist is empty"
 msgstr "再生一覧が空です"
 
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:908
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:944
 msgid "Can't save"
 msgstr "保存できません"
 
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:1231 modules/misc/freetype.c:100
-#: modules/misc/win32text.c:71
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:1418
+#: modules/gui/wxwidgets/wxwidgets.cpp:114 modules/misc/freetype.c:105
+#: modules/misc/win32text.c:77
 msgid "Normal"
 msgstr "通常"
 
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:1233
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:1419
 #, fuzzy
-msgid "Sorted by artist"
-msgstr "タイトルでソート(&T)"
+msgid "One level"
+msgstr "最大レベル"
 
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:1235
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:1615
+msgid "Please enter node name"
+msgstr ""
+
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:1616
 #, fuzzy
-msgid "Sorted by Album"
-msgstr "名前でソート"
+msgid "Add node"
+msgstr "オーディオエンコーダー"
+
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:1616
+#, fuzzy
+msgid "New node"
+msgstr "ニューエイジ"
+
+#: modules/gui/wxwidgets/dialogs/preferences.cpp:208
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:79
+msgid "&Save"
+msgstr "保存(&S)"
+
+#: modules/gui/wxwidgets/dialogs/preferences.cpp:294
+msgid ""
+"This will reset your VLC media player preferences.\n"
+"Are you sure you want to continue?"
+msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/preferences.cpp:1009
+#: modules/gui/wxwidgets/dialogs/preferences.cpp:1027
 msgid ""
 "Some options are available but hidden. Check \"Advanced options\" to see "
 "them."
@@ -12076,10 +13476,10 @@ msgstr "Ctrl"
 msgid "Shift"
 msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:433
+#: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:443
 msgid ""
-"Select modules that you want. To get more advanced control, you can also "
-"modify the resulting chain by yourself"
+"Select the desired modules. For more advanced control, the resulting \"chain"
+"\" can be modified."
 msgstr ""
 
 #: modules/gui/wxwidgets/dialogs/streamout.cpp:167
@@ -12088,430 +13488,498 @@ msgstr "ストリームの出力 MRL"
 
 #: modules/gui/wxwidgets/dialogs/streamout.cpp:171
 #, fuzzy
-msgid "Destination Target:"
-msgstr "送信先のアスペクト・レシオ"
+msgid "Target:"
+msgstr "ターゲットを開く:"
 
 #: 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/dialogs/streamout.cpp:463
-msgid "Output methods"
-msgstr "出力方法"
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:462
+#, fuzzy
+msgid "Outputs"
+msgstr "出力"
 
-#: modules/gui/wxwidgets/dialogs/streamout.cpp:474
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:470
+#, fuzzy
+msgid "Play locally"
+msgstr "スロー再生"
+
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:473
 msgid "MMSH"
 msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/streamout.cpp:475 modules/stream_out/rtp.c:90
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:474
+#: modules/stream_out/rtp.c:101
 msgid "RTP"
 msgstr "RTP"
 
-#: modules/gui/wxwidgets/dialogs/streamout.cpp:579
-msgid "Miscellaneous options"
-msgstr "その他のオプション"
-
-#: modules/gui/wxwidgets/dialogs/streamout.cpp:593
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:592
 #, fuzzy
 msgid "Group name"
 msgstr "グループ情報"
 
-#: modules/gui/wxwidgets/dialogs/streamout.cpp:600
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:599
 msgid "Channel name"
 msgstr "チャンネル名"
 
-#: modules/gui/wxwidgets/dialogs/streamout.cpp:625
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:606
 #, fuzzy
 msgid "Select all elementary streams"
 msgstr "ネットワークストリームを選択する"
 
-#: modules/gui/wxwidgets/dialogs/streamout.cpp:709
-#, fuzzy
-msgid "Transcoding options"
-msgstr "持続期間"
-
-#: modules/gui/wxwidgets/dialogs/streamout.cpp:766
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:768
 msgid "Video codec"
 msgstr "ビデオコーデック"
 
-#: modules/gui/wxwidgets/dialogs/streamout.cpp:836
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:838
 msgid "Audio codec"
 msgstr "オーディオコーデック"
 
-#: modules/gui/wxwidgets/dialogs/streamout.cpp:886
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:888
 #, fuzzy
 msgid "Subtitles codec"
 msgstr "字幕・デコーダ・モジュール"
 
-#: modules/gui/wxwidgets/dialogs/streamout.cpp:895
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:897
 #, fuzzy
 msgid "Subtitles overlay"
 msgstr "字幕"
 
-#: modules/gui/wxwidgets/dialogs/streamout.cpp:1009
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:1011
 msgid "Save file"
 msgstr "ファイルの保存"
 
-#: modules/gui/wxwidgets/dialogs/subtitles.cpp:72
+#: 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/dialogs/subtitles.cpp:127
-msgid "Subtitles options"
-msgstr "字幕オプション"
+#: modules/gui/wxwidgets/dialogs/subtitles.cpp:129
+msgid "Options"
+msgstr "オプション"
 
-#: modules/gui/wxwidgets/dialogs/subtitles.cpp:209
+#: 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/dialogs/subtitles.cpp:216
-#: modules/stream_out/bridge.c:40 modules/stream_out/display.c:41
-#: modules/video_filter/mosaic.c:109
-msgid "Delay"
-msgstr "ディレイ"
-
-#: modules/gui/wxwidgets/dialogs/subtitles.cpp:225
+#: modules/gui/wxwidgets/dialogs/subtitles.cpp:227
 #, fuzzy
 msgid "Set subtitle delay (in 1/10s)"
 msgstr "字幕の選択"
 
-#: modules/gui/wxwidgets/dialogs/subtitles.cpp:284
+#: modules/gui/wxwidgets/dialogs/subtitles.cpp:286
 msgid "Open file"
 msgstr "ファイルを開く"
 
-#: modules/gui/wxwidgets/dialogs/updatevlc.cpp:101
-#: modules/gui/wxwidgets/interface.cpp:594
-msgid "Check for updates ..."
-msgstr ""
+#: modules/gui/wxwidgets/dialogs/updatevlc.cpp:65
+#, fuzzy
+msgid "Updates"
+msgstr "更新"
 
-#: modules/gui/wxwidgets/dialogs/updatevlc.cpp:127
-msgid "Check for updates now !"
+#: modules/gui/wxwidgets/dialogs/updatevlc.cpp:78
+msgid "Check for updates"
 msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/updatevlc.cpp:567
-msgid "type : "
-msgstr "種類 : "
-
-#: modules/gui/wxwidgets/dialogs/updatevlc.cpp:569
-msgid "URL : "
-msgstr "URL : "
-
-#: modules/gui/wxwidgets/dialogs/updatevlc.cpp:573
-msgid "file size : "
-msgstr "ファイルサイズ : "
-
-#: modules/gui/wxwidgets/dialogs/updatevlc.cpp:577
-msgid "file md5 hash : "
+#: modules/gui/wxwidgets/dialogs/updatevlc.cpp:170
+msgid ""
+"\n"
+"Available updates and related downloads.\n"
+"(Double click on a file to download it)\n"
 msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/updatevlc.cpp:592
-#, fuzzy
-msgid "Choose a mirror"
-msgstr "ミラーの選択"
-
-#: modules/gui/wxwidgets/dialogs/updatevlc.cpp:640
+#: modules/gui/wxwidgets/dialogs/updatevlc.cpp:198
 #, fuzzy
-msgid "Save file ..."
+msgid "Save file..."
 msgstr "ファイルの保存"
 
-#: modules/gui/wxwidgets/dialogs/updatevlc.cpp:677
-msgid "Downloading..."
-msgstr "ダウンロード中..."
-
 #: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:65
 msgid "Broadcasts"
 msgstr "ブロードキャスト"
 
-#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:76
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:78
 msgid "Load"
 msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:215
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:217
 #, fuzzy
-msgid "Load configuration"
+msgid "Load Configuration"
 msgstr "YLM 設定"
 
-#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:229
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:231
 #, fuzzy
-msgid "Save configuration"
+msgid "Save Configuration"
 msgstr "YLM 設定"
 
-#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:245
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:247
 msgid "New broadcast"
 msgstr "新規ブロードキャスト"
 
-#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:380
-#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:391
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:115
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:383
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:394
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:122
 msgid "Choose"
 msgstr "選択..."
 
-#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:385
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:388
 msgid "Output"
 msgstr "出力"
 
-#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:397
-msgid "Create"
-msgstr "作成"
-
-#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:407
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:404
 msgid "Loop"
 msgstr "ループ"
 
-#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:510
-msgid "VLM configuration"
-msgstr "YLM 設定"
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:415
+msgid "Create"
+msgstr "作成"
 
-#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:544
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:560
 msgid "VLM stream"
 msgstr "VLM ストリーム"
 
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:90
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:86
+#, fuzzy
+msgid "This wizard helps you to stream, transcode or save a stream."
+msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+
+#: 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/dialogs/wizard.cpp:93
-msgid "Use this to stream on a network"
+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:106
-msgid "You must choose a stream"
-msgstr "ストリームを選択しなければなりません"
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:97
+msgid "Use this to stream on a network"
+msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:107
-msgid "Uh Oh! Unable to find playlist !"
+#: 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:109
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:112
+msgid "You must choose a stream"
+msgstr "ストリームを選択しなければなりません"
+
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:113
+#, fuzzy
+msgid "Unable to find playlist"
+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 ""
-"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 a RTP/UDP network "
-"stream.)\n"
-"Enter the starting and ending times (in seconds)."
+"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:136
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:130
+#, fuzzy
+msgid "Transcode video (if available)"
+msgstr "ストリームの一時停止"
+
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:131
+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
+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 "VLCが選択するパケッタライザーの順序を選択します。"
+
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:143
 msgid "This does not appear to be a valid multicast address"
 msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:138
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:145
 #, fuzzy
-msgid "You need to enter an address"
+msgid "Please enter an address"
 msgstr "ネットワークインタフェースアドレス"
 
 #: modules/gui/wxwidgets/dialogs/wizard.cpp:149
 msgid ""
-"In this page, you will define a few additionnal parameters for your "
-"transcoding"
+"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
+msgid "Defines a few additional parameters for the transcoding."
 msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:152
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:159
 #, fuzzy
 msgid "You must choose a file to save to"
 msgstr "ストリームの出力先の選択"
 
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:156
+#: 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 ""
-"In this page, you will define a few additionnal parameters for your stream"
+"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:164
+#: 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, else, a default "
-"name will be used"
+"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:1283
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:506
+#, fuzzy
+msgid "More information"
+msgstr "バージョン情報の印刷"
+
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:1291
 msgid "Save to file"
 msgstr "ファイルへ保存する"
 
-#: modules/gui/wxwidgets/extrapanel.cpp:42
+#: modules/gui/wxwidgets/extrapanel.cpp:41
 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."
+"Controls the blending of equalizer bands. The higher this value is, the more "
+"correlated their movement will be."
 msgstr ""
 
-#: modules/gui/wxwidgets/extrapanel.cpp:155 modules/video_filter/magnify.c:60
+#: 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:155
+#: modules/gui/wxwidgets/extrapanel.cpp:153
 msgid "Magnifies part of the image"
 msgstr ""
 
-#: modules/gui/wxwidgets/extrapanel.cpp:272
+#: modules/gui/wxwidgets/extrapanel.cpp:270
 msgid "Video Options"
 msgstr "ビデオオプション"
 
-#: modules/gui/wxwidgets/extrapanel.cpp:286
+#: modules/gui/wxwidgets/extrapanel.cpp:284
 msgid "Aspect Ratio"
 msgstr "アスペクト比"
 
-#: modules/gui/wxwidgets/extrapanel.cpp:319
-msgid "More info"
-msgstr "更なる情報"
-
-#: modules/gui/wxwidgets/extrapanel.cpp:404
-msgid ""
-"This filter prevents the audio output power from going over a defined value."
+#: modules/gui/wxwidgets/extrapanel.cpp:402
+msgid "Prevents the audio output level from going over a predefined value."
 msgstr ""
 
-#: modules/gui/wxwidgets/extrapanel.cpp:468
+#: modules/gui/wxwidgets/extrapanel.cpp:466
 msgid ""
-"Enable the equalizer. You can either manually change the bands or use a "
+"Enable the equalizer. You can either manually adjust the bands or use a "
 "preset (Audio Menu->Equalizer)."
 msgstr ""
 
-#: modules/gui/wxwidgets/extrapanel.cpp:475
+#: 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 ""
-"If you enable this setting, the equalizer filter will be applied twice. The "
-"effect will be sharper."
+"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:178
+#: modules/gui/wxwidgets/input_manager.cpp:185
 msgid "Stopped"
 msgstr "停止"
 
-#: modules/gui/wxwidgets/input_manager.cpp:200
+#: modules/gui/wxwidgets/input_manager.cpp:210
 msgid "Paused"
 msgstr "一時停止"
 
-#: modules/gui/wxwidgets/input_manager.cpp:200
+#: modules/gui/wxwidgets/input_manager.cpp:210
 msgid "Playing"
 msgstr "再生中"
 
-#: modules/gui/wxwidgets/input_manager.cpp:214
+#: modules/gui/wxwidgets/input_manager.cpp:225
 msgid "Menu"
 msgstr "メニュー"
 
-#: modules/gui/wxwidgets/input_manager.cpp:217
+#: modules/gui/wxwidgets/input_manager.cpp:228
 msgid "Previous track"
 msgstr "前のトラック"
 
-#: modules/gui/wxwidgets/input_manager.cpp:218
+#: modules/gui/wxwidgets/input_manager.cpp:229
 msgid "Next track"
 msgstr "次のトラック"
 
-#: modules/gui/wxwidgets/interface.cpp:555
+#: modules/gui/wxwidgets/interface.cpp:571
 msgid "Quick &Open File...\tCtrl-O"
 msgstr "ファイルを開く...\tCtrl-O"
 
-#: modules/gui/wxwidgets/interface.cpp:558
+#: modules/gui/wxwidgets/interface.cpp:574
 msgid "Open &File...\tCtrl-F"
 msgstr "ファイルを開く(&F)...\tCtrl-F"
 
-#: modules/gui/wxwidgets/interface.cpp:559
+#: modules/gui/wxwidgets/interface.cpp:575
 msgid "Open Dir&ectory...\tCtrl-E"
 msgstr "ディレクトリを開く(&D)...\tCtrl-E"
 
-#: modules/gui/wxwidgets/interface.cpp:560
+#: modules/gui/wxwidgets/interface.cpp:576
 msgid "Open &Disc...\tCtrl-D"
 msgstr "ディスクを開く(&D)...\tCtrl-D"
 
-#: modules/gui/wxwidgets/interface.cpp:562
+#: modules/gui/wxwidgets/interface.cpp:578
 msgid "Open &Network Stream...\tCtrl-N"
 msgstr "ネットワークストリームを開く(&N)...\tCtrl-N"
 
-#: modules/gui/wxwidgets/interface.cpp:564
+#: modules/gui/wxwidgets/interface.cpp:580
 msgid "Open C&apture Device...\tCtrl-A"
 msgstr "キャプチャデバイスを開く(&A)...\tCtrl-C"
 
-#: modules/gui/wxwidgets/interface.cpp:567
+#: modules/gui/wxwidgets/interface.cpp:583
 msgid "&Wizard...\tCtrl-W"
 msgstr "ウィザード(&W)...\tCtrl-W"
 
-#: modules/gui/wxwidgets/interface.cpp:570
+#: modules/gui/wxwidgets/interface.cpp:586
 msgid "E&xit\tCtrl-X"
 msgstr "終了(&X)\tCtrl-X"
 
-#: modules/gui/wxwidgets/interface.cpp:576
+#: modules/gui/wxwidgets/interface.cpp:592
 msgid "&Playlist...\tCtrl-P"
 msgstr "再生一覧(&P)...\tCtrl-P"
 
-#: modules/gui/wxwidgets/interface.cpp:578
+#: modules/gui/wxwidgets/interface.cpp:594
 msgid "&Messages...\tCtrl-M"
 msgstr "メッセージ(&M)...\tCtrl-M"
 
-#: modules/gui/wxwidgets/interface.cpp:580
-msgid "Stream and Media &info...\tCtrl-I"
+#: modules/gui/wxwidgets/interface.cpp:596
+#, fuzzy
+msgid "Stream and Media &Info...\tCtrl-I"
 msgstr "ストリームとメディア情報(&I)...\tCtrl-I"
 
-#: modules/gui/wxwidgets/interface.cpp:582
+#: modules/gui/wxwidgets/interface.cpp:598
 #, fuzzy
 msgid "VLM Control...\tCtrl-V"
 msgstr "VLM 制御...\\tCtrl-I"
 
-#: modules/gui/wxwidgets/interface.cpp:598
+#: modules/gui/wxwidgets/interface.cpp:608
+#, fuzzy
+msgid "About..."
+msgstr "VideoLANについて(_A)..."
+
+#: modules/gui/wxwidgets/interface.cpp:610
+msgid "Check for Updates..."
+msgstr ""
+
+#: modules/gui/wxwidgets/interface.cpp:614
 msgid "&File"
 msgstr "ファイル(&F)"
 
-#: modules/gui/wxwidgets/interface.cpp:599
+#: modules/gui/wxwidgets/interface.cpp:615
 msgid "&View"
 msgstr "表示(&V)"
 
-#: modules/gui/wxwidgets/interface.cpp:600
+#: modules/gui/wxwidgets/interface.cpp:616
 msgid "&Settings"
 msgstr "設定(&S)"
 
-#: modules/gui/wxwidgets/interface.cpp:601
+#: modules/gui/wxwidgets/interface.cpp:617
 msgid "&Audio"
 msgstr "オーディオ(&A)"
 
-#: modules/gui/wxwidgets/interface.cpp:602
+#: modules/gui/wxwidgets/interface.cpp:618
 msgid "&Video"
 msgstr "ビデオ(&I)"
 
-#: modules/gui/wxwidgets/interface.cpp:603
+#: modules/gui/wxwidgets/interface.cpp:619
 msgid "&Navigation"
 msgstr "ナビゲーション(&N)"
 
-#: modules/gui/wxwidgets/interface.cpp:604
+#: modules/gui/wxwidgets/interface.cpp:620
 msgid "&Help"
 msgstr "ヘルプ(&H)"
 
-#: modules/gui/wxwidgets/interface.cpp:664
+#: modules/gui/wxwidgets/interface.cpp:680
+#: modules/gui/wxwidgets/interface.cpp:691
 #, fuzzy
-msgid "Small playlist"
-msgstr "再生一覧を保存"
+msgid "Embedded playlist"
+msgstr "再生一覧を開く"
 
-#: modules/gui/wxwidgets/interface.cpp:665
+#: modules/gui/wxwidgets/interface.cpp:681
 msgid "Previous playlist item"
 msgstr "前の再生一覧項目"
 
-#: modules/gui/wxwidgets/interface.cpp:666
+#: modules/gui/wxwidgets/interface.cpp:682
 msgid "Next playlist item"
 msgstr "次の再生一覧項目再生一覧を開く"
 
-#: modules/gui/wxwidgets/interface.cpp:667
+#: modules/gui/wxwidgets/interface.cpp:683
 msgid "Play slower"
 msgstr "スロー再生"
 
-#: modules/gui/wxwidgets/interface.cpp:668
+#: modules/gui/wxwidgets/interface.cpp:684
 msgid "Play faster"
 msgstr "早送り再生"
 
-#: modules/gui/wxwidgets/interface.cpp:851
+#: modules/gui/wxwidgets/interface.cpp:881
 msgid "Extended &GUI\tCtrl-G"
 msgstr "GUI 拡張(&G)\tCtrl-G"
 
-#: modules/gui/wxwidgets/interface.cpp:854
+#: modules/gui/wxwidgets/interface.cpp:884
 msgid "&Bookmarks...\tCtrl-B"
 msgstr "ブックマーク(&B)...\tCtrl-B"
 
-#: modules/gui/wxwidgets/interface.cpp:856
+#: modules/gui/wxwidgets/interface.cpp:886
 msgid "Preference&s...\tCtrl-S"
 msgstr "設定(&S)...\tCtrl-S"
 
-#: modules/gui/wxwidgets/interface.cpp:909
+#: modules/gui/wxwidgets/interface.cpp:939
 msgid ""
 " (wxWidgets interface)\n"
 "\n"
@@ -12519,7 +13987,7 @@ msgstr ""
 "(wxWidgets インタフェース)\n"
 "\n"
 
-#: modules/gui/wxwidgets/interface.cpp:920
+#: modules/gui/wxwidgets/interface.cpp:952
 msgid ""
 "The VideoLAN team <videolan@videolan.org>\n"
 "http://www.videolan.org/\n"
@@ -12529,53 +13997,54 @@ msgstr ""
 "http://www.videolan.org/\n"
 "\n"
 
-#: modules/gui/wxwidgets/interface.cpp:923
+#: modules/gui/wxwidgets/interface.cpp:955
 #, c-format
 msgid "About %s"
 msgstr "%s について"
 
-#: modules/gui/wxwidgets/interface.cpp:1456
-msgid "Show/Hide interface"
+#: modules/gui/wxwidgets/interface.cpp:1519
+#, fuzzy
+msgid "Show/Hide Interface"
 msgstr "インターフェース表示/非表示"
 
-#: modules/gui/wxwidgets/menus.cpp:132
+#: modules/gui/wxwidgets/menus.cpp:124
 #, fuzzy
 msgid "Quick &Open File..."
 msgstr "ファイルを開く(&O)..."
 
-#: modules/gui/wxwidgets/menus.cpp:133
+#: modules/gui/wxwidgets/menus.cpp:125
 msgid "Open &File..."
 msgstr "ファイルを開く(&F)..."
 
-#: modules/gui/wxwidgets/menus.cpp:134
+#: modules/gui/wxwidgets/menus.cpp:126
 msgid "Open D&irectory..."
 msgstr "ディレクトリを開く(&I)..."
 
-#: modules/gui/wxwidgets/menus.cpp:135
+#: modules/gui/wxwidgets/menus.cpp:127
 msgid "Open &Disc..."
 msgstr "ディスクを開く(&D)..."
 
-#: modules/gui/wxwidgets/menus.cpp:136
+#: modules/gui/wxwidgets/menus.cpp:128
 msgid "Open &Network Stream..."
 msgstr "ネットワークストリームを開く(&N)..."
 
-#: modules/gui/wxwidgets/menus.cpp:137
+#: modules/gui/wxwidgets/menus.cpp:129
 msgid "Open &Capture Device..."
 msgstr "キャプチャデバイスを開く(&C)..."
 
-#: modules/gui/wxwidgets/menus.cpp:144
+#: modules/gui/wxwidgets/menus.cpp:136
 msgid "Media &Info..."
 msgstr "メディア情報(&I)"
 
-#: modules/gui/wxwidgets/menus.cpp:145
+#: modules/gui/wxwidgets/menus.cpp:137
 msgid "&Messages..."
 msgstr "メッセージ(&M)..."
 
-#: modules/gui/wxwidgets/menus.cpp:146
+#: modules/gui/wxwidgets/menus.cpp:138
 msgid "&Preferences..."
 msgstr "設定(&P)..."
 
-#: modules/gui/wxwidgets/menus.cpp:565 modules/gui/wxwidgets/menus.cpp:592
+#: modules/gui/wxwidgets/menus.cpp:572 modules/gui/wxwidgets/menus.cpp:599
 msgid "Empty"
 msgstr "空"
 
@@ -12610,67 +14079,129 @@ msgstr ""
 msgid "WMV (Windows Media Video) 9 (useable with MPEG TS, MPEG1, ASF and OGG)"
 msgstr ""
 
+#: modules/gui/wxwidgets/streamdata.cpp:73
+msgid "Theora is a free general-purpose codec (useable with MPEG TS)"
+msgstr ""
+
 #: modules/gui/wxwidgets/streamdata.cpp:122
 msgid "RTP Unicast"
 msgstr "RTP ユニキャスト"
 
+#: modules/gui/wxwidgets/streamdata.cpp:122
+#, fuzzy
+msgid "Stream to a single computer."
+msgstr "ネットワークを開く"
+
 #: modules/gui/wxwidgets/streamdata.cpp:125
 #, fuzzy
 msgid "RTP Multicast"
 msgstr "RTP マルチキャスト"
 
+#: modules/gui/wxwidgets/streamdata.cpp:126
+msgid ""
+"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/streamdata.cpp:129
 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."
+"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/streamdata.cpp:134
+msgid ""
+"Stream to several computers. This method is less efficient, as the server "
+"needs to send the stream several times."
+msgstr ""
+
+#: modules/gui/wxwidgets/streamdata.cpp:137
+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 "
+"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:92
-#: modules/gui/wxwidgets/wxwidgets.cpp:93
-msgid "Show extended GUI"
+#: modules/gui/wxwidgets/wxwidgets.cpp:91
+#, fuzzy
+msgid "Extended GUI"
 msgstr "拡張 GUI を表示する"
 
+#: modules/gui/wxwidgets/wxwidgets.cpp:92
+msgid ""
+"Show extended GUI (equalizer, image adjust, video filters...) at startup"
+msgstr ""
+
 #: modules/gui/wxwidgets/wxwidgets.cpp:94
-#: modules/gui/wxwidgets/wxwidgets.cpp:95
-msgid "Show taskbar entry"
-msgstr "タスクバーに入れて表示する"
+msgid "Taskbar"
+msgstr ""
 
 #: modules/gui/wxwidgets/wxwidgets.cpp:96
 msgid "Minimal interface"
 msgstr "最小化インターフェース"
 
 #: modules/gui/wxwidgets/wxwidgets.cpp:97
-msgid "Use minimal interface, no toolbar, few menus"
+msgid "Use minimal interface, with no toolbar and fewer menus."
 msgstr ""
 
-#: modules/gui/wxwidgets/wxwidgets.cpp:98
+#: modules/gui/wxwidgets/wxwidgets.cpp:99
 #, fuzzy
 msgid "Size to video"
 msgstr "ビデオズーム"
 
-#: modules/gui/wxwidgets/wxwidgets.cpp:99
-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:100
-#: modules/gui/wxwidgets/wxwidgets.cpp:101
-msgid "Show systray icon"
-msgstr "システムトレイアイコンを表示する"
+#: 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:110
+#: modules/gui/wxwidgets/wxwidgets.cpp:114
+msgid "Embedded"
+msgstr ""
+
+#: modules/gui/wxwidgets/wxwidgets.cpp:115
+msgid "Both"
+msgstr ""
+
+#: modules/gui/wxwidgets/wxwidgets.cpp:124
 msgid "wxWidgets interface module"
 msgstr "wxWidgets インターフェースモジュール"
 
-#: modules/gui/wxwidgets/wxwidgets.cpp:149
+#: modules/gui/wxwidgets/wxwidgets.cpp:171
 msgid "wxWidgets dialogs provider"
 msgstr "wxWidgets ダイアログ提供"
 
@@ -12694,8 +14225,8 @@ msgstr "生コーデックデータを保存する"
 #: modules/misc/dummy/dummy.c:45
 #, fuzzy
 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 ""
 "オーディオ出力の遅れを設定します。ビデオと音声のズレがある場合には、適切な値"
 "を設定できます。"
@@ -12711,195 +14242,297 @@ 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
 #, fuzzy
 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:126 modules/video_filter/rss.c:164
-#: 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 ""
+"DVDの中で使用したいオーディオのチャンネル番号を指定します。(1からnまで)"
 
 #: modules/misc/freetype.c:85 modules/misc/win32text.c:56
 msgid "Font size in pixels"
 msgstr "ピクセル中のフォントサイズ"
 
-#: modules/misc/freetype.c:86 modules/misc/win32text.c:57
+#: modules/misc/freetype.c:86
 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
-msgid "Opacity, 0..255"
+#: modules/misc/freetype.c:90 modules/misc/win32text.c:62
+#: modules/video_filter/marq.c:86 modules/video_filter/rss.c:138
+#: modules/video_filter/time.c:77
+msgid "Opacity"
 msgstr ""
 
-#: modules/misc/freetype.c: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:63
 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:66
+#, fuzzy
+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:67
 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:71
+#, fuzzy
+msgid "Relative font size"
+msgstr "リモート・コントロール・インタフェース・モジュール"
+
+#: modules/misc/freetype.c:100 modules/misc/win32text.c:72
+msgid ""
+"This is the relative default size of the fonts that will be rendered on the "
+"video. If absolute font size is set, relative size will be overriden."
+msgstr ""
 
-#: modules/misc/freetype.c:100 modules/misc/win32text.c:71
+#: modules/misc/freetype.c:105 modules/misc/win32text.c:77
 msgid "Smaller"
 msgstr "とても小さい"
 
-#: modules/misc/freetype.c:100 modules/misc/win32text.c:71
+#: modules/misc/freetype.c:105 modules/misc/win32text.c:77
 msgid "Small"
 msgstr "小さい"
 
-#: modules/misc/freetype.c:101 modules/misc/win32text.c:72
+#: modules/misc/freetype.c:106 modules/misc/win32text.c:78
 msgid "Large"
 msgstr "大きい"
 
-#: modules/misc/freetype.c:101 modules/misc/win32text.c:72
+#: modules/misc/freetype.c:106 modules/misc/win32text.c:78
 msgid "Larger"
 msgstr "とても大きい"
 
-#: modules/misc/freetype.c:113 modules/misc/win32text.c:84
+#: modules/misc/freetype.c:107
+#, fuzzy
+msgid "Use YUVP renderer"
+msgstr "テキストレンダラー設定"
+
+#: 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
+#, fuzzy
+msgid "Font Effect"
+msgstr "取出し"
+
+#: modules/misc/freetype.c:111
+msgid ""
+"It is possible to apply effects to the rendered text to improve its "
+"readability."
+msgstr ""
+
+#: modules/misc/freetype.c:119
+#, fuzzy
+msgid "Background"
+msgstr "逆転再生"
+
+#: modules/misc/freetype.c:119
+#, fuzzy
+msgid "Outline"
+msgstr "オリーブ"
+
+#: modules/misc/freetype.c:120
+#, fuzzy
+msgid "Fat Outline"
+msgstr "早送り"
+
+#: modules/misc/freetype.c:132 modules/misc/win32text.c:90
 #, 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
+#, fuzzy
 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 ""
+"表示されるログ・ウィンドウの最大行数を指定できます。すべてのメッセージを保持"
+"する場合には、-1を指定してください。"
 
-#: 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 "GnuTLS TLS 暗号化レイヤー"
 
+#: modules/misc/growl.c:59
+#, fuzzy
+msgid "Growl server"
+msgstr "サーバーなし"
+
+#: modules/misc/growl.c:60
+msgid ""
+"This is the host to which Growl notifications will be sent. By default, "
+"notifications are sent locally."
+msgstr ""
+
+#: modules/misc/growl.c:63
+#, fuzzy
+msgid "Growl password"
+msgstr "FTP パスワード"
+
+#: modules/misc/growl.c:65
+msgid "Growl password on the server."
+msgstr ""
+
+#: modules/misc/growl.c:66
+#, fuzzy
+msgid "Growl UDP port"
+msgstr "UDP ポート"
+
+#: modules/misc/growl.c:68
+#, fuzzy
+msgid "Growl UDP port on the server."
+msgstr "UDP ポート"
+
+#: modules/misc/growl.c:73
+#, fuzzy
+msgid "Growl"
+msgstr "グループ"
+
+#: modules/misc/growl.c:74
+msgid "Growl Notification Plugin"
+msgstr ""
+
+#: modules/misc/growl.c:172 modules/misc/msn.c:202 modules/misc/notify.c:163
+msgid "(no title)"
+msgstr "(タイトルなし)"
+
+#: modules/misc/growl.c:173 modules/misc/msn.c:203
+msgid "(no artist)"
+msgstr "(アーティストなし)"
+
+#: modules/misc/growl.c:174 modules/misc/msn.c:204
+msgid "(no album)"
+msgstr "(アルバムなし)"
+
 #: modules/misc/gtk_main.c:60
 msgid "Gtk+ GUI helper"
 msgstr "Gtk+ GUI ヘルパー"
 
-#: modules/misc/logger.c:107
+#: modules/misc/logger.c:112 modules/video_filter/marq.c:76
 msgid "Text"
 msgstr "テキスト"
 
-#: modules/misc/logger.c:113
+#: modules/misc/logger.c:118
 msgid "Log format"
 msgstr "ログフォーマット"
 
-#: modules/misc/logger.c:115
+#: modules/misc/logger.c:120
 #, fuzzy
 msgid ""
 "Specify the log format. Available choices are \"text\" (default), \"html\", "
-"and \"syslog\"."
+"and \"syslog\" (special mode to send to syslog instead of file."
 msgstr ""
 "ログ・フォーマットを指定します。\"text\" (デフォルト) and \"html\"が選択でき"
 "ます。"
 
-#: modules/misc/logger.c:117
+#: modules/misc/logger.c:124
 #, fuzzy
 msgid ""
 "Specify the log format. Available choices are \"text\" (default) and \"html"
@@ -12908,23 +14541,32 @@ msgstr ""
 "ログ・フォーマットを指定します。\"text\" (デフォルト) and \"html\"が選択でき"
 "ます。"
 
-#: modules/misc/logger.c:123
+#: modules/misc/logger.c:129
 msgid "Logging"
 msgstr ""
 
-#: modules/misc/logger.c:124
+#: modules/misc/logger.c:130
 #, fuzzy
 msgid "File logging"
 msgstr "ファイルロギングインターフェース"
 
-#: modules/misc/logger.c:126
+#: modules/misc/logger.c:136
 msgid "Log filename"
 msgstr "ログファイル名"
 
-#: modules/misc/logger.c:126
+#: modules/misc/logger.c:136
 msgid "Specify the log filename."
 msgstr "ログ・ファイル名を指定します。"
 
+#: 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
 msgid "libc memcpy"
 msgstr "libc memcpy"
@@ -12945,45 +14587,62 @@ msgstr "MMX 拡張memcpy"
 msgid "AltiVec memcpy"
 msgstr "AltiVec memcpy"
 
-#: modules/misc/msn.c:67
+#: modules/misc/msn.c:64
 msgid "MSN Title format string"
 msgstr "MSN 題名書式文字列"
 
-#: modules/misc/msn.c:68
-msgid "MSN Title format string. {0} artist, {1} title, {2} album"
+#: modules/misc/msn.c:65
+msgid ""
+"Format of the string to send to MSN {0} Artist, {1} Title, {2} Album. "
+"Defaults to \"Artist - Title\" ({0} - {1})."
 msgstr ""
-"MSN の題名の書式文字列です。「{0}はアーティスト、{1}は題名、{2}はアルバムです"
 
-#: modules/misc/msn.c:74
+#: modules/misc/msn.c:71
 msgid "MSN"
 msgstr "MSN"
 
-#: modules/misc/msn.c:75
-msgid "MSN Title Plugin"
-msgstr "MSN 題名プラグイン"
-
-#: modules/misc/msn.c:198
-msgid "(no title)"
-msgstr "(タイトルなし)"
-
-#: modules/misc/msn.c:199
-msgid "(no artist)"
-msgstr "(アーティストなし)"
-
-#: modules/misc/msn.c:200
-msgid "(no album)"
-msgstr "(アルバムなし)"
+#: modules/misc/msn.c:72
+#, 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:81
 #, fuzzy
 msgid "UDP/IPv6 network abstraction layer"
 msgstr "IPv6ネットワーク抽象レイヤ"
 
+#: modules/misc/notify.c:55
+#, fuzzy
+msgid "Timeout (ms)"
+msgstr "時間"
+
+#: modules/misc/notify.c:56
+msgid "How long the notification will be displayed "
+msgstr ""
+
+#: modules/misc/notify.c:61
+msgid "Notify"
+msgstr ""
+
+#: modules/misc/notify.c:62
+msgid "LibNotify Notification Plugin"
+msgstr ""
+
+#: modules/misc/notify.c:158
+#, fuzzy
+msgid "no artist"
+msgstr "(アーティストなし)"
+
+#: modules/misc/notify.c:161
+#, fuzzy
+msgid "no album"
+msgstr "(アルバムなし)"
+
 #: modules/misc/playlist/export.c:44
 msgid "M3U playlist exporter"
 msgstr "M3U 再生一覧をエクスポートする"
@@ -12992,6 +14651,16 @@ msgstr "M3U 再生一覧をエクスポートする"
 msgid "Old playlist exporter"
 msgstr "古い再生一覧をエクスポートする"
 
+#: modules/misc/playlist/export.c:56
+#, fuzzy
+msgid "XSPF playlist export"
+msgstr "M3U 再生一覧をエクスポートする"
+
+#: modules/misc/probe/hal.c:52 modules/services_discovery/hal.c:63
+#, fuzzy
+msgid "HAL devices detection"
+msgstr "HAL デバイス検知"
+
 #: modules/misc/qte_main.cpp:66
 msgid "Run as standalone Qt/Embedded GUI Server"
 msgstr ""
@@ -13011,31 +14680,52 @@ msgid "video"
 msgstr "ビデオ"
 
 #: modules/misc/rtsp.c:48
+#, fuzzy
+msgid "RTSP host address"
+msgstr "ホストアドレス"
+
+#: modules/misc/rtsp.c:51
 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 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:56
+#, fuzzy
+msgid "Maximum number of connections"
+msgstr "クローンの数"
+
+#: modules/misc/rtsp.c:57
+msgid ""
+"This limits the maximum number of clients that can connect to the RTSP VOD. "
+"0 means no limit."
+msgstr ""
+
+#: modules/misc/rtsp.c:60
+msgid "MUX for RAW RTSP transport"
 msgstr ""
 
-#: modules/misc/rtsp.c:52
+#: modules/misc/rtsp.c:63
 msgid "RTSP VoD"
 msgstr "RTSP VoD"
 
-#: modules/misc/rtsp.c:53
+#: modules/misc/rtsp.c:64
 msgid "RTSP VoD server"
 msgstr "RTSP VoD サーバー"
 
-#: modules/misc/screensaver.c:44
+#: modules/misc/screensaver.c:81
 #, fuzzy
 msgid "X Screensaver disabler"
 msgstr "ノンインタレース化モジュール"
 
-#: modules/misc/svg.c:57
+#: modules/misc/svg.c:65
 #, fuzzy
 msgid "SVG template file"
 msgstr "ファイルの保存"
 
-#: modules/misc/svg.c:58
+#: modules/misc/svg.c:66
 msgid ""
 "Location of a file holding a SVG template for automatic string conversion"
 msgstr ""
@@ -13053,53 +14743,59 @@ msgstr "Cモジュール(何もしません)"
 msgid "Miscellaneous stress tests"
 msgstr "その他 負荷テスト"
 
-#: modules/misc/win32text.c:85
+#: modules/misc/win32text.c:58
+msgid ""
+"This is the default size of the fonts that will be rendered on the video. If "
+"set to something different than 0 this option will override the relative "
+"font size. "
+msgstr ""
+
+#: modules/misc/win32text.c:91
 msgid "Win32 font renderer"
 msgstr "Win32 フォントレンダラー"
 
-#: 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
 #, fuzzy
 msgid "Simple XML Parser"
 msgstr "シンプルなid3タグ・スキッパ"
 
 #: 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
 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
 #, fuzzy
 msgid "ASF muxer"
 msgstr "MPEG 1/2レイヤ1/2オーディオ・デコーダ"
@@ -13118,29 +14814,29 @@ msgid "Dummy/Raw muxer"
 msgstr ""
 
 #: modules/mux/mp4.c:45
-msgid "Create \"Fast start\" files"
+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 ""
 
-#: 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 "DTS ディレイ (ミリ秒)"
 
 #: 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
@@ -13148,9 +14844,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
@@ -13163,7 +14857,7 @@ msgstr "ビデオ PID"
 
 #: 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 ""
 
@@ -13172,7 +14866,7 @@ msgid "Audio PID"
 msgstr "オーディオ PID"
 
 #: 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
@@ -13180,7 +14874,7 @@ msgid "SPU PID"
 msgstr "SPU PID"
 
 #: 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
@@ -13188,7 +14882,7 @@ msgid "PMT PID"
 msgstr "PMT PID"
 
 #: 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
@@ -13196,66 +14890,87 @@ msgid "TS ID"
 msgstr "TS ID"
 
 #: modules/mux/mpeg/ts.c:93
-msgid "Assigns a fixed Transport Stream ID."
-msgstr ""
+#, fuzzy
+msgid "Assign a fixed Transport Stream ID."
+msgstr "ストリームの再生"
 
 #: modules/mux/mpeg/ts.c:94
 msgid "NET ID"
 msgstr "NET ID"
 
 #: 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. Disabling this "
+"might save some bandwidth but introduce incompatibilities."
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:107
+#: modules/mux/mpeg/ts.c:118
 #, fuzzy
 msgid "Shaping delay (ms)"
 msgstr "キャッシング値 (ms)"
 
-#: 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 "
@@ -13264,74 +14979,73 @@ 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 ディレイ (ミリ秒)"
 
-#: 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 "暗号オーディオに CVS を使用する"
 
-#: 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
 #, fuzzy
 msgid "Crypt video using CSA"
 msgstr "暗号オーディオに CVS を使用する"
 
-#: modules/mux/mpeg/ts.c:142
+#: modules/mux/mpeg/ts.c:154
 msgid "CSA Key"
 msgstr "CSA キー"
 
-#: 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:160
 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:173
 msgid "TS muxer (libdvbpsi)"
 msgstr ""
 
@@ -13341,18 +15055,19 @@ 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
 #, fuzzy
-msgid "Multipart jpeg muxer"
+msgid "Multipart JPEG muxer"
 msgstr "出力フォーマット"
 
 #: modules/mux/ogg.c:50
-msgid "Ogg/ogm muxer"
-msgstr ""
+#, fuzzy
+msgid "Ogg/OGM muxer"
+msgstr "MPEG 1/2レイヤ1/2オーディオ・デコーダ"
 
 #: modules/mux/wav.c:42
 #, fuzzy
@@ -13365,7 +15080,7 @@ msgstr ""
 
 #: modules/packetizer/h264.c:47
 #, fuzzy
-msgid "H264 video packetizer"
+msgid "H.264 video packetizer"
 msgstr "MPEG 1/2ビデオ・デコーダ・モジュール"
 
 #: modules/packetizer/mpeg4audio.c:118
@@ -13373,20 +15088,20 @@ msgstr "MPEG 1/2ビデオ・デコーダ・モジュール"
 msgid "MPEG4 audio packetizer"
 msgstr "字幕・デコーダ・モジュール"
 
-#: modules/packetizer/mpeg4video.c:47
+#: modules/packetizer/mpeg4video.c:48
 #, fuzzy
 msgid "MPEG4 video packetizer"
 msgstr "MPEG 1/2ビデオ・デコーダ・モジュール"
 
 #: 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
@@ -13399,11 +15114,11 @@ msgstr "MPEG 1/2ビデオ・デコーダ・モジュール"
 msgid "Bonjour services"
 msgstr "サーバーなし"
 
-#: modules/services_discovery/bonjour.c:307
+#: modules/services_discovery/bonjour.c:310
 msgid "Bonjour"
 msgstr ""
 
-#: modules/services_discovery/daap.c:53 modules/services_discovery/daap.c:187
+#: modules/services_discovery/daap.c:53 modules/services_discovery/daap.c:189
 msgid "DAAP shares"
 msgstr "DAAP 共有"
 
@@ -13411,11 +15126,7 @@ msgstr "DAAP 共有"
 msgid "DAAP access"
 msgstr "DAAP アクセス"
 
-#: modules/services_discovery/hal.c:63
-msgid "HAL device detection"
-msgstr "HAL デバイス検知"
-
-#: modules/services_discovery/hal.c:153
+#: modules/services_discovery/hal.c:130
 msgid "Devices"
 msgstr "デバイス"
 
@@ -13424,15 +15135,16 @@ msgid "Podcast URLs list"
 msgstr "Podcast URL 一覧"
 
 #: modules/services_discovery/podcast.c:58
-msgid "Podcast '|' (pipe) seperated URLs list"
+msgid "Enter the list of podcasts to retrieve, separated by '|' (pipe)."
 msgstr ""
 
-#: modules/services_discovery/podcast.c:62
+#: modules/services_discovery/podcast.c:63
 #, fuzzy
-msgid "Podcast Service Discovery"
-msgstr "ソースディレクトリ"
+msgid "Podcasts"
+msgstr "ペースト"
 
 #: modules/services_discovery/podcast.c:154
+#: modules/services_discovery/podcast.c:156
 #, fuzzy
 msgid "Podcast"
 msgstr "ペースト"
@@ -13442,164 +15154,167 @@ msgid "SAP multicast address"
 msgstr "SAP マルチキャストアドレス"
 
 #: modules/services_discovery/sap.c:80
-msgid "Listen for SAP announcements on another address"
+msgid ""
+"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:81
-msgid "IPv4-SAP listening"
-msgstr "IPv4-SAP の待ちうけ"
-
 #: modules/services_discovery/sap.c:83
-msgid ""
-"Set this if you want the SAP module to listen to IPv4 announcements on the "
-"standard address."
-msgstr ""
+#, fuzzy
+msgid "IPv4 SAP"
+msgstr "IPv6 SAP スコープ"
 
 #: modules/services_discovery/sap.c:85
-msgid "IPv6-SAP listening"
-msgstr "IPv6-SAP の待ち受け"
+msgid "Listen to IPv4 announcements on the standard address."
+msgstr ""
 
 #: modules/services_discovery/sap.c:87
-msgid ""
-"Set this if you want the SAP module to listen to IPv6 announcements on the "
-"standard address."
-msgstr ""
+#, fuzzy
+msgid "IPv6 SAP"
+msgstr "IPv6 SAP スコープ"
 
 #: modules/services_discovery/sap.c:89
+msgid "Listen to IPv6 announcements on the standard addresses."
+msgstr ""
+
+#: modules/services_discovery/sap.c:91
 msgid "IPv6 SAP scope"
 msgstr "IPv6 SAP スコープ"
 
-#: modules/services_discovery/sap.c:91
-msgid "Sets the scope for IPv6 announcements (default is 8)."
+#: modules/services_discovery/sap.c:93
+msgid "Scope for IPv6 announcements (default is 8)."
 msgstr ""
 
-#: modules/services_discovery/sap.c:92
+#: modules/services_discovery/sap.c:94
 msgid "SAP timeout (seconds)"
 msgstr "SAP タイムアウト (秒)"
 
-#: modules/services_discovery/sap.c:94
+#: modules/services_discovery/sap.c:96
 msgid ""
-"Sets the time before SAP items get deleted if no new announcement is "
-"received."
+"Delay after which SAP items get deleted if no new announcement is received."
 msgstr ""
 
-#: modules/services_discovery/sap.c:96
-msgid "Try to parse the SAP"
+#: modules/services_discovery/sap.c:98
+msgid "Try to parse the announce"
 msgstr ""
 
-#: modules/services_discovery/sap.c:98
+#: modules/services_discovery/sap.c:100
 msgid ""
-"When SAP can it will try to parse the SAP. If you don't select this, all "
-"announcements 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:100
+#: modules/services_discovery/sap.c:103
 msgid "SAP Strict mode"
 msgstr "SAP 厳密モード"
 
-#: modules/services_discovery/sap.c:102
+#: modules/services_discovery/sap.c:105
 msgid ""
 "When this is set, the SAP parser will discard some non-compliant "
 "announcements."
 msgstr ""
 
-#: modules/services_discovery/sap.c:104
+#: modules/services_discovery/sap.c:107
 msgid "Use SAP cache"
 msgstr "SAP キャッシュを使う"
 
-#: modules/services_discovery/sap.c:106
+#: modules/services_discovery/sap.c:109
 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 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:111
+#: modules/services_discovery/sap.c:113
 msgid ""
-"Enable timeshifting automatically for streams discovered through SAP "
+"This automatically enables timeshifting for streams discovered through SAP "
 "announcements."
 msgstr ""
 
-#: modules/services_discovery/sap.c:122
+#: modules/services_discovery/sap.c:124
 #, fuzzy
 msgid "SAP Announcements"
 msgstr "SAP アナウンス:"
 
-#: modules/services_discovery/sap.c:147
+#: modules/services_discovery/sap.c:151
 msgid "SDP file parser for UDP"
 msgstr ""
 
-#: modules/services_discovery/sap.c:316
+#: modules/services_discovery/sap.c:319
 #, fuzzy
-msgid "Session Announcements (SAP)"
-msgstr "セッション・アナウンスメント・プロトコルをサポートする"
+msgid "SAP sessions"
+msgstr "セッション"
 
-#: modules/services_discovery/sap.c:812 modules/services_discovery/sap.c:817
+#: modules/services_discovery/sap.c:846 modules/services_discovery/sap.c:850
 msgid "Session"
 msgstr "セッション"
 
-#: modules/services_discovery/sap.c:813
+#: modules/services_discovery/sap.c:846
 msgid "Tool"
 msgstr "ツール"
 
-#: modules/services_discovery/sap.c:818
+#: modules/services_discovery/sap.c:851
 msgid "User"
 msgstr "ユーザー"
 
-#: modules/services_discovery/shout.c:61
-#, fuzzy
-msgid "Maximum number of shoutcast servers to be listed"
-msgstr "ログ・ウィンドウの最大行数"
-
 #: modules/services_discovery/shout.c:67
 msgid "Shoutcast radio listings"
 msgstr ""
 
-#: modules/services_discovery/shout.c:139
-msgid "Shoutcast"
+#: modules/services_discovery/shout.c:79
+msgid "Shoutcast TV listings"
+msgstr ""
+
+#: modules/services_discovery/shout.c:147
+msgid "Shoutcast TV"
 msgstr ""
 
-#: modules/services_discovery/upnp.cpp:58
+#: modules/services_discovery/upnp_cc.cpp:58
 msgid "Universal Plug'n'Play discovery"
 msgstr ""
 
+#: 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
 #, fuzzy
 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
 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
 #, fuzzy
 msgid "Bridge out"
 msgstr "ビデオポート"
 
-#: modules/stream_out/bridge.c:72
+#: modules/stream_out/bridge.c:73
 msgid "Bridge in"
 msgstr ""
 
@@ -13620,7 +15335,7 @@ msgstr "ビデオレンダリングの有効/無効"
 msgid "Introduces a delay in the display of the stream."
 msgstr ""
 
-#: modules/stream_out/display.c:50 modules/video_filter/deinterlace.c:121
+#: modules/stream_out/display.c:50 modules/video_filter/deinterlace.c:127
 msgid "Display"
 msgstr "表示"
 
@@ -13632,94 +15347,98 @@ msgstr "ストリーム出力の表示"
 msgid "Duplicate stream output"
 msgstr "ストリーム出力の複製"
 
-#: modules/stream_out/es.c:37 modules/stream_out/standard.c:42
+#: 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:44
-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."
-msgstr ""
+#, fuzzy
+msgid "This is the output access method that will be used for audio."
+msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: 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
+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:46
+#: modules/stream_out/es.c:48 modules/stream_out/standard.c:43
 #, fuzzy
 msgid "Output muxer"
 msgstr "出力フォーマット"
 
-#: modules/stream_out/es.c:52 modules/stream_out/rtp.c:55
+#: modules/stream_out/es.c:50
 #, fuzzy
-msgid "Allows you to specify the muxer used for the streaming output."
-msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+msgid "This is the default muxer method that will be used."
+msgstr "VCDデバイスの既定値を指定します。"
 
-#: modules/stream_out/es.c:53
+#: modules/stream_out/es.c:51
 #, fuzzy
 msgid "Audio output muxer"
 msgstr "オーディオ出力モジュール"
 
-#: modules/stream_out/es.c:55
+#: modules/stream_out/es.c:53
 #, fuzzy
-msgid "Allows you to specify the muxer used for the audio streaming output."
-msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+msgid "This is the muxer that will be used for audio."
+msgstr ""
+"X11が描画するローカルのディスプレイ・ポートを指定します。インスタンスは、:0.1"
+"です。"
 
-#: modules/stream_out/es.c:56
+#: modules/stream_out/es.c:54
 #, fuzzy
 msgid "Video output muxer"
 msgstr "ビデオ出力モジュール"
 
-#: modules/stream_out/es.c:58
+#: modules/stream_out/es.c:56
 #, fuzzy
-msgid "Allows you to specify the muxer used for the video streaming output."
-msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+msgid "This is the muxer that will be used for video."
+msgstr ""
+"X11が描画するローカルのディスプレイ・ポートを指定します。インスタンスは、:0.1"
+"です。"
 
-#: modules/stream_out/es.c:60
+#: modules/stream_out/es.c:58
 msgid "Output URL"
 msgstr "出力 URL"
 
-#: modules/stream_out/es.c:62 modules/stream_out/rtp.c:46
+#: modules/stream_out/es.c:60
 #, fuzzy
-msgid "Allows you to specify the output URL used for the streaming output."
-msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+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."
+#: modules/stream_out/es.c:63
+#, fuzzy
+msgid "This is the output URI that will be used for audio."
 msgstr ""
+"X11が描画するローカルのディスプレイ・ポートを指定します。インスタンスは、:0.1"
+"です。"
 
-#: modules/stream_out/es.c:67
+#: modules/stream_out/es.c:64
 msgid "Video output URL"
 msgstr "ビデオ出力 URL"
 
-#: modules/stream_out/es.c:69
+#: modules/stream_out/es.c:66
 #, fuzzy
-msgid ""
-"Allows you to specify the output URL used for the video streaming output."
-msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+msgid "This is the output URI that will be used for video."
+msgstr ""
+"X11が描画するローカルのディスプレイ・ポートを指定します。インスタンスは、:0.1"
+"です。"
 
-#: modules/stream_out/es.c:79
+#: modules/stream_out/es.c:75
 #, fuzzy
 msgid "Elementary stream output"
 msgstr "ストリームの出力先の選択"
@@ -13751,218 +15470,242 @@ msgstr "設定"
 msgid "Mosaic bridge stream output"
 msgstr "ストリームの出力先の選択"
 
-#: modules/stream_out/rtp.c:47
+#: 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 "SDP"
 
-#: modules/stream_out/rtp.c:49
+#: 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:53
+#: modules/stream_out/rtp.c:55
 #, fuzzy
 msgid "Muxer"
 msgstr "ミュートする"
 
-#: modules/stream_out/rtp.c:57 modules/stream_out/standard.c:59
+#: 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 "VLCが選択するパケッタライザーの順序を選択します。"
+
+#: modules/stream_out/rtp.c:60 modules/stream_out/standard.c:51
 msgid "Session name"
 msgstr "セッション名"
 
-#: modules/stream_out/rtp.c:59
-#, fuzzy
-msgid "Allows you to specify the session name used for the streaming output."
-msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+#: 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:60
+#: modules/stream_out/rtp.c:64
 msgid "Session description"
 msgstr "セッションの説明"
 
-#: modules/stream_out/rtp.c:62
+#: modules/stream_out/rtp.c:66
 #, fuzzy
-msgid "Allows you to give a broader description of the stream."
+msgid ""
+"This allows you to give a broader description of the stream, that will be "
+"announced in the SDP (Session Descriptor)."
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: modules/stream_out/rtp.c:63
+#: modules/stream_out/rtp.c:68
 msgid "Session URL"
 msgstr "セッション URL"
 
-#: modules/stream_out/rtp.c:65
-#, fuzzy
-msgid "Allows you to specify a URL with additional information on the stream."
-msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+#: 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:66
+#: modules/stream_out/rtp.c:73
 #, fuzzy
 msgid "Session email"
 msgstr "セッション名"
 
-#: modules/stream_out/rtp.c:68
-#, fuzzy
-msgid "Allows you to specify contact e-mail address for this session."
-msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+#: 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:72
+#: modules/stream_out/rtp.c:79
 #, fuzzy
-msgid "Allows you to specify the base port used for the RTP streaming."
+msgid "This allows you to specify the base port for the RTP streaming."
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: modules/stream_out/rtp.c:73
+#: modules/stream_out/rtp.c:80
 msgid "Audio port"
 msgstr "オーディオポート"
 
-#: modules/stream_out/rtp.c:75
+#: modules/stream_out/rtp.c:82
 #, fuzzy
 msgid ""
-"Allows you to specify the default audio port used for the RTP streaming."
+"This allows you to specify the default audio port for the RTP streaming."
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: modules/stream_out/rtp.c:76
+#: modules/stream_out/rtp.c:83
 msgid "Video port"
 msgstr "ビデオポート"
 
-#: modules/stream_out/rtp.c:78
+#: 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 "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: modules/stream_out/rtp.c:82
-msgid "Allows you to specify the time to live for the output stream."
-msgstr ""
+#: modules/stream_out/rtp.c:89
+#, fuzzy
+msgid "This allows you to specify the Time-To-Live for the output stream."
+msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
 #: modules/stream_out/rtp.c:91
-msgid "RTP stream output"
-msgstr "RTP ストリーム出力"
+msgid "MP4A LATM"
+msgstr ""
 
-#: modules/stream_out/standard.c:48
+#: modules/stream_out/rtp.c:93
 #, fuzzy
-msgid ""
-"Allows you to specify the output muxer method used for the streaming output."
+msgid "This allows you to stream MPEG4 LATM audio streams (see RFC3016)."
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: modules/stream_out/standard.c:50
-#, fuzzy
-msgid "Output URL (deprecated)"
-msgstr "出力デバイス"
+#: modules/stream_out/rtp.c:102
+msgid "RTP stream output"
+msgstr "RTP ストリーム出力"
+
+#: modules/stream_out/standard.c:42
+msgid "This is the output access method that will be used."
+msgstr ""
 
-#: modules/stream_out/standard.c:52
+#: modules/stream_out/standard.c:46
 #, fuzzy
-msgid ""
-"Allows you to specify the output URL used for the streaming output."
-"Deprecated, use dst instead."
-msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+msgid "This is the muxer that will be used."
+msgstr "VCDデバイスの既定値を指定します。"
 
-#: modules/stream_out/standard.c:55
+#: modules/stream_out/standard.c:47
 #, fuzzy
 msgid "Output destination"
 msgstr "送信先のアスペクト・レシオ"
 
-#: modules/stream_out/standard.c:57
+#: modules/stream_out/standard.c:50
 #, fuzzy
-msgid ""
-"Allows you to specify the output destination used for the streaming output."
+msgid "This is the destination (URL) that will be used for the stream."
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: modules/stream_out/standard.c:61
-msgid "Name of the session that will be announced with SAP"
-msgstr ""
+#: modules/stream_out/standard.c:53
+#, fuzzy
+msgid ""
+"This allows you to specify a name for the session, that will be announced if "
+"you choose to use SAP."
+msgstr "VLCがプラグインを見つけるときに検索される追加のパスを設定します。"
 
-#: modules/stream_out/standard.c:63
+#: modules/stream_out/standard.c:56
 msgid "Session groupname"
 msgstr "セッショングループ名"
 
-#: modules/stream_out/standard.c:65
-msgid "Name of the group that will be announced for the session"
-msgstr ""
+#: modules/stream_out/standard.c:58
+#, fuzzy
+msgid ""
+"This allows you to specify a group for the session, that will be announced "
+"if you choose to use SAP."
+msgstr "VLCがプラグインを見つけるときに検索される追加のパスを設定します。"
 
-#: modules/stream_out/standard.c:67
+#: modules/stream_out/standard.c:61
 #, fuzzy
 msgid "SAP announcing"
 msgstr "ストリーム出力"
 
-#: modules/stream_out/standard.c:68
-msgid "Announce this session with SAP"
+#: modules/stream_out/standard.c:62
+msgid "Announce this session with SAP."
 msgstr ""
 
-#: modules/stream_out/standard.c:76
+#: modules/stream_out/standard.c:70
 msgid "Standard"
 msgstr "標準"
 
-#: modules/stream_out/standard.c:77
+#: modules/stream_out/standard.c:71
 msgid "Standard stream output"
 msgstr "標準ストリーム出力"
 
-#: modules/stream_out/switcher.c:81
+#: modules/stream_out/switcher.c:82
 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 "出力ファイルのパス"
 
-#: 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 "アスペクト比(4:3 や 16:9)です。"
 
-#: modules/stream_out/switcher.c:90
+#: modules/stream_out/switcher.c:91
 msgid "Command UDP port"
 msgstr "コマンド UDP ポート"
 
-#: modules/stream_out/switcher.c:92
+#: modules/stream_out/switcher.c:93
 msgid "UDP port to listen to for commands."
 msgstr "コマンドを待ち受ける UDP ポートです。"
 
-#: 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 "GOP サイズ"
 
-#: modules/stream_out/switcher.c:98
+#: modules/stream_out/switcher.c:99
 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 "ビデオ・ストリームの出力を有効にする"
@@ -13972,9 +15715,11 @@ 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 "VLCが選択するパケッタライザーの順序を選択します。"
 
 #: modules/stream_out/transcode.c:50
 #, fuzzy
@@ -13982,240 +15727,300 @@ 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
+#: modules/stream_out/transcode.c:55
 #, fuzzy
-msgid "Allows you to specify the video bitrate used for the streaming output."
-msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+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
+#: modules/stream_out/transcode.c:61
 #, fuzzy
-msgid "Allows you to specify an output frame rate for the video."
-msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+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
 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 "VLCが選択するパケッタライザーの順序を選択します。"
+msgid "Maximum output video width."
+msgstr "ビデオの最大の幅"
 
-#: modules/stream_out/transcode.c:79
+#: modules/stream_out/transcode.c:77
 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 "VLCが選択するパケッタライザーの順序を選択します。"
+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 "VLCが選択するパケッタライザーの順序を選択します。"
+"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
+#: modules/stream_out/transcode.c:85
 #, fuzzy
-msgid "Video crop top"
+msgid "Video crop (top)"
 msgstr "設定"
 
-#: modules/stream_out/transcode.c:89
-msgid "Allows you to specify the top coordinate for the video cropping."
+#: modules/stream_out/transcode.c:87
+msgid "Number of pixels to crop at the top of the video."
 msgstr ""
 
-#: modules/stream_out/transcode.c:90
+#: modules/stream_out/transcode.c:88
 #, fuzzy
-msgid "Video crop left"
+msgid "Video crop (left)"
 msgstr "DVDデバイス"
 
-#: modules/stream_out/transcode.c:92
-msgid "Allows you to specify the left coordinate for the video cropping."
+#: modules/stream_out/transcode.c:90
+msgid "Number of pixels to crop at the left of the video."
 msgstr ""
 
-#: modules/stream_out/transcode.c:93
+#: modules/stream_out/transcode.c:91
 #, fuzzy
-msgid "Video crop bottom"
+msgid "Video crop (bottom)"
 msgstr "設定"
 
-#: modules/stream_out/transcode.c:95
-msgid "Allows you to specify the bottom coordinate for the video cropping."
+#: modules/stream_out/transcode.c:93
+msgid "Number of pixels to crop at the bottom of the video."
 msgstr ""
 
-#: modules/stream_out/transcode.c:96
+#: modules/stream_out/transcode.c:94
 #, fuzzy
-msgid "Video crop right"
+msgid "Video crop (right)"
 msgstr "ビデオの高さ"
 
-#: modules/stream_out/transcode.c:98
-msgid "Allows you to specify the right coordinate for the video cropping."
+#: modules/stream_out/transcode.c:96
+msgid "Number of pixels to crop at the right of the video."
 msgstr ""
 
+#: modules/stream_out/transcode.c:98
+#, fuzzy
+msgid "Video padding (top)"
+msgstr "設定"
+
 #: modules/stream_out/transcode.c:100
-msgid "Audio encoder"
-msgstr "オーディオエンコーダー"
+msgid "Size of the black border to add at the top of the video."
+msgstr ""
 
-#: modules/stream_out/transcode.c:102
-msgid ""
-"Allows you to specify the audio encoder to use and its associated options."
+#: modules/stream_out/transcode.c:101
+#, fuzzy
+msgid "Video padding (left)"
+msgstr "DVDデバイス"
+
+#: 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 "Destination audio codec"
-msgstr "送信先のアスペクト・レシオ"
+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 ""
-"Allows you to specify the destination audio codec used for the streaming "
-"output."
+"This sets aspect (like 4:3) of the video canvas and letterbox the video "
+"accordingly."
 msgstr ""
 
-#: modules/stream_out/transcode.c:108
+#: modules/stream_out/transcode.c:122
+msgid "Audio encoder"
+msgstr "オーディオエンコーダー"
+
+#: modules/stream_out/transcode.c:124
+#, fuzzy
+msgid ""
+"This is the audio encoder module that will be used (and its associated "
+"options)."
+msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+
+#: modules/stream_out/transcode.c:126
+#, fuzzy
+msgid "Destination audio codec"
+msgstr "送信先のアスペクト・レシオ"
+
+#: modules/stream_out/transcode.c:128
+#, fuzzy
+msgid "This is the audio codec that will be used."
+msgstr "VCDデバイスの既定値を指定します。"
+
+#: modules/stream_out/transcode.c:129
 msgid "Audio bitrate"
 msgstr "オーディオビットレート"
 
-#: modules/stream_out/transcode.c:110
+#: modules/stream_out/transcode.c:131
 #, fuzzy
-msgid "Allows you to specify the audio bitrate used for the streaming output."
-msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+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
-#, fuzzy
+#: modules/stream_out/transcode.c:134
 msgid ""
-"Allows you to specify the audio sample rate used for the streaming output."
-msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+"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."
+#: 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
 #, fuzzy
 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 "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: modules/stream_out/transcode.c:125
+#: modules/stream_out/transcode.c:143
 #, fuzzy
 msgid "Destination subtitles codec"
 msgstr "送信先のアスペクト・レシオ"
 
-#: modules/stream_out/transcode.c:127
-#, fuzzy
-msgid ""
-"Allows you to specify the destination subtitles codec used for the streaming "
-"output."
-msgstr "VLCが選択するパケッタライザーの順序を選択します。"
-
-#: modules/stream_out/transcode.c:129
-#, fuzzy
-msgid "Subpictures filter"
-msgstr "字幕ファイル"
+#: 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:118
+#: modules/stream_out/transcode.c:154 modules/video_filter/osdmenu.c:119
 msgid "OSD menu"
 msgstr "OSD メニュー"
 
-#: 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
 #, fuzzy
 msgid "Transcode stream output"
 msgstr "ストリームの一時停止"
 
-#: modules/stream_out/transcode.c:228
+#: modules/stream_out/transcode.c:263
 msgid "Overlays/Subtitles"
 msgstr "オーバーレイ/字幕"
 
@@ -14238,6 +16043,13 @@ msgstr "MMX I420,IYUV,YV12 to RV15,RV16,RV24,RV32コンバージョン"
 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 "
@@ -14249,50 +16061,66 @@ msgid "AltiVec conversions from "
 msgstr "変換元 "
 
 #: modules/video_filter/adjust.c:60
-msgid "Image contrast (0-2)"
-msgstr "画像コントラスト (0〜2)"
+#, fuzzy
+msgid "Brightness threshold"
+msgstr "ブライトネス"
 
 #: modules/video_filter/adjust.c:61
-msgid "Set the image contrast, between 0 and 2. Defaults to 1"
+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:62
+#: modules/video_filter/adjust.c:64
+msgid "Image contrast (0-2)"
+msgstr "画像コントラスト (0〜2)"
+
+#: 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:66
 msgid "Image hue (0-360)"
 msgstr ""
 
-#: modules/video_filter/adjust.c:63
-msgid "Set the image hue, between 0 and 360. Defaults to 0"
-msgstr ""
+#: modules/video_filter/adjust.c:67
+#, fuzzy
+msgid "Set the image hue, between 0 and 360. Defaults to 0."
+msgstr "画像ブライトネス設定。0〜2 の間でデフォルトは 1 です。"
 
-#: modules/video_filter/adjust.c:64
+#: modules/video_filter/adjust.c:68
 msgid "Image saturation (0-3)"
 msgstr ""
 
-#: modules/video_filter/adjust.c:65
-msgid "Set the image saturation, between 0 and 3. Defaults to 1"
-msgstr ""
+#: modules/video_filter/adjust.c:69
+#, fuzzy
+msgid "Set the image saturation, between 0 and 3. Defaults to 1."
+msgstr "画像ブライトネス設定。0〜2 の間でデフォルトは 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.01〜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 "画像調整"
 
@@ -14306,24 +16134,26 @@ msgstr "クローンの数"
 
 #: modules/video_filter/clone.c:56
 #, fuzzy
-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
 #, fuzzy
-msgid "List of video output modules"
+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
 #, fuzzy
 msgid "Clone video filter"
 msgstr "イメージ・クローン・ビデオ・モジュール"
 
-#: modules/video_filter/clone.c:65
+#: modules/video_filter/clone.c:66
 #, fuzzy
 msgid "Clone"
 msgstr "閉じる"
@@ -14345,7 +16175,7 @@ msgstr "自動縁取り"
 
 #: modules/video_filter/crop.c:58
 #, fuzzy
-msgid "Activate automatic black border cropping."
+msgid "Automatic black border cropping."
 msgstr "黒縁を自動的にアクティブにする"
 
 #: modules/video_filter/crop.c:61
@@ -14353,21 +16183,26 @@ msgstr "黒縁を自動的にアクティブにする"
 msgid "Crop video filter"
 msgstr "ビデオ・フィルター・モジュール"
 
-#: modules/video_filter/deinterlace.c:102
-#: modules/video_filter/deinterlace.c:105
+#: modules/video_filter/deinterlace.c:108
 msgid "Deinterlace mode"
 msgstr "ノンインタレース化モード"
 
-#: modules/video_filter/deinterlace.c:103
+#: modules/video_filter/deinterlace.c:109
 #, fuzzy
-msgid "Default deinterlace method to use for local playback"
+msgid "Deinterlace method to use for local playback."
 msgstr "スローモーションに使うホットキーを選択"
 
-#: modules/video_filter/deinterlace.c:106
-msgid "Default deinterlace methode to use for streaming"
-msgstr ""
+#: modules/video_filter/deinterlace.c:111
+#, fuzzy
+msgid "Streaming deinterlace mode"
+msgstr "ノンインタレース化モード"
 
-#: modules/video_filter/deinterlace.c:115
+#: modules/video_filter/deinterlace.c:112
+#, fuzzy
+msgid "Deinterlace method to use for streaming."
+msgstr "スローモーションに使うホットキーを選択"
+
+#: modules/video_filter/deinterlace.c:121
 #, fuzzy
 msgid "Deinterlacing video filter"
 msgstr "ビデオ逆転モジュール"
@@ -14379,7 +16214,9 @@ msgstr "湾曲モード"
 
 #: modules/video_filter/distort.c:65
 #, fuzzy
-msgid "Distort mode, one of \"wave\", \"ripple\", \"gradient\" and \"edge\""
+msgid ""
+"Distort mode, one of \"wave\", \"ripple\", \"gradient\", \"edge\", \"hough\" "
+"and \"psychedelic\"."
 msgstr "湾曲モード(\"wave\", \"ripple\")"
 
 #: modules/video_filter/distort.c:67
@@ -14387,41 +16224,58 @@ msgid "Gradient image type"
 msgstr ""
 
 #: modules/video_filter/distort.c:68
-msgid "Gradient image type (0 or 1)"
+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:70
+#: modules/video_filter/distort.c:71
 #, fuzzy
 msgid "Apply cartoon effect"
 msgstr "次のチャプターを選択"
 
-#: modules/video_filter/distort.c:71
-msgid "Apply cartoon effect. Used by \"gradient\" and \"edge\"."
+#: modules/video_filter/distort.c:72
+msgid "Apply cartoon effect. It is only used by \"gradient\" and \"edge\"."
 msgstr ""
 
-#: modules/video_filter/distort.c:74
+#: modules/video_filter/distort.c:77
 msgid "Wave"
 msgstr "波形"
 
-#: modules/video_filter/distort.c:74
+#: modules/video_filter/distort.c:77
 #, fuzzy
 msgid "Ripple"
 msgstr "ファイル"
 
-#: modules/video_filter/distort.c:74
-msgid "gradient"
-msgstr ""
+#: modules/video_filter/distort.c:77
+#, fuzzy
+msgid "Gradient"
+msgstr "緑"
 
-#: modules/video_filter/distort.c:74
+#: modules/video_filter/distort.c:78
 #, fuzzy
 msgid "Edge"
 msgstr "ブライトネス"
 
-#: modules/video_filter/distort.c:77
+#: modules/video_filter/distort.c:78
+msgid "Hough"
+msgstr ""
+
+#: modules/video_filter/distort.c:81
 #, fuzzy
 msgid "Distort video filter"
 msgstr "ビデオ逆転モジュール"
 
+#: modules/video_filter/dummy.c:54
+#, fuzzy
+msgid "Dummy video filter"
+msgstr "ビデオ・フィルター・モジュール"
+
+#: modules/video_filter/dummy.c:55
+#, fuzzy
+msgid "Dummy VF"
+msgstr "ダミー"
+
 #: modules/video_filter/invert.c:52
 #, fuzzy
 msgid "Invert video filter"
@@ -14433,55 +16287,81 @@ msgid "Color inversion"
 msgstr "変換元 "
 
 #: modules/video_filter/logo.c:68
-msgid "Logo filename"
+#, fuzzy
+msgid "Logo filenames"
 msgstr "ロゴファイル名"
 
 #: modules/video_filter/logo.c:69
+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:72
 #, fuzzy
-msgid "Full path of the PNG file to use."
-msgstr "出力ファイルのパス"
+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:70
-msgid "X coordinate of the logo"
+#: modules/video_filter/logo.c:75
+msgid "Logo individual image time in ms"
 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:76
+msgid "Individual image display time of 0 - 60000 ms."
 msgstr ""
 
-#: modules/video_filter/logo.c:72
-msgid "Y coordinate of the logo"
+#: modules/video_filter/logo.c:78 modules/video_filter/osdmenu.c:51
+#, 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:54
+#, 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 "ロゴの位置"
 
-#: 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 "ロゴサブフィルター"
 
@@ -14490,165 +16370,290 @@ msgstr "ロゴサブフィルター"
 msgid "Magnify/Zoom interactive video filter"
 msgstr "ビデオ逆転モジュール"
 
-#: modules/video_filter/marq.c:76
-msgid "Marquee text"
-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 "左からの X 座標オフセット"
+#, 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"
-msgstr ""
+#: modules/video_filter/marq.c:79 modules/video_filter/rss.c:135
+#, fuzzy
+msgid "X offset, from the left screen edge."
+msgstr "左からの X 座標オフセット"
 
-#: 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 "上からの Y 座標オフセット"
+#, fuzzy
+msgid "Y offset"
+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 ""
+#: modules/video_filter/marq.c:81 modules/video_filter/rss.c:137
+#, fuzzy
+msgid "Y offset, down from the top."
+msgstr "上からの Y 座標オフセット"
 
 #: modules/video_filter/marq.c:82
-msgid "Marquee timeout"
-msgstr ""
+#, fuzzy
+msgid "Timeout"
+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
-#: modules/video_filter/time.c:77
-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
 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:136 modules/video_filter/rss.c:173
+#: modules/video_filter/marq.c:137 modules/video_filter/rss.c:189
 #, fuzzy
 msgid "Misc"
 msgstr "ディスク"
 
-#: modules/video_filter/marq.c:140
-msgid "Marquee display sub filter"
-msgstr ""
-
-#: modules/video_filter/mosaic.c:87
-msgid "Alpha blending"
-msgstr "αブレンディング"
-
-#: modules/video_filter/mosaic.c:88
-msgid "Alpha blending (0 -> 255). Default is 255"
-msgstr "αブレンディング (0 から 255) です。デフォルトは 255 です。"
+#: modules/video_filter/marq.c:141
+#, fuzzy
+msgid "Marquee display"
+msgstr "オンスクリーンディスプレイ"
 
 #: modules/video_filter/mosaic.c:90
-msgid "Height in pixels"
-msgstr "ピクセル指定の高さ"
+#, fuzzy
+msgid "Transparency"
+msgstr "ロゴの透過"
 
 #: modules/video_filter/mosaic.c:91
-msgid "Width in pixels"
-msgstr "ピクセル指定の幅"
+msgid ""
+"Transparency of the mosaic foreground pictures. 0 means transparent, 255 "
+"opaque (default)."
+msgstr ""
+
+#: modules/video_filter/mosaic.c:95
+#, fuzzy
+msgid "Total height of the mosaic, in pixels."
+msgstr "エフェクトビデオウィンドウの高さをピクセルで指定します。"
 
-#: modules/video_filter/mosaic.c:92
+#: modules/video_filter/mosaic.c:97
 #, fuzzy
-msgid "Top left corner x coordinate"
+msgid "Total width of the mosaic, in pixels."
+msgstr "エフェクトビデオウィンドウの幅をピクセルで指定します。"
+
+#: modules/video_filter/mosaic.c:99
+#, fuzzy
+msgid "Top left corner X coordinate"
 msgstr "Video x コーディネート"
 
-#: modules/video_filter/mosaic.c:93
+#: modules/video_filter/mosaic.c:100
+msgid "X Coordinate of the top-left corner of the mosaic."
+msgstr ""
+
+#: modules/video_filter/mosaic.c:101
 #, fuzzy
-msgid "Top left corner y coordinate"
-msgstr "ビデオ y コーディネート"
+msgid "Top left corner Y coordinate"
+msgstr "Video x コーディネート"
 
-#: modules/video_filter/mosaic.c:94
-msgid "Vertical border width in pixels"
+#: 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 "Vertical border width"
 msgstr "ピクセル指定の垂直境界線幅"
 
-#: modules/video_filter/mosaic.c:95
-msgid "Horizontal 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:106
+#, fuzzy
+msgid "Horizontal border width"
 msgstr "ピクセル指定の水平境界線幅"
 
-#: modules/video_filter/mosaic.c:96
+#: 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:110
 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
 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:122 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:123
+msgid ""
+"Number of image rows in the mosaic (only used if positionning method is set "
+"to \"fixed\"."
+msgstr ""
+
+#: modules/video_filter/mosaic.c:125 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:126
+msgid ""
+"Number of image columns in the mosaic (only used if positionning method is "
+"set to \"fixed\"."
+msgstr ""
+
+#: modules/video_filter/mosaic.c:130
+#, fuzzy
+msgid "Keep the original aspect ratio when resizing mosaic elements."
 msgstr "サイズ変更時にアスペクト比を維持する"
 
-#: modules/video_filter/mosaic.c:105
+#: modules/video_filter/mosaic.c:132
 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:133
+#, fuzzy
+msgid "Keep the original size of mosaic elements."
+msgstr "元サイズを維持する"
+
+#: modules/video_filter/mosaic.c:135
+#, fuzzy
+msgid "Elements order"
+msgstr "湾曲モード"
+
+#: modules/video_filter/mosaic.c:136
+msgid ""
+"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:110
+#: modules/video_filter/mosaic.c:141
 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."
+"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:116
+#: modules/video_filter/mosaic.c:145
+#, fuzzy
+msgid "Bluescreen"
+msgstr "全画面化"
+
+#: modules/video_filter/mosaic.c:146
+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:151
+msgid "Bluescreen U value"
+msgstr ""
+
+#: modules/video_filter/mosaic.c:152
+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:154
+msgid "Bluescreen V value"
+msgstr ""
+
+#: modules/video_filter/mosaic.c:155
+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:157
+#, fuzzy
+msgid "Bluescreen U tolerance"
+msgstr "オーディオ"
+
+#: modules/video_filter/mosaic.c:158
+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:161
+#, fuzzy
+msgid "Bluescreen V tolerance"
+msgstr "オーディオ"
+
+#: modules/video_filter/mosaic.c:162
+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:168
 #, fuzzy
 msgid "fixed"
 msgstr "ファイル"
 
-#: modules/video_filter/mosaic.c:125
+#: modules/video_filter/mosaic.c:177
 msgid "Mosaic video sub filter"
 msgstr "モザイクビデオサブフィルター"
 
-#: modules/video_filter/mosaic.c:126
+#: modules/video_filter/mosaic.c:178
 msgid "Mosaic"
 msgstr "モザイク"
 
@@ -14672,38 +16677,40 @@ 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:59
+msgid "The umber of frames used for detection."
 msgstr ""
 
-#: modules/video_filter/motiondetect.c:60
+#: modules/video_filter/motiondetect.c:62
 #, fuzzy
 msgid "Motion detect video filter"
 msgstr "イメージ・クローン・ビデオ・モジュール"
 
-#: modules/video_filter/motiondetect.c:61
+#: modules/video_filter/motiondetect.c:63
 msgid "Motion detect"
 msgstr "モーション検知"
 
 #: modules/video_filter/osdmenu.c:42
-msgid "OSD menu configuration file"
-msgstr "OSD メニュー設定ファイル"
+#, fuzzy
+msgid "Configuration file"
+msgstr "VLM 設定ファイル"
 
-#: modules/video_filter/osdmenu.c:44
-msgid "An OSD menu configuration file that menu actions with button images"
-msgstr ""
+#: modules/video_filter/osdmenu.c:45
+#, fuzzy
+msgid "Configuration file for the OSD Menu"
+msgstr "設定オプション"
 
 #: modules/video_filter/osdmenu.c:46
 msgid "Path to OSD menu images"
@@ -14711,35 +16718,30 @@ msgstr "OSD メニュー画像へのパス"
 
 #: modules/video_filter/osdmenu.c:48
 msgid ""
-"Specify another path to the OSD menu images. This will override the path as "
-"defined in the OSD configuration file."
-msgstr ""
-
-#: modules/video_filter/osdmenu.c:51
-msgid "X coordinate of the OSD menu"
+"Path to the OSD menu images. This will override the path defined in the OSD "
+"configuration file."
 msgstr ""
 
 #: modules/video_filter/osdmenu.c:52 modules/video_filter/osdmenu.c:55
 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
-msgid "OSD menu position"
+#, fuzzy
+msgid "Menu position"
 msgstr "OSD メニューの位置"
 
 #: modules/video_filter/osdmenu.c:59
 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 "OSD メニューのタイムアウト"
+#, fuzzy
+msgid "Menu timeout"
+msgstr "時間"
 
 #: modules/video_filter/osdmenu.c:65
 msgid ""
@@ -14749,53 +16751,91 @@ msgid ""
 msgstr ""
 
 #: modules/video_filter/osdmenu.c:69
-msgid "Update speed of OSD menu"
-msgstr "OSD メニューの更新速度"
+#, fuzzy
+msgid "Menu update interval"
+msgstr "キー間隔:"
 
 #: modules/video_filter/osdmenu.c:71
 msgid ""
-"Update the OSD menu picture every 200 ms (default). Shorten the update time "
-"for environments that experience transmissions errors. Be careful 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:117
-msgid "On Screen Display menu subfilter"
-msgstr ""
+#: modules/video_filter/osdmenu.c:118
+#, fuzzy
+msgid "On Screen Display menu"
+msgstr "オンスクリーンディスプレイ"
 
-#: modules/video_filter/rss.c:110
-msgid "RSS feed URLs"
-msgstr "RSS フィード URL"
+#: 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 "RSS フィードは「|(パイプ)」で分けられた URL です"
 
-#: modules/video_filter/rss.c:112
-msgid "RSS feed speed"
-msgstr "RSS フィード速度"
+#: modules/video_filter/rss.c:123
+msgid "Speed of feeds"
+msgstr ""
 
-#: modules/video_filter/rss.c:113
-msgid "RSS feed speed (bigger is slower)"
+#: modules/video_filter/rss.c:124
+#, fuzzy
+msgid "Speed of the RSS/Atom feeds (bigger is slower)."
 msgstr "RSS フィード速度(大きいほど遅い)"
 
-#: modules/video_filter/rss.c:114 modules/video_filter/rss.c:115
-msgid "RSS feed max number of chars displayed"
-msgstr "RSS フィードの表示する最大文字数"
+#: 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:131
+msgid "Feed images"
+msgstr ""
+
+#: modules/video_filter/rss.c:132
+msgid "Display feed images if available."
+msgstr ""
 
-#: modules/video_filter/rss.c:116
-msgid "Number of seconds between each forced refresh of the feeds"
+#: modules/video_filter/rss.c:139 modules/video_filter/time.c:78
+msgid ""
+"Opacity (inverse of transparency) of overlay text. 0 = transparent, 255 = "
+"totally opaque."
 msgstr ""
 
-#: modules/video_filter/rss.c:117
+#: modules/video_filter/rss.c:152 modules/video_filter/time.c:91
+#, fuzzy
+msgid "Text position"
+msgstr "時間の位置"
+
+#: modules/video_filter/rss.c:154
 msgid ""
-"Number of seconds between each forced refresh of the feeds. If 0, the feeds "
-"will never be updated."
+"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:180
-msgid "RSS feed display"
+#: modules/video_filter/rss.c:197
+#, fuzzy
+msgid "RSS and Atom feed display"
 msgstr "RSS フィード表示"
 
 #: modules/video_filter/rv32.c:52
@@ -14811,8 +16851,9 @@ msgid "Scaling mode"
 msgstr "スケーリングモード"
 
 #: modules/video_filter/swscale/filter.c:64
-msgid "You can choose the default scaling mode."
-msgstr ""
+#, fuzzy
+msgid "Scaling mode to use."
+msgstr "スケーリングモード"
 
 #: modules/video_filter/swscale/filter.c:68
 #, fuzzy
@@ -14867,25 +16908,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
-msgid "Time position"
-msgstr "時間の位置"
+#: 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:121
+#: modules/video_filter/time.c:124
 msgid "Time display sub filter"
 msgstr ""
 
@@ -14926,14 +16971,12 @@ msgstr "イメージ変換モジュール"
 
 #: modules/video_filter/wall.c:54
 #, fuzzy
-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
 #, fuzzy
-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
@@ -14942,7 +16985,7 @@ msgstr "アクティブ・ウィンドウ"
 
 #: modules/video_filter/wall.c:62
 #, fuzzy
-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
@@ -14951,21 +16994,21 @@ msgid "Element aspect ratio"
 msgstr "送信先のアスペクト・レシオ"
 
 #: modules/video_filter/wall.c:66
-msgid "The aspect ratio of the individual displays building the display wall"
+msgid "Aspect ratio of the individual displays building the wall."
 msgstr ""
 
-#: modules/video_filter/wall.c:69
+#: modules/video_filter/wall.c:70
 #, fuzzy
 msgid "Wall video filter"
 msgstr "ビデオ・フィルター・モジュール"
 
-#: modules/video_filter/wall.c:70
+#: modules/video_filter/wall.c:71
 #, fuzzy
 msgid "Image wall"
 msgstr "大きい"
 
 #: modules/video_output/aa.c:55
-msgid "Ascii Art"
+msgid "ASCII Art"
 msgstr ""
 
 #: modules/video_output/aa.c:58
@@ -14973,11 +17016,15 @@ msgstr ""
 msgid "ASCII-art video output"
 msgstr "ASCIIアート・ビデオ出力モジュール"
 
-#: modules/video_output/caca.c:57
+#: modules/video_output/caca.c:80
 #, fuzzy
 msgid "Color ASCII art video output"
 msgstr "ASCIIアート・ビデオ出力モジュール"
 
+#: 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 変換を使用する"
@@ -15046,8 +17093,7 @@ msgstr "DirectX ビデオ出力"
 msgid "Wallpaper"
 msgstr "壁紙"
 
-#: modules/video_output/directx/glwin32.c:65 modules/video_output/opengl.c:135
-#: modules/video_output/x11/glx.c:115
+#: modules/video_output/directx/glwin32.c:65 modules/video_output/opengl.c:180
 msgid "OpenGL video output"
 msgstr "OpenGL ビデオ出力"
 
@@ -15056,24 +17102,23 @@ 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 "GNU/Linux フレームバッファコンソールのビデオ出力"
 
 #: 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"
+#, fuzzy
+msgid "X11 display"
 msgstr "X11 ディスプレイ名"
 
 #: modules/video_output/ggi.c:58
 #, fuzzy
 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 ""
 "使用したいX11のハードウェア・ディスプレイを指定します。\n"
@@ -15093,30 +17138,68 @@ 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
+#, fuzzy
+msgid "Image width"
+msgstr "画像調整"
+
+#: modules/video_output/image.c:52
+#, fuzzy
+msgid ""
+"You can enforce the image width. By default (-1) VLC will adapt to the video "
+"characteristics."
+msgstr ""
+"ビデオの幅を強制的に指定することができます。\n"
+"※VLCはデフォルトでビデオの特性に合わせます。"
+
+#: modules/video_output/image.c:56
+#, fuzzy
+msgid "Image height"
+msgstr "ビデオの高さ"
+
+#: modules/video_output/image.c:57
+#, fuzzy
+msgid ""
+"You can enforce the image height. By default (-1) VLC will adapt to the "
+"video characteristics."
+msgstr ""
+"ビデオの高さを強制的に指定することができます。\n"
+"※VLCはデフォルトでビデオの特性に合わせます。"
+
+#: modules/video_output/image.c:61
 msgid "Recording ratio"
 msgstr ""
 
-#: modules/video_output/image.c:52
+#: modules/video_output/image.c:62
 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
+#: modules/video_output/image.c:65
 msgid "Filename prefix"
 msgstr "ファイル名の接頭語"
 
-#: modules/video_output/image.c:56
+#: modules/video_output/image.c:66
 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:64
+#: modules/video_output/image.c:70
+msgid "Always write to the same file"
+msgstr ""
+
+#: modules/video_output/image.c:71
+msgid ""
+"Always write to the same file instead of creating one file per image. In "
+"this case, the number is not appended to the filename."
+msgstr ""
+
+#: modules/video_output/image.c:80
 msgid "Image video output"
 msgstr "画像ビデオ出力"
 
@@ -15125,39 +17208,122 @@ msgstr "画像ビデオ出力"
 msgid "Matrox Graphic Array video output"
 msgstr "Matroxグラフィック・アレイ・ビデオ・モジュール"
 
-#: modules/video_output/opengl.c:114 modules/video_output/opengl.c:118
-msgid "OpenGL cube rotation speed"
+#: modules/video_output/opengl.c:122 modules/video_output/opengl.c:173
+msgid "Cube"
+msgstr "キューブ"
+
+#: modules/video_output/opengl.c:122 modules/video_output/opengl.c:173
+msgid "Transparent Cube"
+msgstr ""
+
+#: modules/video_output/opengl.c:123
+#, fuzzy
+msgid "Cylinder"
+msgstr "リニア"
+
+#: modules/video_output/opengl.c:123
+msgid "Torus"
+msgstr ""
+
+#: modules/video_output/opengl.c:123
+#, fuzzy
+msgid "Sphere"
+msgstr "速度"
+
+#: modules/video_output/opengl.c:123
+msgid "SQUAREXY"
+msgstr ""
+
+#: modules/video_output/opengl.c:123
+msgid "SQUARER"
+msgstr ""
+
+#: modules/video_output/opengl.c:123
+msgid "ASINXY"
 msgstr ""
 
-#: modules/video_output/opengl.c:119
-msgid "If the OpenGL cube effect is enabled, this controls its rotation speed."
+#: modules/video_output/opengl.c:123
+msgid "ASINR"
 msgstr ""
 
-#: modules/video_output/opengl.c:122
-msgid "Select effect"
-msgstr "エフェクトの選択"
+#: modules/video_output/opengl.c:123
+msgid "SINEXY"
+msgstr ""
+
+#: modules/video_output/opengl.c:123
+msgid "SINER"
+msgstr ""
+
+#: modules/video_output/opengl.c:148
+msgid "OpenGL sampling accuracy "
+msgstr ""
+
+#: modules/video_output/opengl.c:149
+msgid "Select the accuracy of 3D object sampling(1 = min and 10 = max)"
+msgstr ""
+
+#: modules/video_output/opengl.c:150
+msgid "OpenGL Cylinder radius"
+msgstr ""
+
+#: modules/video_output/opengl.c:151
+msgid "Radius of the OpenGL cylinder effect, if enabled"
+msgstr ""
 
-#: modules/video_output/opengl.c:124
+#: modules/video_output/opengl.c:152
 #, fuzzy
-msgid "Allows you to select different visual effects."
-msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+msgid "Point of view x-coordinate"
+msgstr "ビデオ x コーディネート"
 
-#: modules/video_output/opengl.c:129
-msgid "Cube"
-msgstr "キューブ"
+#: modules/video_output/opengl.c:153
+msgid "Point of view (X coordinate) of the cube/cylinder effect, if enabled."
+msgstr ""
 
-#: modules/video_output/opengl.c:129
-msgid "Transparent Cube"
+#: modules/video_output/opengl.c:155
+#, fuzzy
+msgid "Point of view y-coordinate"
+msgstr "ビデオ x コーディネート"
+
+#: modules/video_output/opengl.c:156
+msgid "Point of view (Y coordinate) of the cube/cylinder effect, if enabled."
+msgstr ""
+
+#: modules/video_output/opengl.c:158
+#, fuzzy
+msgid "Point of view z-coordinate"
+msgstr "ビデオ x コーディネート"
+
+#: modules/video_output/opengl.c:159
+msgid "Point of view (Z coordinate) of the cube/cylinder effect, if enabled."
+msgstr ""
+
+#: modules/video_output/opengl.c:162
+msgid "OpenGL cube rotation speed"
+msgstr ""
+
+#: modules/video_output/opengl.c:163
+msgid "Rotation speed of the OpenGL cube effect, if enabled."
+msgstr ""
+
+#: modules/video_output/opengl.c:165
+#, fuzzy
+msgid "Effect"
+msgstr "取出し"
+
+#: modules/video_output/opengl.c:167
+msgid "Several visual OpenGL effects are available."
 msgstr ""
 
 #: modules/video_output/qte/qte.cpp:79
-msgid "QT Embedded display name"
+#, fuzzy
+msgid "QT Embedded display"
 msgstr "埋め込みQTのX11ディスプレイ名"
 
 #: modules/video_output/qte/qte.cpp:81
+#, fuzzy
 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 ""
 "使用したいQtのハードウェア・ディスプレイを指定します。\n"
 "デフォルトではVLCは、DISPLAY環境変数に設定されているものを使用します。"
@@ -15173,39 +17339,48 @@ msgid "Simple DirectMedia Layer video output"
 msgstr "シンプル DirectMedia レイヤ・モジュール"
 
 #: 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."
-msgstr ""
+#, fuzzy
+msgid "Width of the snapshot image."
+msgstr "ビデオスナップショットの形式"
 
 #: modules/video_output/snapshot.c:63
-msgid "snapshot height"
-msgstr ""
+#, fuzzy
+msgid "Snapshot height"
+msgstr "スナップショット"
 
 #: modules/video_output/snapshot.c:64
-msgid "Set the height of the snapshot image."
-msgstr ""
+#, 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
@@ -15224,10 +17399,11 @@ msgstr "Windows GDI ビデオ出力"
 msgid "XVideo adaptor number"
 msgstr "XVideoアダプタ番号"
 
-#: modules/video_output/x11/glx.c:89 modules/video_output/x11/xvideo.c:46
+#: modules/video_output/x11/glx.c:89
+#, fuzzy
 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 ""
 "グラフィックカードが複数のアダプタを提供している場合、このオプションはどれを"
 "使用するかを選択することができます。(これは変更すべきではありません)"
@@ -15257,23 +17433,29 @@ msgstr ""
 
 #: modules/video_output/x11/glx.c:103 modules/video_output/x11/x11.c:54
 #: modules/video_output/x11/xvideo.c:60
+#, fuzzy
 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 ""
 "使用したいX11のハードウェア・ディスプレイを指定します。\n"
 "デフォルトではVLCは、DISPLAY環境変数に設定されているものを使用します。"
 
-#: modules/video_output/x11/glx.c:106 modules/video_output/x11/xvideo.c:72
+#: modules/video_output/x11/glx.c:106 modules/video_output/x11/x11.c:61
+#: modules/video_output/x11/xvideo.c:72
 #, fuzzy
-msgid "Screen to be used for fullscreen mode."
+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/glx.c:115
+msgid "OpenGL(GLX) provider"
 msgstr ""
 
 #: modules/video_output/x11/x11.c:57 modules/video_output/x11/xvideo.c:68
@@ -15284,14 +17466,19 @@ msgstr "共有メモリの使用"
 msgid "Use shared memory to communicate between VLC and the X server."
 msgstr "共有メモリをVLCとXサーバの通信のために使用します。"
 
-#: 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
+#, fuzzy
+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色彩フォーマット"
@@ -15323,7 +17510,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 ""
 
@@ -15332,193 +17519,879 @@ 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)."
+#, fuzzy
+msgid ""
+"This allows you to set the animation speed (between 1 and 10, defaults to 6)."
+msgstr "画像ガンマ設定。0.01〜10の間でデフォルトは 1 です。"
+
+#: modules/visualization/goom.c:70
+msgid "Goom"
+msgstr "Goom"
+
+#: modules/visualization/goom.c:71
+msgid "Goom effect"
+msgstr "Goom エフェクト"
+
+#: modules/visualization/visual/visual.c:38
+msgid "Effects list"
+msgstr "エフェクト一覧"
+
+#: modules/visualization/visual/visual.c:40
+msgid ""
+"A list of visual effect, separated by commas.\n"
+"Current effects include: dummy, scope, spectrum."
+msgstr ""
+
+#: modules/visualization/visual/visual.c:45
+msgid "The width of the effects video window, in pixels."
+msgstr "エフェクトビデオウィンドウの幅をピクセルで指定します。"
+
+#: modules/visualization/visual/visual.c:49
+msgid "The height of the effects video window, in pixels."
+msgstr "エフェクトビデオウィンドウの高さをピクセルで指定します。"
+
+#: modules/visualization/visual/visual.c:51
+msgid "Number of bands"
+msgstr "バンド数"
+
+#: modules/visualization/visual/visual.c:53
+msgid "Number of bands used by spectrum analyzer, should be 20 or 80."
+msgstr ""
+
+#: modules/visualization/visual/visual.c:55
+msgid "Number of bands used by the spectrometer, from 20 to 80."
 msgstr ""
 
-#: modules/visualization/goom.c:70
-msgid "Goom"
-msgstr "Goom"
+#: modules/visualization/visual/visual.c:57
+msgid "Band separator"
+msgstr "バンドセパレータ"
+
+#: modules/visualization/visual/visual.c:59
+msgid "Number of blank pixels between bands."
+msgstr ""
+
+#: modules/visualization/visual/visual.c:61
+#, fuzzy
+msgid "Amplification"
+msgstr "このアプリケーションについて"
+
+#: modules/visualization/visual/visual.c:63
+msgid "This is a coefficient that modifies the height of the bands."
+msgstr ""
+
+#: modules/visualization/visual/visual.c:65
+msgid "Enable peaks"
+msgstr "ピークを有効にする"
+
+#: modules/visualization/visual/visual.c:67
+msgid "Draw \"peaks\" in the spectrum analyzer."
+msgstr ""
+
+#: modules/visualization/visual/visual.c:69
+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:75
+msgid "Draw bands in the spectrometer."
+msgstr ""
+
+#: modules/visualization/visual/visual.c:77
+#, fuzzy
+msgid "Enable base"
+msgstr "ピークを有効にする"
+
+#: modules/visualization/visual/visual.c:79
+msgid "Defines whether to draw the base of the bands."
+msgstr ""
+
+#: modules/visualization/visual/visual.c:81
+msgid "Base pixel radius"
+msgstr ""
+
+#: modules/visualization/visual/visual.c:83
+msgid "Defines radius size in pixels, of base of bands(beginning)."
+msgstr ""
+
+#: modules/visualization/visual/visual.c:85
+#, fuzzy
+msgid "Spectral sections"
+msgstr "選択"
+
+#: modules/visualization/visual/visual.c:87
+msgid "Determines how many sections of spectrum will exist."
+msgstr ""
+
+#: modules/visualization/visual/visual.c:89
+#, fuzzy
+msgid "Peak height"
+msgstr "ビデオの高さ"
+
+#: modules/visualization/visual/visual.c:91
+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:95
+msgid "Additions or subtractions of pixels on the peak width."
+msgstr ""
+
+#: modules/visualization/visual/visual.c:97
+msgid "V-plane color"
+msgstr ""
+
+#: modules/visualization/visual/visual.c:99
+msgid "YUV-Color cube shifting across the V-plane ( 0 - 127 )."
+msgstr ""
+
+#: modules/visualization/visual/visual.c:101
+msgid "Number of stars"
+msgstr "星の数"
+
+#: modules/visualization/visual/visual.c:103
+msgid "Number of stars to draw with random effect."
+msgstr ""
+
+#: modules/visualization/visual/visual.c:109
+msgid "Visualizer"
+msgstr "ビジュアライザー"
+
+#: modules/visualization/visual/visual.c:112
+msgid "Visualizer filter"
+msgstr "ビジュアライザーフィルター"
+
+#: modules/visualization/visual/visual.c:120
+msgid "Spectrum analyser"
+msgstr "スペクトラム解析"
+
+#: modules/visualization/xosd.c:63
+#, fuzzy
+msgid "Flip vertical position"
+msgstr "垂直方向位置"
+
+#: modules/visualization/xosd.c:64
+#, fuzzy
+msgid "Display XOSD output at the bottom of the screen instead of the top."
+msgstr "xosd出力をスクリーンの最上端ではなく、最下端に表示する"
+
+#: modules/visualization/xosd.c:67
+msgid "Vertical offset"
+msgstr "垂直オフセット"
+
+#: modules/visualization/xosd.c:68
+msgid ""
+"Vertical offset between the border of the screen and the displayed text (in "
+"pixels, defaults to 30 pixels)."
+msgstr ""
+
+#: modules/visualization/xosd.c:72
+msgid "Shadow offset"
+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
+#, fuzzy
+msgid "Font used to display text in the XOSD output."
+msgstr "xods出力でテキスト出力のために使用されるフォント"
+
+#: modules/visualization/xosd.c:79
+#, fuzzy
+msgid "Color used to display text in the XOSD output."
+msgstr "xods出力でテキスト出力のために使用されるフォント"
+
+#: modules/visualization/xosd.c:84
+#, fuzzy
+msgid "XOSD interface"
+msgstr "XOSD インターフェース"
+
+#, fuzzy
+#~ msgid "Playlist metademux"
+#~ msgstr "再生一覧を開く"
+
+#, fuzzy
+#~ msgid "Native playlist import"
+#~ msgstr "再生一覧を開く"
+
+#, fuzzy
+#~ msgid "Mime type"
+#~ msgstr "ディスクタイプ"
+
+#, fuzzy
+#~ msgid "Listeners"
+#~ msgstr "リニア"
+
+#, fuzzy
+#~ msgid "Center-Center"
+#~ msgstr "中央"
+
+#, fuzzy
+#~ msgid "Left-Center"
+#~ msgstr "中央"
+
+#, fuzzy
+#~ msgid "Right-Center"
+#~ msgstr "中央"
+
+#, fuzzy
+#~ msgid "Center-Top"
+#~ msgstr "中央"
+
+#, fuzzy
+#~ msgid "Left-Top"
+#~ msgstr "å·¦"
+
+#, fuzzy
+#~ msgid "Right-Top"
+#~ msgstr "右"
+
+#, fuzzy
+#~ msgid "Center-Bottom"
+#~ msgstr "下"
+
+#, fuzzy
+#~ msgid "Left-Bottom"
+#~ msgstr "下"
+
+#, fuzzy
+#~ msgid "Right-Bottom"
+#~ msgstr "下"
+
+#~ msgid "M3U file"
+#~ msgstr "M3U ファイル"
+
+#~ msgid "CDDB Artist"
+#~ msgstr "CDDB アーティスト"
+
+#~ msgid "CDDB Category"
+#~ msgstr "CDDB カテゴリ"
+
+#~ msgid "CDDB Disc ID"
+#~ msgstr "CDDB ディスク ID"
+
+#~ msgid "CDDB Extended Data"
+#~ msgstr "CDDB 拡張データ"
+
+#~ msgid "CDDB Genre"
+#~ msgstr "CDDB ジャンル"
+
+#, fuzzy
+#~ msgid "CDDB Year"
+#~ msgstr "CDDB å¹´"
+
+#~ msgid "CDDB Title"
+#~ msgstr "CDDB タイトル"
+
+#~ msgid "CD-Text Arranger"
+#~ msgstr "CD テキストアレンジャー"
+
+#~ msgid "CD-Text Composer"
+#~ msgstr "CD テキストコンポーサー"
+
+#~ msgid "CD-Text Disc ID"
+#~ msgstr "CD テキストディスク ID"
+
+#~ msgid "CD-Text Genre"
+#~ msgstr "CD テキストジャンル"
+
+#~ msgid "CD-Text Message"
+#~ msgstr "CD テキストメッセージ"
+
+#~ msgid "CD-Text Songwriter"
+#~ msgstr "CD テキストソングライター"
+
+#~ msgid "CD-Text Performer"
+#~ msgstr "<CD テキストパフォーマー"
+
+#~ msgid "CD-Text Title"
+#~ msgstr "CD テキストタイトル"
+
+#~ msgid "ISO-9660 Application ID"
+#~ msgstr "ISO-9660 アプリケーション ID"
+
+#~ msgid "ISO-9660 Preparer"
+#~ msgstr "ISO-9660 準備"
+
+#~ msgid "ISO-9660 Publisher"
+#~ msgstr "ISO-9660 出版社"
+
+#~ msgid "ISO-9660 Volume"
+#~ msgstr "ISO-9660 ボリューム"
+
+#, fuzzy
+#~ msgid "ISO-9660 Volume Set"
+#~ msgstr "音量設定"
+
+#, fuzzy
+#~ msgid "By category"
+#~ msgstr "CDDB カテゴリ"
+
+#~ msgid "Segment filename"
+#~ msgstr "分割ファイル名"
+
+#, fuzzy
+#~ msgid "Muxing application"
+#~ msgstr "このアプリケーションについて"
+
+#, fuzzy
+#~ msgid "Writing application"
+#~ msgstr "垂直方向位置"
+
+#, fuzzy
+#~ msgid "%i items in playlist (%i not shown)"
+#~ msgstr "デフォルトで再生一覧に追加"
+
+#, fuzzy
+#~ msgid "Sorted by Artist"
+#~ msgstr "タイトルでソート(&T)"
+
+#, fuzzy
+#~ msgid "Sorted by Album"
+#~ msgstr "名前でソート"
+
+#, fuzzy
+#~ msgid "Session Announcements (SAP)"
+#~ msgstr "セッション・アナウンスメント・プロトコルをサポートする"
+
+#, fuzzy
+#~ msgid "Number of streams"
+#~ msgstr "行数"
+
+#, fuzzy
+#~ msgid "Maximum number of Shoutcast radio streams which would be listed."
+#~ msgstr "ログ・ウィンドウの最大行数"
+
+#~ msgid "Adjust Image"
+#~ msgstr "画像調整"
+
+#~ msgid "delay"
+#~ msgstr "ディレイ"
+
+#~ msgid "fps"
+#~ msgstr "fps"
+
+#~ msgid "More info"
+#~ msgstr "更なる情報"
+
+#~ msgid "Control interface settings"
+#~ msgstr "制御インターフェース設定"
+
+#, fuzzy
+#~ msgid "This option allows you to select control interfaces. "
+#~ msgstr "VLCがプラグインを見つけるときに検索される追加のパスを設定します。"
+
+#, fuzzy
+#~ msgid "This option allows you to always open a default stream on start-up."
+#~ msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+
+#~ 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は常にビデオをフルスクリーン・モードにしま"
+#~ "す。"
+
+#, fuzzy
+#~ msgid ""
+#~ "If enabled, VLC will try to take advantage of the overlay capabilities of "
+#~ "your graphics card (hardware acceleration)."
+#~ msgstr ""
+#~ "VLCはデフォルトでグラフィックカードのオーバレイ機能の使用を試みます。"
+
+#, fuzzy
+#~ msgid ""
+#~ "Allows you to specify the image format in which the video snapshots will "
+#~ "be stored."
+#~ msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+
+#, fuzzy
+#~ msgid "Program to select"
+#~ msgstr "デコードのプログラム"
+
+#, fuzzy
+#~ msgid "Programs to select"
+#~ msgstr "デコードのプログラム"
+
+#~ msgid "Input start time (seconds)"
+#~ msgstr "入力開始時間 (秒)"
+
+#~ msgid "Input stop time (seconds)"
+#~ msgstr "入力停止時間 (秒)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Allows you to modify the default TCP connection timeout. This value "
+#~ "should be set in millisecond units."
+#~ msgstr ""
+#~ "udpストリームで使用される既定のキャッシング値が変更可能です。単位はミリ秒"
+#~ "で指定します。"
+
+#~ msgid "Preferred codecs list"
+#~ msgstr "準備されているコーデックの一覧"
+
+#, fuzzy
+#~ msgid "This is a legacy entry to let you configure access filter modules."
+#~ msgstr "アクセス・モジュールを選択するレガシー・エントリです。"
+
+#, fuzzy
+#~ msgid "This is a legacy entry to let you configure demux modules."
+#~ msgstr "demuxモジュールを選択するレガシー・エントリです。"
+
+#~ msgid "Select the key to turn off audio volume."
+#~ msgstr "オーディオボリュームを生オンするキーを選択します。"
+
+#, fuzzy
+#~ msgid "Interfaces"
+#~ msgstr "インタフェース"
+
+#, fuzzy
+#~ msgid ""
+#~ "Allows you to modify the default caching value for cdda streams. This "
+#~ "value should be set in milliseconds units."
+#~ msgstr ""
+#~ "udpストリームで使用される既定のキャッシング値が変更可能です。単位はミリ秒"
+#~ "で指定します。"
+
+#, fuzzy
+#~ msgid "Allows you to select the default DVD angle."
+#~ msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+
+#, fuzzy
+#~ msgid ""
+#~ "Allows you to modify the default caching value for DVDread streams. This "
+#~ "value should be set in millisecond units."
+#~ msgstr ""
+#~ "udpストリームで使用される既定のキャッシング値が変更可能です。単位はミリ秒"
+#~ "で指定します。"
+
+#, fuzzy
+#~ msgid "Standard filesystem file input"
+#~ msgstr "標準的なファイルシステムのファイルを読む"
+
+#, fuzzy
+#~ msgid "GnomeVFS filesystem file input"
+#~ msgstr "標準的なファイルシステムのファイルを読む"
+
+#, fuzzy
+#~ msgid ""
+#~ "Allows you to modify the default caching value for http streams. This "
+#~ "value should be set in millisecond units."
+#~ msgstr ""
+#~ "httpストリームで使用される既定のキャッシング値が変更可能です。単位はミリ秒"
+#~ "で指定します。"
+
+#, fuzzy
+#~ msgid ""
+#~ "Allows you to modify the default caching value for pvr streams. This "
+#~ "value should be set in millisecond units."
+#~ msgstr ""
+#~ "ファイル・ストリームの既定のキャッシング値を変更できます。単位はミリ秒"
+
+#, fuzzy
+#~ msgid "Allows you to set the desired frame rate for the capture."
+#~ msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+
+#, fuzzy
+#~ msgid "Allows you to give the mime returned by the server."
+#~ msgstr ""
+#~ "ファイルを見つけるときにオープンされるインタフェースの既定のパスを設定しま"
+#~ "す。"
+
+#~ msgid "Output channels number"
+#~ msgstr "出力チャンネル数"
+
+#~ msgid "Timeout of subpictures"
+#~ msgstr "字幕のタイムアウト"
+
+#, fuzzy
+#~ msgid "Allows you to specify the output video height."
+#~ msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+
+#, fuzzy
+#~ msgid "Allows you to specify the rate control buffer aggressiveness."
+#~ msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+
+#, fuzzy
+#~ msgid "This allows you to change the display name of the Service."
+#~ msgstr ""
+#~ "ファイルを見つけるときにオープンされるインタフェースの既定のパスを設定しま"
+#~ "す。"
+
+#~ msgid "Telnet Interface host"
+#~ msgstr "Telnet インターフェースのホスト"
+
+#, fuzzy
+#~ msgid "Default to listen on all network interfaces"
+#~ msgstr "ネットワーク・インタフェースのMTU"
+
+#~ msgid "Telnet Interface port"
+#~ msgstr "Telnet インターフェースポート"
+
+#~ msgid "Telnet Interface password"
+#~ msgstr "Telnet インターフェースパスワード"
+
+#, fuzzy
+#~ msgid "Default to admin"
+#~ msgstr "削除"
+
+#~ msgid "Size offset"
+#~ msgstr "サイズオフセット"
+
+#, fuzzy
+#~ msgid "You have to select two bookmarks."
+#~ msgstr "2 つのブックマークを選ばなければなりません"
+
+#, fuzzy
+#~ msgid "Go To Position"
+#~ msgstr "ロゴの位置"
+
+#, fuzzy
+#~ msgid "Go to specific position"
+#~ msgstr "特定位置を直接指定"
+
+#, fuzzy
+#~ msgid "Use embedded video output"
+#~ msgstr "QT埋め込みモジュール"
+
+#~ msgid "Fill fullscreen"
+#~ msgstr "全画面化"
+
+#~ msgid "VIDEO_TS folder"
+#~ msgstr "VIDEO_TS フォルダ"
+
+#~ msgid "Override"
+#~ msgstr "上書き"
+
+#, fuzzy
+#~ msgid "Advanced output:"
+#~ msgstr "ALSAオーディオ・モジュール"
+
+#~ msgid "Output Options"
+#~ msgstr "出力オプション"
+
+#, fuzzy
+#~ 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 "&Shuffle Playlist"
+#~ msgstr "再生一覧をシャッフル(&S)"
+
+#, fuzzy
+#~ msgid "Destination Target:"
+#~ msgstr "送信先のアスペクト・レシオ"
+
+#~ msgid "Output methods"
+#~ msgstr "出力方法"
+
+#~ msgid "Miscellaneous options"
+#~ msgstr "その他のオプション"
+
+#~ msgid "Subtitles options"
+#~ msgstr "字幕オプション"
+
+#, fuzzy
+#~ msgid "VLC media player - Updates"
+#~ msgstr "VLC メディアプレイヤー"
+
+#~ msgid "VLM configuration"
+#~ msgstr "YLM 設定"
+
+#~ msgid "Show taskbar entry"
+#~ msgstr "タスクバーに入れて表示する"
+
+#~ msgid "Font filename"
+#~ msgstr "フォントファイル名"
+
+#~ msgid "The size of the fonts used by the osd module"
+#~ msgstr "osd モジュールで使用するフォントのサイズ"
+
+#~ msgid "MSN Title format string. {0} artist, {1} title, {2} album"
+#~ msgstr ""
+#~ "MSN の題名の書式文字列です。「{0}はアーティスト、{1}は題名、{2}はアルバム"
+#~ "です"
+
+#~ msgid "MSN Title Plugin"
+#~ msgstr "MSN 題名プラグイン"
+
+#, fuzzy
+#~ msgid "Podcast Service Discovery"
+#~ msgstr "ソースディレクトリ"
+
+#~ msgid "IPv4-SAP listening"
+#~ msgstr "IPv4-SAP の待ちうけ"
+
+#~ msgid "IPv6-SAP listening"
+#~ msgstr "IPv6-SAP の待ち受け"
+
+#, fuzzy
+#~ msgid "Allows you to specify the muxer used for the streaming output."
+#~ msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+
+#, fuzzy
+#~ msgid "Allows you to specify the muxer used for the audio streaming output."
+#~ msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+
+#, fuzzy
+#~ msgid "Allows you to specify the muxer used for the video streaming output."
+#~ msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+
+#, fuzzy
+#~ msgid "Allows you to specify the output URL used for the streaming output."
+#~ msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+
+#, fuzzy
+#~ msgid ""
+#~ "Allows you to specify the output URL used for the video streaming output."
+#~ msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+
+#, fuzzy
+#~ msgid ""
+#~ "Allows you to specify the session name used for the streaming output."
+#~ msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+
+#, fuzzy
+#~ msgid ""
+#~ "Allows you to specify a URL with additional information on the stream."
+#~ msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+
+#, fuzzy
+#~ msgid "Allows you to specify contact e-mail address for this session."
+#~ msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+
+#, fuzzy
+#~ msgid ""
+#~ "Allows you to specify the output muxer method used for the streaming "
+#~ "output."
+#~ msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+
+#, fuzzy
+#~ msgid "Output URL (deprecated)"
+#~ msgstr "出力デバイス"
+
+#, fuzzy
+#~ msgid ""
+#~ "Allows you to specify the output destination used for the streaming "
+#~ "output."
+#~ msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+
+#, fuzzy
+#~ msgid ""
+#~ "Allows you to specify the video bitrate used for the streaming output."
+#~ msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+
+#, fuzzy
+#~ msgid "Allows you to specify an output frame rate for the video."
+#~ msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+
+#, fuzzy
+#~ msgid "Allows you to specify a maximum output video width."
+#~ msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+
+#, fuzzy
+#~ msgid "Allows you to specify a maximum output video height."
+#~ msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+
+#, fuzzy
+#~ msgid ""
+#~ "Allows you to specify video filters used after the video transcoding and "
+#~ "subpictures overlaying."
+#~ msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+
+#, fuzzy
+#~ msgid ""
+#~ "Allows you to specify the audio bitrate used for the streaming output."
+#~ msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+
+#, fuzzy
+#~ msgid ""
+#~ "Allows you to specify the audio sample rate used for the streaming output."
+#~ msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+
+#, fuzzy
+#~ msgid "Subpictures filter"
+#~ msgstr "字幕ファイル"
 
-#: modules/visualization/goom.c:71
-msgid "Goom effect"
-msgstr "Goom エフェクト"
+#, fuzzy
+#~ msgid "List of video output modules"
+#~ msgstr "ビデオ出力モジュール"
 
-#: modules/visualization/visual/visual.c:38
-msgid "Effects list"
-msgstr "エフェクト一覧"
+#~ msgid "Alpha blending"
+#~ msgstr "αブレンディング"
 
-#: modules/visualization/visual/visual.c:40
-msgid ""
-"A list of visual effect, separated by commas.\n"
-"Current effects include: dummy, scope, spectrum"
-msgstr ""
+#~ msgid "Alpha blending (0 -> 255). Default is 255"
+#~ msgstr "αブレンディング (0 から 255) です。デフォルトは 255 です。"
 
-#: modules/visualization/visual/visual.c:45
-msgid "The width of the effects video window, in pixels."
-msgstr "エフェクトビデオウィンドウの幅をピクセルで指定します。"
+#~ msgid "Height in pixels"
+#~ msgstr "ピクセル指定の高さ"
 
-#: modules/visualization/visual/visual.c:49
-msgid "The height of the effects video window, in pixels."
-msgstr "エフェクトビデオウィンドウの高さをピクセルで指定します。"
+#~ msgid "Width in pixels"
+#~ msgstr "ピクセル指定の幅"
 
-#: modules/visualization/visual/visual.c:51
-msgid "Number of bands"
-msgstr "バンド数"
+#, fuzzy
+#~ msgid "Top left corner y coordinate"
+#~ msgstr "ビデオ y コーディネート"
 
-#: modules/visualization/visual/visual.c:53
-msgid "Number of bands used by spectrum analyzer, should be 20 or 80."
-msgstr ""
+#~ msgid "OSD menu configuration file"
+#~ msgstr "OSD メニュー設定ファイル"
 
-#: modules/visualization/visual/visual.c:55
-msgid "Number of bands used by the spectrometer, from 20 to 80."
-msgstr ""
+#~ msgid "Timeout of OSD menu"
+#~ msgstr "OSD メニューのタイムアウト"
 
-#: modules/visualization/visual/visual.c:57
-msgid "Band separator"
-msgstr "バンドセパレータ"
+#~ msgid "Update speed of OSD menu"
+#~ msgstr "OSD メニューの更新速度"
 
-#: modules/visualization/visual/visual.c:59
-msgid "Number of blank pixels between bands."
-msgstr ""
+#, fuzzy
+#~ msgid "RSS/Atom feed URLs"
+#~ msgstr "RSS フィード URL"
 
-#: modules/visualization/visual/visual.c:61
 #, fuzzy
-msgid "Amplification"
-msgstr "このアプリケーションについて"
+#~ msgid "RSS/Atom feed speed"
+#~ msgstr "RSS フィード速度"
 
-#: modules/visualization/visual/visual.c:63
-msgid "This is a coefficient that modifies the height of the bands."
-msgstr ""
+#, fuzzy
+#~ msgid "RSS/Atom feed max number of chars displayed"
+#~ msgstr "RSS フィードの表示する最大文字数"
 
-#: modules/visualization/visual/visual.c:65
-msgid "Enable peaks"
-msgstr "ピークを有効にする"
+#~ msgid "Select effect"
+#~ msgstr "エフェクトの選択"
 
-#: modules/visualization/visual/visual.c:67
-msgid "Defines whether to draw peaks."
-msgstr ""
+#, fuzzy
+#~ msgid "Allows you to select different visual effects."
+#~ msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: modules/visualization/visual/visual.c:69
-msgid "Enable original graphic spectrum"
-msgstr ""
+#~ msgid "Vertical offset in pixels of the displayed text"
+#~ msgstr "表示されている文字列の垂直方向のオフセット"
 
-#: modules/visualization/visual/visual.c:71
-msgid "Defines whether to draw the original spectrum graphic routine."
-msgstr ""
+#~ msgid "Offset in pixels of the shadow"
+#~ msgstr "陰のオフセット(ピクセル)"
 
-#: modules/visualization/visual/visual.c:73
 #, fuzzy
-msgid "Enable bands"
-msgstr "オーディオを有効にする"
-
-#: modules/visualization/visual/visual.c:75
-msgid "Defines whether to draw the bands."
-msgstr ""
+#~ msgid "Small playlist"
+#~ msgstr "再生一覧を保存"
 
-#: modules/visualization/visual/visual.c:77
 #, fuzzy
-msgid "Enable base"
-msgstr "ピークを有効にする"
-
-#: modules/visualization/visual/visual.c:79
-msgid "Defines whether to draw the base of the bands."
-msgstr ""
+#~ msgid "VC-1 decoder module"
+#~ msgstr "字幕・デコーダ・モジュール"
 
-#: modules/visualization/visual/visual.c:81
-msgid "Base pixel radius"
-msgstr ""
+#~ msgid "M3U file|*.m3u"
+#~ msgstr "M3U ファイル|*.m3u"
 
-#: modules/visualization/visual/visual.c:83
-msgid "Defines radius size in pixels, of base of bands(beginning)."
-msgstr ""
+#~ msgid "Mega bass cut off (10-100Hz)"
+#~ msgstr "メガバス カットオフ (10〜100Hz)"
 
-#: modules/visualization/visual/visual.c:85
 #, fuzzy
-msgid "Spectral sections"
-msgstr "選択"
+#~ msgid "Allows you to set the desired frame rate."
+#~ msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: modules/visualization/visual/visual.c:87
-msgid "Determines how many sections of spectrum will exist."
-msgstr ""
+#, fuzzy
+#~ msgid "MPEG-I/II audio demuxer"
+#~ msgstr "MPEG 1/2レイヤ1/2オーディオ・デコーダ"
 
-#: modules/visualization/visual/visual.c:89
 #, fuzzy
-msgid "Peak height"
-msgstr "ビデオの高さ"
+#~ msgid "Ogg stream demuxer"
+#~ msgstr "MPEG 1/2レイヤ1/2オーディオ・デコーダ"
 
-#: modules/visualization/visual/visual.c:91
-msgid "This is the total pixel height of the peak items."
-msgstr ""
+#~ msgid "Podcast playlist import"
+#~ msgstr "PLS 再生一覧をインポートする"
 
-#: modules/visualization/visual/visual.c:93
-msgid "Peak extra width"
-msgstr ""
+#, fuzzy
+#~ msgid "raw DV demuxer"
+#~ msgstr "MPEG 1/2レイヤ1/2オーディオ・デコーダ"
 
-#: modules/visualization/visual/visual.c:95
-msgid "Additions or subtractions of pixels on the peak width."
-msgstr ""
+#, fuzzy
+#~ msgid "Text subtitles demux"
+#~ msgstr "字幕の選択"
 
-#: modules/visualization/visual/visual.c:97
-msgid "V-plane color"
-msgstr ""
+#, fuzzy
+#~ msgid "ID3 tag parser using libid3tag"
+#~ msgstr "id3タグパーサでlibid3tagを使用"
 
-#: modules/visualization/visual/visual.c:99
-msgid "YUV-Color cube shifting across the V-plane ( 0 - 127 )."
-msgstr ""
+#, fuzzy
+#~ msgid "Enable CABAC"
+#~ msgstr "有効"
 
-#: modules/visualization/visual/visual.c:101
-msgid "Number of stars"
-msgstr "星の数"
+#, fuzzy
+#~ msgid "Enable loop filter"
+#~ msgstr "すべてのグループ項目を有効にする(&E)"
 
-#: modules/visualization/visual/visual.c:103
-msgid "Defines the number of stars to draw with random effect."
-msgstr ""
+#, fuzzy
+#~ msgid "Sets maximum interval between IDR-frames"
+#~ msgstr "ネットワークストリームを選択する"
 
-#: modules/visualization/visual/visual.c:109
-msgid "Visualizer"
-msgstr "ビジュアライザー"
+#, fuzzy
+#~ msgid "Sets minimum interval between IDR-frames"
+#~ msgstr "ネットワークストリームを選択する"
 
-#: modules/visualization/visual/visual.c:112
-msgid "Visualizer filter"
-msgstr "ビジュアライザーフィルター"
+#, fuzzy
+#~ msgid "Scene-cut detection."
+#~ msgstr "選択"
 
-#: modules/visualization/visual/visual.c:120
-msgid "Spectrum analyser"
-msgstr "スペクトラム解析"
+#~ msgid "Properties"
+#~ msgstr "プロパティ"
 
-#: modules/visualization/xosd.c:63
 #, fuzzy
-msgid "Flip vertical position"
-msgstr "垂直方向位置"
+#~ msgid "from "
+#~ msgstr "オロモ語"
 
-#: modules/visualization/xosd.c:64
-msgid "Display xosd output on the bottom of the screen instead of the top"
-msgstr "xosd出力をスクリーンの最上端ではなく、最下端に表示する"
+#, fuzzy
+#~ msgid "Netsync"
+#~ msgstr "ネット"
 
-#: modules/visualization/xosd.c:67
-msgid "Vertical offset"
-msgstr "垂直オフセット"
+#, fuzzy
+#~ msgid "Interface showing control interface"
+#~ msgstr "赤外線リモート・コントロール・モジュール"
 
-#: modules/visualization/xosd.c:68
-msgid "Vertical offset in pixels of the displayed text"
-msgstr "表示されている文字列の垂直方向のオフセット"
+#~ msgid "Item Info"
+#~ msgstr "項目情報"
 
-#: modules/visualization/xosd.c:70
-msgid "Shadow offset"
-msgstr "陰のオフセット"
+#~ msgid "type : "
+#~ msgstr "種類 : "
 
-#: modules/visualization/xosd.c:71
-msgid "Offset in pixels of the shadow"
-msgstr "陰のオフセット(ピクセル)"
+#~ msgid "URL : "
+#~ msgstr "URL : "
 
-#: modules/visualization/xosd.c:74
-msgid "Font used to display text in the xosd output"
-msgstr "xods出力でテキスト出力のために使用されるフォント"
+#~ msgid "file size : "
+#~ msgstr "ファイルサイズ : "
 
-#: modules/visualization/xosd.c:82
 #, fuzzy
-msgid "XOSD interface"
-msgstr "XOSD インターフェース"
+#~ msgid "Choose a mirror"
+#~ msgstr "ミラーの選択"
+
+#~ msgid "Time To Live"
+#~ msgstr "生存時間"
+
+#~ msgid "Force options for separate subtitle files."
+#~ msgstr "分離された字幕ファイルをの強制オプション"
 
 #~ msgid ""
 #~ "VLC is an open-source and cross-platform multimedia player for various "
@@ -15602,10 +18475,6 @@ msgstr "XOSD インターフェース"
 #~ msgid "Track "
 #~ msgstr "トラック "
 
-#, fuzzy
-#~ msgid "VC-1 decoder module"
-#~ msgstr "字幕・デコーダ・モジュール"
-
 #, fuzzy
 #~ msgid "Stretch Aspect Ratio"
 #~ msgstr "ソースのアスペクト・レシオ"
@@ -15739,13 +18608,6 @@ msgstr "XOSD インターフェース"
 #~ msgid "Show tooltips for configuration options."
 #~ msgstr "コンフィグレーション・オプションにツールチップを表示"
 
-#, fuzzy
-#~ msgid "Show text on toolbar buttons"
-#~ msgstr "ツールバー・ボタン上のテキストを表示"
-
-#~ msgid "Show the text below icons on the toolbar."
-#~ msgstr "ツールバーのアイコン上に表示されるテキストを表示します。"
-
 #, fuzzy
 #~ msgid "Maximum height for the configuration windows"
 #~ msgstr "コンフィグレーション・ウィンドウの高さの最大値"
@@ -15872,9 +18734,6 @@ msgstr "XOSD インターフェース"
 #~ msgid "Stop stream"
 #~ msgstr "ストリームの停止"
 
-#~ msgid "Eject"
-#~ msgstr "取出し"
-
 #~ msgid "Play stream"
 #~ msgstr "ストリームの再生"
 
@@ -15908,9 +18767,6 @@ msgstr "XOSD インターフェース"
 #~ msgid "Select previous chapter"
 #~ msgstr "前のチャプターを選択"
 
-#~ msgid "No server"
-#~ msgstr "サーバーなし"
-
 #~ msgid "Toggle fullscreen mode"
 #~ msgstr "全画面表示の切替え"
 
@@ -15920,9 +18776,6 @@ msgstr "XOSD インターフェース"
 #~ msgid "_Jump..."
 #~ msgstr "ジャンプ(_J)..."
 
-#~ msgid "Got directly so specified point"
-#~ msgstr "特定位置を直接指定"
-
 #~ msgid "Switch program"
 #~ msgstr "プログラムの切替え"
 
@@ -15953,15 +18806,9 @@ msgstr "XOSD インターフェース"
 #~ msgid "Open Stream"
 #~ msgstr "ストリームを開く"
 
-#~ msgid "Open Target:"
-#~ msgstr "ターゲットを開く:"
-
 #~ msgid "Symbol Rate"
 #~ msgstr "シンボル・レート"
 
-#~ msgid "Polarization"
-#~ msgstr "極性"
-
 #~ msgid "Vertical"
 #~ msgstr "垂直"
 
@@ -15990,9 +18837,6 @@ msgstr "XOSD インターフェース"
 #~ msgid "Invert"
 #~ msgstr "逆転"
 
-#~ msgid "Jump to: "
-#~ msgstr "指定時間へジャンプ: "
-
 #~ msgid "stream output (MRL)"
 #~ msgstr "ストリームの出力 (MRL)"
 
@@ -16058,9 +18902,6 @@ msgstr "XOSD インターフェース"
 #~ msgid "Go Backward"
 #~ msgstr "逆転再生"
 
-#~ msgid "Stop Stream"
-#~ msgstr "ストリームの停止"
-
 #~ msgid "Play Stream"
 #~ msgstr "ストリームの再生"
 
@@ -16091,9 +18932,6 @@ msgstr "XOSD インターフェース"
 #~ msgid "Open Target"
 #~ msgstr "ファイルを開く"
 
-#~ msgid "Use a subtitles file"
-#~ msgstr "字幕ファイルを使う"
-
 #, fuzzy
 #~ msgid "Select a subtitles file"
 #~ msgstr "字幕の選択"
@@ -16226,10 +19064,6 @@ msgstr "XOSD インターフェース"
 #~ msgid "Opens a network stream"
 #~ msgstr "ネットワークストリームを選択する"
 
-#, fuzzy
-#~ msgid "Backward"
-#~ msgstr "逆転再生"
-
 #~ msgid "Starts playback"
 #~ msgstr "再生開始"
 
@@ -16262,13 +19096,6 @@ msgstr "XOSD インターフェース"
 #~ msgid "Port "
 #~ msgstr "ポート "
 
-#~ msgid "&Save"
-#~ msgstr "保存(&S)"
-
-#, fuzzy
-#~ msgid "Qt interface"
-#~ msgstr "Qtインタフェース・モジュール"
-
 #, fuzzy
 #~ msgid "Video Filters"
 #~ msgstr "ビデオタイトル"
@@ -16352,18 +19179,6 @@ msgstr "XOSD インターフェース"
 #~ msgid "Tetum"
 #~ msgstr "テキスト"
 
-#~ msgid "HTTP user name"
-#~ msgstr "HTTP ユーザー名"
-
-#, fuzzy
-#~ msgid ""
-#~ "Allows you to modify the user name that will be used for the connection "
-#~ "(Basic authentication only)."
-#~ msgstr "VLCが選択するパケッタライザーの順序を選択します。"
-
-#~ msgid "HTTP password"
-#~ msgstr "HTTP パスワード"
-
 #, fuzzy
 #~ msgid "Late delay (ms)"
 #~ msgstr "ファイルの選択"
@@ -16628,17 +19443,6 @@ msgstr "XOSD インターフェース"
 #~ msgid "&Groups"
 #~ msgstr "グループ(&G)"
 
-#~ msgid "Enter a name for the new group:"
-#~ msgstr "新規グループ名前を入力:"
-
-#, fuzzy
-#~ msgid "Effect"
-#~ msgstr "取出し"
-
-#, fuzzy
-#~ msgid "no input\n"
-#~ msgstr "入力がありません。\n"
-
 #~ msgid "| no entries\n"
 #~ msgstr "| エントリがありません。\n"
 
@@ -16776,9 +19580,6 @@ msgstr "XOSD インターフェース"
 #~ msgid "OpenGL effect"
 #~ msgstr "スコープ効果"
 
-#~ msgid "Options"
-#~ msgstr "オプション"
-
 #~ msgid "Audio menu"
 #~ msgstr "オーディオメニュー"
 
@@ -16788,9 +19589,6 @@ msgstr "XOSD インターフェース"
 #~ msgid "Input menu"
 #~ msgstr "入力メニュー"
 
-#~ msgid "Interface menu"
-#~ msgstr "インターフェースメニュー"
-
 #~ msgid "DVD (test)"
 #~ msgstr "DVD(test)"
 
@@ -16809,9 +19607,6 @@ msgstr "XOSD インターフェース"
 #~ msgid "Step 3: Start streaming."
 #~ msgstr "ステップ 3:ストリーミングを開始する"
 
-#~ msgid "Start!"
-#~ msgstr "開始!"
-
 #, fuzzy
 #~ msgid ""
 #~ "Satellite transponder frequency in kHz for DVB-S and in Hz for DVB-C/T"
@@ -16875,12 +19670,6 @@ msgstr "XOSD インターフェース"
 #~ "ファイルを見つけるときにオープンされるインタフェースの既定のパスを設定しま"
 #~ "す。"
 
-#, fuzzy
-#~ msgid ""
-#~ "Allows you to pecify the output access method used for the streaming "
-#~ "output."
-#~ msgstr "VLCが選択するパケッタライザーの順序を選択します。"
-
 #, fuzzy
 #~ msgid "Allows you to pecify the output URL used for the streaming output."
 #~ msgstr "VLCが選択するパケッタライザーの順序を選択します。"
@@ -16889,10 +19678,6 @@ msgstr "XOSD インターフェース"
 #~ msgid "Toggle enabled"
 #~ msgstr " (デフォルト：有効)"
 
-#, fuzzy
-#~ msgid "Streaming / Transcoding Wizard"
-#~ msgstr "ストリームの情報..."
-
 #, fuzzy
 #~ msgid "Welcome, streaming wizard"
 #~ msgstr "ビデオ・ストリームの出力を有効にする"
@@ -16926,10 +19711,6 @@ msgstr "XOSD インターフェース"
 #~ "httpストリームで使用される既定のキャッシング値が変更可能です。単位はミリ秒"
 #~ "で指定します。"
 
-#, fuzzy
-#~ msgid "Number of streams"
-#~ msgstr "行数"
-
 #, fuzzy
 #~ msgid "Codec name"
 #~ msgstr "デバイス名"
@@ -16946,10 +19727,6 @@ msgstr "XOSD インターフェース"
 #~ msgid "Codec download"
 #~ msgstr "デバイス名"
 
-#, fuzzy
-#~ msgid "No"
-#~ msgstr "なし"
-
 #, fuzzy
 #~ msgid "ftp://"
 #~ msgstr "ファイル"
@@ -16974,10 +19751,6 @@ msgstr "XOSD インターフェース"
 #~ msgid "Exit this program"
 #~ msgstr "プログラムの終了"
 
-#, fuzzy
-#~ msgid "Open other types of inputs"
-#~ msgstr "ビデオ・ストリームの出力を有効にする"
-
 #, fuzzy
 #~ msgid "Open the playlist"
 #~ msgstr "再生一覧を開く"
@@ -17018,10 +19791,6 @@ msgstr "XOSD インターフェース"
 #~ msgid "Common options"
 #~ msgstr "持続期間"
 
-#, fuzzy
-#~ msgid "Frequency (kHz)"
-#~ msgstr "周波数"
-
 #, fuzzy
 #~ msgid "The channel frequency in kHz"
 #~ msgstr "衛星 既定転送周波数"
@@ -17030,10 +19799,6 @@ msgstr "XOSD インターフェース"
 #~ msgid "Audio device"
 #~ msgstr "DVDデバイス"
 
-#, fuzzy
-#~ msgid "The maximum bitrate of the stream"
-#~ msgstr "ストリームをナビゲートする"
-
 #, fuzzy
 #~ msgid "VLC plugins preferences"
 #~ msgstr "設定..."
@@ -17077,10 +19842,6 @@ msgstr "XOSD インターフェース"
 #~ msgid "subtitles"
 #~ msgstr "字幕"
 
-#, fuzzy
-#~ msgid "HTTP remote control"
-#~ msgstr "リモート・コントロール"
-
 #, fuzzy
 #~ msgid "mka/mkv stream demuxer"
 #~ msgstr "MPEG 1/2レイヤ1/2オーディオ・デコーダ"
@@ -17121,10 +19882,6 @@ msgstr "XOSD インターフェース"
 #~ msgid "&About..."
 #~ msgstr "VideoLANについて(_A)..."
 
-#, fuzzy
-#~ msgid "Stop current playlist item"
-#~ msgstr "再生一覧を開く"
-
 #, fuzzy
 #~ msgid "Quick"
 #~ msgstr "VLCを終了"
@@ -17141,21 +19898,10 @@ msgstr "XOSD インターフェース"
 #~ msgid "&Randomize Playlist"
 #~ msgstr "再生一覧を開く"
 
-#, fuzzy
-#~ msgid "&Delete"
-#~ msgstr "削除"
-
-#, fuzzy
-#~ msgid "Open subtitles file"
-#~ msgstr "字幕の選択"
-
 #, fuzzy
 #~ msgid "Fonts"
 #~ msgstr "フォント"
 
-#~ msgid "log filename"
-#~ msgstr "ログ・ファイル名"
-
 #~ msgid "Using the logger interface plugin..."
 #~ msgstr "ロギング・インタフェース・プラグインを使用します。"
 
@@ -17211,14 +19957,6 @@ msgstr "XOSD インターフェース"
 #~ msgid "Video Device Advanced Options"
 #~ msgstr "ALSAオーディオ・モジュール"
 
-#, fuzzy
-#~ msgid "Logo File"
-#~ msgstr "ファイル"
-
-#, fuzzy
-#~ msgid "CD-ROM device name"
-#~ msgstr "デバイス名"
-
 #, fuzzy
 #~ msgid "VCD device name"
 #~ msgstr "デバイス名"
@@ -17241,10 +19979,6 @@ msgstr "XOSD インターフェース"
 #~ msgid "UDP/RTP (Adress when Multicast)"
 #~ msgstr "UDPマルチキャスト"
 
-#, fuzzy
-#~ msgid "Automatically play file"
-#~ msgstr "ファイルの自動再生"
-
 #~ msgid ""
 #~ "The VideoLAN Client is a MPEG, MPEG 2, MP3, DivX player, that accepts "
 #~ "input from local or network sources."
@@ -17391,10 +20125,6 @@ msgstr "XOSD インターフェース"
 #~ msgid "MMX EXT IDCT"
 #~ msgstr "MMXエクステンションIDCTモジュール"
 
-#, fuzzy
-#~ msgid "motion compensation"
-#~ msgstr "モーション補正モジュール"
-
 #, fuzzy
 #~ msgid "3D Now! motion compensation"
 #~ msgstr "3D Now!モーション補正モジュール"
@@ -17538,13 +20268,6 @@ msgstr "XOSD インターフェース"
 #~ msgid "Display identifier"
 #~ msgstr "ディスプレイ名"
 
-#~ msgid ""
-#~ "This is the local display port that will be used for X11 drawing. For "
-#~ "instance :0.1."
-#~ msgstr ""
-#~ "X11が描画するローカルのディスプレイ・ポートを指定します。インスタンス"
-#~ "は、:0.1です。"
-
 #, fuzzy
 #~ msgid "Launch playlist on startup"
 #~ msgstr "起動時に再生一覧を開く"
@@ -17650,10 +20373,6 @@ msgstr "XOSD インターフェース"
 #~ msgid "&Fullscreen"
 #~ msgstr "全画面化(_F)"
 
-#, fuzzy
-#~ msgid "About..."
-#~ msgstr "VideoLANについて(_A)..."
-
 #, fuzzy
 #~ msgid "Volume &Up"
 #~ msgstr "ボリュームを上げる"
@@ -17717,13 +20436,6 @@ msgstr "XOSD インターフェース"
 #~ msgid "Add subtitles"
 #~ msgstr "字幕"
 
-#, fuzzy
-#~ msgid ""
-#~ "You can set the maximum number of lines that the log window will display."
-#~ msgstr ""
-#~ "表示されるログ・ウィンドウの最大行数を指定できます。すべてのメッセージを保"
-#~ "持する場合には、-1を指定してください。"
-
 #, fuzzy
 #~ msgid ""
 #~ "Check this option if you want to display the caption of the buttons in "
@@ -17866,10 +20578,6 @@ msgstr "XOSD インターフェース"
 #~ msgid "A_udio"
 #~ msgstr "オーディオ(_u)"
 
-#, fuzzy
-#~ msgid "Slowmotion"
-#~ msgstr "選択"
-
 #, fuzzy
 #~ msgid "Open disc..."
 #~ msgstr "ディスクを開く(_D)..."
@@ -17878,10 +20586,6 @@ msgstr "XOSD インターフェース"
 #~ msgid "Select program"
 #~ msgstr "プログラムの切替え"
 
-#, fuzzy
-#~ msgid "Toggle fullscreen"
-#~ msgstr "全画面表示の切替え"
-
 #~ msgid "Jump to previous title"
 #~ msgstr "前のタイトルを選択"
 
@@ -17903,10 +20607,6 @@ msgstr "XOSD インターフェース"
 #~ msgid "Volume is %d\n"
 #~ msgstr "ボリュームは %d です。\n"
 
-#, fuzzy
-#~ msgid "The average bitrate of the stream"
-#~ msgstr "ストリームをナビゲートする"
-
 #~ msgid "XOSD module"
 #~ msgstr "XOSDモジュール"