X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=po%2Fja.po;h=2901d2db7a048381d49eae5225a95df90120906e;hb=9f5f3cc9c8edee7ac68b72aff8b051d510273147;hp=b591ac78a8da386c6e6aee379b04f679abf81d09;hpb=fe087a38282e93addb25fa9598393e40ea233b09;p=vlc

diff --git a/po/ja.po b/po/ja.po
index b591ac78a8..2901d2db7a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,17 +1,16 @@
 # translation of ja.po to Japanese
 # Japanese translation for VLC
-# Copyright (C) 2002,2004 the VideoLAN team
-# $Id$
-#
-#
+# Copyright (C) 2002, 2004 the VideoLAN team
 # Fumio Nakayama <endymion@ca2.so-net.ne.jp>, 2002.
 # Tadashi Jokagi <fedora@elf.no-ip.org>, 2004.
+# $Id$
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: ja\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-26 17:34+0200\n"
-"PO-Revision-Date: 2004-09-20 02:46+0900\n"
+"POT-Creation-Date: 2006-02-03 10:51+0100\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"
 "MIME-Version: 1.0\n"
@@ -19,70 +18,79 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: include/vlc_config_cat.h:32 modules/gui/kde/preferences.cpp:56
+#: include/vlc/vlc.h:578
+#, fuzzy
+msgid ""
+"This program comes with NO WARRANTY, to the extent permitted by law.\n"
+"You may redistribute it under the terms of the GNU General Public License;\n"
+"see the file named COPYING for details.\n"
+"Written by the VideoLAN team; see the AUTHORS file.\n"
+msgstr ""
+"法律によって許可される範囲でこのプログラムには何の保証もありません。\n"
+"あなたは、GNU GPLの条項に基づいて再配布するかも知れません。\n"
+"COPYINGファイルに詳細が書かれていますので、参照してください。\n"
+"Written by the VideoLAN team at Ecole Centrale, Paris.\n"
+
+#: include/vlc_config_cat.h:32
 msgid "VLC preferences"
 msgstr "VLC 設定"
 
 #: include/vlc_config_cat.h:34
 msgid "Click on \"Advanced Options\" to see all options."
-msgstr ""
+msgstr "すべてのオプションを見るには「高度なオプション」をクリックします。"
 
-#: include/vlc_config_cat.h:36 src/input/input.c:1822 src/input/input.c:1882
-#: src/playlist/item.c:366 src/playlist/playlist.c:133
-#: modules/gui/wince/playlist.cpp:674 modules/visualization/visual/visual.c:79
+#: include/vlc_config_cat.h:36 include/vlc_config_cat.h:122
+#: src/input/input.c:1898 src/input/input.c:1958 src/playlist/item.c:369
+#: src/playlist/playlist.c:163 modules/gui/wince/playlist.cpp:674
+#: modules/gui/wxwidgets/dialogs/fileinfo.cpp:75
+#: modules/visualization/visual/visual.c:113
 msgid "General"
-msgstr ""
+msgstr "一般"
 
-#: include/vlc_config_cat.h:39 src/libvlc.h:1274 modules/misc/dummy/dummy.c:67
+#: include/vlc_config_cat.h:39 src/libvlc.h:1436 modules/misc/dummy/dummy.c:67
 msgid "Interface"
 msgstr "インタフェース"
 
 #: include/vlc_config_cat.h:40
-#, fuzzy
 msgid "Settings for VLC interfaces"
-msgstr "ネットワーク・インタフェース"
+msgstr "VLC インターフェースの設定"
 
 #: include/vlc_config_cat.h:42
-#, fuzzy
 msgid "General interface setttings"
-msgstr "一般設定"
+msgstr "一般インターフェース設定"
 
-#: include/vlc_config_cat.h:44 src/libvlc.h:63
-#, fuzzy
+#: include/vlc_config_cat.h:44 src/libvlc.h:70
 msgid "Control interfaces"
-msgstr "リモート・コントロール・インタフェース・モジュール"
+msgstr "制御インターフェース"
 
 #: include/vlc_config_cat.h:45
-#, fuzzy
 msgid "Control interface settings"
-msgstr "インターフェースプラグイン設定"
+msgstr "制御インターフェース設定"
 
 #: include/vlc_config_cat.h:47 include/vlc_config_cat.h:48
-#, fuzzy
 msgid "Hotkeys settings"
-msgstr "オーディオエンコーダー設定"
-
-#: include/vlc_config_cat.h:51 src/input/es_out.c:1527 src/libvlc.h:920
-#: modules/gui/beos/InterfaceWindow.cpp:263
-#: modules/gui/gtk/gnome_interface.c:1092 modules/gui/gtk/gtk_interface.c:1219
-#: modules/gui/macosx/intf.m:493 modules/gui/macosx/output.m:170
-#: modules/gui/macosx/wizard.m:141 modules/gui/wxwindows/extrapanel.cpp:180
-#: modules/gui/wxwindows/wizard.cpp:832 modules/stream_out/transcode.c:192
+msgstr "ホットキー設定"
+
+#: include/vlc_config_cat.h:51 src/input/es_out.c:1586 src/libvlc.h:1046
+#: modules/gui/beos/InterfaceWindow.cpp:280 modules/gui/macosx/extended.m:81
+#: modules/gui/macosx/intf.m:535 modules/gui/macosx/output.m:170
+#: modules/gui/macosx/wizard.m:412
+#: modules/gui/wxwidgets/dialogs/infopanels.cpp:237
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:855
+#: modules/gui/wxwidgets/extrapanel.cpp:180 modules/stream_out/transcode.c:214
 msgid "Audio"
 msgstr "オーディオ"
 
 #: include/vlc_config_cat.h:52
-#, fuzzy
 msgid "Audio settings"
-msgstr "オーディオフィルター設定"
+msgstr "オーディオ設定"
 
 #: include/vlc_config_cat.h:54 include/vlc_config_cat.h:55
-#, fuzzy
 msgid "General audio settings"
-msgstr "一般設定"
+msgstr "一般オーディオ設定"
 
 #: include/vlc_config_cat.h:57 include/vlc_config_cat.h:82
-#: src/video_output/video_output.c:435
+#: src/video_output/video_output.c:402
 msgid "Filters"
 msgstr "フィルター"
 
@@ -90,54 +98,50 @@ msgstr "フィルター"
 msgid "Audio filters are used to postprocess the audio stream"
 msgstr ""
 
-#: include/vlc_config_cat.h:61 src/audio_output/input.c:106
-#: modules/gui/macosx/intf.m:503 modules/gui/macosx/intf.m:504
+#: include/vlc_config_cat.h:61 src/audio_output/input.c:78
+#: modules/gui/macosx/intf.m:545 modules/gui/macosx/intf.m:546
 msgid "Visualizations"
 msgstr "ビジュアル化"
 
-#: include/vlc_config_cat.h:63 src/audio_output/input.c:180
-#, fuzzy
+#: include/vlc_config_cat.h:63 src/audio_output/input.c:152
 msgid "Audio visualizations"
-msgstr "ビジュアル化"
+msgstr "オーディオのビジュアル化"
 
 #: include/vlc_config_cat.h:65 include/vlc_config_cat.h:78
-#, fuzzy
 msgid "Output modules"
-msgstr "出力方法"
+msgstr "出力モジュール"
 
 #: include/vlc_config_cat.h:66
 msgid "These are general settings for audio output modules."
-msgstr ""
+msgstr "これらはオーディオ出力モジュールの一般設定です"
 
-#: include/vlc_config_cat.h:68 src/libvlc.h:1205 src/libvlc.h:1245
-#: src/libvlc.h:1285 modules/gui/wxwindows/menus.cpp:307
-#: modules/stream_out/transcode.c:217
+#: include/vlc_config_cat.h:68 src/libvlc.h:1363 src/libvlc.h:1401
+#: src/libvlc.h:1446 modules/gui/wxwidgets/menus.cpp:311
+#: modules/stream_out/transcode.c:243
 msgid "Miscellaneous"
 msgstr "その他"
 
 #: include/vlc_config_cat.h:69
-#, fuzzy
 msgid "Miscellaneous audio settings and modules"
-msgstr "その他のオプション"
-
-#: include/vlc_config_cat.h:72 src/input/es_out.c:1549 src/libvlc.h:949
-#: modules/gui/gtk/gnome_interface.c:1099 modules/gui/gtk/gtk_interface.c:1296
-#: modules/gui/macosx/intf.m:506 modules/gui/macosx/output.m:160
-#: modules/gui/macosx/wizard.m:142 modules/gui/wxwindows/extrapanel.cpp:178
-#: modules/gui/wxwindows/wizard.cpp:793 modules/misc/dummy/dummy.c:97
-#: modules/stream_out/transcode.c:157
+msgstr "その他のオーディオとモジュールの設定"
+
+#: include/vlc_config_cat.h:72 src/input/es_out.c:1608 src/libvlc.h:1081
+#: modules/gui/macosx/extended.m:80 modules/gui/macosx/intf.m:548
+#: modules/gui/macosx/output.m:160 modules/gui/macosx/wizard.m:413
+#: modules/gui/wxwidgets/dialogs/infopanels.cpp:191
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:816
+#: modules/gui/wxwidgets/extrapanel.cpp:178 modules/misc/dummy/dummy.c:97
+#: modules/stream_out/transcode.c:174
 msgid "Video"
 msgstr "ビデオ"
 
 #: include/vlc_config_cat.h:73
-#, fuzzy
 msgid "Video settings"
-msgstr "ビデオフィルター設定"
+msgstr "ビデオ設定"
 
 #: include/vlc_config_cat.h:75 include/vlc_config_cat.h:76
-#, fuzzy
 msgid "General video settings"
-msgstr "一般設定"
+msgstr "一般ビデオ設定"
 
 #: include/vlc_config_cat.h:80
 #, fuzzy
@@ -160,9 +164,8 @@ msgid ""
 msgstr ""
 
 #: include/vlc_config_cat.h:89
-#, fuzzy
 msgid "Text rendering"
-msgstr "ダイレクトレンダリング"
+msgstr "テキストレンダリング"
 
 #: include/vlc_config_cat.h:91
 msgid ""
@@ -172,7 +175,7 @@ msgstr ""
 
 #: include/vlc_config_cat.h:95
 msgid "Input / Codecs"
-msgstr ""
+msgstr "入力 / コーデック"
 
 #: include/vlc_config_cat.h:96
 msgid ""
@@ -181,78 +184,73 @@ msgid ""
 msgstr ""
 
 #: include/vlc_config_cat.h:98
-#, fuzzy
 msgid "Access modules"
 msgstr "アクセスモジュール"
 
 #: include/vlc_config_cat.h:100
 msgid ""
-"Settings related to the various access methods used by VLC.\n"
-"Common settings you may want to alter are HTTP proxy or caching settings."
+"Settings related to the various access methods used by VLC. Common settings "
+"you may want to alter are HTTP proxy or caching settings."
 msgstr ""
 
 #: include/vlc_config_cat.h:104
-#, fuzzy
-msgid "Access filter modules"
-msgstr "アクセスモジュール"
+msgid "Access filters"
+msgstr "アクセスフィルター"
 
 #: include/vlc_config_cat.h:106
-msgid "Settings related to the various access filter used by VLC.\n"
+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"
 msgstr ""
 
-#: include/vlc_config_cat.h:108
+#: include/vlc_config_cat.h:110
 #, fuzzy
 msgid "Demuxers"
 msgstr "demuxモジュール"
 
-#: include/vlc_config_cat.h:109
+#: include/vlc_config_cat.h:111
 msgid "Demuxers are used to separate audio and video streams"
 msgstr ""
 
-#: include/vlc_config_cat.h:111
+#: include/vlc_config_cat.h:113
 #, fuzzy
 msgid "Video codecs"
 msgstr "ビデオコーデック"
 
-#: include/vlc_config_cat.h:112
+#: include/vlc_config_cat.h:114
 msgid "Settings for the video-only decoders and encoders"
 msgstr ""
 
-#: include/vlc_config_cat.h:114
+#: include/vlc_config_cat.h:116
 #, fuzzy
 msgid "Audio codecs"
 msgstr "オーディオコーデック"
 
-#: include/vlc_config_cat.h:115
+#: include/vlc_config_cat.h:117
 msgid "Settings for the audio-only decoders and encoders"
 msgstr ""
 
-#: include/vlc_config_cat.h:117
+#: include/vlc_config_cat.h:119
 #, fuzzy
 msgid "Other codecs"
 msgstr "ステレオ"
 
-#: include/vlc_config_cat.h:118
+#: include/vlc_config_cat.h:120
 msgid "Settings for audio+video and miscellaneous decoders and encoders"
 msgstr ""
 
-#: include/vlc_config_cat.h:120 include/vlc_config_cat.h:178 src/libvlc.h:1134
-#: modules/gui/macosx/prefs.m:119
-msgid "Advanced"
-msgstr ""
-
-#: include/vlc_config_cat.h:121
+#: include/vlc_config_cat.h:123
 #, fuzzy
-msgid "Advanced input settings. Use with care."
+msgid "General input settings. Use with care."
 msgstr "ALSAオーディオ・モジュール"
 
-#: include/vlc_config_cat.h:124 src/libvlc.h:1153
-#: modules/gui/gtk/gtk_interface.c:2370 modules/gui/gtk/gtk_interface.c:3046
-#: modules/gui/wxwindows/open.cpp:417 modules/gui/wxwindows/streamout.cpp:159
+#: include/vlc_config_cat.h:126 src/libvlc.h:1307
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:152
 msgid "Stream output"
 msgstr "ストリーム出力"
 
-#: include/vlc_config_cat.h:126
+#: include/vlc_config_cat.h:128
 msgid ""
 "Stream output is what allows VLC to act as a streaming server or to save "
 "incoming streams.\n"
@@ -263,214 +261,209 @@ msgid ""
 "duplicating, ..."
 msgstr ""
 
-#: include/vlc_config_cat.h:134
+#: include/vlc_config_cat.h:136
 #, fuzzy
 msgid "General stream output settings"
 msgstr "ストリームの出力先の選択"
 
-#: include/vlc_config_cat.h:136
+#: include/vlc_config_cat.h:138
 #, fuzzy
 msgid "Muxers"
 msgstr "ミュートする"
 
-#: include/vlc_config_cat.h:137
+#: include/vlc_config_cat.h:139
 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"
+"force a muxer. You should probably not do that.\n"
 "You can also set default parameters for each muxer."
 msgstr ""
 
-#: include/vlc_config_cat.h:142
+#: include/vlc_config_cat.h:144
 #, fuzzy
 msgid "Access output"
 msgstr "オーディオ出力モジュールアクセス"
 
-#: include/vlc_config_cat.h:143
+#: include/vlc_config_cat.h:145
 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 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"
 "You can also set default parameters for each access output."
 msgstr ""
 
-#: include/vlc_config_cat.h:148
+#: include/vlc_config_cat.h:150
 #, fuzzy
 msgid "Packetizers"
 msgstr "準備されているパケッタライザー一覧の選択"
 
-#: include/vlc_config_cat.h:149
+#: include/vlc_config_cat.h:151
 msgid ""
-"Packetizers are used to \"preprocess\" the elementary streams before muxing."
-"This setting allows you to always force a packetizer.You should probably not "
-"do that.\n"
+"Packetizers are used to \"preprocess\" the elementary streams before muxing. "
+"This setting allows you to always force a packetizer. You should probably "
+"not do that.\n"
 "You can also set default parameters for each packetizer."
 msgstr ""
 
-#: include/vlc_config_cat.h:155
+#: include/vlc_config_cat.h:157
 #, fuzzy
 msgid "Sout stream"
 msgstr "ストリームの停止"
 
-#: include/vlc_config_cat.h:156
+#: include/vlc_config_cat.h:158
 msgid ""
 "Sout stream modules allow to build a sout processing chain. Please refer to "
 "the Streaming Howto for more information. You can configure default options "
 "for each sout stream module here."
 msgstr ""
 
-#: include/vlc_config_cat.h:161 modules/services_discovery/sap.c:117
-#: modules/services_discovery/sap.c:353
+#: include/vlc_config_cat.h:163 modules/services_discovery/sap.c:121
 #, fuzzy
 msgid "SAP"
 msgstr "SDP"
 
-#: include/vlc_config_cat.h:162
+#: include/vlc_config_cat.h:164
 msgid ""
 "SAP is a way to publically announce streams that are being sent using "
 "multicast UDP or RTP."
 msgstr ""
 
-#: include/vlc_config_cat.h:165
-#, fuzzy
+#: include/vlc_config_cat.h:167
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:66
 msgid "VOD"
-msgstr "DVD"
+msgstr "VOD"
 
-#: include/vlc_config_cat.h:166
+#: include/vlc_config_cat.h:168
 msgid "VLC's implementation of Video On Demand"
 msgstr ""
 
-#: include/vlc_config_cat.h:170 src/libvlc.h:1257
-#: modules/gui/beos/InterfaceWindow.cpp:213
-#: modules/gui/beos/InterfaceWindow.cpp:305
-#: modules/gui/gtk/gnome_interface.c:643
-#: modules/gui/gtk/gnome_interface.c:2396
-#: modules/gui/gtk/gnome_interface.c:2421 modules/gui/gtk/gtk_interface.c:747
-#: modules/gui/gtk/gtk_interface.c:2709 modules/gui/macosx/intf.m:440
-#: modules/gui/macosx/intf.m:530 modules/gui/pda/pda_interface.c:1264
-#: modules/gui/wxwindows/interface.cpp:483
-#: modules/gui/wxwindows/playlist.cpp:196
+#: include/vlc_config_cat.h:172 src/libvlc.h:1415
+#: modules/demux/playlist/playlist.c:48 modules/demux/playlist/playlist.c:49
+#: modules/gui/beos/InterfaceWindow.cpp:230
+#: modules/gui/beos/InterfaceWindow.cpp:322 modules/gui/macosx/intf.m:480
+#: modules/gui/macosx/intf.m:574 modules/gui/pda/pda_interface.c:1264
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:197
+#: modules/gui/wxwidgets/interface.cpp:663
 msgid "Playlist"
-msgstr "リスト"
+msgstr "再生一覧"
 
-#: include/vlc_config_cat.h:171
+#: include/vlc_config_cat.h:173
 msgid ""
 "Settings related to playlist behaviour (playback mode, for example) and to "
 "modules that automatically add items to the playlist ('service discovery "
 "modules'"
 msgstr ""
 
-#: include/vlc_config_cat.h:173
+#: include/vlc_config_cat.h:175
+#, fuzzy
 msgid "General playlist behaviour"
-msgstr ""
+msgstr "再生一覧を開く"
 
-#: include/vlc_config_cat.h:174 modules/gui/macosx/playlist.m:235
-#: modules/gui/wxwindows/playlist.cpp:235
+#: include/vlc_config_cat.h:176 modules/gui/macosx/playlist.m:508
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:235
 #, fuzzy
 msgid "Services discovery"
 msgstr "ソースディレクトリ"
 
-#: include/vlc_config_cat.h:175
+#: include/vlc_config_cat.h:177
 msgid ""
 "Services discovery modules are modules that automatically add items to "
 "playlist"
 msgstr ""
 
-#: include/vlc_config_cat.h:179
+#: include/vlc_config_cat.h:180 src/libvlc.h:1268
+#: modules/gui/macosx/prefs.m:124
+msgid "Advanced"
+msgstr ""
+
+#: include/vlc_config_cat.h:181
 #, fuzzy
 msgid "Advanced settings. Use with care."
 msgstr "ALSAオーディオ・モジュール"
 
-#: include/vlc_config_cat.h:181
+#: include/vlc_config_cat.h:183
 msgid "CPU features"
 msgstr ""
 
-#: include/vlc_config_cat.h:182
+#: include/vlc_config_cat.h:184
 msgid ""
 "From here you can choose to disable some CPU accelerations. You should "
 "probably not touch that."
 msgstr ""
 
-#: include/vlc_config_cat.h:184 modules/demux/util/id3genres.h:40
+#: include/vlc_config_cat.h:186 modules/demux/util/id3genres.h:40
 msgid "Other"
 msgstr "その他"
 
-#: include/vlc_config_cat.h:185
+#: include/vlc_config_cat.h:187
 #, fuzzy
 msgid "Other advanced settings"
 msgstr "ALSAオーディオ・モジュール"
 
-#: include/vlc_config_cat.h:187 modules/gui/gtk/gnome_interface.c:1839
-#: modules/gui/gtk/gnome_interface.c:2293 modules/gui/gtk/gtk_interface.c:2154
-#: modules/gui/gtk/gtk_interface.c:2752 modules/gui/macosx/open.m:162
+#: include/vlc_config_cat.h:189 modules/gui/macosx/open.m:162
 #: modules/gui/macosx/open.m:379 modules/gui/pda/pda_interface.c:548
-#: modules/gui/wxwindows/open.cpp:475
+#: modules/gui/wxwidgets/dialogs/open.cpp:506
 msgid "Network"
 msgstr "ネットワーク"
 
-#: include/vlc_config_cat.h:188
+#: include/vlc_config_cat.h:190
 msgid "These modules provide network functions to all other parts of VLC"
 msgstr ""
 
-#: include/vlc_config_cat.h:193
+#: include/vlc_config_cat.h:195
 msgid "Chroma modules settings"
 msgstr "クロマモジュール設定"
 
-#: include/vlc_config_cat.h:194
+#: include/vlc_config_cat.h:196
 msgid "These settings affect chroma transformation modules."
 msgstr ""
 
-#: include/vlc_config_cat.h:196
+#: include/vlc_config_cat.h:198
 #, fuzzy
 msgid "Packetizer modules settings"
 msgstr "デコードモジュール設定"
 
-#: include/vlc_config_cat.h:197 include/vlc_config_cat.h:215
-msgid " "
-msgstr ""
-
-#: include/vlc_config_cat.h:199
+#: include/vlc_config_cat.h:201
 #, fuzzy
 msgid "Encoders settings"
 msgstr "オーディオエンコーダー設定"
 
-#: include/vlc_config_cat.h:201
+#: include/vlc_config_cat.h:203
 msgid "These are general settings for video/audio/subtitles encoding modules."
 msgstr ""
 
-#: include/vlc_config_cat.h:205
-#, fuzzy
+#: include/vlc_config_cat.h:207
 msgid "Dialog providers settings"
-msgstr "オーディオエンコーダー設定"
+msgstr "ダイアログ提供設定"
 
-#: include/vlc_config_cat.h:207
+#: include/vlc_config_cat.h:209
 msgid "Dialog providers can be configured here."
 msgstr ""
 
-#: include/vlc_config_cat.h:209
+#: include/vlc_config_cat.h:211
 #, fuzzy
 msgid "Subtitle demuxer settings"
 msgstr "設定"
 
-#: include/vlc_config_cat.h:211
+#: include/vlc_config_cat.h:213
 msgid ""
 "In this section you can force the behavior of the subtitle demuxer, for "
 "example by setting the subtitles type or file name."
 msgstr ""
 
-#: include/vlc_config_cat.h:214
+#: include/vlc_config_cat.h:216
 msgid "Video filters settings"
 msgstr "ビデオフィルター設定"
 
-#: include/vlc_config_cat.h:221
+#: include/vlc_config_cat.h:223
 msgid "No help available"
 msgstr "有効なヘルプがありません。"
 
-#: include/vlc_config_cat.h:222
+#: include/vlc_config_cat.h:224
 #, fuzzy
 msgid "No help is available for these modules"
 msgstr "有効なモジュールのリストを印刷"
 
-#: include/vlc_interface.h:129
+#: include/vlc_interface.h:137
 #, fuzzy
 msgid ""
 "\n"
@@ -482,54 +475,33 @@ msgstr ""
 "がインストールされているディレクトリに移動し、\"vlc -I win32\"を実行してくだ"
 "さい。\n"
 
-#: include/vlc_interface.h:164
-msgid ""
-"VLC is an open-source and cross-platform multimedia player for various audio "
-"and video formats (MPEG-1, MPEG-2, MPEG-4, DivX, mp3, Ogg, etc.) as well as "
-"DVDs, VCDs, CD audio, and various streaming protocols.\n"
-"\n"
-"VLC is also a streaming server with transcoding capabilities (UDP unicast "
-"and multicast, HTTP, etc.) mainly designed for high-bandwidth networks.\n"
-"\n"
-"For more information, have a look at the web site."
-msgstr ""
-"VLC はオープンソースでクロスプラットフォームなマルチメディアプレイヤーで、"
-"様々なオーディオとビデオフォーマット(MPEG-1, MPEG-2, MPEG-4, DivX, mp3, "
-"Ogg, ...)とDVD・VCD・CD オーディオと様々なストリーミングプロトコルに対応しま"
-"す。\n"
-"\n"
-"さらに、VLC は、高帯域ネットワーク用に主として設計された、転送能力(UDP ユニ"
-"キャストおよびマルチキャスト(HTTP)...)を備えたストリーミングサーバです。\n"
-"より詳細は、ウェブを見てください。"
-
-#: include/vlc_meta.h:28 src/input/var.c:140
-#: modules/gui/beos/MediaControlView.cpp:1233
-#: modules/gui/gtk/gnome_interface.c:1659 modules/gui/gtk/gtk_interface.c:1965
-#: modules/gui/gtk/menu.c:1369 modules/gui/gtk/menu.c:1390
-#: modules/gui/gtk/open.c:236 modules/gui/kde/interface.cpp:144
-#: modules/gui/macosx/intf.m:488 modules/gui/macosx/intf.m:489
-#: modules/gui/macosx/open.m:168 modules/gui/macosx/playlistinfo.m:55
-#: modules/gui/wxwindows/open.cpp:664 modules/gui/wxwindows/open.cpp:1211
-#: modules/mux/asf.c:48
+#: 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:530
+#: modules/gui/macosx/intf.m:531 modules/gui/macosx/open.m:168
+#: modules/gui/macosx/playlistinfo.m:55 modules/gui/macosx/wizard.m:382
+#: modules/gui/wxwidgets/dialogs/open.cpp:757
+#: modules/gui/wxwidgets/dialogs/open.cpp:1653 modules/mux/asf.c:48
 msgid "Title"
 msgstr "タイトル"
 
-#: include/vlc_meta.h:29 src/input/input.c:1823
-#: modules/gui/macosx/playlist.m:237 modules/gui/macosx/playlistinfo.m:56
-#: modules/gui/wince/playlist.cpp:674 modules/mux/asf.c:51
+#: include/vlc_meta.h:29 src/input/input.c:1899
+#: modules/gui/macosx/playlist.m:133 modules/gui/macosx/playlistinfo.m:56
+#: modules/gui/macosx/wizard.m:384 modules/gui/wince/playlist.cpp:674
+#: modules/mux/asf.c:51
 msgid "Author"
 msgstr "作成者"
 
 #: include/vlc_meta.h:30 src/playlist/sort.c:190 src/playlist/sort.c:193
-#: src/playlist/sort.c:285 modules/codec/vorbis.c:623
-#: modules/gui/macosx/playlist.m:822 modules/gui/macosx/playlist.m:1228
-#: modules/gui/macosx/playlistinfo.m:118 modules/gui/macosx/playlistinfo.m:152
-#: modules/gui/wxwindows/playlist.cpp:498 modules/misc/playlist/m3u.c:68
-#: modules/services_discovery/daap.c:608
+#: 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/playlist_manager.cpp:294
+#: modules/misc/playlist/m3u.c:68 modules/services_discovery/daap.c:608
 msgid "Artist"
 msgstr "アーティスト"
 
-#: include/vlc_meta.h:31 src/playlist/sort.c:290
+#: include/vlc_meta.h:31 src/playlist/sort.c:338
 msgid "Genre"
 msgstr "ジャンル"
 
@@ -537,8 +509,8 @@ msgstr "ジャンル"
 msgid "Copyright"
 msgstr "コピーライト"
 
-#: include/vlc_meta.h:33 modules/gui/gtk/preferences.c:327
-#: modules/gui/kde/pluginsbox.cpp:46 modules/gui/wxwindows/bookmarks.cpp:257
+#: include/vlc_meta.h:33 modules/gui/macosx/bookmarks.m:99
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:195
 msgid "Description"
 msgstr "説明"
 
@@ -554,16 +526,13 @@ msgstr "日付"
 msgid "Setting"
 msgstr "設定"
 
-#: include/vlc_meta.h:37 modules/gui/gtk/gnome_interface.c:1768
-#: modules/gui/gtk/gnome_interface.c:2300
-#: modules/gui/gtk/gnome_interface.c:2441 modules/gui/gtk/gtk_interface.c:2083
-#: modules/gui/gtk/gtk_interface.c:2759 modules/gui/macosx/open.m:181
-#: modules/gui/wxwindows/open.cpp:770
+#: include/vlc_meta.h:37 modules/gui/macosx/open.m:181
+#: modules/gui/wxwidgets/dialogs/open.cpp:871
 msgid "URL"
 msgstr ""
 
-#: include/vlc_meta.h:38 src/input/es_out.c:1519 src/libvlc.h:80
-#: modules/gui/beos/InterfaceWindow.cpp:259
+#: include/vlc_meta.h:38 src/input/es_out.c:1578 src/libvlc.h:87
+#: modules/gui/beos/InterfaceWindow.cpp:276
 msgid "Language"
 msgstr "言語"
 
@@ -573,14 +542,12 @@ msgid "Now Playing"
 msgstr "再生"
 
 #: include/vlc_meta.h:41
-#, fuzzy
 msgid "CDDB Artist"
-msgstr "アーティスト"
+msgstr "CDDB アーティスト"
 
 #: include/vlc_meta.h:42
-#, fuzzy
 msgid "CDDB Category"
-msgstr "CDDB ディスクカテゴリ"
+msgstr "CDDB カテゴリ"
 
 #: include/vlc_meta.h:43
 msgid "CDDB Disc ID"
@@ -588,75 +555,68 @@ msgstr "CDDB ディスク ID"
 
 #: include/vlc_meta.h:44
 msgid "CDDB Extended Data"
-msgstr ""
+msgstr "CDDB 拡張データ"
 
 #: include/vlc_meta.h:45
-#, fuzzy
 msgid "CDDB Genre"
-msgstr "サーバーなし"
+msgstr "CDDB ジャンル"
 
 #: include/vlc_meta.h:46
 #, fuzzy
 msgid "CDDB Year"
-msgstr "サーバーなし"
+msgstr "CDDB å¹´"
 
 #: include/vlc_meta.h:47
-#, fuzzy
 msgid "CDDB Title"
-msgstr "タイトル"
+msgstr "CDDB タイトル"
 
 #: include/vlc_meta.h:49
 msgid "CD-Text Arranger"
-msgstr ""
+msgstr "CD テキストアレンジャー"
 
 #: include/vlc_meta.h:50
 msgid "CD-Text Composer"
-msgstr ""
+msgstr "CD テキストコンポーサー"
 
 #: include/vlc_meta.h:51
-#, fuzzy
 msgid "CD-Text Disc ID"
-msgstr "CDDB ディスク ID"
+msgstr "CD テキストディスク ID"
 
 #: include/vlc_meta.h:52
 msgid "CD-Text Genre"
-msgstr ""
+msgstr "CD テキストジャンル"
 
 #: include/vlc_meta.h:53
-#, fuzzy
 msgid "CD-Text Message"
-msgstr "メッセージ"
+msgstr "CD テキストメッセージ"
 
 #: include/vlc_meta.h:54
 msgid "CD-Text Songwriter"
-msgstr ""
+msgstr "CD テキストソングライター"
 
 #: include/vlc_meta.h:55
 msgid "CD-Text Performer"
-msgstr ""
+msgstr "<CD テキストパフォーマー"
 
 #: include/vlc_meta.h:56
-#, fuzzy
 msgid "CD-Text Title"
-msgstr "次のタイトル"
+msgstr "CD テキストタイトル"
 
 #: include/vlc_meta.h:58
-#, fuzzy
 msgid "ISO-9660 Application ID"
-msgstr "アプリケーション"
+msgstr "ISO-9660 アプリケーション ID"
 
 #: include/vlc_meta.h:59
-#, fuzzy
 msgid "ISO-9660 Preparer"
-msgstr "準備"
+msgstr "ISO-9660 準備"
 
 #: include/vlc_meta.h:60
 msgid "ISO-9660 Publisher"
-msgstr ""
+msgstr "ISO-9660 出版社"
 
 #: include/vlc_meta.h:61
 msgid "ISO-9660 Volume"
-msgstr ""
+msgstr "ISO-9660 ボリューム"
 
 #: include/vlc_meta.h:62
 #, fuzzy
@@ -671,63 +631,66 @@ msgstr "コーデック名デバイス名"
 msgid "Codec Description"
 msgstr "コーデック説明"
 
-#: src/audio_output/input.c:108 src/audio_output/input.c:154
-#: src/input/es_out.c:350 src/libvlc.h:302 src/video_output/video_output.c:414
+#: src/audio_output/input.c:80 src/audio_output/input.c:126
+#: src/input/es_out.c:361 src/libvlc.h:365 src/video_output/video_output.c:378
 #: modules/codec/ffmpeg/postprocess.c:94
 msgid "Disable"
 msgstr "無効"
 
-#: src/audio_output/input.c:110 modules/gui/macosx/controls.m:581
-#: modules/gui/macosx/intf.m:480 modules/gui/macosx/playlist.m:242
-msgid "Random"
-msgstr "ランダム"
+#: src/audio_output/input.c:82 modules/visualization/visual/visual.c:129
+#, fuzzy
+msgid "Spectrometer"
+msgstr "スペクトラム"
 
-#: src/audio_output/input.c:112
+#: src/audio_output/input.c:84
 msgid "Scope"
 msgstr "スコープ"
 
-#: src/audio_output/input.c:114
+#: src/audio_output/input.c:86
 msgid "Spectrum"
 msgstr "スペクトラム"
 
-#: src/audio_output/input.c:151 modules/audio_filter/equalizer.c:66
+#: 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:529 modules/gui/wxwindows/extrapanel.cpp:179
-#, fuzzy
+#: modules/gui/macosx/intf.m:571 modules/gui/wxwidgets/extrapanel.cpp:179
 msgid "Equalizer"
-msgstr "ビデオ・フィルター・モジュール"
+msgstr "イコライザー"
 
-#: src/audio_output/input.c:173 src/libvlc.h:156
-#: modules/gui/wxwindows/extrapanel.cpp:392
+#: src/audio_output/input.c:145 src/libvlc.h:184
+#: modules/gui/macosx/extended.m:82 modules/gui/wxwidgets/extrapanel.cpp:392
 msgid "Audio filters"
 msgstr "オーディオフィルター"
 
 #: src/audio_output/output.c:102 src/audio_output/output.c:129
-#: modules/access/vcdx/info.c:116 modules/gui/macosx/intf.m:499
-#: modules/gui/macosx/intf.m:500
+#: modules/access/vcdx/info.c:118 modules/gui/macosx/intf.m:541
+#: modules/gui/macosx/intf.m:542
 msgid "Audio Channels"
 msgstr "オーディオチャンネル"
 
 #: src/audio_output/output.c:105 src/audio_output/output.c:140
-#: modules/access/v4l/v4l.c:125 modules/audio_output/alsa.c:190
-#: modules/audio_output/alsa.c:221 modules/audio_output/directx.c:476
+#: modules/access/v4l/v4l.c:125 modules/audio_output/alsa.c:191
+#: modules/audio_output/alsa.c:222 modules/audio_output/directx.c:467
 #: modules/audio_output/oss.c:205 modules/audio_output/portaudio.c:408
 #: modules/audio_output/sdl.c:184 modules/audio_output/sdl.c:201
-#: modules/audio_output/waveout.c:403
+#: modules/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:221 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/time.c:96
+#: src/libvlc.h:243 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
 msgid "Left"
 msgstr "å·¦"
 
 #: src/audio_output/output.c:109 src/audio_output/output.c:145
-#: src/libvlc.h:221 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/time.c:96
+#: src/libvlc.h:243 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
 msgid "Right"
 msgstr "右"
 
@@ -739,289 +702,318 @@ msgstr "ドルビーサラウンド"
 msgid "Reverse stereo"
 msgstr "リバースステレオ"
 
-#: src/extras/getopt.c:638
+#: src/extras/getopt.c:636
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr ""
 
-#: src/extras/getopt.c:663
+#: src/extras/getopt.c:661
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr ""
 
-#: src/extras/getopt.c:668
+#: src/extras/getopt.c:666
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr ""
 
-#: src/extras/getopt.c:686 src/extras/getopt.c:859
+#: src/extras/getopt.c:684 src/extras/getopt.c:857
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr ""
 
-#: src/extras/getopt.c:715
+#: src/extras/getopt.c:713
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr ""
 
-#: src/extras/getopt.c:719
+#: src/extras/getopt.c:717
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr ""
 
-#: src/extras/getopt.c:745
+#: src/extras/getopt.c:743
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: 間違ったオプション -- %c\n"
 
-#: src/extras/getopt.c:748
+#: src/extras/getopt.c:746
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: 無効なオプション -- %c\n"
 
-#: src/extras/getopt.c:778 src/extras/getopt.c:908
+#: src/extras/getopt.c:776 src/extras/getopt.c:906
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr ""
 
-#: src/extras/getopt.c:825
+#: src/extras/getopt.c:823
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr ""
 
-#: src/extras/getopt.c:843
+#: src/extras/getopt.c:841
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr ""
 
-#: src/input/control.c:278
+#: src/input/control.c:283
 #, c-format
 msgid "Bookmark %i"
 msgstr "ブックマーク %i"
 
-#: src/input/es_out.c:370 src/input/es_out.c:371 src/input/es_out.c:377
-#: src/input/es_out.c:378 modules/access/cdda.c:164
-#: modules/access/cdda/info.c:974 modules/access/cdda/info.c:1007
+#: src/input/es_out.c:381 src/input/es_out.c:382 src/input/es_out.c:388
+#: src/input/es_out.c:389 modules/access/cdda.c:588
+#: modules/access/cdda/info.c:975 modules/access/cdda/info.c:1008
 #, c-format
 msgid "Track %i"
 msgstr "トラック %i"
 
-#: src/input/es_out.c:451 src/input/es_out.c:453 src/input/es_out.c:553
-#: src/input/es_out.c:560 src/input/var.c:129
-#: modules/gui/gtk/gnome_interface.c:1078 modules/gui/gtk/gtk_interface.c:1199
-#: modules/gui/kde/interface.cpp:142 modules/gui/macosx/intf.m:486
-#: modules/gui/macosx/intf.m:487
+#: src/input/es_out.c:462 src/input/es_out.c:464 src/input/es_out.c:564
+#: src/input/es_out.c:571 src/input/var.c:125 modules/gui/macosx/intf.m:528
+#: modules/gui/macosx/intf.m:529
 msgid "Program"
 msgstr "プログラム"
 
-#: src/input/es_out.c:454 src/input/es_out.c:622 src/input/input.c:222
-#: src/input/input.c:1825 src/playlist/sort.c:190 src/playlist/sort.c:193
-#: src/playlist/sort.c:285 src/playlist/sort.c:290 modules/codec/vorbis.c:622
-#: modules/demux/playlist/b4s.c:323 modules/demux/playlist/b4s.c:331
-#: modules/demux/playlist/b4s.c:339 modules/demux/playlist/b4s.c:347
-#: modules/gui/macosx/playlist.m:822 modules/gui/macosx/playlist.m:1228
+#: src/input/es_out.c:465 src/input/es_out.c:634 src/input/input.c:226
+#: src/input/input.c:1901 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/access/cdda.c:627
+#: modules/access/cdda.c:639 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/wxwindows/playlist.cpp:497 modules/gui/wxwindows/timer.cpp:138
-#: modules/gui/wxwindows/timer.cpp:201 modules/misc/playlist/m3u.c:68
-#: modules/services_discovery/daap.c:607 modules/services_discovery/daap.c:609
-#, fuzzy
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:497
+#: 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 "バージョン情報の印刷"
+msgstr "メタ情報"
 
-#: src/input/es_out.c:1514
+#: src/input/es_out.c:1573
 #, c-format
 msgid "Stream %d"
 msgstr "ストリーム %d"
 
-#: src/input/es_out.c:1516 modules/gui/macosx/wizard.m:146
-#: modules/gui/wxwindows/wizard.cpp:802 modules/gui/wxwindows/wizard.cpp:842
+#: src/input/es_out.c:1575 modules/gui/macosx/wizard.m:417
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:825
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:865
 msgid "Codec"
 msgstr "コーデック"
 
-#: src/input/es_out.c:1527 src/input/es_out.c:1549 src/input/es_out.c:1572
+#: src/input/es_out.c:1586 src/input/es_out.c:1608 src/input/es_out.c:1631
 #: modules/gui/macosx/output.m:153
 msgid "Type"
 msgstr "タイプ"
 
-#: src/input/es_out.c:1530 modules/gui/gtk/gnome_interface.c:148
-#: modules/gui/gtk/gnome_interface.c:931 modules/gui/gtk/gtk_interface.c:481
-#: modules/gui/gtk/gtk_interface.c:1282 modules/gui/macosx/output.m:176
-#: modules/gui/wxwindows/streamout.cpp:828
+#: src/input/es_out.c:1589 modules/gui/macosx/output.m:176
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:855
 msgid "Channels"
 msgstr "チャンネル"
 
-#: src/input/es_out.c:1534
+#: src/input/es_out.c:1593
 msgid "Sample rate"
 msgstr "サンプルレート"
 
-#: src/input/es_out.c:1535
+#: src/input/es_out.c:1594
 #, c-format
 msgid "%d Hz"
-msgstr ""
+msgstr "%d Hz"
 
-#: src/input/es_out.c:1539
+#: src/input/es_out.c:1598
 msgid "Bits per sample"
 msgstr "ビット/サンプル"
 
-#: src/input/es_out.c:1543 modules/access/pvr/pvr.c:80
-#: modules/demux/playlist/b4s.c:348
+#: src/input/es_out.c:1602 modules/access/pvr/pvr.c:83
+#: modules/demux/playlist/b4s.c:349
 msgid "Bitrate"
 msgstr "ビットレート"
 
-#: src/input/es_out.c:1544
+#: src/input/es_out.c:1603
 #, c-format
 msgid "%d kb/s"
 msgstr ""
 
-#: src/input/es_out.c:1553
+#: src/input/es_out.c:1612
 msgid "Resolution"
 msgstr "解像度"
 
-#: src/input/es_out.c:1559
+#: src/input/es_out.c:1618
 msgid "Display resolution"
 msgstr "ディスプレイ解像度選択"
 
-#: src/input/es_out.c:1565 modules/access/screen/screen.c:41
-#, fuzzy
+#: src/input/es_out.c:1624 modules/access/screen/screen.c:41
 msgid "Frame rate"
-msgstr "サンプルレート"
+msgstr "フレームレート"
 
-#: src/input/es_out.c:1572 modules/gui/gtk/gnome_interface.c:1972
-#: modules/gui/gtk/gtk_interface.c:2287
+#: src/input/es_out.c:1631
 msgid "Subtitle"
 msgstr "字幕"
 
-#: src/input/input.c:1836 src/input/input.c:1840
-#: modules/gui/macosx/output.m:143 modules/gui/macosx/output.m:253
-#: modules/gui/macosx/output.m:395
+#: src/input/input.c:1912 src/input/input.c:1916
+#: 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:1882 src/playlist/item.c:366
-#: modules/access/cdda/info.c:324 modules/access/cdda/info.c:392
-#: modules/gui/gtk/gnome_interface.c:2448 modules/gui/gtk/gtk_interface.c:2869
-#: modules/gui/macosx/playlist.m:238
+#: src/input/input.c:1958 src/playlist/item.c:369
+#: modules/access/cdda/info.c:325 modules/access/cdda/info.c:393
+#: modules/gui/macosx/playlist.m:134
 msgid "Duration"
 msgstr "持続期間"
 
-#: src/input/var.c:118
+#: src/input/input.c:2133 src/input/input.c:2203
+#, fuzzy
+msgid "Errors"
+msgstr "エラー"
+
+#: src/input/var.c:115
 msgid "Bookmark"
 msgstr "ブックマーク"
 
-#: src/input/var.c:135
-#, fuzzy
+#: src/input/var.c:131
 msgid "Programs"
 msgstr "プログラム"
 
-#: src/input/var.c:146 modules/gui/beos/MediaControlView.cpp:1234
-#: modules/gui/gtk/gnome_interface.c:1649 modules/gui/gtk/gtk_interface.c:1955
-#: modules/gui/gtk/menu.c:986 modules/gui/gtk/menu.c:1399
-#: modules/gui/kde/interface.cpp:146 modules/gui/macosx/intf.m:490
-#: modules/gui/macosx/intf.m:491 modules/gui/macosx/open.m:169
-#: modules/gui/wxwindows/open.cpp:669
+#: src/input/var.c:142 modules/gui/beos/MediaControlView.cpp:1234
+#: modules/gui/macosx/intf.m:532 modules/gui/macosx/intf.m:533
+#: modules/gui/macosx/open.m:169 modules/gui/wxwidgets/dialogs/open.cpp:762
 msgid "Chapter"
 msgstr "チャプター"
 
-#: src/input/var.c:152 modules/access/vcdx/info.c:300
-#: modules/access/vcdx/info.c:301 modules/gui/beos/InterfaceWindow.cpp:274
+#: src/input/var.c:148 modules/access/vcdx/info.c:302
+#: modules/access/vcdx/info.c:303 modules/gui/beos/InterfaceWindow.cpp:291
 msgid "Navigation"
 msgstr "ナビゲーション"
 
-#: src/input/var.c:168 modules/gui/macosx/intf.m:514
-#: modules/gui/macosx/intf.m:515
+#: src/input/var.c:163 modules/gui/macosx/intf.m:556
+#: modules/gui/macosx/intf.m:557
 msgid "Video Track"
 msgstr "ビデオトラック"
 
-#: src/input/var.c:174 modules/gui/macosx/intf.m:497
-#: modules/gui/macosx/intf.m:498
+#: src/input/var.c:169 modules/gui/macosx/intf.m:539
+#: modules/gui/macosx/intf.m:540
 msgid "Audio Track"
 msgstr "オーディオトラック"
 
-#: src/input/var.c:180 modules/gui/macosx/intf.m:518
-#: modules/gui/macosx/intf.m:519
+#: src/input/var.c:175 modules/gui/macosx/intf.m:560
+#: modules/gui/macosx/intf.m:561
 msgid "Subtitles Track"
 msgstr "字幕トラック"
 
-#: src/input/var.c:263
+#: src/input/var.c:256
 msgid "Next title"
 msgstr "次のタイトル"
 
-#: src/input/var.c:268
+#: src/input/var.c:261
 msgid "Previous title"
 msgstr "前のタイトル"
 
-#: src/input/var.c:291
+#: src/input/var.c:284
 #, c-format
 msgid "Title %i"
 msgstr "タイトル %i"
 
-#: src/input/var.c:314 src/input/var.c:374
+#: src/input/var.c:307 src/input/var.c:367
 #, c-format
 msgid "Chapter %i"
 msgstr "チャプター %i"
 
-#: src/input/var.c:353 modules/gui/beos/InterfaceWindow.cpp:271
-#: modules/gui/wxwindows/timer.cpp:225
+#: src/input/var.c:346 modules/gui/beos/InterfaceWindow.cpp:288
+#: modules/gui/wxwidgets/input_manager.cpp:216
 msgid "Next chapter"
 msgstr "次のチャプター"
 
-#: src/input/var.c:358 modules/gui/beos/InterfaceWindow.cpp:270
-#: modules/gui/wxwindows/timer.cpp:224
+#: src/input/var.c:351 modules/gui/beos/InterfaceWindow.cpp:287
+#: modules/gui/wxwidgets/input_manager.cpp:215
 msgid "Previous chapter"
 msgstr "前のチャプター"
 
-#: src/interface/interface.c:326
+#: src/interface/interaction.c:428
+#, fuzzy
+msgid "Login"
+msgstr "グルジア語"
+
+#: src/interface/interaction.c:436 modules/access_output/http.c:63
+msgid "Password"
+msgstr "パスワード"
+
+#: src/interface/interface.c:344
 msgid "Switch interface"
 msgstr "インターフェースを切り替え"
 
-#: src/interface/interface.c:353 modules/gui/macosx/intf.m:449
-#: modules/gui/macosx/intf.m:450
+#: src/interface/interface.c:371 modules/gui/macosx/intf.m:491
+#: modules/gui/macosx/intf.m:492
 msgid "Add Interface"
 msgstr "インタフェースを追加"
 
-#: src/libvlc.c:288 src/libvlc.c:419 src/misc/modules.c:1684
-#: src/misc/modules.c:1988
+#: src/libvlc.c:335 src/libvlc.c:485 src/misc/modules.c:1680
+#: src/misc/modules.c:1984
 msgid "C"
 msgstr "ja"
 
-#: src/libvlc.c:305
+#: src/libvlc.c:352
 msgid "Help options"
 msgstr "ヘルプオプション"
 
-#: src/libvlc.c:2065 src/misc/configuration.c:1265
+#: src/libvlc.c:2264 src/misc/configuration.c:1265
 msgid "string"
 msgstr "文字列"
 
-#: src/libvlc.c:2082 src/misc/configuration.c:1229
+#: src/libvlc.c:2281 src/misc/configuration.c:1229
 msgid "integer"
 msgstr "整数"
 
-#: src/libvlc.c:2100 src/misc/configuration.c:1254
+#: src/libvlc.c:2299 src/misc/configuration.c:1254
 msgid "float"
 msgstr "浮動小数点"
 
-#: src/libvlc.c:2106
+#: src/libvlc.c:2305
 msgid " (default enabled)"
 msgstr " (デフォルト有効)"
 
-#: src/libvlc.c:2107
+#: src/libvlc.c:2306
 msgid " (default disabled)"
 msgstr " (デフォルト無効)"
 
-#: src/libvlc.c:2291
+#: src/libvlc.c:2488
+#, c-format
+msgid "VLC version %s\n"
+msgstr "VLC バージョン %s\n"
+
+#: src/libvlc.c:2489
 #, fuzzy, c-format
+msgid "Compiled by %s@%s.%s\n"
+msgstr "エラー"
+
+#: src/libvlc.c:2491
+#, c-format
+msgid "Compiler: %s\n"
+msgstr "コンパイラー: %s\n"
+
+#: src/libvlc.c:2493
+#, c-format
+msgid "Based upon svn changeset [%s]\n"
+msgstr ""
+
+#: src/libvlc.c:2524
+#, c-format
 msgid ""
-"This program comes with NO WARRANTY, to the extent permitted by law.\n"
-"You may redistribute it under the terms of the GNU General Public License;\n"
-"see the file named COPYING for details.\n"
-"Written by the VideoLAN team; see the AUTHORS file.\n"
+"\n"
+"Dumped content to vlc-help.txt file.\n"
 msgstr ""
-"法律によって許可される範囲でこのプログラムには何の保証もありません。\n"
-"あなたは、GNU GPLの条項に基づいて再配布するかも知れません。\n"
-"COPYINGファイルに詳細が書かれていますので、参照してください。\n"
-"Written by the VideoLAN team at Ecole Centrale, Paris.\n"
 
-#: src/libvlc.c:2333
+#: src/libvlc.c:2545
 #, c-format
 msgid ""
 "\n"
@@ -1030,68 +1022,94 @@ msgstr ""
 "\n"
 "続けるにはEnterキーを押してください。\n"
 
-#: src/libvlc.h:33
+#: src/libvlc.h:35 src/libvlc.h:181
 msgid "Auto"
 msgstr "自動"
 
-#: src/libvlc.h:33
+#: src/libvlc.h:35
 #, fuzzy
 msgid "American English"
 msgstr "アメリカ英語"
 
-#: src/libvlc.h:33
+#: src/libvlc.h:35
 #, fuzzy
 msgid "British English"
-msgstr "イギリス英語"
+msgstr "英語"
 
-#: src/libvlc.h:33 src/misc/iso-639_def.h:59
+#: src/libvlc.h:36 src/misc/iso-639_def.h:59
 #, fuzzy
 msgid "Catalan"
 msgstr "文字列"
 
-#: src/libvlc.h:33 src/misc/iso-639_def.h:68
+#: src/libvlc.h:36 src/misc/iso-639_def.h:68
 #, fuzzy
 msgid "Danish"
 msgstr "ディスク"
 
-#: src/libvlc.h:33 src/misc/iso-639_def.h:80
+#: src/libvlc.h:36 src/misc/iso-639_def.h:80
 msgid "German"
 msgstr "ドイツ語"
 
-#: src/libvlc.h:33 src/misc/iso-639_def.h:168
+#: src/libvlc.h:36 src/misc/iso-639_def.h:169
 msgid "Spanish"
 msgstr "スペイン語"
 
-#: src/libvlc.h:33 src/misc/iso-639_def.h:77
+#: src/libvlc.h:36 src/misc/iso-639_def.h:77
 msgid "French"
 msgstr "フランス語"
 
-#: src/libvlc.h:33 src/misc/iso-639_def.h:99
+#: src/libvlc.h:37 src/misc/iso-639_def.h:99
 msgid "Italian"
 msgstr "イタリア語"
 
-#: src/libvlc.h:33 src/misc/iso-639_def.h:101
+#: src/libvlc.h:37 src/misc/iso-639_def.h:101
 msgid "Japanese"
 msgstr "日本語"
 
-#: src/libvlc.h:33 src/misc/iso-639_def.h:69
+#: src/libvlc.h:37 src/misc/iso-639_def.h:79
+msgid "Georgian"
+msgstr "グルジア語"
+
+#: src/libvlc.h:37 src/misc/iso-639_def.h:111
+#, fuzzy
+msgid "Korean"
+msgstr "韓国語"
+
+#: src/libvlc.h:38 src/misc/iso-639_def.h:69
 msgid "Dutch"
 msgstr ""
 
-#: src/libvlc.h:33
+#: src/libvlc.h:38
+msgid "Occitan"
+msgstr ""
+
+#: src/libvlc.h:38
 #, fuzzy
 msgid "Brazilian Portuguese"
-msgstr "プログラムの選択"
+msgstr "ポルトガル語"
 
-#: src/libvlc.h:33 src/misc/iso-639_def.h:154
+#: src/libvlc.h:38 src/misc/iso-639_def.h:153
+msgid "Romanian"
+msgstr "ルーマニア語"
+
+#: src/libvlc.h:39 src/misc/iso-639_def.h:155
 msgid "Russian"
 msgstr "ロシア語"
 
-#: src/libvlc.h:33
+#: src/libvlc.h:39 src/misc/iso-639_def.h:187
+#, fuzzy
+msgid "Turkish"
+msgstr "キャンセル"
+
+#: src/libvlc.h:39
+msgid "Simplified Chinese"
+msgstr ""
+
+#: src/libvlc.h:40
 msgid "Chinese Traditional"
 msgstr ""
 
-#: src/libvlc.h:46
+#: src/libvlc.h:53
 #, fuzzy
 msgid ""
 "These options allow you to configure the interfaces used by VLC.\n"
@@ -1101,11 +1119,11 @@ msgstr ""
 "使用するインタフェースが選択可能です。デフォルトで自動的に最適なモジュールが"
 "選択されます。"
 
-#: src/libvlc.h:50 src/libvlc.h:1275
+#: src/libvlc.h:57
 msgid "Interface module"
 msgstr "インタフェースモジュール"
 
-#: src/libvlc.h:52
+#: src/libvlc.h:59
 #, fuzzy
 msgid ""
 "This option allows you to select the interface used by VLC.\n"
@@ -1114,11 +1132,11 @@ msgstr ""
 "使用するインタフェースが選択可能です。デフォルトで自動的に最適なモジュールが"
 "選択されます。"
 
-#: src/libvlc.h:56 src/libvlc.h:1280 modules/control/ntservice.c:53
+#: src/libvlc.h:63 modules/control/ntservice.c:53
 msgid "Extra interface modules"
 msgstr "その他のインタフェースモジュール"
 
-#: src/libvlc.h:58
+#: src/libvlc.h:65
 #, fuzzy
 msgid ""
 "This option allows you to select additional interfaces used by VLC. They "
@@ -1129,17 +1147,17 @@ msgstr ""
 "使用するインタフェースが選択可能です。デフォルトで自動的に最適なモジュールが"
 "選択されます。"
 
-#: src/libvlc.h:65
+#: src/libvlc.h:72
 #, fuzzy
 msgid "This option allows you to select control interfaces. "
 msgstr "VLCがプラグインを見つけるときに検索される追加のパスを設定します。"
 
-#: src/libvlc.h:67
+#: src/libvlc.h:74
 #, fuzzy
 msgid "Verbosity (0,1,2)"
 msgstr "冗長 (0,1,2)"
 
-#: src/libvlc.h:69
+#: src/libvlc.h:76
 #, fuzzy
 msgid ""
 "This option sets the verbosity level (0=only errors and standard messages, "
@@ -1147,27 +1165,26 @@ msgid ""
 msgstr ""
 "冗長レベルを指定します (0=エラーと標準メッセージのみ、1=警告、2=デバッグ)"
 
-#: src/libvlc.h:72
+#: src/libvlc.h:79
 #, fuzzy
 msgid "Be quiet"
 msgstr "エラーのみ"
 
-#: src/libvlc.h:74
+#: src/libvlc.h:81
 #, fuzzy
 msgid "This option turns off all warning and information messages."
 msgstr "すべての警告と情報メッセージを抑止します。"
 
-#: src/libvlc.h:76
-#, fuzzy
-msgid "Open MRL"
-msgstr "開く"
+#: src/libvlc.h:83
+msgid "Default stream"
+msgstr "デフォルトストリーム"
 
-#: src/libvlc.h:78
+#: src/libvlc.h:85
 #, fuzzy
-msgid "This option allows you to open a default MRL on start-up."
-msgstr "VLCがプラグインを見つけるときに検索される追加のパスを設定します。"
+msgid "This option allows you to always open a default stream on start-up."
+msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: src/libvlc.h:81
+#: src/libvlc.h:88
 #, fuzzy
 msgid ""
 "This option allows you to set the language of the interface. The system "
@@ -1176,11 +1193,11 @@ msgstr ""
 "ファイルを見つけるときにオープンされるインタフェースの既定のパスを設定しま"
 "す。"
 
-#: src/libvlc.h:85
+#: src/libvlc.h:92
 msgid "Color messages"
-msgstr "カラーメッセージ"
+msgstr "色メッセージ"
 
-#: src/libvlc.h:87
+#: src/libvlc.h:94
 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."
@@ -1188,18 +1205,29 @@ msgstr ""
 "このオプションを設定すると、コンソールに送信されるメッセージはカラー化されま"
 "す。この動作は端末がLinuxカラーをサポートしている必要があります。"
 
-#: src/libvlc.h:90
+#: src/libvlc.h:97
 msgid "Show advanced options"
 msgstr "高度なオプションを表示する"
 
-#: src/libvlc.h:92
+#: src/libvlc.h:99
 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."
 msgstr ""
 
-#: src/libvlc.h:97
+#: src/libvlc.h:103 modules/control/showintf.c:68
+#, fuzzy
+msgid "Show interface with mouse"
+msgstr "インターフェースを表示する"
+
+#: src/libvlc.h:105
+msgid ""
+"If this enabled, the interface will be shown when you move the mouse to the "
+"edge of the screen in fullscreen mode."
+msgstr ""
+
+#: src/libvlc.h:109
 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 "
@@ -1208,11 +1236,11 @@ msgid ""
 "modules section."
 msgstr ""
 
-#: src/libvlc.h:103
+#: src/libvlc.h:115
 msgid "Audio output module"
 msgstr "オーディオ出力モジュール"
 
-#: src/libvlc.h:105
+#: src/libvlc.h:117
 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."
@@ -1220,11 +1248,11 @@ msgstr ""
 "オーディオ出力方法が選択可能です。デフォルトで自動的に最適な方法が選択されま"
 "す。"
 
-#: src/libvlc.h:109 modules/stream_out/display.c:37
+#: src/libvlc.h:121 modules/stream_out/display.c:37
 msgid "Enable audio"
 msgstr "オーディオを有効にする"
 
-#: src/libvlc.h:111
+#: src/libvlc.h:123
 #, fuzzy
 msgid ""
 "You can completely disable the audio output. In this case, the audio "
@@ -1233,38 +1261,50 @@ msgstr ""
 "オーディオ出力を完全に無効にします。オーディオはデコードされません。これによ"
 "り、いくらかの処理パワーをセーブすることができます。"
 
-#: src/libvlc.h:114
+#: src/libvlc.h:126
 msgid "Force mono audio"
 msgstr "強制的にモノラル音声"
 
-#: src/libvlc.h:115
+#: src/libvlc.h:127
 #, fuzzy
 msgid "This will force a mono audio output."
 msgstr "オーディオ出力を強制的にモノラルにします。"
 
-#: src/libvlc.h:117
-msgid "Audio output volume"
-msgstr "オーディオ出力ボリューム"
+#: src/libvlc.h:129
+msgid "Default audio volume"
+msgstr "デフォルトのオーディオボリューム"
 
-#: src/libvlc.h:119
+#: src/libvlc.h:131
 msgid ""
 "You can set the default audio output volume here, in a range from 0 to 1024."
 msgstr "オーディオ・ボリュームの既定値を0から1024の間で設定可能です。"
 
-#: src/libvlc.h:122
+#: src/libvlc.h:134
 #, fuzzy
 msgid "Audio output saved volume"
 msgstr "オーディオ・ボリューム"
 
-#: src/libvlc.h:124
+#: src/libvlc.h:136
 msgid "This saves the audio output volume when you select mute."
 msgstr ""
 
-#: src/libvlc.h:126
+#: src/libvlc.h:138
+#, fuzzy
+msgid "Audio output volume step"
+msgstr "オーディオ出力ボリューム"
+
+#: src/libvlc.h:140
+#, 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:143
 msgid "Audio output frequency (Hz)"
 msgstr "オーディオ出力周波数(Hz)"
 
-#: src/libvlc.h:128
+#: src/libvlc.h:145
 #, fuzzy
 msgid ""
 "You can force the audio output frequency here. Common values are -1 "
@@ -1273,23 +1313,23 @@ msgstr ""
 "オーディオ出力の周波数を強制的に設定可能です。\n"
 "一般的な値は、48000, 44100, 32000, 22050, 16000, 11025, 8000です。"
 
-#: src/libvlc.h:132
+#: src/libvlc.h:149
 msgid "High quality audio resampling"
 msgstr "高品質オーディオリサンプリング"
 
-#: src/libvlc.h:134
+#: src/libvlc.h:151
 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:139
+#: src/libvlc.h:156
 #, fuzzy
 msgid "Audio desynchronization compensation"
 msgstr "AltiVec モーション補正モジュール"
 
-#: src/libvlc.h:141
+#: src/libvlc.h:158
 #, fuzzy
 msgid ""
 "This option allows you to delay the audio output. You must give a number of "
@@ -1299,12 +1339,12 @@ msgstr ""
 "オーディオ出力の遅れを設定します。ビデオと音声のズレがある場合には、適切な値"
 "を設定できます。"
 
-#: src/libvlc.h:145
+#: src/libvlc.h:162
 #, fuzzy
 msgid "Preferred audio output channels mode"
 msgstr "準備されているコーデックの一覧の選択"
 
-#: src/libvlc.h:147
+#: src/libvlc.h:164
 #, fuzzy
 msgid ""
 "This option allows you to set the audio output channels mode that will be "
@@ -1314,11 +1354,11 @@ msgstr ""
 "オーディオ出力方法が選択可能です。デフォルトで自動的に最適な方法が選択されま"
 "す。"
 
-#: src/libvlc.h:151
+#: src/libvlc.h:168
 msgid "Use the S/PDIF audio output when available"
 msgstr "有効なら S/PDIF オーディオ出力を使う"
 
-#: src/libvlc.h:153
+#: src/libvlc.h:170
 #, fuzzy
 msgid ""
 "This option allows you to use the S/PDIF audio output by default when your "
@@ -1327,31 +1367,41 @@ msgstr ""
 "オーディオ出力方法が選択可能です。デフォルトで自動的に最適な方法が選択されま"
 "す。"
 
-#: src/libvlc.h:158
+#: src/libvlc.h:173
+msgid "Force detection of Dolby Surround"
+msgstr "ドルビーサラウンドの強制検知"
+
+#: src/libvlc.h:175
+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 "
+"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:181
+msgid "On"
+msgstr "オン"
+
+#: src/libvlc.h:181
+msgid "Off"
+msgstr "オフ"
+
+#: src/libvlc.h:186
 msgid ""
 "This allows you to add audio post processing filters, to modify the sound"
 msgstr ""
 
-#: src/libvlc.h:161
+#: src/libvlc.h:189
 #, fuzzy
 msgid "Audio visualizations "
 msgstr "ビジュアル化"
 
-#: src/libvlc.h:163
+#: src/libvlc.h:191
 msgid "This allows you to add visualization modules (spectrum analyzer, etc.)."
 msgstr ""
 
-#: src/libvlc.h:166
-msgid "Channel mixer"
-msgstr "チャンネルミキサー"
-
-#: src/libvlc.h:168
-msgid ""
-"This allows you to choose a specific audio channel mixer. For instance, you "
-"can use the \"headphone\" mixer that gives 5.1 feeling with a headphone."
-msgstr ""
-
-#: src/libvlc.h:173
+#: src/libvlc.h:195
 msgid ""
 "These options allow you to modify the behavior of the video output "
 "subsystem. You can for example enable video filters (deinterlacing, image "
@@ -1360,11 +1410,11 @@ msgid ""
 "options."
 msgstr ""
 
-#: src/libvlc.h:179
+#: src/libvlc.h:201
 msgid "Video output module"
 msgstr "ビデオ出力モジュール"
 
-#: src/libvlc.h:181
+#: src/libvlc.h:203
 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."
@@ -1372,11 +1422,11 @@ msgstr ""
 "このオプションは使用するビデオ出力方法が選択できます。デフォルトで自動的に最"
 "適な方法が選択されます。"
 
-#: src/libvlc.h:185 modules/stream_out/display.c:39
+#: src/libvlc.h:207 modules/stream_out/display.c:39
 msgid "Enable video"
 msgstr "ビデオを有効にする"
 
-#: src/libvlc.h:187
+#: src/libvlc.h:209
 #, fuzzy
 msgid ""
 "You can completely disable the video output. In this case, the video "
@@ -1385,12 +1435,13 @@ msgstr ""
 "ビデオ出力を完全に無効化します。ビデオはデコードされません。これにより、いく"
 "らかの処理パワーをセーブすることができます。"
 
-#: src/libvlc.h:190 modules/stream_out/mosaic_bridge.c:104
-#: modules/stream_out/transcode.c:68 modules/visualization/visual/visual.c:43
+#: src/libvlc.h:212 modules/codec/fake.c:47
+#: modules/stream_out/mosaic_bridge.c:107 modules/stream_out/transcode.c:70
+#: modules/visualization/visual/visual.c:43
 msgid "Video width"
 msgstr "ビデオの幅"
 
-#: src/libvlc.h:192
+#: src/libvlc.h:214
 #, fuzzy
 msgid ""
 "You can enforce the video width here. By default (-1) VLC will adapt to the "
@@ -1399,12 +1450,13 @@ msgstr ""
 "ビデオの幅を強制的に指定することができます。\n"
 "※VLCはデフォルトでビデオの特性に合わせます。"
 
-#: src/libvlc.h:195 modules/stream_out/mosaic_bridge.c:107
-#: modules/stream_out/transcode.c:71 modules/visualization/visual/visual.c:47
+#: src/libvlc.h:217 modules/codec/fake.c:50
+#: modules/stream_out/mosaic_bridge.c:110 modules/stream_out/transcode.c:73
+#: modules/visualization/visual/visual.c:47
 msgid "Video height"
 msgstr "ビデオの高さ"
 
-#: src/libvlc.h:197
+#: src/libvlc.h:219
 #, fuzzy
 msgid ""
 "You can enforce the video height here. By default (-1) VLC will adapt to the "
@@ -1413,101 +1465,107 @@ msgstr ""
 "ビデオの高さを強制的に指定することができます。\n"
 "※VLCはデフォルトでビデオの特性に合わせます。"
 
-#: src/libvlc.h:200
+#: src/libvlc.h:222
 msgid "Video x coordinate"
-msgstr "Video x コーディネート"
+msgstr "ビデオ x コーディネート"
 
-#: src/libvlc.h:202
+#: src/libvlc.h:224
 msgid ""
 "You can enforce the position of the top left corner of the video window here "
 "(x coordinate)."
 msgstr ""
 
-#: src/libvlc.h:205
+#: src/libvlc.h:227
 msgid "Video y coordinate"
 msgstr "ビデオ y コーディネート"
 
-#: src/libvlc.h:207
+#: src/libvlc.h:229
 msgid ""
 "You can enforce the position of the top left corner of the video window here "
 "(y coordinate)."
 msgstr ""
 
-#: src/libvlc.h:210
+#: src/libvlc.h:232
 msgid "Video title"
-msgstr "ビデオタイトル"
+msgstr "ビデオの題名"
 
-#: src/libvlc.h:212
+#: src/libvlc.h:234
 msgid "You can specify a custom video window title here."
-msgstr ""
+msgstr "ここでカスタムビデオウィンドウの題名を指定できます。"
 
-#: src/libvlc.h:214
-#, fuzzy
+#: src/libvlc.h:236
 msgid "Video alignment"
-msgstr "設定"
+msgstr "ビデオの位置あわせ"
 
-#: src/libvlc.h:216
+#: src/libvlc.h:238
 msgid ""
 "You can enforce the video alignment 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)."
 msgstr ""
 
-#: src/libvlc.h:221 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/time.c:96
+#: src/libvlc.h:243 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
 msgid "Center"
 msgstr "中央"
 
-#: src/libvlc.h:221 modules/video_filter/logo.c:85
+#: src/libvlc.h:243 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
 msgid "Top"
 msgstr "上"
 
-#: src/libvlc.h:221 modules/video_filter/logo.c:85
+#: src/libvlc.h:243 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
 msgid "Bottom"
 msgstr "下"
 
-#: src/libvlc.h:222 modules/video_filter/logo.c:86
+#: src/libvlc.h:244 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
 msgid "Top-Left"
 msgstr "左上"
 
-#: src/libvlc.h:222 modules/video_filter/logo.c:86
+#: src/libvlc.h:244 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
 msgid "Top-Right"
 msgstr "右上"
 
-#: src/libvlc.h:222 modules/video_filter/logo.c:86
+#: src/libvlc.h:244 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
 msgid "Bottom-Left"
 msgstr "左下"
 
-#: src/libvlc.h:222 modules/video_filter/logo.c:86
+#: src/libvlc.h:244 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
 msgid "Bottom-Right"
 msgstr "右下"
 
-#: src/libvlc.h:224
+#: src/libvlc.h:246
 msgid "Zoom video"
 msgstr "ビデオズーム"
 
-#: src/libvlc.h:226
+#: src/libvlc.h:248
 msgid "You can zoom the video by the specified factor."
 msgstr "任意にビデオをズームすることができます。"
 
-#: src/libvlc.h:228
+#: src/libvlc.h:250
 msgid "Grayscale video output"
 msgstr "グレースケールビデオ出力"
 
-#: src/libvlc.h:230
+#: src/libvlc.h:252
 msgid ""
 "When enabled, the color information from the video won't be decoded (this "
 "can also allow you to save some processing power)."
@@ -1515,51 +1573,80 @@ msgstr ""
 "このオプションを使用すると、VLCはカラー情報をデコードしません。(これにより、"
 "いくらかの処理パワーをセーブすることができます。)"
 
-#: src/libvlc.h:233
+#: src/libvlc.h:255
 msgid "Fullscreen video output"
 msgstr "フルスクリーンビデオ出力"
 
-#: src/libvlc.h:235
+#: src/libvlc.h:257
 msgid ""
 "If this option is enabled, VLC will always start a video in fullscreen mode."
 msgstr ""
 "このオプションを指定すると、VLCは常にビデオをフルスクリーン・モードにします。"
 
-#: src/libvlc.h:238
+#: src/libvlc.h:260
 msgid "Overlay video output"
 msgstr "オーバーレイビデオ出力"
 
-#: src/libvlc.h:240
+#: src/libvlc.h:262
 #, fuzzy
 msgid ""
 "If enabled, VLC will try to take advantage of the overlay capabilities of "
 "your graphics card (hardware acceleration)."
 msgstr "VLCはデフォルトでグラフィックカードのオーバレイ機能の使用を試みます。"
 
-#: src/libvlc.h:243 src/video_output/vout_intf.c:216
+#: src/libvlc.h:265 src/video_output/vout_intf.c:322
 msgid "Always on top"
 msgstr "常に最前面"
 
-#: src/libvlc.h:244
+#: src/libvlc.h:266
 #, fuzzy
 msgid "Always place the video window on top of other windows."
 msgstr "ビデオをクローンするためにビデオ・ウィンドウ数を選択する"
 
-#: src/libvlc.h:247
+#: src/libvlc.h:269
+msgid "Disable screensaver"
+msgstr "スクリーンセーバーを無効にする"
+
+#: src/libvlc.h:270
+msgid "Disable the screensaver during video playback."
+msgstr "ビデオ再生中のスクリーンセーバーを無効にします。"
+
+#: src/libvlc.h:272
+#, fuzzy
+msgid "Log to file"
+msgstr "ファイル"
+
+#: src/libvlc.h:273
+msgid ""
+"Log all VLC messages to a text file. Use the logfile option to set the file "
+"name."
+msgstr ""
+
+#: src/libvlc.h:276
+msgid "Log to syslog"
+msgstr ""
+
+#: src/libvlc.h:277
+msgid "Log all VLC messages to syslog."
+msgstr ""
+
+#: src/libvlc.h:279
 msgid "Window decorations"
 msgstr ""
 
-#: src/libvlc.h:249
+#: src/libvlc.h:281
+#, fuzzy
 msgid ""
 "If this option is disabled, VLC will avoid creating window caption, frames, "
-"etc... around the video. Currently only supported on Windows."
+"etc... around the video."
 msgstr ""
+"このオプションを指定すると、VLCは常にビデオをフルスクリーン・モードにします。"
 
-#: src/libvlc.h:252
+#: src/libvlc.h:284
 msgid "Video filter module"
 msgstr "ビデオフィルターモジュール"
 
-#: src/libvlc.h:254
+#: src/libvlc.h:286
 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."
@@ -1567,33 +1654,53 @@ msgstr ""
 "ノンインタレースのインスタンスまたは、クローン、湾曲化されたビデオ・ウィンド"
 "ウの映像クォリティに効果を加えるフィルターを指定できます。"
 
-#: src/libvlc.h:258
+#: src/libvlc.h:290
 msgid "Video snapshot directory"
-msgstr ""
+msgstr "ビデオスナップショットのディレクトリ"
 
-#: src/libvlc.h:260
+#: src/libvlc.h:292
 #, fuzzy
 msgid ""
 "Allows you to specify the directory where the video snapshots will be stored."
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: src/libvlc.h:263
-#, fuzzy
+#: src/libvlc.h:295
 msgid "Video snapshot format"
-msgstr "ビデオ入力のクロマフォーマット"
+msgstr "ビデオスナップショットの形式"
 
-#: src/libvlc.h:265
+#: src/libvlc.h:297
 #, fuzzy
 msgid ""
 "Allows you to specify the image format in which the video snapshots will be "
 "stored."
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: src/libvlc.h:268
+#: src/libvlc.h:300
+#, fuzzy
+msgid "Display video snapshot preview"
+msgstr "ビデオのスナップショットを取る"
+
+#: src/libvlc.h:302
+msgid ""
+"Enable / disable displaying the snapshot preview in the screen's to  left "
+"corner."
+msgstr ""
+
+#: src/libvlc.h:305
+msgid "Video cropping"
+msgstr "ビデオ縁取り"
+
+#: src/libvlc.h:307
+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."
+msgstr ""
+
+#: src/libvlc.h:311
 msgid "Source aspect ratio"
 msgstr "ソースのアスペクト比"
 
-#: src/libvlc.h:270
+#: src/libvlc.h:313
 msgid ""
 "This will force 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 "
@@ -1607,238 +1714,285 @@ msgstr ""
 "x:y (4:3, 16:9, etc.)の形式でアスペクトを指定するか、浮動小数点値 (1.25, "
 "1.3333, etc.)の形式でピクセルの矩形を指定します。"
 
-#: src/libvlc.h:277
-#, fuzzy
+#: src/libvlc.h:320
+msgid "Fix HDTV height"
+msgstr "HDTV の高さを固定にする"
+
+#: src/libvlc.h:322
+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."
+msgstr ""
+
+#: src/libvlc.h:327
+msgid "Monitor pixel aspect ratio"
+msgstr "モニターのピクセルアスペクト比"
+
+#: src/libvlc.h:329
+msgid ""
+"This will force 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:333
 msgid "Skip frames"
-msgstr "キーフレームを使用"
+msgstr "フレームを飛ばす"
 
-#: src/libvlc.h:279
-msgid "Disable this option to disable frame drops on MPEG-2 streams."
+#: src/libvlc.h:335
+msgid ""
+"This option enables framedropping on MPEG2 stream. Framedropping occurs when "
+"your computer is not powerful enough"
 msgstr ""
 
-#: src/libvlc.h:281
+#: src/libvlc.h:338
 msgid "Quiet synchro"
 msgstr ""
 
-#: src/libvlc.h:283
+#: src/libvlc.h:340
 msgid ""
 "Enable this option to avoid flooding the message log with debug output from "
 "the video output synchro."
 msgstr ""
 
-#: src/libvlc.h:287
+#: src/libvlc.h:344
 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:291
+#: src/libvlc.h:348
 msgid "Clock reference average counter"
-msgstr ""
+msgstr "平均カウンターの参照クロック"
 
-#: src/libvlc.h:293
+#: src/libvlc.h:350
 msgid ""
 "When using the PVR input (or a very irregular source), you should set this "
 "to 10000."
 msgstr ""
 
-#: src/libvlc.h:296
-#, fuzzy
+#: src/libvlc.h:353
 msgid "Clock synchronisation"
-msgstr "コーデック説明"
+msgstr "時刻同期"
 
-#: src/libvlc.h:298
+#: src/libvlc.h:355
 msgid ""
 "Allows you to enable/disable the input clock synchronisation for real-time "
 "sources."
 msgstr ""
 
-#: src/libvlc.h:302 modules/access/dshow/dshow.cpp:72
+#: src/libvlc.h:358 modules/control/netsync.c:69
+msgid "Network synchronisation"
+msgstr ""
+
+#: src/libvlc.h:359
+msgid ""
+"This allows you to remotely synchronise clocks for server and client. The "
+"detailed settings are available in Advanced / Others / Network Sync"
+msgstr ""
+
+#: src/libvlc.h:365 src/video_output/vout_intf.c:236
+#: src/video_output/vout_intf.c:297 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:1286
-#: modules/gui/macosx/vout.m:173
-#: modules/gui/wxwindows/preferences_widgets.cpp:285
-#: modules/gui/wxwindows/preferences_widgets.cpp:335
-#: modules/video_filter/marq.c:52 modules/video_filter/time.c:52
-#: modules/video_output/directx/directx.c:141
+#: modules/audio_output/alsa.c:101 modules/gui/macosx/prefs_widgets.m:1292
+#: modules/gui/macosx/sfilters.m:135 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/time.c:52 modules/video_output/directx/directx.c:142
 msgid "Default"
 msgstr "デフォルト"
 
-#: src/libvlc.h:302 modules/gui/macosx/equalizer.m:144
-#: modules/gui/macosx/wizard.m:125 modules/gui/wxwindows/extrapanel.cpp:218
-#: modules/gui/wxwindows/extrapanel.cpp:467
-#: modules/gui/wxwindows/wizard.cpp:614
+#: src/libvlc.h:365 modules/gui/macosx/equalizer.m:144
+#: modules/gui/macosx/extended.m:106 modules/gui/macosx/wizard.m:386
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:624
+#: modules/gui/wxwidgets/extrapanel.cpp:218
+#: modules/gui/wxwidgets/extrapanel.cpp:467
 msgid "Enable"
 msgstr "有効"
 
-#: src/libvlc.h:304
-#, fuzzy
+#: src/libvlc.h:367
 msgid "UDP port"
-msgstr "ポート番号"
+msgstr "UDP ポート"
 
-#: src/libvlc.h:306
+#: src/libvlc.h:369
 msgid "This is the port used for UDP streams. By default, we chose 1234."
 msgstr "UDPストリームで使用されるポートを指定します。既定値は1234です。"
 
-#: src/libvlc.h:308
+#: src/libvlc.h:371
 msgid "MTU of the network interface"
-msgstr "ネットワーク・インタフェースのMTU"
+msgstr "ネットワークインタフェースの MTU"
 
-#: src/libvlc.h:310
+#: src/libvlc.h:373
+#, fuzzy
 msgid ""
-"This is the typical size of UDP packets that we expect. On Ethernet it is "
-"usually 1500."
+"This is the maximum packet size that can be transmitted over network "
+"interface. On Ethernet it is usually 1500 bytes."
 msgstr ""
 "期待する典型的なUDPパケットのサイズです。イーサネットでは、その値は、通常1500"
 "です。"
 
-#: src/libvlc.h:313
-msgid "Network interface address"
-msgstr "ネットワークインタフェースアドレス"
+#: src/libvlc.h:376
+msgid "Hop limit (TTL)"
+msgstr ""
 
-#: src/libvlc.h:315
+#: src/libvlc.h:378
 msgid ""
-"If you have several interfaces on your machine and use the multicast "
-"solution, you will probably have to indicate the IP address of your "
-"multicasting interface here."
+"Specify the hop limit (TTL) of the multicast packets sent by the stream "
+"output."
 msgstr ""
-"Linuxマシン上に複数のネットワーク・インタフェースがあり、マルチキャスト・ソ"
-"リューションを使用する場合には、おそらく、IPアドレスかマルチキャストを行って"
-"いるインタフェースを指定しなければなりません。"
 
-#: src/libvlc.h:319 modules/access_output/udp.c:69 modules/stream_out/rtp.c:77
-#, fuzzy
-msgid "Time To Live"
-msgstr "垂直オフセット"
+#: src/libvlc.h:381
+msgid "Multicast output interface"
+msgstr "マルチキャスト出力インターフェース)"
 
-#: src/libvlc.h:321
+#: src/libvlc.h:383
 msgid ""
-"Indicate here the Time To Live of the multicast packets sent by the stream "
-"output."
+"Indicate here the multicast output interface. This overrides the routing "
+"table."
 msgstr ""
 
-#: src/libvlc.h:324
-msgid "Choose program (SID)"
-msgstr "プログラムの選択 (SID)"
+#: src/libvlc.h:386
+#, fuzzy
+msgid "Program to select"
+msgstr "デコードのプログラム"
 
-#: src/libvlc.h:326
+#: src/libvlc.h:388
 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)."
 msgstr ""
 
-#: src/libvlc.h:330
+#: src/libvlc.h:392
 #, fuzzy
-msgid "Choose programs"
-msgstr "プログラムの選択"
+msgid "Programs to select"
+msgstr "デコードのプログラム"
 
-#: src/libvlc.h:332
+#: src/libvlc.h:394
 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)."
 msgstr ""
 
-#: src/libvlc.h:337
-#, fuzzy
-msgid "Choose audio track"
+#: src/libvlc.h:399 modules/gui/wxwidgets/dialogs/open.cpp:776
+msgid "Audio track"
 msgstr "オーディオトラック"
 
-#: src/libvlc.h:339
+#: src/libvlc.h:401
 #, fuzzy
-msgid "Give the stream number of the audio track you want to use(from 0 to n)."
+msgid ""
+"Give the stream number of the audio track you want to use (from 0 to n)."
 msgstr ""
 "DVDの中で使用したいオーディオのチャンネル番号を指定します。(1からnまで)"
 
-#: src/libvlc.h:342
-#, fuzzy
-msgid "Choose subtitles track"
-msgstr "字幕トラックの選択"
+#: src/libvlc.h:404 modules/gui/wxwidgets/dialogs/open.cpp:768
+msgid "Subtitles track"
+msgstr "字幕トラック"
 
-#: src/libvlc.h:344
+#: src/libvlc.h:406
 #, fuzzy
 msgid ""
 "Give the stream number of the subtitle track you want to use (from 0 to n)."
 msgstr "DVDの中で使用したい字幕のチャンネル番号を指定します。(1からnまで)"
 
-#: src/libvlc.h:347
-#, fuzzy
-msgid "Choose audio language"
-msgstr "オーディオチャンネルの選択"
+#: src/libvlc.h:409
+msgid "Audio language"
+msgstr "オーディオ言語"
 
-#: src/libvlc.h:349
+#: src/libvlc.h:411
 #, fuzzy
 msgid ""
 "Give the language of the audio track you want to use (comma separted, two or "
-"tree letter country code)."
+"three letter country code)."
 msgstr ""
 "DVDの中で使用したいオーディオのチャンネル番号を指定します。(1からnまで)"
 
-#: src/libvlc.h:352
-#, fuzzy
-msgid "Choose subtitle language"
-msgstr "オーディオチャンネルの選択"
+#: src/libvlc.h:414
+msgid "Subtitle language"
+msgstr "字幕言語"
 
-#: src/libvlc.h:354
+#: src/libvlc.h:416
 #, fuzzy
 msgid ""
 "Give the language of the subtitle track you want to use (comma separted, two "
 "or tree letter country code)."
 msgstr "DVDの中で使用したい字幕のチャンネル番号を指定します。(1からnまで)"
 
-#: src/libvlc.h:357
+#: src/libvlc.h:419
+#, fuzzy
+msgid "Audio track ID"
+msgstr "オーディオトラック"
+
+#: src/libvlc.h:421
+#, fuzzy
+msgid "Give the stream ID of the audio track you want to use."
+msgstr ""
+"DVDの中で使用したいオーディオのチャンネル番号を指定します。(1からnまで)"
+
+#: src/libvlc.h:423
+#, fuzzy
+msgid "Subtitles track ID"
+msgstr "字幕トラック"
+
+#: src/libvlc.h:425
+#, fuzzy
+msgid "Give the stream ID of the subtitle track you want to use."
+msgstr "DVDの中で使用したい字幕のチャンネル番号を指定します。(1からnまで)"
+
+#: src/libvlc.h:427
 #, fuzzy
 msgid "Input repetitions"
 msgstr "出力オプション"
 
-#: src/libvlc.h:358
+#: src/libvlc.h:428
 msgid "Number of time the same input will be repeated"
 msgstr ""
 
-#: src/libvlc.h:361 src/libvlc.h:362
+#: src/libvlc.h:431 src/libvlc.h:432
 msgid "Input start time (seconds)"
 msgstr "入力開始時間 (秒)"
 
-#: src/libvlc.h:364 src/libvlc.h:365
+#: src/libvlc.h:434 src/libvlc.h:435
 msgid "Input stop time (seconds)"
 msgstr "入力停止時間 (秒)"
 
-#: src/libvlc.h:367
-#, fuzzy
+#: src/libvlc.h:437
 msgid "Input list"
-msgstr "入力"
+msgstr "入力一覧"
 
-#: src/libvlc.h:368
+#: src/libvlc.h:438
 #, fuzzy
 msgid ""
 "Allows you to specify a comma-separated list of inputs that will be "
-"concatenated."
+"concatenated after the normal one."
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: src/libvlc.h:371
+#: src/libvlc.h:441
 msgid "Input slave (experimental)"
-msgstr ""
+msgstr "スレーブ入力 (実験)"
 
-#: src/libvlc.h:372
+#: src/libvlc.h:442
 msgid ""
-"Allows you to play from several files at the same time. This feature is "
+"Allows you to play from several streams at the same time. This feature is "
 "experimental, not all formats are supported."
 msgstr ""
 
-#: src/libvlc.h:376
+#: src/libvlc.h:446
 msgid "Bookmarks list for a stream"
-msgstr ""
+msgstr "ストリームのブックマーク一覧"
 
-#: src/libvlc.h:377
+#: src/libvlc.h:447
 msgid ""
 "You can specify 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:382
+#: src/libvlc.h:452
 msgid ""
 "These options allow you to modify the behavior of the subpictures subsystem. "
 "You can for example enable subpictures filters (logo, etc.). Enable these "
@@ -1846,12 +2000,11 @@ msgid ""
 "section. You can also set many miscellaneous subpictures options."
 msgstr ""
 
-#: src/libvlc.h:388
-#, fuzzy
+#: src/libvlc.h:458
 msgid "Force subtitle position"
-msgstr "字幕の位置"
+msgstr "強制的な字幕の位置"
 
-#: src/libvlc.h:390
+#: src/libvlc.h:460
 msgid ""
 "You can use this option to place the subtitles under the movie, instead of "
 "over the movie. Try several positions."
@@ -1859,43 +2012,51 @@ msgstr ""
 "このオプションは映像中の字幕の位置を指定できます。いくつかの位置を試してみて"
 "ください。"
 
-#: src/libvlc.h:393 src/libvlc.h:1005
-msgid "On Screen Display"
+#: src/libvlc.h:463
+#, fuzzy
+msgid "Enable sub-pictures"
+msgstr "字幕"
+
+#: src/libvlc.h:465
+msgid "You can completely disable the sub-picture processing."
 msgstr ""
 
-#: src/libvlc.h:395
+#: src/libvlc.h:467 src/libvlc.h:1152 src/misc/iso-639_def.h:143
+#: modules/stream_out/transcode.c:239
+msgid "On Screen Display"
+msgstr "オンスクリーンディスプレイ"
+
+#: src/libvlc.h:469
 msgid ""
 "VLC can display messages on the video. This is called OSD (On Screen "
 "Display). You can disable this feature here."
 msgstr ""
 
-#: src/libvlc.h:398
-#, fuzzy
+#: src/libvlc.h:472
 msgid "Subpictures filter module"
-msgstr "ビデオフィルターモジュール"
+msgstr "字幕フィルターモジュール"
 
-#: src/libvlc.h:400
+#: src/libvlc.h:474
 msgid ""
 "This will allow you to add a subpictures filter for instance to overlay a "
 "logo."
 msgstr ""
 
-#: src/libvlc.h:403
-#, fuzzy
+#: src/libvlc.h:477
 msgid "Autodetect subtitle files"
-msgstr "字幕の選択"
+msgstr "字幕ファイルの自動検知"
 
-#: src/libvlc.h:405
+#: src/libvlc.h:479
 msgid ""
 "Automatically detect a subtitle file, if no subtitle filename is specified."
 msgstr ""
 
-#: src/libvlc.h:408
+#: src/libvlc.h:482
 #, fuzzy
 msgid "Subtitle autodetection fuzziness"
 msgstr "字幕"
 
-#: src/libvlc.h:410
+#: src/libvlc.h:484
 msgid ""
 "This determines how fuzzy subtitle and movie filename matching will be. "
 "Options are:\n"
@@ -1906,32 +2067,32 @@ msgid ""
 "4 = subtitle file matching the movie name exactly"
 msgstr ""
 
-#: src/libvlc.h:418
+#: src/libvlc.h:492
 #, fuzzy
 msgid "Subtitle autodetection paths"
 msgstr "字幕"
 
-#: src/libvlc.h:420
+#: src/libvlc.h:494
 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:423
+#: src/libvlc.h:497
 msgid "Use subtitle file"
 msgstr "字幕ファイルを使用"
 
-#: src/libvlc.h:425
+#: src/libvlc.h:499
 msgid ""
 "Load this subtitle file. To be used when autodetect cannot detect your "
 "subtitle file."
 msgstr ""
 
-#: src/libvlc.h:428
+#: src/libvlc.h:502
 msgid "DVD device"
 msgstr "DVD デバイス"
 
-#: src/libvlc.h:431
+#: src/libvlc.h:505
 #, fuzzy
 msgid ""
 "This is the default DVD drive (or file) to use. Don't forget the colon after "
@@ -1940,45 +2101,45 @@ msgstr ""
 "使用する既定のDVDドライブ(またはファイル)です。ドライブ文字の後にコロンを付加"
 "することを忘れないでください。(例 D:)"
 
-#: src/libvlc.h:435
+#: src/libvlc.h:509
 msgid "This is the default DVD device to use."
 msgstr "DVDデバイスの既定値を設定します。"
 
-#: src/libvlc.h:438
+#: src/libvlc.h:512
 msgid "VCD device"
 msgstr "VCD デバイス"
 
-#: src/libvlc.h:441
+#: src/libvlc.h:515
 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:445
+#: src/libvlc.h:519
 msgid "This is the default VCD device to use."
 msgstr "VCDデバイスの既定値を指定します。"
 
-#: src/libvlc.h:448
+#: src/libvlc.h:522
 #, fuzzy
 msgid "Audio CD device"
 msgstr "オーディオ CD デバイス"
 
-#: src/libvlc.h:451
+#: src/libvlc.h:525
 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:455
+#: src/libvlc.h:529
 #, fuzzy
 msgid "This is the default Audio CD device to use."
 msgstr "VCDデバイスの既定値を指定します。"
 
-#: src/libvlc.h:458 modules/gui/wxwindows/open.cpp:737
+#: src/libvlc.h:532 modules/gui/wxwidgets/dialogs/open.cpp:838
 msgid "Force IPv6"
 msgstr "強制的に IPv6"
 
-#: src/libvlc.h:460
+#: src/libvlc.h:534
 msgid ""
 "If you check this box, IPv6 will be used by default for all UDP and HTTP "
 "connections."
@@ -1986,12 +2147,11 @@ msgstr ""
 "このチェックボックスをオンにすると、IPv6がすべてのUDPとHTTPの接続で既定値とし"
 "て使用されます。"
 
-#: src/libvlc.h:463
-#, fuzzy
+#: src/libvlc.h:537
 msgid "Force IPv4"
-msgstr "強制で IPv4"
+msgstr "強制的に IPv4"
 
-#: src/libvlc.h:465
+#: src/libvlc.h:539
 msgid ""
 "If you check this box, IPv4 will be used by default for all UDP and HTTP "
 "connections."
@@ -1999,11 +2159,11 @@ msgstr ""
 "このチェックボックスをオンにすると、IPv4がすべてのUDPとHTTPの接続で既定値とし"
 "て使用されます。"
 
-#: src/libvlc.h:468
+#: src/libvlc.h:542
 msgid "TCP connection timeout in ms"
 msgstr ""
 
-#: src/libvlc.h:470
+#: src/libvlc.h:544
 #, fuzzy
 msgid ""
 "Allows you to modify the default TCP connection timeout. This value should "
@@ -2012,178 +2172,171 @@ msgstr ""
 "udpストリームで使用される既定のキャッシング値が変更可能です。単位はミリ秒で指"
 "定します。"
 
-#: src/libvlc.h:473
+#: src/libvlc.h:547
 #, fuzzy
 msgid "SOCKS server"
-msgstr "サーバーなし"
+msgstr "CDDB サーバー"
 
-#: src/libvlc.h:475
+#: src/libvlc.h:549
 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"
 msgstr ""
 
-#: src/libvlc.h:478
-#, fuzzy
+#: src/libvlc.h:552
 msgid "SOCKS user name"
-msgstr "FTP ユーザー名"
+msgstr "SOCKS ユーザー名"
 
-#: src/libvlc.h:479
+#: src/libvlc.h:553
 #, fuzzy
 msgid ""
 "Allows you to modify the user name that will be used for the connection to "
 "the SOCKS server."
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: src/libvlc.h:482
-#, fuzzy
+#: src/libvlc.h:556
 msgid "SOCKS password"
-msgstr "FTP パスワード"
+msgstr "SOCKS パスワード"
 
-#: src/libvlc.h:483
+#: src/libvlc.h:557
 #, fuzzy
 msgid ""
 "Allows you to modify the password that will be used for the connection to "
 "the SOCKS server."
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: src/libvlc.h:489
-#, fuzzy
+#: src/libvlc.h:560
 msgid "Title metadata"
-msgstr "ファイル"
+msgstr "タイトルメタデータ"
 
-#: src/libvlc.h:491
+#: src/libvlc.h:562
 msgid "Allows you to specify a \"title\" metadata for an input."
 msgstr ""
 
-#: src/libvlc.h:493
+#: src/libvlc.h:564
 msgid "Author metadata"
 msgstr "製作者メタデータ"
 
-#: src/libvlc.h:495
+#: src/libvlc.h:566
 msgid "Allows you to specify an \"author\" metadata for an input."
 msgstr ""
 
-#: src/libvlc.h:497
+#: src/libvlc.h:568
 msgid "Artist metadata"
 msgstr "アーティストメタデータ"
 
-#: src/libvlc.h:499
+#: src/libvlc.h:570
 msgid "Allows you to specify an \"artist\" metadata for an input."
 msgstr ""
 
-#: src/libvlc.h:501
+#: src/libvlc.h:572
 msgid "Genre metadata"
 msgstr "ジャンルメタデータ"
 
-#: src/libvlc.h:503
+#: src/libvlc.h:574
 msgid "Allows you to specify a \"genre\" metadata for an input."
 msgstr ""
 
-#: src/libvlc.h:505
-#, fuzzy
+#: src/libvlc.h:576
 msgid "Copyright metadata"
-msgstr "コピー"
+msgstr "著作権メタデータ"
 
-#: src/libvlc.h:507
+#: src/libvlc.h:578
 msgid "Allows you to specify a \"copyright\" metadata for an input."
 msgstr ""
 
-#: src/libvlc.h:509
+#: src/libvlc.h:580
 msgid "Description metadata"
 msgstr "説明メタデータ"
 
-#: src/libvlc.h:511
+#: src/libvlc.h:582
 msgid "Allows you to specify a \"description\" metadata for an input."
 msgstr ""
 
-#: src/libvlc.h:513
+#: src/libvlc.h:584
 msgid "Date metadata"
 msgstr "日付メタデータ"
 
-#: src/libvlc.h:515
+#: src/libvlc.h:586
 msgid "Allows you to specify a \"date\" metadata for an input."
 msgstr ""
 
-#: src/libvlc.h:517
+#: src/libvlc.h:588
 msgid "URL metadata"
 msgstr "URL メタデータ"
 
-#: src/libvlc.h:519
+#: src/libvlc.h:590
 msgid "Allows you to specify a \"url\" metadata for an input."
 msgstr ""
 
-#: src/libvlc.h:522
+#: src/libvlc.h:593
 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:526
-#, fuzzy
+#: src/libvlc.h:597
 msgid "Preferred codecs list"
-msgstr "準備されているコーデックの一覧の選択"
+msgstr "準備されているコーデックの一覧"
 
-#: src/libvlc.h:528
+#: src/libvlc.h:599
 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."
 msgstr ""
 
-#: src/libvlc.h:532
-#, fuzzy
+#: src/libvlc.h:603
 msgid "Preferred encoders list"
-msgstr "準備されているコーデックの一覧の選択"
+msgstr "準備されているエンコーダー一覧"
 
-#: src/libvlc.h:534
+#: src/libvlc.h:605
 #, fuzzy
 msgid ""
 "This allows you to select a list of encoders that VLC will use in priority"
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: src/libvlc.h:538
+#: src/libvlc.h:609
 msgid ""
 "These options allow you to set default global options for the stream output "
 "subsystem."
 msgstr ""
 
-#: src/libvlc.h:541
-#, fuzzy
+#: src/libvlc.h:612
 msgid "Default stream output chain"
-msgstr "ストリーム出力の複製"
+msgstr "デフォルトのストリーム出力チェイン"
 
-#: src/libvlc.h:543
+#: src/libvlc.h:614
 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:547
+#: src/libvlc.h:618
 msgid "Enable streaming of all ES"
-msgstr ""
+msgstr "全 ES のストリーミングを有効にする"
 
-#: src/libvlc.h:549
+#: src/libvlc.h:620
 #, fuzzy
 msgid "This allows you to stream all ES (video, audio and subtitles)"
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: src/libvlc.h:551
+#: src/libvlc.h:622
 msgid "Display while streaming"
-msgstr ""
+msgstr "ストリーミング中の表示"
 
-#: src/libvlc.h:553
+#: src/libvlc.h:624
 #, fuzzy
 msgid "This allows you to play the stream while streaming it."
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: src/libvlc.h:555
+#: src/libvlc.h:626
 msgid "Enable video stream output"
 msgstr "ビデオストリームの出力を有効にする"
 
-#: src/libvlc.h:557
+#: src/libvlc.h:628
 msgid ""
 "This allows you to choose if the video stream should be redirected to the "
 "stream output facility when this last one is enabled."
@@ -2191,11 +2344,11 @@ msgstr ""
 "ビデオ・ストリーム出力機構の最後のものが有効になっているとビデオ・ストリーム"
 "が出力機構にリダイレクトされるべき場合、選択可能です。"
 
-#: src/libvlc.h:560
+#: src/libvlc.h:631
 msgid "Enable audio stream output"
 msgstr "オーディオストリームの出力を有効にする"
 
-#: src/libvlc.h:562
+#: src/libvlc.h:633
 #, fuzzy
 msgid ""
 "This allows you to choose if the audio stream should be redirected to the "
@@ -2204,76 +2357,89 @@ msgstr ""
 "ビデオ・ストリーム出力機構の最後のものが有効になっているとビデオ・ストリーム"
 "が出力機構にリダイレクトされるべき場合、選択可能です。"
 
-#: src/libvlc.h:565
+#: src/libvlc.h:636
+#, fuzzy
+msgid "Enable SPU stream output"
+msgstr "オーディオストリームの出力を有効にする"
+
+#: src/libvlc.h:638
+#, fuzzy
+msgid ""
+"This allows you to choose if the SPU streams should be redirected to the "
+"stream output facility when this last one is enabled."
+msgstr ""
+"ビデオ・ストリーム出力機構の最後のものが有効になっているとビデオ・ストリーム"
+"が出力機構にリダイレクトされるべき場合、選択可能です。"
+
+#: src/libvlc.h:641
 #, fuzzy
 msgid "Keep stream output open"
 msgstr "ストリームの出力先の選択"
 
-#: src/libvlc.h:567
+#: src/libvlc.h:643
 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:571
+#: src/libvlc.h:647
 #, fuzzy
 msgid "Preferred packetizer list"
 msgstr "準備されているパケッタライザー一覧の選択"
 
-#: src/libvlc.h:573
+#: src/libvlc.h:649
 msgid ""
 "This allows you to select the order in which VLC will choose its packetizers."
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: src/libvlc.h:576
+#: src/libvlc.h:652
 msgid "Mux module"
 msgstr "Mux モジュール"
 
-#: src/libvlc.h:578
+#: src/libvlc.h:654
 msgid "This is a legacy entry to let you configure mux modules"
 msgstr "muxモジュールを設定するレガシー・エントリです。"
 
-#: src/libvlc.h:580
+#: src/libvlc.h:656
 msgid "Access output module"
 msgstr "オーディオ出力モジュールアクセス"
 
-#: src/libvlc.h:582
+#: src/libvlc.h:658
 msgid "This is a legacy entry to let you configure access output modules"
 msgstr "アクセス出力モジュールを設定するレガシー・エントリです。"
 
-#: src/libvlc.h:584
+#: src/libvlc.h:660
 msgid "Control SAP flow"
 msgstr "コントロール SAP フロー"
 
-#: src/libvlc.h:585
+#: src/libvlc.h:661
 msgid ""
 "If this option is enabled, the flow on the SAP multicast address will be "
 "controlled. This is needed if you want to make announcements on the MBone"
 msgstr ""
 
-#: src/libvlc.h:589
+#: src/libvlc.h:665
 msgid "SAP announcement interval"
 msgstr ""
 
-#: src/libvlc.h:590
+#: src/libvlc.h:666
 msgid ""
 "When the SAP flow control is disabled, this lets you set the fixed interval "
 "between SAP announcements"
 msgstr ""
 
-#: src/libvlc.h:594
+#: src/libvlc.h:670
 msgid ""
 "These options allow you to enable special CPU optimizations.\n"
 "You should always leave all these enabled."
 msgstr ""
 
-#: src/libvlc.h:597
-#, fuzzy
+#: src/libvlc.h:673
 msgid "Enable FPU support"
-msgstr "CPU の MMX サポートを有効にする"
+msgstr "FPU サポートを有効にする"
 
-#: src/libvlc.h:599
+#: src/libvlc.h:675
 #, fuzzy
 msgid ""
 "If your processor has a floating point calculation unit, VLC can take "
@@ -2282,11 +2448,11 @@ msgstr ""
 "プロセッサがAltiVecの機能セットをサポートしている場合には、そのアドバンテージ"
 "を利用することができます。"
 
-#: src/libvlc.h:602
+#: src/libvlc.h:678
 msgid "Enable CPU MMX support"
 msgstr "CPU の MMX サポートを有効にする"
 
-#: src/libvlc.h:604
+#: src/libvlc.h:680
 msgid ""
 "If your processor supports the MMX instructions set, VLC can take advantage "
 "of them."
@@ -2294,11 +2460,11 @@ msgstr ""
 "プロセッサがMMXの機能セットをサポートしている場合には、VLCはそのアドバンテー"
 "ジを利用できます。"
 
-#: src/libvlc.h:607
+#: src/libvlc.h:683
 msgid "Enable CPU 3D Now! support"
 msgstr "CPU の 3D Now! サポートを有効にする"
 
-#: src/libvlc.h:609
+#: src/libvlc.h:685
 msgid ""
 "If your processor supports the 3D Now! instructions set, VLC can take "
 "advantage of them."
@@ -2306,11 +2472,11 @@ msgstr ""
 "プロセッサが3D Now!機能をサポートしている場合には、VLCはそのアドバンテージを"
 "利用できます。"
 
-#: src/libvlc.h:612
+#: src/libvlc.h:688
 msgid "Enable CPU MMX EXT support"
 msgstr "CPU の MMX 拡張機能サポートを有効にする"
 
-#: src/libvlc.h:614
+#: src/libvlc.h:690
 msgid ""
 "If your processor supports the MMX EXT instructions set, VLC can take "
 "advantage of them."
@@ -2318,11 +2484,11 @@ msgstr ""
 "プロセッサがMMXの拡張機能セットをサポートしている場合には、VLCはそのアドバン"
 "テージを利用することができます。"
 
-#: src/libvlc.h:617
+#: src/libvlc.h:693
 msgid "Enable CPU SSE support"
 msgstr "CPU の SSE サポートを有効にする"
 
-#: src/libvlc.h:619
+#: src/libvlc.h:695
 msgid ""
 "If your processor supports the SSE instructions set, VLC can take advantage "
 "of them."
@@ -2330,11 +2496,11 @@ msgstr ""
 "プロセッサがSSEの機能セットをサポートしている場合には、VLCはそのアドバンテー"
 "ジを利用することができます。"
 
-#: src/libvlc.h:622
+#: src/libvlc.h:698
 msgid "Enable CPU SSE2 support"
 msgstr "CPU の SSE2 サポートを有効にする"
 
-#: src/libvlc.h:624
+#: src/libvlc.h:700
 #, fuzzy
 msgid ""
 "If your processor supports the SSE2 instructions set, VLC can take advantage "
@@ -2343,12 +2509,11 @@ msgstr ""
 "プロセッサがSSEの機能セットをサポートしている場合には、VLCはそのアドバンテー"
 "ジを利用することができます。"
 
-#: src/libvlc.h:627
-#, fuzzy
+#: src/libvlc.h:703
 msgid "Enable CPU AltiVec support"
 msgstr "CPU の AltiVec サポートを有効にする"
 
-#: src/libvlc.h:629
+#: src/libvlc.h:705
 msgid ""
 "If your processor supports the AltiVec instructions set, VLC can take "
 "advantage of them."
@@ -2356,79 +2521,86 @@ msgstr ""
 "プロセッサがAltiVecの機能セットをサポートしている場合には、そのアドバンテージ"
 "を利用することができます。"
 
-#: src/libvlc.h:633
+#: src/libvlc.h:709
 msgid ""
 "These options define the behavior of the playlist. Some of them can be "
 "overridden in the playlist dialog box."
 msgstr ""
 
-#: src/libvlc.h:636
+#: src/libvlc.h:712
 #, fuzzy
-msgid "Services discovery modules"
-msgstr "MPEG 1/2ビデオ・デコーダ・モジュール"
+msgid "Automatically preparse files"
+msgstr "ファイルの自動再生"
 
-#: src/libvlc.h:638
+#: src/libvlc.h:714
+msgid ""
+"This option enables automatic preparsing of files added to the playlist (to "
+"retrieve some metadata)."
+msgstr ""
+
+#: src/libvlc.h:717
+#, fuzzy
+msgid "Services discovery modules"
+msgstr "MPEG 1/2ビデオ・デコーダ・モジュール"
+
+#: src/libvlc.h:719
 msgid ""
 "Specifies the services discovery modules to load, separated by semi-colons. "
 "Typical values are sap, hal, ..."
 msgstr ""
 
-#: src/libvlc.h:641
+#: src/libvlc.h:722
 #, fuzzy
 msgid "Play files randomly forever"
 msgstr "ファイルをランダムに再生"
 
-#: src/libvlc.h:643
+#: src/libvlc.h:724
 msgid ""
 "When selected, VLC will randomly play files in the playlist until "
 "interrupted."
 msgstr ""
-"このオプションが選択されるとVLCはプレイリストのファイルをランダムに再生しま"
-"す。"
+"このオプションが選択されるとVLCは再生一覧のファイルをランダムに再生します。"
 
-#: src/libvlc.h:646
-#, fuzzy
+#: src/libvlc.h:727
 msgid "Repeat all"
 msgstr "すべて繰り返す"
 
-#: src/libvlc.h:648
+#: src/libvlc.h:729
 msgid ""
 "If you want VLC to keep playing the playlist indefinitely then enable this "
 "option."
 msgstr ""
-"プレイリストの再生を繰り返して行いたい場合には、このオプションを選択します。"
+"再生一覧の再生を繰り返して行いたい場合には、このオプションを選択します。"
 
-#: src/libvlc.h:651
-#, fuzzy
+#: src/libvlc.h:732
 msgid "Repeat current item"
 msgstr "現在の項目を繰り返す"
 
-#: src/libvlc.h:653
+#: src/libvlc.h:734
 msgid ""
 "When this is active, VLC will keep playing the current playlist item over "
 "and over again."
 msgstr ""
 
-#: src/libvlc.h:656
-#, fuzzy
+#: src/libvlc.h:737
 msgid "Play and stop"
-msgstr "常に最前面"
+msgstr "再生と停止"
 
-#: src/libvlc.h:658
+#: src/libvlc.h:739
 msgid "Stop the playlist after each played playlist item. "
 msgstr ""
 
-#: src/libvlc.h:661
+#: src/libvlc.h:742
 msgid ""
 "These options allow you to select default modules. Leave these alone unless "
 "you really know what you are doing."
 msgstr ""
 
-#: src/libvlc.h:664
+#: src/libvlc.h:745
 msgid "Memory copy module"
 msgstr "メモリコピーモジュール"
 
-#: src/libvlc.h:666
+#: src/libvlc.h:747
 msgid ""
 "You can select which memory copy module you want to use. By default VLC will "
 "select the fastest one supported by your hardware."
@@ -2436,40 +2608,42 @@ msgstr ""
 "使用したいメモリー・コピー・モジュールを選択します。VLCはデフォルトでハード"
 "ウェアがサポートしている最も速いものを選択します。"
 
-#: src/libvlc.h:669
+#: src/libvlc.h:750
 msgid "Access module"
 msgstr "アクセスモジュール"
 
-#: src/libvlc.h:671
-#, fuzzy
-msgid "This is a legacy entry to let you configure access modules."
-msgstr "アクセス・モジュールを選択するレガシー・エントリです。"
+#: src/libvlc.h:752
+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:673
+#: src/libvlc.h:756
 #, fuzzy
 msgid "Access filter module"
 msgstr "アクセスモジュール"
 
-#: src/libvlc.h:675
+#: src/libvlc.h:758
 #, fuzzy
 msgid "This is a legacy entry to let you configure access filter modules."
 msgstr "アクセス・モジュールを選択するレガシー・エントリです。"
 
-#: src/libvlc.h:677
+#: src/libvlc.h:760
 #, fuzzy
 msgid "Demux module"
 msgstr "demuxモジュール"
 
-#: src/libvlc.h:679
+#: src/libvlc.h:762
 #, fuzzy
 msgid "This is a legacy entry to let you configure demux modules."
 msgstr "demuxモジュールを選択するレガシー・エントリです。"
 
-#: src/libvlc.h:681
+#: src/libvlc.h:764
 msgid "Allow real-time priority"
-msgstr ""
+msgstr "リアルタイム優先度を許可する"
 
-#: src/libvlc.h:683
+#: src/libvlc.h:766
 msgid ""
 "Running VLC in real-time priority will allow for much more precise "
 "scheduling and yield better, especially when streaming content. It can "
@@ -2477,71 +2651,79 @@ msgid ""
 "only activate this if you know what you're doing."
 msgstr ""
 
-#: src/libvlc.h:689
+#: src/libvlc.h:772
 msgid "Adjust VLC priority"
-msgstr ""
+msgstr "VLC 優先度調整"
 
-#: src/libvlc.h:691
+#: src/libvlc.h:774
 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:695
+#: src/libvlc.h:778
 msgid "Minimize number of threads"
 msgstr "スレッドの最少数"
 
-#: src/libvlc.h:697
+#: src/libvlc.h:780
 msgid "This option minimizes the number of threads needed to run VLC"
 msgstr ""
 
-#: src/libvlc.h:699
+#: src/libvlc.h:782
 msgid "Modules search path"
 msgstr "モジュールの検索パス"
 
-#: src/libvlc.h:701
+#: src/libvlc.h:784
 #, fuzzy
 msgid ""
 "This option allows you to specify an additional path for VLC to look for its "
 "modules."
 msgstr "VLCがプラグインを見つけるときに検索される追加のパスを設定します。"
 
-#: src/libvlc.h:704
-#, fuzzy
+#: src/libvlc.h:787
 msgid "VLM configuration file"
-msgstr "コンフィグレーション・オプションにツールチップを表示"
+msgstr "VLM 設定ファイル"
 
-#: src/libvlc.h:706
+#: src/libvlc.h:789
 #, 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:709
+#: src/libvlc.h:792
 msgid "Use a plugins cache"
-msgstr ""
+msgstr "プラグインキャッシュを使う"
 
-#: src/libvlc.h:711
+#: src/libvlc.h:794
 msgid ""
 "This option allows you to use a plugins cache which will greatly improve the "
 "start time of VLC."
 msgstr ""
 
-#: src/libvlc.h:714
-msgid "Run as daemon process"
+#: src/libvlc.h:797
+msgid "Collect statistics"
 msgstr ""
 
-#: src/libvlc.h:716
+#: src/libvlc.h:799
+#, fuzzy
+msgid "This option allows you to collect miscellaneous statistics."
+msgstr "VLCがプラグインを見つけるときに検索される追加のパスを設定します。"
+
+#: src/libvlc.h:801
+msgid "Run as daemon process"
+msgstr "デーモンプロセスとして実行する"
+
+#: src/libvlc.h:803
 msgid "Runs VLC as a background daemon process."
-msgstr ""
+msgstr "バックグラウンドデーモンプロセスとして実行する"
 
-#: src/libvlc.h:718
+#: src/libvlc.h:805
 msgid "Allow only one running instance"
-msgstr ""
+msgstr "ひとつだけ実行を許可する"
 
-#: src/libvlc.h:720
+#: src/libvlc.h:807
 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 "
@@ -2550,21 +2732,21 @@ msgid ""
 "running instance or enqueue it."
 msgstr ""
 
-#: src/libvlc.h:727
+#: src/libvlc.h:814
 msgid "Enqueue items to playlist when in one instance mode"
 msgstr ""
 
-#: src/libvlc.h:729
+#: src/libvlc.h:816
 msgid ""
 "When using the one instance only option, enqueue items to playlist and keep "
 "playing current item."
 msgstr ""
 
-#: src/libvlc.h:732
+#: src/libvlc.h:819
 msgid "Increase the priority of the process"
-msgstr ""
+msgstr "プロセスの優先度を増やす"
 
-#: src/libvlc.h:734
+#: src/libvlc.h:821
 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 "
@@ -2574,12 +2756,11 @@ msgid ""
 "require a reboot of your machine."
 msgstr ""
 
-#: src/libvlc.h:741
-#, fuzzy
+#: src/libvlc.h:828
 msgid "Fast mutex on NT/2K/XP (developers only)"
-msgstr "高速mutexの使用 NT/2K/XP (開発者向け)"
+msgstr "NT/2K/XP での高速 mutex (開発者のみ)"
 
-#: src/libvlc.h:743
+#: src/libvlc.h:830
 #, fuzzy
 msgid ""
 "On Windows NT/2K/XP we use a slow mutex implementation but which allows us "
@@ -2590,11 +2771,11 @@ msgstr ""
 "し、より速いmutexの実装を使用することも可能です。その場合、問題が発生する可能"
 "性があります。"
 
-#: src/libvlc.h:748
+#: src/libvlc.h:835
 msgid "Condition variables implementation for Win9x (developers only)"
-msgstr "Win9x向け条件値の実装 (開発者向け)"
+msgstr "Win9x 向け条件値の実装 (開発者向け)"
 
-#: src/libvlc.h:751
+#: src/libvlc.h:838
 #, fuzzy
 msgid ""
 "On Windows 9x/Me you can use a fast but incorrect condition variables "
@@ -2607,455 +2788,580 @@ msgstr ""
 "る可能性があります)を使用します。しかし、代替えとなる遅くても安定した実装を選"
 "択することも可能です。現時点では、0(既定値の最速のもの), 1, 2が選択可能です。"
 
-#: src/libvlc.h:759
+#: src/libvlc.h:846
 msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
 msgstr ""
 
-#: src/libvlc.h:762 src/video_output/vout_intf.c:225
+#: src/libvlc.h:849 src/video_output/vout_intf.c:331
 #: modules/gui/beos/VideoOutput.cpp:1057 modules/gui/macosx/applescript.m:121
-#: modules/gui/macosx/controls.m:304 modules/gui/macosx/controls.m:621
-#: modules/gui/macosx/controls.m:649 modules/gui/macosx/intf.m:437
-#: modules/gui/macosx/intf.m:511
+#: modules/gui/macosx/controls.m:321 modules/gui/macosx/controls.m:638
+#: modules/gui/macosx/controls.m:668 modules/gui/macosx/embeddedwindow.m:44
+#: modules/gui/macosx/intf.m:477 modules/gui/macosx/intf.m:553
 msgid "Fullscreen"
 msgstr "全画面化"
 
-#: src/libvlc.h:763
+#: src/libvlc.h:850
 msgid "Select the hotkey to use to swap fullscreen state."
 msgstr ""
 
-#: src/libvlc.h:764 modules/gui/wxwindows/interface.cpp:1542
+#: src/libvlc.h:851 modules/gui/wxwidgets/dialogs/vlm/vlm_streampanel.cpp:81
+#: modules/gui/wxwidgets/interface.cpp:1489
 msgid "Play/Pause"
 msgstr "再生/一時停止"
 
-#: src/libvlc.h:765
+#: src/libvlc.h:852
 msgid "Select the hotkey to use to swap paused state."
 msgstr ""
 
-#: src/libvlc.h:766
+#: src/libvlc.h:853
 msgid "Pause only"
 msgstr "一時停止のみ"
 
-#: src/libvlc.h:767
+#: src/libvlc.h:854
 msgid "Select the hotkey to use to pause."
 msgstr "一時停止に使うホットキーを選択"
 
-#: src/libvlc.h:768
+#: src/libvlc.h:855
 msgid "Play only"
 msgstr "再生のみ"
 
-#: src/libvlc.h:769
+#: src/libvlc.h:856
 msgid "Select the hotkey to use to play."
 msgstr "再生に使うホットキーを選択"
 
-#: src/libvlc.h:770 modules/control/hotkeys.c:593
-#: modules/gui/macosx/controls.m:556 modules/gui/macosx/intf.m:476
+#: src/libvlc.h:857 modules/control/hotkeys.c:641
+#: modules/gui/macosx/controls.m:573 modules/gui/macosx/intf.m:518
 msgid "Faster"
 msgstr "早送り"
 
-#: src/libvlc.h:771
+#: src/libvlc.h:858
 msgid "Select the hotkey to use for fast forward playback."
 msgstr "早送りに使うホットキーを選択"
 
-#: src/libvlc.h:772 modules/control/hotkeys.c:599
-#: modules/gui/macosx/controls.m:557 modules/gui/macosx/intf.m:477
+#: src/libvlc.h:859 modules/control/hotkeys.c:648
+#: modules/gui/macosx/controls.m:574 modules/gui/macosx/intf.m:519
 msgid "Slower"
 msgstr "スロー"
 
-#: src/libvlc.h:773
+#: src/libvlc.h:860
 msgid "Select the hotkey to use for slow motion playback."
 msgstr "スローモーションに使うホットキーを選択"
 
-#: src/libvlc.h:774 modules/control/hotkeys.c:563
-#: modules/gui/gtk/gnome_interface.c:667
-#: modules/gui/gtk/gnome_interface.c:1056 modules/gui/gtk/gtk_interface.c:769
-#: modules/gui/gtk/gtk_interface.c:852 modules/gui/gtk/gtk_interface.c:896
-#: modules/gui/gtk/gtk_interface.c:1166 modules/gui/kde/interface.cpp:131
-#: modules/gui/kde/interface.cpp:163 modules/gui/macosx/controls.m:577
-#: modules/gui/macosx/intf.m:436 modules/gui/macosx/intf.m:479
-#: modules/gui/macosx/intf.m:546 modules/gui/wxwindows/interface.cpp:1547
-#: modules/gui/wxwindows/menus.cpp:283
+#: src/libvlc.h:861 modules/control/hotkeys.c:610
+#: modules/gui/macosx/controls.m:594 modules/gui/macosx/intf.m:476
+#: modules/gui/macosx/intf.m:521 modules/gui/macosx/intf.m:592
+#: modules/gui/macosx/wizard.m:314 modules/gui/macosx/wizard.m:356
+#: modules/gui/macosx/wizard.m:1411 modules/gui/wxwidgets/interface.cpp:1494
+#: modules/gui/wxwidgets/menus.cpp:287
 msgid "Next"
 msgstr "次"
 
-#: src/libvlc.h:775
+#: src/libvlc.h:862
 msgid "Select the hotkey to use to skip to the next item in the playlist."
 msgstr ""
 
-#: src/libvlc.h:776 modules/control/hotkeys.c:574
-#: modules/gui/macosx/controls.m:576 modules/gui/macosx/intf.m:431
-#: modules/gui/macosx/intf.m:478 modules/gui/macosx/intf.m:547
-#: modules/gui/wxwindows/interface.cpp:1546
-#: modules/gui/wxwindows/menus.cpp:282
+#: src/libvlc.h:863 modules/control/hotkeys.c:621
+#: modules/gui/macosx/controls.m:593 modules/gui/macosx/intf.m:471
+#: modules/gui/macosx/intf.m:520 modules/gui/macosx/intf.m:593
+#: modules/gui/wxwidgets/interface.cpp:1493
+#: modules/gui/wxwidgets/menus.cpp:286
 msgid "Previous"
 msgstr "前"
 
-#: src/libvlc.h:777
+#: src/libvlc.h:864
 msgid "Select the hotkey to use to skip to the previous item in the playlist."
 msgstr ""
 
-#: src/libvlc.h:778 modules/gui/gtk/gnome_interface.c:566
-#: modules/gui/gtk/gnome_interface.c:1027 modules/gui/gtk/gtk_interface.c:676
-#: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:568
-#: modules/gui/macosx/intf.m:434 modules/gui/macosx/intf.m:475
-#: modules/gui/macosx/intf.m:545 modules/gui/pda/pda_interface.c:274
-#: modules/gui/pda/pda_interface.c:275 modules/gui/wxwindows/interface.cpp:480
-#: modules/gui/wxwindows/interface.cpp:1548
-#: modules/gui/wxwindows/menus.cpp:281 modules/visualization/xosd.c:232
-#: modules/visualization/xosd.c:233
-#, c-format
+#: src/libvlc.h:865 modules/gui/macosx/controls.m:585
+#: modules/gui/macosx/intf.m:474 modules/gui/macosx/intf.m:517
+#: modules/gui/macosx/intf.m:591 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:1495
+#: modules/gui/wxwidgets/menus.cpp:285 modules/visualization/xosd.c:235
 msgid "Stop"
 msgstr "停止"
 
-#: src/libvlc.h:779
+#: src/libvlc.h:866
 msgid "Select the hotkey to stop the playback."
 msgstr "最低を停止するホットキーを選択する"
 
-#: src/libvlc.h:780 modules/gui/macosx/intf.m:439
-#: modules/video_filter/marq.c:120
+#: src/libvlc.h:867 modules/gui/macosx/embeddedwindow.m:46
+#: modules/gui/macosx/intf.m:479 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
 msgid "Position"
 msgstr "位置"
 
-#: src/libvlc.h:781
+#: src/libvlc.h:868
 msgid "Select the hotkey to display the position."
 msgstr ""
 
-#: src/libvlc.h:783
-msgid "Jump 10 seconds backwards"
-msgstr "10 秒前に戻る"
+#: src/libvlc.h:870
+msgid "Very short backwards jump"
+msgstr ""
+
+#: src/libvlc.h:872
+#, fuzzy
+msgid "Select the hotkey to make a very short backwards jump."
+msgstr "5 分前に戻るホットキーを選択する<"
 
-#: src/libvlc.h:784
-msgid "Select the hotkey to jump 10 seconds backwards."
-msgstr "10 秒前に戻るホットキーを選択する"
+#: src/libvlc.h:873
+#, fuzzy
+msgid "Short backwards jump"
+msgstr "逆転再生"
 
-#: src/libvlc.h:786
-msgid "Jump 1 minute backwards"
-msgstr "1 分前に戻る"
+#: src/libvlc.h:875
+#, fuzzy
+msgid "Select the hotkey to make a short backwards jump."
+msgstr "3 秒前に戻るホットキーを選択する"
 
-#: src/libvlc.h:787
-msgid "Select the hotkey to jump 1 minute backwards."
+#: src/libvlc.h:877
+msgid "Medium backwards jump"
+msgstr ""
+
+#: src/libvlc.h:879
+#, fuzzy
+msgid "Select the hotkey to make a medium backwards jump."
 msgstr "1 分前に戻るホットキーを選択する"
 
-#: src/libvlc.h:788
-msgid "Jump 5 minutes backwards"
-msgstr "5 分前に戻る"
+#: src/libvlc.h:880
+#, fuzzy
+msgid "Long backwards jump"
+msgstr "逆転再生"
 
-#: src/libvlc.h:789
-msgid "Select the hotkey to jump 5 minutes backwards."
-msgstr "5 分前に戻るホットキーを選択する<"
+#: src/libvlc.h:882
+#, fuzzy
+msgid "Select the hotkey to make a long backwards jump."
+msgstr "3 秒前に戻るホットキーを選択する"
 
-#: src/libvlc.h:790
-msgid "Jump 10 seconds forward"
-msgstr "10 秒先に進む"
+#: src/libvlc.h:884
+msgid "Very short forward jump"
+msgstr ""
+
+#: src/libvlc.h:886
+#, fuzzy
+msgid "Select the hotkey to make a very short forward jump."
+msgstr "早送りに使うホットキーを選択"
 
-#: src/libvlc.h:791
-msgid "Select the hotkey to jump 10 seconds forward."
-msgstr "10 秒進むホットキーを選択する"
+#: src/libvlc.h:887
+#, fuzzy
+msgid "Short forward jump"
+msgstr "転送"
 
-#: src/libvlc.h:793
-msgid "Jump 1 minute forward"
-msgstr "1 分先に進む"
+#: src/libvlc.h:889
+#, fuzzy
+msgid "Select the hotkey to make a short forward jump."
+msgstr "3 秒進むホットキーを選択する"
 
-#: src/libvlc.h:794
-msgid "Select the hotkey to jump 1 minute forward."
+#: src/libvlc.h:891
+msgid "Medium forward jump"
+msgstr ""
+
+#: src/libvlc.h:893
+#, fuzzy
+msgid "Select the hotkey to make a medium forward jump."
 msgstr "1 分先に進むホットキーを選択する<"
 
-#: src/libvlc.h:796
-msgid "Jump 5 minutes forward"
-msgstr "5 分先に進む"
+#: src/libvlc.h:894
+msgid "Long forward jump"
+msgstr ""
+
+#: src/libvlc.h:896
+#, fuzzy
+msgid "Select the hotkey to make a long forward jump."
+msgstr "3 秒進むホットキーを選択する"
 
-#: src/libvlc.h:797
-msgid "Select the hotkey to jump 5 minutes forward."
-msgstr "5 分先に進むホットキーを選択する"
+#: src/libvlc.h:898
+msgid "Very short jump size"
+msgstr ""
 
-#: src/libvlc.h:799 modules/control/hotkeys.c:266
-#: modules/gui/beos/InterfaceWindow.cpp:257
+#: src/libvlc.h:899
+msgid "Very short jump \"size\", in seconds"
+msgstr ""
+
+#: src/libvlc.h:900
+msgid "Short jump size"
+msgstr ""
+
+#: src/libvlc.h:901
+msgid "Short jump \"size\", in seconds"
+msgstr ""
+
+#: src/libvlc.h:902
+msgid "Medium jump size"
+msgstr ""
+
+#: src/libvlc.h:903
+msgid "Medium jump \"size\", in seconds"
+msgstr ""
+
+#: src/libvlc.h:904
+#, fuzzy
+msgid "Long jump size"
+msgstr "フォントサイズ"
+
+#: src/libvlc.h:905
+msgid "Long jump \"size\", in seconds"
+msgstr ""
+
+#: src/libvlc.h:907 modules/control/hotkeys.c:275
+#: modules/gui/beos/InterfaceWindow.cpp:274
 msgid "Quit"
 msgstr "終了"
 
-#: src/libvlc.h:800
-#, fuzzy
+#: src/libvlc.h:908
 msgid "Select the hotkey to quit the application."
-msgstr "プレイリストを開く"
+msgstr "アプリケーションを終了するホットキーを選択します。"
 
-#: src/libvlc.h:801
+#: src/libvlc.h:909
 #, fuzzy
 msgid "Navigate up"
 msgstr "ナビゲーション(_N)"
 
-#: src/libvlc.h:802
+#: src/libvlc.h:910
 msgid "Select the key to move the selector up in DVD menus."
 msgstr ""
 
-#: src/libvlc.h:803
+#: src/libvlc.h:911
 #, fuzzy
 msgid "Navigate down"
 msgstr "ナビゲーション(_N)"
 
-#: src/libvlc.h:804
+#: src/libvlc.h:912
 msgid "Select the key to move the selector down in DVD menus."
 msgstr ""
 
-#: src/libvlc.h:805
+#: src/libvlc.h:913
 #, fuzzy
 msgid "Navigate left"
 msgstr "ナビゲーション(_N)"
 
-#: src/libvlc.h:806
+#: src/libvlc.h:914
 msgid "Select the key to move the selector left in DVD menus."
 msgstr ""
 
-#: src/libvlc.h:807
+#: src/libvlc.h:915
 #, fuzzy
 msgid "Navigate right"
 msgstr "ナビゲーション(_N)"
 
-#: src/libvlc.h:808
+#: src/libvlc.h:916
 #, fuzzy
 msgid "Select the key to move the selector right in DVD menus."
-msgstr "プレイリストを開く"
+msgstr "再生一覧を開く"
 
-#: src/libvlc.h:809
+#: src/libvlc.h:917
 msgid "Activate"
 msgstr ""
 
-#: src/libvlc.h:810
+#: src/libvlc.h:918
 msgid "Select the key to activate selected item in DVD menus."
 msgstr ""
 
-#: src/libvlc.h:811 modules/gui/gtk/gnome_interface.c:909
+#: src/libvlc.h:919
+msgid "Go to the DVD menu"
+msgstr "DVD メニューに移動する"
+
+#: src/libvlc.h:920
+#, fuzzy
+msgid "Select the key to take you to the DVD menu"
+msgstr "再生一覧を開く"
+
+#: src/libvlc.h:921
+msgid "Select previous DVD title"
+msgstr "前の DVD の題名を選択する"
+
+#: src/libvlc.h:922
+#, fuzzy
+msgid "Select the key to choose the previous title from the DVD"
+msgstr "再生一覧を開く"
+
+#: src/libvlc.h:923
+msgid "Select next DVD title"
+msgstr "次の DVD の題名を選択する"
+
+#: src/libvlc.h:924
+#, fuzzy
+msgid "Select the key to choose the next title from the DVD"
+msgstr "再生一覧を開く"
+
+#: src/libvlc.h:925
+msgid "Select prev DVD chapter"
+msgstr "前の DVD チャプターを選択する"
+
+#: src/libvlc.h:926
+#, fuzzy
+msgid "Select the key to choose the previous chapter from the DVD"
+msgstr "再生一覧を開く"
+
+#: src/libvlc.h:927
+#, fuzzy
+msgid "Select next DVD chapter"
+msgstr "次のチャプターを選択"
+
+#: src/libvlc.h:928
+#, fuzzy
+msgid "Select the key to choose the next chapter from the DVD"
+msgstr "再生一覧を開く"
+
+#: src/libvlc.h:929
 msgid "Volume up"
 msgstr "ボリュームを上げる"
 
-#: src/libvlc.h:812
+#: src/libvlc.h:930
 msgid "Select the key to increase audio volume."
 msgstr ""
 
-#: src/libvlc.h:813 modules/gui/gtk/gnome_interface.c:916
+#: src/libvlc.h:931
 msgid "Volume down"
 msgstr "ボリュームを下げる"
 
-#: src/libvlc.h:814
+#: src/libvlc.h:932
 msgid "Select the key to decrease audio volume."
 msgstr ""
 
-#: src/libvlc.h:815 modules/gui/gtk/gnome_interface.c:140
-#: modules/gui/gtk/gnome_interface.c:923 modules/gui/gtk/gtk_interface.c:466
-#: modules/gui/gtk/gtk_interface.c:1267 modules/gui/macosx/controls.m:611
-#: modules/gui/macosx/intf.m:496 modules/gui/macosx/intf.m:548
+#: src/libvlc.h:933 modules/gui/macosx/controls.m:628
+#: modules/gui/macosx/intf.m:538 modules/gui/macosx/intf.m:594
 msgid "Mute"
 msgstr "ミュートする"
 
-#: src/libvlc.h:816
+#: src/libvlc.h:934
 msgid "Select the key to turn off audio volume."
-msgstr ""
+msgstr "オーディオボリュームを生オンするキーを選択します。"
 
-#: src/libvlc.h:817
+#: src/libvlc.h:935
 #, fuzzy
 msgid "Subtitle delay up"
 msgstr "字幕"
 
-#: src/libvlc.h:818
+#: src/libvlc.h:936
 #, fuzzy
 msgid "Select the key to increase the subtitle delay."
-msgstr "プレイリストを開く"
+msgstr "再生一覧を開く"
 
-#: src/libvlc.h:819
+#: src/libvlc.h:937
 #, fuzzy
 msgid "Subtitle delay down"
 msgstr "字幕・デコーダ・モジュール"
 
-#: src/libvlc.h:820
+#: src/libvlc.h:938
 #, fuzzy
 msgid "Select the key to decrease the subtitle delay."
-msgstr "プレイリストを開く"
+msgstr "再生一覧を開く"
 
-#: src/libvlc.h:821
+#: src/libvlc.h:939
 #, fuzzy
 msgid "Audio delay up"
 msgstr "字幕"
 
-#: src/libvlc.h:822
+#: src/libvlc.h:940
 #, fuzzy
 msgid "Select the key to increase the audio delay."
-msgstr "プレイリストを開く"
+msgstr "再生一覧を開く"
 
-#: src/libvlc.h:823
+#: src/libvlc.h:941
 #, fuzzy
 msgid "Audio delay down"
 msgstr "字幕・デコーダ・モジュール"
 
-#: src/libvlc.h:824
+#: src/libvlc.h:942
 #, fuzzy
 msgid "Select the key to decrease the audio delay."
-msgstr "プレイリストを開く"
+msgstr "再生一覧を開く"
 
-#: src/libvlc.h:825
+#: src/libvlc.h:943
 msgid "Play playlist bookmark 1"
-msgstr ""
+msgstr "再生一覧ブックマーク 1 を再生する"
 
-#: src/libvlc.h:826
+#: src/libvlc.h:944
 msgid "Play playlist bookmark 2"
-msgstr ""
+msgstr "再生一覧ブックマーク 2 を再生する"
 
-#: src/libvlc.h:827
+#: src/libvlc.h:945
 msgid "Play playlist bookmark 3"
-msgstr ""
+msgstr "再生一覧ブックマーク 3 を再生する"
 
-#: src/libvlc.h:828
+#: src/libvlc.h:946
 msgid "Play playlist bookmark 4"
-msgstr ""
+msgstr "再生一覧ブックマーク 4 を再生する"
 
-#: src/libvlc.h:829
+#: src/libvlc.h:947
 msgid "Play playlist bookmark 5"
-msgstr ""
+msgstr "再生一覧ブックマーク 5 を再生する"
 
-#: src/libvlc.h:830
+#: src/libvlc.h:948
 msgid "Play playlist bookmark 6"
-msgstr ""
+msgstr "再生一覧ブックマーク 6 を再生する"
 
-#: src/libvlc.h:831
+#: src/libvlc.h:949
 msgid "Play playlist bookmark 7"
-msgstr ""
+msgstr "再生一覧ブックマーク 7 を再生する"
 
-#: src/libvlc.h:832
+#: src/libvlc.h:950
 msgid "Play playlist bookmark 8"
-msgstr ""
+msgstr "再生一覧ブックマーク 8 を再生する"
 
-#: src/libvlc.h:833
+#: src/libvlc.h:951
 msgid "Play playlist bookmark 9"
-msgstr ""
+msgstr "再生一覧ブックマーク 9 を再生する"
 
-#: src/libvlc.h:834
+#: src/libvlc.h:952
 msgid "Play playlist bookmark 10"
-msgstr ""
+msgstr "再生一覧ブックマーク 10 を再生する"
 
-#: src/libvlc.h:835
+#: src/libvlc.h:953
 #, fuzzy
 msgid "Select the key to play this bookmark."
-msgstr "プレイリストを開く"
+msgstr "このブックマークを再生するキーを選択します。"
 
-#: src/libvlc.h:836
-#, fuzzy
+#: src/libvlc.h:954
 msgid "Set playlist bookmark 1"
-msgstr "プレイリストを開く"
+msgstr "再生一覧ブックマーク 1 を設定する"
 
-#: src/libvlc.h:837
-#, fuzzy
+#: src/libvlc.h:955
 msgid "Set playlist bookmark 2"
-msgstr "プレイリストを開く"
+msgstr "再生一覧ブックマーク 2 を設定する"
 
-#: src/libvlc.h:838
-#, fuzzy
+#: src/libvlc.h:956
 msgid "Set playlist bookmark 3"
-msgstr "プレイリストを開く"
+msgstr "再生一覧ブックマーク 3 を設定する"
 
-#: src/libvlc.h:839
-#, fuzzy
+#: src/libvlc.h:957
 msgid "Set playlist bookmark 4"
-msgstr "プレイリストを開く"
+msgstr "再生一覧ブックマーク 4 を設定する"
 
-#: src/libvlc.h:840
-#, fuzzy
+#: src/libvlc.h:958
 msgid "Set playlist bookmark 5"
-msgstr "プレイリストを開く"
+msgstr "再生一覧ブックマーク 5 を設定する"
 
-#: src/libvlc.h:841
-#, fuzzy
+#: src/libvlc.h:959
 msgid "Set playlist bookmark 6"
-msgstr "プレイリストを開く"
+msgstr "再生一覧ブックマーク 6 を設定する"
 
-#: src/libvlc.h:842
-#, fuzzy
+#: src/libvlc.h:960
 msgid "Set playlist bookmark 7"
-msgstr "プレイリストを開く"
+msgstr "再生一覧ブックマーク 7 を設定する"
 
-#: src/libvlc.h:843
-#, fuzzy
+#: src/libvlc.h:961
 msgid "Set playlist bookmark 8"
-msgstr "プレイリストを開く"
+msgstr "再生一覧ブックマーク 8 を設定する"
 
-#: src/libvlc.h:844
-#, fuzzy
+#: src/libvlc.h:962
 msgid "Set playlist bookmark 9"
-msgstr "プレイリストを開く"
+msgstr "再生一覧ブックマーク 9 を設定する"
 
-#: src/libvlc.h:845
-#, fuzzy
+#: src/libvlc.h:963
 msgid "Set playlist bookmark 10"
-msgstr "プレイリストを開く"
+msgstr "再生一覧ブックマーク 10 を設定する"
 
-#: src/libvlc.h:846
-#, fuzzy
+#: src/libvlc.h:964
 msgid "Select the key to set this playlist bookmark."
-msgstr "プレイリストを開く"
+msgstr "この再生一覧ブックマークを設定するキーを選択します。"
 
-#: src/libvlc.h:848
+#: src/libvlc.h:966
 msgid "Go back in browsing history"
 msgstr ""
 
-#: src/libvlc.h:849
+#: src/libvlc.h:967
 msgid ""
 "Select the key to go back (to the previous media item) in the browsing "
 "history."
 msgstr ""
 
-#: src/libvlc.h:850
+#: src/libvlc.h:968
 msgid "Go forward in browsing history"
 msgstr ""
 
-#: src/libvlc.h:851
+#: src/libvlc.h:969
 msgid ""
 "Select the key to go forward (to the next media item) in the browsing "
 "history."
 msgstr ""
 
-#: src/libvlc.h:853
+#: src/libvlc.h:971
 #, fuzzy
 msgid "Cycle audio track"
 msgstr "オーディオトラック"
 
-#: src/libvlc.h:854
+#: src/libvlc.h:972
 msgid "Cycle through the available audio tracks(languages)"
 msgstr ""
 
-#: src/libvlc.h:855
+#: src/libvlc.h:973
 #, fuzzy
 msgid "Cycle subtitle track"
 msgstr "字幕トラックの選択"
 
-#: src/libvlc.h:856
+#: src/libvlc.h:974
 msgid "Cycle through the available subtitle tracks"
 msgstr ""
 
-#: src/libvlc.h:857
+#: src/libvlc.h:975
+#, fuzzy
+msgid "Cycle source aspect ratio"
+msgstr "ソースのアスペクト比"
+
+#: src/libvlc.h:976
+msgid "Cycle through a predefined list of source aspect ratios"
+msgstr ""
+
+#: src/libvlc.h:977
+#, fuzzy
+msgid "Cycle video crop"
+msgstr "グレースケールビデオ出力"
+
+#: src/libvlc.h:978
+msgid "Cycle through a predefined list of crop formats"
+msgstr ""
+
+#: src/libvlc.h:979
 #, fuzzy
+msgid "Cycle deinterlace modes"
+msgstr "ノンインタレース化モード"
+
+#: src/libvlc.h:980
+msgid "Cycle through all the deinterlace modes"
+msgstr ""
+
+#: src/libvlc.h:981
 msgid "Show interface"
-msgstr "インターフェース表示"
+msgstr "インターフェースを表示する"
 
-#: src/libvlc.h:858
+#: src/libvlc.h:982
 #, fuzzy
 msgid "Raise the interface above all other windows"
 msgstr "インタフェースウィンドウを隠す"
 
-#: src/libvlc.h:859
+#: src/libvlc.h:983
+#, fuzzy
+msgid "Hide interface"
+msgstr "インタフェースを隠す(_H)"
+
+#: src/libvlc.h:984
+#, fuzzy
+msgid "Lower the interface below all other windows"
+msgstr "インタフェースウィンドウを隠す"
+
+#: src/libvlc.h:985
 msgid "Take video snapshot"
-msgstr ""
+msgstr "ビデオのスナップショットを取る"
 
-#: src/libvlc.h:860
+#: src/libvlc.h:986
 msgid "Takes a video snapshot and writes it to disk."
-msgstr ""
+msgstr "ビデオのスナップショットを取ってディスクに書き込みます。"
 
-#: src/libvlc.h:862 modules/access_filter/record.c:50
+#: src/libvlc.h:988 modules/access_filter/record.c:50
 #: modules/access_filter/record.c:51
-#, fuzzy
 msgid "Record"
-msgstr "ブレンド"
+msgstr "レコード"
 
-#: src/libvlc.h:863
+#: src/libvlc.h:989
 msgid "Record access filter start/stop."
 msgstr ""
 
-#: src/libvlc.h:867
+#: src/libvlc.h:993
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options] [playlistitems] ...\n"
@@ -3071,7 +3377,8 @@ msgid ""
 "            and that overrides previous settings.\n"
 "\n"
 "Playlistitem MRL syntax:\n"
-"  URL[@[title][:chapter][-[title][:chapter]]] [:option=value ...]\n"
+"  [[access][/demux]://]URL[@[title][:chapter][-[title][:chapter]]] [:"
+"option=value ...]\n"
 "\n"
 "  Many of the global --options can also be used as MRL specific :options.\n"
 "  Multiple :option=value pairs can be specified.\n"
@@ -3087,11 +3394,12 @@ msgid ""
 "  [cdda://][device]              Audio CD device\n"
 "  udp:[[<source address>]@[<bind address>][:<bind port>]]\n"
 "                                 UDP stream sent by a streaming server\n"
-"  vlc:pause                      Special item to pause the playlist\n"
+"  vlc:pause:<seconds>            Special item to pause the playlist for a "
+"certain time\n"
 "  vlc:quit                       Special item to quit VLC\n"
 msgstr ""
 "\n"
-"プレイリスト 項目:\n"
+"再生一覧 項目:\n"
 "  *.mpg, *.vob                   MPEG-1/2ファイル\n"
 "  [dvd://][device][@raw_device][@[title][,[chapter][,angle]]\n"
 "                                 DVDデバイス\n"
@@ -3102,150 +3410,139 @@ msgstr ""
 "  udpstream:[[<source address>]@[<bind address>][:<bind port>]]\n"
 "                                 ストリーミングサーバーから送信された UDP ス"
 "トリーム\n"
-"  vlc:pause                      プレイリスト項目の再生停止\n"
+"  vlc:pause                      再生一覧項目の再生停止\n"
 "  vlc:quit                       VLC を終了\n"
 
-#: src/libvlc.h:967 src/video_output/vout_intf.c:237
-#: modules/gui/macosx/controls.m:286 modules/gui/macosx/controls.m:620
-#: modules/gui/macosx/intf.m:513 modules/video_output/snapshot.c:75
-#, fuzzy
+#: src/libvlc.h:1108 src/video_output/vout_intf.c:343
+#: modules/gui/macosx/controls.m:303 modules/gui/macosx/controls.m:637
+#: modules/gui/macosx/intf.m:555 modules/video_output/snapshot.c:75
 msgid "Snapshot"
-msgstr "アクセスモジュール"
+msgstr "スナップショット"
 
-#: src/libvlc.h:974
-#, fuzzy
+#: src/libvlc.h:1117
 msgid "Window properties"
-msgstr "デバイスのプロパティ"
+msgstr "ウィンドウのプロパティ"
 
-#: src/libvlc.h:1006
+#: src/libvlc.h:1153
 #, fuzzy
 msgid "Subpictures"
 msgstr "字幕"
 
-#: src/libvlc.h:1009 modules/codec/subsdec.c:92 modules/demux/subtitle.c:61
-#: modules/gui/beos/InterfaceWindow.cpp:260 modules/gui/kde/interface.cpp:93
+#: src/libvlc.h:1158 modules/codec/subsdec.c:92 modules/demux/subtitle.c:61
+#: modules/gui/beos/InterfaceWindow.cpp:277
 msgid "Subtitles"
 msgstr "字幕"
 
-#: src/libvlc.h:1026
-#, fuzzy
+#: src/libvlc.h:1175
 msgid "Overlays"
-msgstr "ディレイ"
-
-#: src/libvlc.h:1033
-#, fuzzy
-msgid "Input"
-msgstr "入力"
+msgstr "オーバーレイ"
 
-#: src/libvlc.h:1050
-#, fuzzy
+#: src/libvlc.h:1183
 msgid "Track settings"
-msgstr "オーディオエンコーダー設定"
+msgstr "トラック設定"
 
-#: src/libvlc.h:1069
-#, fuzzy
+#: src/libvlc.h:1205
 msgid "Playback control"
-msgstr "コントロール"
+msgstr "再生制御"
 
-#: src/libvlc.h:1084
-#, fuzzy
+#: src/libvlc.h:1220
 msgid "Default devices"
-msgstr "デフォルト"
+msgstr "デフォルトデバイス"
 
-#: src/libvlc.h:1093
-#, fuzzy
+#: src/libvlc.h:1229
 msgid "Network settings"
-msgstr "デコードモジュール設定"
+msgstr "ネットワーク設定"
 
-#: src/libvlc.h:1107
+#: src/libvlc.h:1241
 msgid "Socks proxy"
-msgstr ""
+msgstr "Sock プロキシ"
 
-#: src/libvlc.h:1116
-#, fuzzy
+#: src/libvlc.h:1250
 msgid "Metadata"
-msgstr "URL メタデータ"
+msgstr "メタデータ"
 
-#: src/libvlc.h:1143
+#: src/libvlc.h:1280
 msgid "Decoders"
 msgstr "デコーダ"
 
-#: src/libvlc.h:1189
-#, fuzzy
+#: src/libvlc.h:1287 modules/gui/wxwidgets/dialogs/infopanels.cpp:165
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:375
+msgid "Input"
+msgstr "入力"
+
+#: src/libvlc.h:1347
 msgid "CPU"
 msgstr "CPU"
 
-#: src/libvlc.h:1204
-#, fuzzy
+#: src/libvlc.h:1362
 msgid "Special modules"
-msgstr "湾曲モード"
+msgstr "特殊モジュール"
 
-#: src/libvlc.h:1212 modules/gui/kde/preferences.cpp:96
+#: src/libvlc.h:1368
 msgid "Plugins"
 msgstr "プラグイン"
 
-#: src/libvlc.h:1218
-#, fuzzy
+#: src/libvlc.h:1374
 msgid "Performance options"
-msgstr "ストリームの一時停止"
+msgstr "パフォーマンスオプションストリームの一時停止"
 
-#: src/libvlc.h:1305
+#: src/libvlc.h:1437
+#, fuzzy
+msgid "Interfaces"
+msgstr "インタフェース"
+
+#: src/libvlc.h:1468
 msgid "Hot keys"
 msgstr "ホットキー"
 
-#: src/libvlc.h:1574
+#: src/libvlc.h:1791
 msgid "main program"
 msgstr "メインプログラム"
 
-#: src/libvlc.h:1581
-#, fuzzy
+#: src/libvlc.h:1798
 msgid "print help for VLC (can be combined with --advanced)"
-msgstr "ヘルプを表示する (--advanced と併用出来ます)"
+msgstr "VLC のヘルプを表示する (--advanced と併用できます)"
 
-#: src/libvlc.h:1583
-#, fuzzy
+#: src/libvlc.h:1800
 msgid ""
 "print help for VLC and all it's modules (can be combined with --advanced)"
-msgstr "モジュールのヘルプを表示する (--advanced と併用出来ます)"
+msgstr "VLC とすべてのモジュールのヘルプを表示する (--advanced と併用できます)"
 
-#: src/libvlc.h:1585
-#, fuzzy
+#: src/libvlc.h:1802
 msgid "print help for the advanced options"
-msgstr "高度なオプションを表示する"
+msgstr "高度なオプションのヘルプを表示する"
 
-#: src/libvlc.h:1587
+#: src/libvlc.h:1804
 msgid "ask for extra verbosity when displaying help"
 msgstr ""
 
-#: src/libvlc.h:1589
+#: src/libvlc.h:1806
 msgid "print a list of available modules"
-msgstr "有効なモジュールのリストを印刷"
+msgstr "有効なモジュールの一覧を表示する"
 
-#: src/libvlc.h:1591
-#, fuzzy
+#: src/libvlc.h:1808
 msgid "print help on a specific module (can be combined with --advanced)"
-msgstr "モジュールのヘルプを表示する (--advanced と併用出来ます)"
+msgstr "モジュールのヘルプを表示する (--advanced と併用できます)"
 
-#: src/libvlc.h:1593
+#: src/libvlc.h:1810
 msgid "save the current command line options in the config"
 msgstr ""
 
-#: src/libvlc.h:1595
+#: src/libvlc.h:1812
 msgid "reset the current config to the default values"
 msgstr ""
 
-#: src/libvlc.h:1597
+#: src/libvlc.h:1814
 msgid "use alternate config file"
 msgstr ""
 
-#: src/libvlc.h:1599
-#, fuzzy
+#: src/libvlc.h:1816
 msgid "resets the current plugins cache"
-msgstr "現在の項目を繰り返す"
+msgstr "現在のプラグインキャッシュをリセットする"
 
-#: src/libvlc.h:1601
+#: src/libvlc.h:1818
 msgid "print version information"
-msgstr "バージョン情報の印刷"
+msgstr "バージョン情報を表示する"
 
 #: src/misc/configuration.c:1229
 msgid "boolean"
@@ -3257,100 +3554,96 @@ msgstr "キー"
 
 #: src/misc/iso-639_def.h:38
 msgid "Afar"
-msgstr ""
+msgstr "アファール語"
 
 #: src/misc/iso-639_def.h:39
 msgid "Abkhazian"
-msgstr ""
+msgstr "アブハーズ語"
 
 #: src/misc/iso-639_def.h:40
 msgid "Afrikaans"
-msgstr ""
+msgstr "アフリカーンス語"
 
 #: src/misc/iso-639_def.h:41
 msgid "Albanian"
-msgstr ""
+msgstr "アルバニア語"
 
 #: src/misc/iso-639_def.h:42
-#, fuzzy
 msgid "Amharic"
-msgstr "垂直"
+msgstr "アムハラ語"
 
 #: src/misc/iso-639_def.h:43
 msgid "Arabic"
-msgstr ""
+msgstr "アラビア語"
 
 #: src/misc/iso-639_def.h:44
-#, fuzzy
 msgid "Armenian"
-msgstr "垂直"
+msgstr "アルメニア語"
 
 #: src/misc/iso-639_def.h:45
-#, fuzzy
 msgid "Assamese"
-msgstr "メッセージ"
+msgstr "アッサム語"
 
 #: src/misc/iso-639_def.h:46
 msgid "Avestan"
-msgstr ""
+msgstr "アベスタ語"
 
 #: src/misc/iso-639_def.h:47
 msgid "Aymara"
-msgstr ""
+msgstr "アイマラ語"
 
 #: src/misc/iso-639_def.h:48
-#, fuzzy
 msgid "Azerbaijani"
-msgstr "垂直"
+msgstr "アゼルバイジャン語"
 
 #: src/misc/iso-639_def.h:49
 msgid "Bashkir"
-msgstr ""
+msgstr "バシキール語"
 
 #: src/misc/iso-639_def.h:50
 msgid "Basque"
-msgstr ""
+msgstr "バスク語"
 
 #: src/misc/iso-639_def.h:51
 msgid "Belarusian"
-msgstr ""
+msgstr "ベラルーシ語"
 
 #: src/misc/iso-639_def.h:52
 #, fuzzy
 msgid "Bengali"
-msgstr "ビデオを有効にする"
+msgstr "ベンガル語"
 
 #: src/misc/iso-639_def.h:53
 msgid "Bihari"
-msgstr ""
+msgstr "ビハール語"
 
 #: src/misc/iso-639_def.h:54
 msgid "Bislama"
-msgstr ""
+msgstr "ビスラマ語"
 
 #: src/misc/iso-639_def.h:55
 msgid "Bosnian"
-msgstr ""
+msgstr "ボスニア語"
 
 #: src/misc/iso-639_def.h:56
 msgid "Breton"
-msgstr ""
+msgstr "ブルトン語"
 
 #: src/misc/iso-639_def.h:57
 msgid "Bulgarian"
-msgstr ""
+msgstr "ブルガリア語"
 
 #: src/misc/iso-639_def.h:58
 msgid "Burmese"
-msgstr ""
+msgstr "ビルマ語"
 
 #: src/misc/iso-639_def.h:60
 msgid "Chamorro"
-msgstr ""
+msgstr "チャモロ語"
 
 #: src/misc/iso-639_def.h:61
 msgid "Chechen"
-msgstr ""
+msgstr "チェチェン語"
 
 #: src/misc/iso-639_def.h:62
 msgid "Chinese"
@@ -3358,26 +3651,23 @@ msgstr "中国語"
 
 #: src/misc/iso-639_def.h:63
 msgid "Church Slavic"
-msgstr ""
+msgstr "古期教会スラブ語"
 
 #: src/misc/iso-639_def.h:64
 msgid "Chuvash"
-msgstr ""
+msgstr "チュヴァシュ語"
 
 #: src/misc/iso-639_def.h:65
-#, fuzzy
 msgid "Cornish"
-msgstr "コピー"
+msgstr "コーニシュ語"
 
 #: src/misc/iso-639_def.h:66
-#, fuzzy
 msgid "Corsican"
-msgstr "垂直"
+msgstr "コルシカ語"
 
 #: src/misc/iso-639_def.h:67
-#, fuzzy
 msgid "Czech"
-msgstr "閉じる"
+msgstr "チェコ語"
 
 #: src/misc/iso-639_def.h:70
 msgid "Dzongkha"
@@ -3385,78 +3675,67 @@ msgstr ""
 
 #: src/misc/iso-639_def.h:71
 msgid "English"
-msgstr ""
+msgstr "英語"
 
 #: src/misc/iso-639_def.h:72
 msgid "Esperanto"
-msgstr ""
+msgstr "国際語"
 
 #: src/misc/iso-639_def.h:73
 msgid "Estonian"
-msgstr ""
+msgstr "エストニア語"
 
 #: src/misc/iso-639_def.h:74
-#, fuzzy
 msgid "Faroese"
-msgstr "早送り"
+msgstr "フェロー語"
 
 #: src/misc/iso-639_def.h:75
 msgid "Fijian"
-msgstr ""
+msgstr "フィジー語"
 
 #: src/misc/iso-639_def.h:76
 msgid "Finnish"
-msgstr ""
+msgstr "フィンランド語"
 
 #: src/misc/iso-639_def.h:78
-#, fuzzy
 msgid "Frisian"
-msgstr "文字列"
-
-#: src/misc/iso-639_def.h:79
-#, fuzzy
-msgid "Georgian"
-msgstr "メディア"
+msgstr ""
 
 #: src/misc/iso-639_def.h:81
 msgid "Gaelic (Scots)"
-msgstr ""
+msgstr "ゲール語 (スコットランド)"
 
 #: src/misc/iso-639_def.h:82
 msgid "Irish"
-msgstr ""
+msgstr "アイルランド語"
 
 #: src/misc/iso-639_def.h:83
 msgid "Gallegan"
-msgstr ""
+msgstr "ガルシア語"
 
 #: src/misc/iso-639_def.h:84
-#, fuzzy
 msgid "Manx"
-msgstr "メディア"
+msgstr "マン島語"
 
 #: src/misc/iso-639_def.h:85
 msgid "Greek, Modern ()"
 msgstr ""
 
 #: src/misc/iso-639_def.h:86
-#, fuzzy
 msgid "Guarani"
-msgstr "メディア"
+msgstr "グアラニー語"
 
 #: src/misc/iso-639_def.h:87
-#, fuzzy
 msgid "Gujarati"
-msgstr "持続期間"
+msgstr "グジャラート語"
 
 #: src/misc/iso-639_def.h:88
 msgid "Hebrew"
-msgstr ""
+msgstr "ヘブライ語"
 
 #: src/misc/iso-639_def.h:89
-#, fuzzy
 msgid "Herero"
-msgstr "ステレオ"
+msgstr "ヘレロ語"
 
 #: src/misc/iso-639_def.h:90
 msgid "Hindi"
@@ -3479,14 +3758,12 @@ msgid "Inuktitut"
 msgstr ""
 
 #: src/misc/iso-639_def.h:95
-#, fuzzy
 msgid "Interlingue"
-msgstr "設定"
+msgstr ""
 
 #: src/misc/iso-639_def.h:96
-#, fuzzy
 msgid "Interlingua"
-msgstr "文字列"
+msgstr ""
 
 #: src/misc/iso-639_def.h:97
 msgid "Indonesian"
@@ -3537,49 +3814,41 @@ msgstr ""
 msgid "Komi"
 msgstr ""
 
-#: src/misc/iso-639_def.h:111
-#, fuzzy
-msgid "Korean"
-msgstr "真偽値"
-
 #: src/misc/iso-639_def.h:112
 msgid "Kuanyama"
 msgstr ""
 
 #: src/misc/iso-639_def.h:113
 msgid "Kurdish"
-msgstr ""
+msgstr "クルド語"
 
 #: src/misc/iso-639_def.h:114
 msgid "Lao"
-msgstr ""
+msgstr "ラオ語"
 
 #: src/misc/iso-639_def.h:115
 msgid "Latin"
 msgstr "ラテン語"
 
 #: src/misc/iso-639_def.h:116
-#, fuzzy
 msgid "Latvian"
-msgstr "文字列"
+msgstr "ラトビア語"
 
 #: src/misc/iso-639_def.h:117
-#, fuzzy
 msgid "Lingala"
-msgstr "整数"
+msgstr "リンガラ語"
 
 #: src/misc/iso-639_def.h:118
 msgid "Lithuanian"
-msgstr ""
+msgstr "リトアニア語"
 
 #: src/misc/iso-639_def.h:119
 msgid "Letzeburgesch"
-msgstr ""
+msgstr "ルクセンブルク方言"
 
 #: src/misc/iso-639_def.h:120
-#, fuzzy
 msgid "Macedonian"
-msgstr "メディア"
+msgstr "マケドニア語"
 
 #: src/misc/iso-639_def.h:121
 msgid "Marshall"
@@ -3587,47 +3856,44 @@ msgstr ""
 
 #: src/misc/iso-639_def.h:122
 msgid "Malayalam"
-msgstr ""
+msgstr "マラヤーラム語"
 
 #: src/misc/iso-639_def.h:123
 msgid "Maori"
-msgstr ""
+msgstr "マオリ語"
 
 #: src/misc/iso-639_def.h:124
 msgid "Marathi"
-msgstr ""
+msgstr "マラーティ語"
 
 #: src/misc/iso-639_def.h:125
-#, fuzzy
 msgid "Malay"
-msgstr "再生"
+msgstr "マライ語"
 
 #: src/misc/iso-639_def.h:126
 #, fuzzy
 msgid "Malagasy"
-msgstr "早送り"
+msgstr "マダガスカル語"
 
 #: src/misc/iso-639_def.h:127
 msgid "Maltese"
-msgstr ""
+msgstr "マルタ語"
 
 #: src/misc/iso-639_def.h:128
 msgid "Moldavian"
-msgstr ""
+msgstr "モルダビア語"
 
 #: src/misc/iso-639_def.h:129
-#, fuzzy
 msgid "Mongolian"
-msgstr "真偽値"
+msgstr ""
 
 #: src/misc/iso-639_def.h:130
 msgid "Nauru"
 msgstr ""
 
 #: src/misc/iso-639_def.h:131
-#, fuzzy
 msgid "Navajo"
-msgstr "ナビゲーション(_N)"
+msgstr "ナバホ"
 
 #: src/misc/iso-639_def.h:132
 msgid "Ndebele, South"
@@ -3638,13 +3904,12 @@ msgid "Ndebele, North"
 msgstr ""
 
 #: src/misc/iso-639_def.h:134
-#, fuzzy
 msgid "Ndonga"
-msgstr "なし"
+msgstr ""
 
 #: src/misc/iso-639_def.h:135
 msgid "Nepali"
-msgstr ""
+msgstr "ネパール語"
 
 #: src/misc/iso-639_def.h:136
 msgid "Norwegian"
@@ -3668,341 +3933,339 @@ msgstr ""
 
 #: src/misc/iso-639_def.h:141
 msgid "Oriya"
-msgstr ""
+msgstr "オーリヤ語"
 
 #: src/misc/iso-639_def.h:142
 msgid "Oromo"
-msgstr ""
+msgstr "オロモ語"
 
-#: src/misc/iso-639_def.h:143
+#: src/misc/iso-639_def.h:144
 msgid "Ossetian; Ossetic"
 msgstr ""
 
-#: src/misc/iso-639_def.h:144
+#: src/misc/iso-639_def.h:145
 msgid "Panjabi"
-msgstr ""
+msgstr "パンジャブ語"
 
-#: src/misc/iso-639_def.h:145
-#, fuzzy
+#: src/misc/iso-639_def.h:146
 msgid "Persian"
-msgstr "垂直"
+msgstr "ペルシア語"
 
-#: src/misc/iso-639_def.h:146
-#, fuzzy
+#: src/misc/iso-639_def.h:147
 msgid "Pali"
-msgstr "リスト"
+msgstr "パーリ語"
 
-#: src/misc/iso-639_def.h:147
+#: src/misc/iso-639_def.h:148
 msgid "Polish"
 msgstr ""
 
-#: src/misc/iso-639_def.h:148
-#, fuzzy
+#: src/misc/iso-639_def.h:149
 msgid "Portuguese"
-msgstr "プログラムの選択"
+msgstr "ポルトガル語"
 
-#: src/misc/iso-639_def.h:149
+#: src/misc/iso-639_def.h:150
 #, fuzzy
 msgid "Pushto"
-msgstr "作成者"
-
-#: src/misc/iso-639_def.h:150
-msgid "Quechua"
-msgstr ""
+msgstr "パシュト語"
 
 #: src/misc/iso-639_def.h:151
-msgid "Raeto-Romance"
-msgstr ""
+msgid "Quechua"
+msgstr "ケチュア語"
 
 #: src/misc/iso-639_def.h:152
-msgid "Romanian"
+msgid "Raeto-Romance"
 msgstr ""
 
-#: src/misc/iso-639_def.h:153
+#: src/misc/iso-639_def.h:154
 #, fuzzy
 msgid "Rundi"
 msgstr "オーディオ"
 
-#: src/misc/iso-639_def.h:155
+#: src/misc/iso-639_def.h:156
 msgid "Sango"
 msgstr ""
 
-#: src/misc/iso-639_def.h:156
+#: src/misc/iso-639_def.h:157
 msgid "Sanskrit"
 msgstr ""
 
-#: src/misc/iso-639_def.h:157
+#: src/misc/iso-639_def.h:158
 #, fuzzy
 msgid "Serbian"
 msgstr "垂直"
 
-#: src/misc/iso-639_def.h:158
+#: src/misc/iso-639_def.h:159
 #, fuzzy
 msgid "Croatian"
 msgstr "持続期間"
 
-#: src/misc/iso-639_def.h:159
-#, fuzzy
+#: src/misc/iso-639_def.h:160
 msgid "Sinhalese"
-msgstr "ファイルを開く"
+msgstr "シンハラ語"
 
-#: src/misc/iso-639_def.h:160
-#, fuzzy
+#: src/misc/iso-639_def.h:161
 msgid "Slovak"
-msgstr "スロー"
+msgstr "スロバキア語"
 
-#: src/misc/iso-639_def.h:161
+#: src/misc/iso-639_def.h:162
 msgid "Slovenian"
 msgstr ""
 
-#: src/misc/iso-639_def.h:162
+#: src/misc/iso-639_def.h:163
 msgid "Northern Sami"
 msgstr ""
 
-#: src/misc/iso-639_def.h:163
-#, fuzzy
+#: src/misc/iso-639_def.h:164
 msgid "Samoan"
-msgstr "モノラル"
+msgstr "サモア語"
 
-#: src/misc/iso-639_def.h:164
+#: src/misc/iso-639_def.h:165
 msgid "Shona"
-msgstr ""
+msgstr "ショナ語"
 
-#: src/misc/iso-639_def.h:165
+#: src/misc/iso-639_def.h:166
 msgid "Sindhi"
 msgstr ""
 
-#: src/misc/iso-639_def.h:166
-#, fuzzy
+#: src/misc/iso-639_def.h:167
 msgid "Somali"
-msgstr "なし"
+msgstr "ソマリ語"
 
-#: src/misc/iso-639_def.h:167
+#: src/misc/iso-639_def.h:168
 msgid "Sotho, Southern"
 msgstr ""
 
-#: src/misc/iso-639_def.h:169
+#: src/misc/iso-639_def.h:170
 msgid "Sardinian"
 msgstr ""
 
-#: src/misc/iso-639_def.h:170
+#: src/misc/iso-639_def.h:171
 #, fuzzy
 msgid "Swati"
 msgstr "衛星"
 
-#: src/misc/iso-639_def.h:171
+#: src/misc/iso-639_def.h:172
 msgid "Sundanese"
 msgstr ""
 
-#: src/misc/iso-639_def.h:172
+#: src/misc/iso-639_def.h:173
 msgid "Swahili"
 msgstr ""
 
-#: src/misc/iso-639_def.h:173
+#: src/misc/iso-639_def.h:174
 msgid "Swedish"
 msgstr ""
 
-#: src/misc/iso-639_def.h:174
+#: src/misc/iso-639_def.h:175
 msgid "Tahitian"
 msgstr ""
 
-#: src/misc/iso-639_def.h:175
+#: src/misc/iso-639_def.h:176
 #, fuzzy
 msgid "Tamil"
 msgstr "タイトル"
 
-#: src/misc/iso-639_def.h:176
+#: src/misc/iso-639_def.h:177
 msgid "Tatar"
 msgstr ""
 
-#: src/misc/iso-639_def.h:177
+#: src/misc/iso-639_def.h:178
 msgid "Telugu"
 msgstr ""
 
-#: src/misc/iso-639_def.h:178
+#: src/misc/iso-639_def.h:179
 #, fuzzy
 msgid "Tajik"
 msgstr "キャンセル"
 
-#: src/misc/iso-639_def.h:179
+#: src/misc/iso-639_def.h:180
 msgid "Tagalog"
 msgstr ""
 
-#: src/misc/iso-639_def.h:180
+#: src/misc/iso-639_def.h:181
 msgid "Thai"
 msgstr "タイ語"
 
-#: src/misc/iso-639_def.h:181
+#: src/misc/iso-639_def.h:182
 msgid "Tibetan"
 msgstr ""
 
-#: src/misc/iso-639_def.h:182
+#: src/misc/iso-639_def.h:183
 msgid "Tigrinya"
 msgstr ""
 
-#: src/misc/iso-639_def.h:183
+#: src/misc/iso-639_def.h:184
 msgid "Tonga (Tonga Islands)"
 msgstr ""
 
-#: src/misc/iso-639_def.h:184
+#: src/misc/iso-639_def.h:185
 msgid "Tswana"
 msgstr ""
 
-#: src/misc/iso-639_def.h:185
+#: src/misc/iso-639_def.h:186
 msgid "Tsonga"
 msgstr ""
 
-#: src/misc/iso-639_def.h:186
-#, fuzzy
-msgid "Turkish"
-msgstr "キャンセル"
-
-#: src/misc/iso-639_def.h:187
+#: src/misc/iso-639_def.h:188
 msgid "Turkmen"
 msgstr ""
 
-#: src/misc/iso-639_def.h:188
+#: src/misc/iso-639_def.h:189
 msgid "Twi"
 msgstr ""
 
-#: src/misc/iso-639_def.h:189
+#: src/misc/iso-639_def.h:190
 msgid "Uighur"
 msgstr ""
 
-#: src/misc/iso-639_def.h:190
+#: src/misc/iso-639_def.h:191
 #, fuzzy
 msgid "Ukrainian"
 msgstr "文字列"
 
-#: src/misc/iso-639_def.h:191
+#: src/misc/iso-639_def.h:192
 msgid "Urdu"
 msgstr ""
 
-#: src/misc/iso-639_def.h:192
+#: src/misc/iso-639_def.h:193
 msgid "Uzbek"
 msgstr ""
 
-#: src/misc/iso-639_def.h:193
+#: src/misc/iso-639_def.h:194
 #, fuzzy
 msgid "Vietnamese"
 msgstr "ログ・ファイル名"
 
-#: src/misc/iso-639_def.h:194
+#: src/misc/iso-639_def.h:195
 #, fuzzy
 msgid "Volapuk"
 msgstr "ボリュームを上げる"
 
-#: src/misc/iso-639_def.h:195
+#: src/misc/iso-639_def.h:196
 msgid "Welsh"
 msgstr ""
 
-#: src/misc/iso-639_def.h:196
+#: src/misc/iso-639_def.h:197
 msgid "Wolof"
 msgstr ""
 
-#: src/misc/iso-639_def.h:197
+#: src/misc/iso-639_def.h:198
 msgid "Xhosa"
 msgstr ""
 
-#: src/misc/iso-639_def.h:198
+#: src/misc/iso-639_def.h:199
 msgid "Yiddish"
 msgstr ""
 
-#: src/misc/iso-639_def.h:199
+#: src/misc/iso-639_def.h:200
 msgid "Yoruba"
 msgstr ""
 
-#: src/misc/iso-639_def.h:200
+#: src/misc/iso-639_def.h:201
 msgid "Zhuang"
 msgstr ""
 
-#: src/misc/iso-639_def.h:201
+#: src/misc/iso-639_def.h:202
 msgid "Zulu"
 msgstr ""
 
-#: src/misc/iso_lang.c:70 modules/gui/wxwindows/preferences.cpp:965
+#: src/misc/iso_lang.c:70 modules/gui/wxwidgets/dialogs/preferences.cpp:966
 msgid "Unknown"
+msgstr "不明"
+
+#: src/misc/vlm.c:1107 src/misc/vlm.c:1214
+#, c-format
+msgid "Media: %s"
 msgstr ""
 
-#: src/playlist/playlist.c:35
+#: src/playlist/playlist.c:37
 #, fuzzy
 msgid "By category"
-msgstr "CDDB ディスクカテゴリ"
+msgstr "CDDB カテゴリ"
 
-#: src/playlist/playlist.c:36
+#: src/playlist/playlist.c:38
 msgid "Manually added"
 msgstr ""
 
-#: src/playlist/playlist.c:37
+#: src/playlist/playlist.c:39
 msgid "All items, unsorted"
 msgstr ""
 
-#: src/playlist/sort.c:296 src/playlist/view.c:79 src/playlist/view.c:279
-msgid "Undefined"
+#: src/playlist/sort.c:233 src/playlist/sort.c:236 src/playlist/sort.c:333
+msgid "Album/movie/show title"
 msgstr ""
 
-#: src/video_output/video_output.c:412 modules/gui/gtk/gnome_interface.c:183
-#: modules/gui/gtk/gnome_interface.c:966 modules/gui/gtk/gtk_interface.c:553
-#: modules/gui/gtk/gtk_interface.c:1349 modules/gui/macosx/intf.m:520
-#: modules/gui/macosx/intf.m:521 modules/video_filter/deinterlace.c:113
+#: src/playlist/sort.c:344 src/playlist/view.c:79 src/playlist/view.c:280
+msgid "Undefined"
+msgstr "未定義"
+
+#: src/video_output/video_output.c:376 modules/gui/macosx/intf.m:562
+#: modules/gui/macosx/intf.m:563 modules/video_filter/deinterlace.c:116
 msgid "Deinterlace"
 msgstr "ノンインタレース化"
 
-#: src/video_output/video_output.c:416 modules/video_filter/deinterlace.c:108
-#, fuzzy
+#: src/video_output/video_output.c:380 modules/video_filter/deinterlace.c:111
 msgid "Discard"
-msgstr "ディスク"
+msgstr "破棄する"
 
-#: src/video_output/video_output.c:418 modules/video_filter/deinterlace.c:108
+#: src/video_output/video_output.c:382 modules/video_filter/deinterlace.c:111
 msgid "Blend"
 msgstr "ブレンド"
 
-#: src/video_output/video_output.c:420 modules/video_filter/deinterlace.c:108
+#: src/video_output/video_output.c:384 modules/video_filter/deinterlace.c:111
 #, fuzzy
 msgid "Mean"
 msgstr "メディア"
 
-#: src/video_output/video_output.c:422 modules/video_filter/deinterlace.c:109
+#: src/video_output/video_output.c:386 modules/video_filter/deinterlace.c:112
 msgid "Bob"
 msgstr ""
 
-#: src/video_output/video_output.c:424 modules/video_filter/deinterlace.c:109
-#, fuzzy
+#: src/video_output/video_output.c:388 modules/video_filter/deinterlace.c:112
 msgid "Linear"
 msgstr "リニア"
 
-#: src/video_output/vout_intf.c:189
+#: src/video_output/vout_intf.c:202
 msgid "Zoom"
 msgstr "ズーム"
 
-#: src/video_output/vout_intf.c:201
+#: src/video_output/vout_intf.c:214
 msgid "1:4 Quarter"
 msgstr "1:4 1/4"
 
-#: src/video_output/vout_intf.c:203
+#: src/video_output/vout_intf.c:216
 msgid "1:2 Half"
 msgstr "1:2 半分"
 
-#: src/video_output/vout_intf.c:205
+#: src/video_output/vout_intf.c:218
 msgid "1:1 Original"
 msgstr "1:1 オリジナル"
 
-#: src/video_output/vout_intf.c:207
+#: src/video_output/vout_intf.c:220
 msgid "2:1 Double"
 msgstr "2:1 二倍"
 
-#: modules/access/cdda.c:42 modules/access/dshow/dshow.cpp:79
-#: modules/access/dvb/access.c:67 modules/access/dvdnav.c:63
-#: modules/access/dvdread.c:61 modules/access/fake.c:40
-#: modules/access/file.c:78 modules/access/ftp.c:48 modules/access/http.c:51
+#: src/video_output/vout_intf.c:231 modules/video_filter/crop.c:62
+msgid "Crop"
+msgstr "縁取り"
+
+#: src/video_output/vout_intf.c:292
+msgid "Aspect-ratio"
+msgstr "アスペクト比"
+
+#: modules/access/cdda.c:52 modules/access/dshow/dshow.cpp:79
+#: modules/access/dv.c:68 modules/access/dvb/access.c:71
+#: modules/access/dvdnav.c:63 modules/access/dvdread.c:61
+#: modules/access/fake.c:40 modules/access/file.c:80 modules/access/ftp.c: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/pvr/pvr.c:97 modules/access/screen/screen.c:37
-#: modules/access/smb.c:59 modules/access/tcp.c:37 modules/access/udp.c:41
-#: modules/access/v4l/v4l.c:73 modules/access/vcd/vcd.c:40
+#: modules/access/screen/screen.c:37 modules/access/smb.c:59
+#: modules/access/tcp.c:37 modules/access/udp.c:42 modules/access/v4l/v4l.c:73
+#: modules/access/vcd/vcd.c:40
 msgid "Caching value in ms"
 msgstr "キャッシング値 (ミリ秒)"
 
-#: modules/access/cdda.c:44 modules/access/vcd/vcd.c:42
+#: modules/access/cdda.c:54 modules/access/vcd/vcd.c:42
 #, fuzzy
 msgid ""
 "Allows you to modify the default caching value for cdda streams. This value "
@@ -4011,34 +4274,52 @@ msgstr ""
 "udpストリームで使用される既定のキャッシング値が変更可能です。単位はミリ秒で指"
 "定します。"
 
-#: modules/access/cdda.c:48 modules/gui/gtk/gnome_interface.c:1622
-#: modules/gui/gtk/gtk_interface.c:1937 modules/gui/macosx/open.m:176
+#: modules/access/cdda.c:58 modules/gui/macosx/open.m:176
 #: modules/gui/macosx/open.m:496 modules/gui/macosx/open.m:587
-#: modules/gui/wxwindows/open.cpp:646
+#: modules/gui/wxwidgets/dialogs/open.cpp:699
 msgid "Audio CD"
 msgstr "オーディオ CD"
 
-#: modules/access/cdda.c:49
+#: modules/access/cdda.c:59
 msgid "Audio CD input"
 msgstr "オーディオ CD 入力"
 
-#: modules/access/cdda.c:55
-#, fuzzy
+#: modules/access/cdda.c:65
 msgid "[cdda:][device][@[track]]"
-msgstr "cddax://[device-or-file][@[T]num]"
+msgstr "[cdda:][device][@[track]]"
+
+#: modules/access/cdda.c:71
+#, fuzzy
+msgid "CDDB Server"
+msgstr "CDDB サーバー"
+
+#: modules/access/cdda.c:71
+#, fuzzy
+msgid "Adress of the CDDB server to use"
+msgstr "電子メールアドレスを CDDB サーバーに報告する"
+
+#: modules/access/cdda.c:74
+#, fuzzy
+msgid "CDDB port"
+msgstr "CDDB サーバーポート"
+
+#: modules/access/cdda.c:74
+#, fuzzy
+msgid "CDDB Server port to use"
+msgstr "CDDB サーバーポート"
 
-#: modules/access/cdda.c:380
+#: modules/access/cdda.c:506 modules/access/cdda.c:601
 #, fuzzy
 msgid "Audio CD - Track "
 msgstr "オーディオトラック"
 
-#: modules/access/cdda.c:381
+#: modules/access/cdda.c:507 modules/access/cdda.c:610
 #, fuzzy, c-format
 msgid "Audio CD - Track %i"
 msgstr "オーディオトラック"
 
-#: modules/access/cdda/cdda.c:42 modules/access/directory.c:75
-#: modules/codec/x264.c:124
+#: modules/access/cdda/cdda.c:42 modules/access/directory.c:77
+#: modules/codec/x264.c:176
 msgid "none"
 msgstr "なし"
 
@@ -4131,7 +4412,6 @@ msgid ""
 msgstr ""
 
 #: modules/access/cdda/cdda.c:112
-#, fuzzy
 msgid "cddax://[device-or-file][@[T]track]"
 msgstr "cddax://[device-or-file][@[T]num]"
 
@@ -4160,8 +4440,7 @@ msgstr "スレッドの数"
 
 #: modules/access/cdda/cdda.c:139
 msgid "Format to use in playlist \"title\" field when no CDDB"
-msgstr ""
-"CDDB がない場合のプレイリストの \"title\" フィールドで使用するフォーマット"
+msgstr "CDDB がない場合の再生一覧の \"title\" フィールドで使用するフォーマット"
 
 #: modules/access/cdda/cdda.c:144
 #, fuzzy
@@ -4194,12 +4473,11 @@ msgstr ""
 #: modules/access/cdda/cdda.c:174
 #, fuzzy
 msgid "CDDB"
-msgstr "サーバーなし"
+msgstr "CDDB å¹´"
 
 #: modules/access/cdda/cdda.c:177
 msgid "Format to use in playlist \"title\" field when using CDDB"
-msgstr ""
-"CDDB がある場合のプレイリストの \"title\" フィールドで使用するフォーマット"
+msgstr "CDDB がある場合の再生一覧の \"title\" フィールドで使用するフォーマット"
 
 #: modules/access/cdda/cdda.c:181
 msgid "Do CDDB lookups?"
@@ -4210,16 +4488,14 @@ msgid "If set, lookup CD-DA track information using the CDDB protocol"
 msgstr ""
 
 #: modules/access/cdda/cdda.c:187
-#, fuzzy
 msgid "CDDB server"
-msgstr "サーバーなし"
+msgstr "CDDB サーバー"
 
 #: modules/access/cdda/cdda.c:188
 msgid "Contact this CDDB server look up CD-DA information"
 msgstr ""
 
 #: modules/access/cdda/cdda.c:192
-#, fuzzy
 msgid "CDDB server port"
 msgstr "CDDB サーバーポート"
 
@@ -4269,48 +4545,42 @@ msgid ""
 "are available"
 msgstr ""
 
-#: modules/access/cdda/info.c:324 modules/access/cdda/info.c:329
-#: modules/access/cdda/info.c:333 modules/access/dvdread.c:84
-#: modules/access/vcdx/info.c:88 modules/gui/gtk/gnome_interface.c:515
-#: modules/gui/gtk/gnome_interface.c:718
-#: modules/gui/gtk/gnome_interface.c:1699
-#: modules/gui/gtk/gnome_interface.c:2279 modules/gui/gtk/gtk_interface.c:629
-#: modules/gui/gtk/gtk_interface.c:816 modules/gui/gtk/gtk_interface.c:2014
-#: modules/gui/gtk/gtk_interface.c:2738 modules/gui/macosx/open.m:161
-#: modules/gui/macosx/open.m:375 modules/gui/wxwindows/open.cpp:473
+#: 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/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:329
+#: modules/access/cdda/info.c:330
 msgid "Media Catalog Number (MCN)"
 msgstr ""
 
-#: modules/access/cdda/info.c:333 modules/access/vcdx/info.c:103
+#: modules/access/cdda/info.c:334 modules/access/vcdx/info.c:103
 msgid "Tracks"
 msgstr "トラック"
 
-#: modules/access/cdda/info.c:389 modules/access/cdda/info.c:809
-#: modules/access/cdda/info.c:856 modules/access/vcdx/info.c:284
-#: modules/access/vcdx/info.c:285 modules/gui/gtk/open.c:287
-#: modules/gui/gtk/open.c:301 modules/gui/wxwindows/open.cpp:1236
-#: modules/gui/wxwindows/open.cpp:1244
+#: 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/vcdx/info.c:286 modules/access/vcdx/info.c:287
+#: modules/gui/wxwidgets/dialogs/open.cpp:1700
+#: modules/gui/wxwidgets/dialogs/open.cpp:1718
 msgid "Track"
 msgstr "トラック"
 
-#: modules/access/cdda/info.c:396
+#: modules/access/cdda/info.c:397
 msgid "MRL"
 msgstr ""
 
-#: modules/access/cdda/info.c:856
-#, fuzzy
+#: modules/access/cdda/info.c:857
 msgid "Track Number"
-msgstr "トラック "
+msgstr "トラック番号"
 
-#: modules/access/directory.c:67
+#: modules/access/directory.c:69
 msgid "Subdirectory behavior"
 msgstr ""
 
-#: modules/access/directory.c:69
+#: modules/access/directory.c:71
 msgid ""
 "Select whether subdirectories must be expanded.\n"
 "none: subdirectories do not appear in the playlist.\n"
@@ -4318,38 +4588,38 @@ msgid ""
 "expand: all subdirectories are expanded.\n"
 msgstr ""
 
-#: modules/access/directory.c:75
+#: modules/access/directory.c:77
 msgid "collapse"
 msgstr "閉じる"
 
-#: modules/access/directory.c:76
+#: modules/access/directory.c:78
 msgid "expand"
 msgstr "展開"
 
-#: modules/access/directory.c:78
+#: modules/access/directory.c:80
 msgid "Ignore files with these extensions"
 msgstr ""
 
-#: modules/access/directory.c:80
+#: 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."
 msgstr ""
 
-#: modules/access/directory.c:86
+#: modules/access/directory.c:88
 #, fuzzy
 msgid "Directory"
 msgstr "DirectShow"
 
-#: modules/access/directory.c:88
+#: modules/access/directory.c:90
 #, fuzzy
 msgid "Standard filesystem directory input"
 msgstr "標準的なファイルシステムのファイルを読む"
 
 #: modules/access/dshow/dshow.cpp:72 modules/access/dshow/dshow.cpp:74
-#: modules/gui/gtk/menu.c:700 modules/video_output/opengl.c:113
-#, c-format
+#: modules/codec/ffmpeg/ffmpeg.c:75 modules/demux/mpc.c:53
+#: modules/video_output/opengl.c:129
 msgid "None"
 msgstr "なし"
 
@@ -4415,7 +4685,7 @@ msgstr ""
 #: modules/access/dshow/dshow.cpp:102
 #, fuzzy
 msgid "Video input frame rate"
-msgstr "ビデオビットレート"
+msgstr "ビデオフレームレート"
 
 #: modules/access/dshow/dshow.cpp:104
 msgid ""
@@ -4433,9 +4703,8 @@ msgid ""
 msgstr ""
 
 #: modules/access/dshow/dshow.cpp:110
-#, fuzzy
 msgid "Tuner properties"
-msgstr "デバイスのプロパティ"
+msgstr "チューナーのプロパティ"
 
 #: modules/access/dshow/dshow.cpp:112
 msgid "Show the tuner properties [channel selection] page."
@@ -4464,7 +4733,7 @@ msgstr ""
 #: modules/access/dshow/dshow.cpp:121
 #, fuzzy
 msgid "Tuner input type"
-msgstr "入力"
+msgstr "チューナー番号"
 
 #: modules/access/dshow/dshow.cpp:123
 #, fuzzy
@@ -4481,16 +4750,31 @@ msgid "DirectShow input"
 msgstr "DirectShow 入力"
 
 #: modules/access/dshow/dshow.cpp:144 modules/access/dshow/dshow.cpp:149
-#: modules/audio_output/alsa.c:110 modules/video_output/directx/directx.c:157
+#: modules/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/gui/gtk/preferences.c:373
 msgid "Configure"
 msgstr "設定"
 
-#: modules/access/dvb/access.c:69
+#: modules/access/dv.c:70 modules/access/file.c:82
+#, fuzzy
+msgid ""
+"Allows you to modify the default caching value for file streams. This value "
+"should be set in millisecond units."
+msgstr "ファイル・ストリームの既定のキャッシング値を変更できます。単位はミリ秒"
+
+#: modules/access/dv.c:74
+msgid "Digital Video (Firewire/ieee1394)  input"
+msgstr ""
+
+#: modules/access/dv.c:75
+#, fuzzy
+msgid "dv"
+msgstr "追加"
+
+#: modules/access/dvb/access.c:73
 #, fuzzy
 msgid ""
 "Allows you to modify the default caching value for dvb streams. This value "
@@ -4499,165 +4783,247 @@ msgstr ""
 "udpストリームで使用される既定のキャッシング値が変更可能です。単位はミリ秒で指"
 "定します。"
 
-#: modules/access/dvb/access.c:72
+#: modules/access/dvb/access.c:76
 msgid "Adapter card to tune"
 msgstr ""
 
-#: modules/access/dvb/access.c:73
+#: modules/access/dvb/access.c:77
 msgid ""
 "Adapter cards have a device file in directory named /dev/dvb/adapter[n] with "
 "n>=0."
 msgstr ""
 
-#: modules/access/dvb/access.c:75
+#: modules/access/dvb/access.c:79
 msgid "Device number to use on adapter"
 msgstr ""
 
-#: modules/access/dvb/access.c:78
+#: modules/access/dvb/access.c:82
 msgid "Transponder/multiplex frequency"
 msgstr ""
 
-#: modules/access/dvb/access.c:79
+#: modules/access/dvb/access.c:83
 msgid "In kHz for DVB-S or Hz for DVB-C/T"
 msgstr ""
 
-#: modules/access/dvb/access.c:81
-#, fuzzy
+#: modules/access/dvb/access.c:85
 msgid "Inversion mode"
-msgstr "変換元 "
+msgstr "反転モード"
 
-#: modules/access/dvb/access.c:82
+#: modules/access/dvb/access.c:86
 msgid "Inversion mode [0=off, 1=on, 2=auto]"
-msgstr ""
+msgstr "反転モード [0=オフ 1=オン 2=自動]"
 
-#: modules/access/dvb/access.c:84
+#: modules/access/dvb/access.c:88
 msgid "Probe DVB card for capabilities"
 msgstr ""
 
-#: modules/access/dvb/access.c:85
+#: modules/access/dvb/access.c:89
 msgid "Some DVB cards do not like to be probed for their capabilities."
 msgstr ""
 
-#: modules/access/dvb/access.c:87 modules/access/satellite/satellite.c:62
-#, fuzzy
-msgid "Antenna lnb_lof1 (kHz)"
-msgstr "アンテナ lnb_lof1 (kHz)"
-
-#: modules/access/dvb/access.c:90 modules/access/satellite/satellite.c:65
-#, fuzzy
-msgid "Antenna lnb_lof2 (kHz)"
-msgstr "アンテナ lnb_lof2 (kHz)"
-
-#: modules/access/dvb/access.c:93 modules/access/satellite/satellite.c:68
-#, fuzzy
-msgid "Antenna lnb_slof (kHz)"
-msgstr "アンテナ lnb_slof (kHz)"
-
-#: modules/access/dvb/access.c:97
+#: modules/access/dvb/access.c:91
 #, fuzzy
 msgid "Budget mode"
 msgstr "ネットワーク"
 
-#: modules/access/dvb/access.c:98
+#: modules/access/dvb/access.c:92
 #, fuzzy
 msgid "This allows you to stream an entire transponder with a budget card."
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: modules/access/dvb/access.c:100
+#: modules/access/dvb/access.c:95
 msgid "Satellite number in the Diseqc system"
 msgstr ""
 
-#: modules/access/dvb/access.c:101
+#: modules/access/dvb/access.c:96
 msgid "[0=no diseqc, 1-4=satellite number]"
 msgstr ""
 
-#: modules/access/dvb/access.c:103
+#: modules/access/dvb/access.c:98
 msgid "LNB voltage"
-msgstr ""
+msgstr "LNB 電圧"
 
-#: modules/access/dvb/access.c:104
+#: modules/access/dvb/access.c:99
 msgid "In Volts [0, 13=vertical, 18=horizontal]"
 msgstr ""
 
-#: modules/access/dvb/access.c:106
+#: modules/access/dvb/access.c:101
+#, fuzzy
 msgid "High LNB voltage"
-msgstr ""
+msgstr "LNB 電圧"
 
-#: modules/access/dvb/access.c:107
+#: modules/access/dvb/access.c:102
 msgid ""
 "Enable high voltage if your cables are particularly long. This is not "
 "supported by all frontends."
 msgstr ""
 
-#: modules/access/dvb/access.c:110
+#: modules/access/dvb/access.c:105
 msgid "22 kHz tone"
 msgstr "22 kHz トーン"
 
-#: modules/access/dvb/access.c:111
+#: modules/access/dvb/access.c:106
 msgid "[0=off, 1=on, -1=auto]"
 msgstr "[0:オフ 1:オン -1:自動]"
 
-#: modules/access/dvb/access.c:113
+#: modules/access/dvb/access.c:108
 #, fuzzy
 msgid "Transponder FEC"
 msgstr "衛星 既定転送FEC"
 
-#: modules/access/dvb/access.c:114
+#: modules/access/dvb/access.c:109
 msgid "FEC=Forward Error Correction mode [9=auto]"
 msgstr ""
 
-#: modules/access/dvb/access.c:116
+#: modules/access/dvb/access.c:111
 #, fuzzy
 msgid "Transponder symbol rate in kHz"
 msgstr "衛星 既定転送シンボル・レート"
 
+#: modules/access/dvb/access.c:114
+#, fuzzy
+msgid "Antenna lnb_lof1 (kHz)"
+msgstr "アンテナ lnb_lof1 (kHz)"
+
+#: modules/access/dvb/access.c:117
+#, fuzzy
+msgid "Antenna lnb_lof2 (kHz)"
+msgstr "アンテナ lnb_lof2 (kHz)"
+
 #: modules/access/dvb/access.c:120
+#, fuzzy
+msgid "Antenna lnb_slof (kHz)"
+msgstr "アンテナ lnb_slof (kHz)"
+
+#: modules/access/dvb/access.c:124
 msgid "Modulation type"
 msgstr "モジュレーションタイプ"
 
-#: modules/access/dvb/access.c:121
+#: modules/access/dvb/access.c:125
 msgid "Modulation type for front-end device."
 msgstr "フロントエンドデバイスのモジュレーションタイプ"
 
-#: modules/access/dvb/access.c:124
+#: modules/access/dvb/access.c:128
 msgid "Terrestrial high priority stream code rate (FEC)"
 msgstr ""
 
-#: modules/access/dvb/access.c:127
+#: modules/access/dvb/access.c:131
 msgid "Terrestrial low priority stream code rate (FEC)"
 msgstr ""
 
-#: modules/access/dvb/access.c:130
+#: modules/access/dvb/access.c:134
 msgid "Terrestrial bandwidth"
 msgstr ""
 
-#: modules/access/dvb/access.c:131
+#: modules/access/dvb/access.c:135
 msgid "Terrestrial bandwidth [0=auto,6,7,8 in MHz]"
 msgstr ""
 
-#: modules/access/dvb/access.c:133
+#: modules/access/dvb/access.c:137
 msgid "Terrestrial guard interval"
 msgstr ""
 
-#: modules/access/dvb/access.c:136
+#: modules/access/dvb/access.c:140
 msgid "Terrestrial transmission mode"
 msgstr ""
 
-#: modules/access/dvb/access.c:139
+#: modules/access/dvb/access.c:143
 msgid "Terrestrial hierarchy mode"
 msgstr ""
 
-#: modules/access/dvb/access.c:143
+#: modules/access/dvb/access.c:146
+#, fuzzy
+msgid "HTTP Host address"
+msgstr "ホストアドレス"
+
+#: modules/access/dvb/access.c:148
+msgid "To enable the internal HTTP server, set its address and port here."
+msgstr ""
+
+#: modules/access/dvb/access.c:150
+msgid "HTTP user name"
+msgstr "HTTP ユーザー名"
+
+#: modules/access/dvb/access.c:152
+msgid ""
+"You can set the user name the administrator will use to log into the "
+"internal HTTP server."
+msgstr ""
+
+#: modules/access/dvb/access.c:155
+msgid "HTTP password"
+msgstr "HTTP パスワード"
+
+#: modules/access/dvb/access.c:157
+msgid ""
+"You can set the password the administrator will use to log into the internal "
+"HTTP server."
+msgstr ""
+
+#: modules/access/dvb/access.c:160
+#, fuzzy
+msgid "HTTP ACL"
+msgstr "HTTP SSL"
+
+#: modules/access/dvb/access.c:162
+msgid ""
+"You can set the access control list (equivalent to .hosts) file path, which "
+"will limit the range of IPs entitled to log into the internal HTTP server."
+msgstr ""
+
+#: modules/access/dvb/access.c:166 modules/access_output/http.c:69
+#: modules/control/http/http.c:46
+msgid "Certificate file"
+msgstr "証明書ファイル"
+
+#: modules/access/dvb/access.c:167 modules/control/http/http.c:47
+msgid "HTTP interface x509 PEM certificate file (enables SSL)"
+msgstr "HTTP インターフェースの x509 PEM 証明書ファイル (SSL 有効)"
+
+#: modules/access/dvb/access.c:170 modules/access_output/http.c:72
+#: modules/control/http/http.c:49
+msgid "Private key file"
+msgstr "秘密鍵のファイル"
+
+#: modules/access/dvb/access.c:171 modules/control/http/http.c:50
+msgid "HTTP interface x509 PEM private key file"
+msgstr "HTTP インターフェースの x509 PEM 秘密鍵ファイル"
+
+#: modules/access/dvb/access.c:173 modules/access_output/http.c:76
+#: modules/control/http/http.c:51
+msgid "Root CA file"
+msgstr "ルート CA ファイル"
+
+#: modules/access/dvb/access.c:174 modules/control/http/http.c:52
+msgid "HTTP interface x509 PEM trusted root CA certificates file"
+msgstr ""
+
+#: modules/access/dvb/access.c:177 modules/access_output/http.c:81
+#: modules/control/http/http.c:54
+msgid "CRL file"
+msgstr "CRL ファイル"
+
+#: modules/access/dvb/access.c:178
+#, fuzzy
+msgid "HTTP interface Certificates Revocation List file"
+msgstr "HTTP インターフェースの x509 PEM 秘密鍵ファイル"
+
+#: modules/access/dvb/access.c:181
 msgid "DVB"
 msgstr "DVB"
 
-#: modules/access/dvb/access.c:144
+#: modules/access/dvb/access.c:182
 msgid "DVB input with v4l2 support"
-msgstr ""
+msgstr "DVB 入力と v4l2 サポート"
+
+#: modules/access/dvb/access.c:234
+#, fuzzy
+msgid "HTTP server"
+msgstr "HTTP ユーザー名"
 
 #: modules/access/dvdnav.c:59 modules/access/dvdread.c:57
 msgid "DVD angle"
-msgstr ""
+msgstr "DVD アングル"
 
 #: modules/access/dvdnav.c:61 modules/access/dvdread.c:59
 #, fuzzy
@@ -4684,9 +5050,8 @@ msgid ""
 msgstr ""
 
 #: modules/access/dvdnav.c:78
-#, fuzzy
 msgid "DVD with menus"
-msgstr "DVD メニュー"
+msgstr "DVD とメニュー"
 
 #: modules/access/dvdnav.c:79
 msgid "DVDnav Input"
@@ -4758,18 +5123,17 @@ msgid ""
 "should be set in millisecond units."
 msgstr "ファイル・ストリームの既定のキャッシング値を変更できます。単位はミリ秒"
 
-#: modules/access/fake.c:44 modules/access/pvr/pvr.c:69
+#: modules/access/fake.c:44 modules/access/pvr/pvr.c:72
 #: modules/access/v4l/v4l.c:136
-#, fuzzy
 msgid "Framerate"
-msgstr "シンボル・レート"
+msgstr "フレームレート"
 
 #: modules/access/fake.c:46
 msgid "Specifies the number of frames per second (eg. 24, 25, 29.97, 30)."
 msgstr ""
 
 #: modules/access/fake.c:47 modules/stream_out/bridge.c:36
-#: modules/stream_out/mosaic_bridge.c:100
+#: modules/stream_out/mosaic_bridge.c:103
 msgid "ID"
 msgstr ""
 
@@ -4779,52 +5143,51 @@ msgid ""
 "{} constructs (default 0)."
 msgstr ""
 
-#: modules/access/fake.c:54
+#: modules/access/fake.c:51
+#, fuzzy
+msgid "Duration in ms"
+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)."
+msgstr ""
+
+#: modules/access/fake.c:57 modules/codec/fake.c:74
 #, fuzzy
 msgid "Fake"
 msgstr "疑似 TTY"
 
-#: modules/access/fake.c:55
+#: modules/access/fake.c:58
 #, fuzzy
 msgid "Fake input"
 msgstr "FTP 入力"
 
-#: modules/access/file.c:80
-#, fuzzy
-msgid ""
-"Allows you to modify the default caching value for file streams. This value "
-"should be set in millisecond units."
-msgstr "ファイル・ストリームの既定のキャッシング値を変更できます。単位はミリ秒"
-
-#: modules/access/file.c:82
+#: modules/access/file.c:84
 msgid "Concatenate with additional files"
 msgstr ""
 
-#: modules/access/file.c:84
+#: modules/access/file.c:86
 msgid ""
 "Allows you to play split files as if they were part of a unique file. "
 "Specify a comma-separated list of files."
 msgstr ""
 
-#: modules/access/file.c:88
+#: modules/access/file.c:90
 #, fuzzy
 msgid "Standard filesystem file input"
 msgstr "標準的なファイルシステムのファイルを読む"
 
-#: modules/access/file.c:89 modules/access_output/file.c:71
-#: modules/audio_output/file.c:111 modules/gui/beos/InterfaceWindow.cpp:244
+#: modules/access/file.c:91 modules/access_output/file.c:71
+#: modules/audio_output/file.c:111 modules/gui/beos/InterfaceWindow.cpp:261
 #: modules/gui/beos/MediaControlView.cpp:1232
-#: modules/gui/beos/PlayListWindow.cpp:85
-#: modules/gui/gtk/gnome_interface.c:503
-#: modules/gui/gtk/gnome_interface.c:1570
-#: modules/gui/gtk/gnome_interface.c:2286
-#: modules/gui/gtk/gnome_interface.c:2859 modules/gui/gtk/gtk_interface.c:618
-#: modules/gui/gtk/gtk_interface.c:1885 modules/gui/gtk/gtk_interface.c:2745
-#: modules/gui/gtk/gtk_interface.c:2862 modules/gui/gtk/gtk_interface.c:3114
-#: modules/gui/macosx/open.m:160 modules/gui/macosx/open.m:371
-#: modules/gui/macosx/output.m:142 modules/gui/macosx/output.m:232
-#: modules/gui/macosx/output.m:373 modules/gui/pda/pda_interface.c:366
-#: modules/gui/wxwindows/open.cpp:471 modules/gui/wxwindows/streamout.cpp:456
+#: 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
 msgid "File"
 msgstr "ファイル"
 
@@ -4866,11 +5229,25 @@ msgstr ""
 msgid "FTP input"
 msgstr "FTP 入力"
 
-#: modules/access/http.c:45
+#: 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."
+msgstr ""
+"udpストリームで使用される既定のキャッシング値が変更可能です。単位はミリ秒で指"
+"定します。"
+
+#: modules/access/gnomevfs.c:50
+#, fuzzy
+msgid "GnomeVFS filesystem file input"
+msgstr "標準的なファイルシステムのファイルを読む"
+
+#: modules/access/http.c:46
 msgid "HTTP proxy"
 msgstr "HTTP プロキシ"
 
-#: modules/access/http.c:47
+#: modules/access/http.c:48
 #, fuzzy
 msgid ""
 "You can specify an HTTP proxy to use. It must be of the form http://[user[:"
@@ -4880,7 +5257,7 @@ msgstr ""
 "使用するHTTPプロキシを http://myproxy.mydomain:myport/ の形式で指定してくださ"
 "い。none が指定された場合には、HTTP_PROXYenvironment変数が試みられます。"
 
-#: modules/access/http.c:53
+#: modules/access/http.c:54
 #, fuzzy
 msgid ""
 "Allows you to modify the default caching value for http streams. This value "
@@ -4889,43 +5266,44 @@ msgstr ""
 "httpストリームで使用される既定のキャッシング値が変更可能です。単位はミリ秒で"
 "指定します。"
 
-#: modules/access/http.c:56
+#: modules/access/http.c:57
 msgid "HTTP user agent"
 msgstr "HTTP ユーザーエージェント"
 
-#: modules/access/http.c:57
+#: 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:60
-#, fuzzy
+#: modules/access/http.c:61
 msgid "Auto re-connect"
-msgstr "オーディオコーデック"
+msgstr "自動再接続"
 
-#: modules/access/http.c:61
+#: modules/access/http.c:62
 msgid ""
 "Will automatically attempt a re-connection in case it was untimely closed."
 msgstr ""
 
-#: modules/access/http.c:64
+#: modules/access/http.c:65
 #, fuzzy
 msgid "Continuous stream"
 msgstr "ストリームの停止"
 
-#: modules/access/http.c:65
+#: modules/access/http.c:66
 msgid ""
-"Enable this option to read a file that is being constantly updated (for "
-"example, a JPG file on a server)"
+"This allows you to read a file that is being constantly updated (for "
+"example, a JPG file on a server).You should not globally enable this option "
+"as it will break all other types of HTTP streams."
 msgstr ""
 
-#: modules/access/http.c:69
+#: modules/access/http.c:72
 msgid "HTTP input"
 msgstr "HTTP 入力"
 
-#: modules/access/http.c:71
-msgid "HTTP/HTTPS"
-msgstr ""
+#: modules/access/http.c:74
+#, fuzzy
+msgid "HTTP(S)"
+msgstr "HTTP"
 
 #: modules/access/mms/mms.c:48
 #, fuzzy
@@ -4942,33 +5320,27 @@ msgstr ""
 
 #: modules/access/mms/mms.c:53
 #, fuzzy
-msgid "Select maximum bitrate stream"
-msgstr "ネットワークストリームを選択する"
+msgid "Maximum bitrate"
+msgstr "エンコードの最大ビットレート"
 
 #: modules/access/mms/mms.c:55
-msgid "Always select the stream with the maximum bitrate."
-msgstr ""
-
-#: modules/access/mms/mms.c:58
-msgid "MMS"
+msgid ""
+"If this is set, the stream with the maximum bitrate under that limit      "
+"will be selected"
 msgstr ""
 
-#: modules/access/mms/mms.c:59
+#: modules/access/mms/mms.c:60
 msgid "Microsoft Media Server (MMS) input"
-msgstr ""
+msgstr "マイクロソフトメディアサーバー (MMS) 入力"
 
-#: modules/access/pvr/pvr.c:48 modules/access/pvr/pvr.c:99
+#: modules/access/pvr/pvr.c:48
 #, fuzzy
 msgid ""
 "Allows you to modify the default caching value for pvr streams. This value "
 "should be set in millisecond units."
-msgstr ""
-"udpストリームで使用される既定のキャッシング値が変更可能です。単位はミリ秒で指"
-"定します。"
+msgstr "ファイル・ストリームの既定のキャッシング値を変更できます。単位はミリ秒"
 
-#: modules/access/pvr/pvr.c:51 modules/gui/gtk/gnome_interface.c:155
-#: modules/gui/gtk/gnome_interface.c:938 modules/gui/gtk/gtk_interface.c:488
-#: modules/gui/gtk/gtk_interface.c:1289
+#: modules/access/pvr/pvr.c:51
 msgid "Device"
 msgstr "デバイス"
 
@@ -4977,178 +5349,172 @@ msgstr "デバイス"
 msgid "PVR video device"
 msgstr "DVDデバイス"
 
-#: modules/access/pvr/pvr.c:54 modules/access/v4l/v4l.c:96
+#: modules/access/pvr/pvr.c:54
+#, fuzzy
+msgid "Radio device"
+msgstr "DVDデバイス"
+
+#: modules/access/pvr/pvr.c:55
+#, fuzzy
+msgid "PVR radio device"
+msgstr "DVDデバイス"
+
+#: modules/access/pvr/pvr.c:57 modules/access/v4l/v4l.c:96
 #, fuzzy
 msgid "Norm"
 msgstr "なし"
 
-#: modules/access/pvr/pvr.c:55 modules/access/v4l/v4l.c:98
+#: modules/access/pvr/pvr.c:58 modules/access/v4l/v4l.c:98
 msgid "Defines the norm of the stream (Automatic, SECAM, PAL, or NTSC)"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:58 modules/access/v4l/v4l.c:102
+#: modules/access/pvr/pvr.c:61 modules/access/v4l/v4l.c:102
 msgid "Width"
-msgstr ""
+msgstr "幅"
 
-#: modules/access/pvr/pvr.c:59 modules/access/v4l/v4l.c:103
+#: modules/access/pvr/pvr.c:62 modules/access/v4l/v4l.c:103
 msgid "Width of the stream to capture (-1 for autodetect)"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:62 modules/access/v4l/v4l.c:105
+#: modules/access/pvr/pvr.c:65 modules/access/v4l/v4l.c:105
 #, fuzzy
 msgid "Height"
 msgstr "右"
 
-#: modules/access/pvr/pvr.c:63 modules/access/v4l/v4l.c:106
+#: modules/access/pvr/pvr.c:66 modules/access/v4l/v4l.c:106
 msgid "Height of the stream to capture (-1 for autodetect)"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:66 modules/access/v4l/v4l.c:89
-#: modules/gui/gtk/gnome_interface.c:1866 modules/gui/gtk/gtk_interface.c:2181
+#: modules/access/pvr/pvr.c:69 modules/access/v4l/v4l.c:89
 msgid "Frequency"
 msgstr "周波数"
 
-#: modules/access/pvr/pvr.c:67 modules/access/v4l/v4l.c:91
+#: modules/access/pvr/pvr.c:70 modules/access/v4l/v4l.c:91
 msgid "Frequency to capture (in kHz), if applicable"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:70 modules/access/v4l/v4l.c:137
+#: modules/access/pvr/pvr.c:73 modules/access/v4l/v4l.c:137
 msgid "Framerate to capture, if applicable (-1 for autodetect)"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:73
-#, fuzzy
+#: modules/access/pvr/pvr.c:76
 msgid "Key interval"
-msgstr "キーフレーム間隔:"
+msgstr "キー間隔:"
 
-#: modules/access/pvr/pvr.c:74
+#: modules/access/pvr/pvr.c:77
 msgid "Interval between keyframes (-1 for autodetect)"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:76
+#: modules/access/pvr/pvr.c:79
 msgid "B Frames"
-msgstr ""
+msgstr "B フレーム"
 
-#: modules/access/pvr/pvr.c:77
+#: modules/access/pvr/pvr.c:80
 msgid ""
 "If this option is set, B-Frames will be used. Use this option to set the "
 "number of B-Frames."
 msgstr ""
 
-#: modules/access/pvr/pvr.c:81
+#: modules/access/pvr/pvr.c:84
 msgid "Bitrate to use (-1 for default)"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:83
+#: modules/access/pvr/pvr.c:86
 #, fuzzy
 msgid "Bitrate peak"
 msgstr "ビットレート"
 
-#: modules/access/pvr/pvr.c:84
+#: modules/access/pvr/pvr.c:87
 msgid "Peak bitrate in VBR mode"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:86
+#: modules/access/pvr/pvr.c:89
 msgid "Bitrate mode (vbr or cbr)"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:87
+#: modules/access/pvr/pvr.c:90
 msgid "Bitrate mode to use"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:89
+#: modules/access/pvr/pvr.c:92
 #, fuzzy
 msgid "Audio bitmask"
 msgstr "オーディオビットレート"
 
-#: modules/access/pvr/pvr.c:90
+#: modules/access/pvr/pvr.c:93
 msgid ""
 "This option allows setting of bitmask that will get used by the audio part "
 "of the card."
 msgstr ""
 
-#: modules/access/pvr/pvr.c:93 modules/access/v4l/v4l.c:92
-#, fuzzy
+#: modules/access/pvr/pvr.c:96 modules/access/vcdx/info.c:97
+#: modules/gui/macosx/intf.m:478 modules/gui/wxwidgets/interface.cpp:1361
+msgid "Volume"
+msgstr "音量"
+
+#: modules/access/pvr/pvr.c:97
+msgid "This option allows setting of the audio volume (0-65535)."
+msgstr ""
+
+#: modules/access/pvr/pvr.c:100 modules/access/v4l/v4l.c:92
 msgid "Channel"
 msgstr "チャンネル"
 
-#: modules/access/pvr/pvr.c:94 modules/access/v4l/v4l.c:94
+#: modules/access/pvr/pvr.c:101 modules/access/v4l/v4l.c:94
 msgid ""
 "Channel of the card to use (Usually, 0 = tuner, 1 = composite, 2 = svideo)"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:105 modules/access/v4l/v4l.c:143
-#, fuzzy
+#: modules/access/pvr/pvr.c:107 modules/access/v4l/v4l.c:143
 msgid "Automatic"
-msgstr "自動縁取り"
+msgstr "自動"
 
-#: modules/access/pvr/pvr.c:105 modules/access/v4l/v4l.c:143
+#: modules/access/pvr/pvr.c:107 modules/access/v4l/v4l.c:143
 msgid "SECAM"
-msgstr ""
+msgstr "SECAM"
 
-#: modules/access/pvr/pvr.c:105 modules/access/v4l/v4l.c:143
+#: modules/access/pvr/pvr.c:107 modules/access/v4l/v4l.c:143
 msgid "PAL"
-msgstr ""
+msgstr "PAL"
 
-#: modules/access/pvr/pvr.c:105 modules/access/v4l/v4l.c:143
-#, fuzzy
+#: modules/access/pvr/pvr.c:107 modules/access/v4l/v4l.c:143
 msgid "NTSC"
-msgstr "TS"
+msgstr "NTSC"
 
-#: modules/access/pvr/pvr.c:108
+#: modules/access/pvr/pvr.c:110
 msgid "vbr"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:108
+#: modules/access/pvr/pvr.c:110
 msgid "cbr"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:111
+#: modules/access/pvr/pvr.c:115
 msgid "PVR"
 msgstr "PVR"
 
-#: modules/access/pvr/pvr.c:112
+#: modules/access/pvr/pvr.c:116
 msgid "MPEG Encoding cards input (with ivtv drivers)"
 msgstr ""
 
-#: modules/access/satellite/satellite.c:41
-#, fuzzy
-msgid "Demux number"
-msgstr "demuxモジュール"
-
-#: modules/access/satellite/satellite.c:44
-msgid "Tuner number"
-msgstr ""
-
-#: modules/access/satellite/satellite.c:47
-#, fuzzy
-msgid "Satellite default transponder frequency (kHz)"
-msgstr "衛星 既定転送周波数"
-
-#: modules/access/satellite/satellite.c:50
-#, fuzzy
-msgid "Satellite default transponder polarization"
-msgstr "衛星 既定転送極"
-
-#: modules/access/satellite/satellite.c:53
-#, fuzzy
-msgid "Satellite default transponder FEC"
-msgstr "衛星 既定転送FEC"
-
-#: modules/access/satellite/satellite.c:56
-#, fuzzy
-msgid "Satellite default transponder symbol rate (kHz)"
-msgstr "衛星 既定転送シンボル・レート"
+#: modules/access/rtsp/access.c:40 modules/access_output/udp.c:75
+#: modules/demux/livedotcom.cpp:61
+msgid "Caching value (ms)"
+msgstr "キャッシング値 (ミリ秒)"
 
-#: modules/access/satellite/satellite.c:59
+#: modules/access/rtsp/access.c:42 modules/demux/livedotcom.cpp:63
 #, fuzzy
-msgid "Use diseqc with antenna"
-msgstr "アンテナとdiseqcを使用"
+msgid ""
+"Allows you to modify the default caching value for RTSP streams. This value "
+"should be set in millisecond units."
+msgstr ""
+"udpストリームで使用される既定のキャッシング値が変更可能です。単位はミリ秒で指"
+"定します。"
 
-#: modules/access/satellite/satellite.c:72
+#: modules/access/rtsp/access.c:46 modules/access/rtsp/access.c:47
 #, fuzzy
-msgid "Satellite input"
-msgstr "衛星入力モジュール"
+msgid "Real RTSP"
+msgstr "RTSP"
 
 #: modules/access/screen/screen.c:39
 #, fuzzy
@@ -5175,88 +5541,31 @@ msgid ""
 msgstr ""
 
 #: modules/access/screen/screen.c:62
-#, fuzzy
 msgid "Screen Input"
-msgstr "スクリーン %d"
+msgstr "画面入力"
 
-#: modules/access/screen/screen.c:63 modules/gui/gtk/gnome_interface.c:190
-#: modules/gui/gtk/gnome_interface.c:973 modules/gui/gtk/gtk_interface.c:560
-#: modules/gui/gtk/gtk_interface.c:1356 modules/gui/macosx/vout.m:184
+#: modules/access/screen/screen.c:63 modules/gui/macosx/vout.m:210
 msgid "Screen"
 msgstr "スクリーン"
 
-#: modules/access/slp.c:60
-msgid "SLP attribute identifiers"
-msgstr "SLP 属性識別子"
-
-#: modules/access/slp.c:62
+#: modules/access/smb.c:61
+#, fuzzy
 msgid ""
-"This string is a comma separated list of attribute identifiers to search for "
-"a playlist title or empty to use all attributes."
+"Allows you to modify the default caching value for SMB streams. This value "
+"should be set in millisecond units."
 msgstr ""
+"httpストリームで使用される既定のキャッシング値が変更可能です。単位はミリ秒で"
+"指定します。"
 
-#: modules/access/slp.c:65
-msgid "SLP scopes list"
-msgstr "SLP スコープ一覧"
-
-#: modules/access/slp.c:67
-msgid ""
-"This string is a comma separated list of scope names or empty if you want to "
-"use the default scopes. It is used in all SLP queries."
-msgstr ""
+#: modules/access/smb.c:63
+#, fuzzy
+msgid "SMB user name"
+msgstr "FTP ユーザー名"
 
-#: modules/access/slp.c:70
-msgid "SLP naming authority"
-msgstr ""
-
-#: modules/access/slp.c:72
-msgid ""
-"This string is a list of naming authorities to search. Use \"*\" for all and "
-"the empty string for the default of IANA."
-msgstr ""
-
-#: modules/access/slp.c:75
-msgid "SLP LDAP filter"
-msgstr "SLP LDAP フィルター"
-
-#: modules/access/slp.c:77
-msgid ""
-"This is a query formulated of attribute pattern matching expressions in the "
-"form of an LDAPv3 search filter or empty for all answers."
-msgstr ""
-
-#: modules/access/slp.c:80
-msgid "Language requested in SLP requests"
-msgstr ""
-
-#: modules/access/slp.c:82
-msgid ""
-"RFC 1766 Language tag for the natural language locale of requests, leave "
-"empty to use the default locale. It is used in all SLP queries."
-msgstr ""
-
-#: modules/access/slp.c:86
-msgid "SLP input"
-msgstr "SLP 入力"
-
-#: 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."
-msgstr ""
-"httpストリームで使用される既定のキャッシング値が変更可能です。単位はミリ秒で"
-"指定します。"
-
-#: modules/access/smb.c:63
-#, fuzzy
-msgid "SMB user name"
-msgstr "FTP ユーザー名"
-
-#: modules/access/smb.c:66
-#, fuzzy
-msgid "SMB password"
-msgstr "FTP パスワード"
+#: modules/access/smb.c:66
+#, fuzzy
+msgid "SMB password"
+msgstr "FTP パスワード"
 
 #: modules/access/smb.c:69
 #, fuzzy
@@ -5287,13 +5596,13 @@ msgstr ""
 #: modules/access/tcp.c:46
 #, fuzzy
 msgid "TCP"
-msgstr "CPU"
+msgstr "RTP"
 
 #: modules/access/tcp.c:47
 msgid "TCP input"
 msgstr "TCP 入力"
 
-#: modules/access/udp.c:43 modules/access_output/udp.c:66
+#: modules/access/udp.c:44 modules/access_output/udp.c:77
 #, fuzzy
 msgid ""
 "Allows you to modify the default caching value for UDP streams. This value "
@@ -5302,21 +5611,34 @@ msgstr ""
 "udpストリームで使用される既定のキャッシング値が変更可能です。単位はミリ秒で指"
 "定します。"
 
-#: modules/access/udp.c:46
+#: modules/access/udp.c:47
 msgid "Autodetection of MTU"
 msgstr ""
 
-#: modules/access/udp.c:48
+#: modules/access/udp.c:49
 msgid "Allows growing the MTU if truncated packets are found"
 msgstr ""
 
-#: modules/access/udp.c:54 modules/gui/gtk/gtk_interface.c:2031
-#: modules/gui/macosx/open.m:183 modules/gui/macosx/open.m:654
-#: modules/gui/macosx/open.m:692 modules/gui/wxwindows/open.cpp:700
+#: modules/access/udp.c:51
+msgid "RTP reordering timeout in ms"
+msgstr ""
+
+#: modules/access/udp.c:53
+#, fuzzy
+msgid ""
+"Allows you to modify the RTP reordering behaviour. RTP input will wait for "
+"late packets upto the specified timeout in milisecond units."
+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:801
 msgid "UDP/RTP"
 msgstr ""
 
-#: modules/access/udp.c:55
+#: modules/access/udp.c:62
 msgid "UDP/RTP input"
 msgstr "UDP/RTP 入力"
 
@@ -5354,7 +5676,8 @@ msgstr "オーディオチャンネル"
 msgid "Audio Channel to use, if there are several audio input"
 msgstr ""
 
-#: modules/access/v4l/v4l.c:108 modules/gui/wxwindows/extrapanel.cpp:236
+#: modules/access/v4l/v4l.c:108 modules/gui/macosx/extended.m:107
+#: modules/gui/wxwidgets/extrapanel.cpp:236
 msgid "Brightness"
 msgstr "ブライトネス"
 
@@ -5362,7 +5685,8 @@ msgstr "ブライトネス"
 msgid "Set the Brightness of the video input"
 msgstr ""
 
-#: modules/access/v4l/v4l.c:111 modules/gui/wxwindows/extrapanel.cpp:226
+#: modules/access/v4l/v4l.c:111 modules/gui/macosx/extended.m:110
+#: modules/gui/wxwidgets/extrapanel.cpp:226
 #, fuzzy
 msgid "Hue"
 msgstr "閉じる"
@@ -5371,16 +5695,18 @@ msgstr "閉じる"
 msgid "Set the Hue of the video input"
 msgstr ""
 
-#: modules/access/v4l/v4l.c:114
+#: modules/access/v4l/v4l.c:114 modules/gui/macosx/sfilters.m:89
+#: modules/gui/macosx/sfilters.m:97
 #, fuzzy
 msgid "Color"
-msgstr "国"
+msgstr "閉じる"
 
 #: modules/access/v4l/v4l.c:116
 msgid "Set the Color of the video input"
 msgstr ""
 
-#: modules/access/v4l/v4l.c:117 modules/gui/wxwindows/extrapanel.cpp:231
+#: modules/access/v4l/v4l.c:117 modules/gui/macosx/extended.m:108
+#: modules/gui/wxwidgets/extrapanel.cpp:231
 msgid "Contrast"
 msgstr "コントラスト"
 
@@ -5400,7 +5726,7 @@ msgstr ""
 #: modules/access/v4l/v4l.c:122
 #, fuzzy
 msgid "Samplerate"
-msgstr "サンプルレート"
+msgstr "シンボル・レート"
 
 #: modules/access/v4l/v4l.c:124
 msgid "Samplerate of the captures audio stream, in Hz"
@@ -5446,10 +5772,9 @@ msgstr "Video4Linux"
 msgid "Video4Linux input"
 msgstr "Video4Linux 入力"
 
-#: modules/access/vcd/vcd.c:46 modules/gui/gtk/gnome_interface.c:1614
-#: modules/gui/gtk/gtk_interface.c:1929 modules/gui/macosx/open.m:175
+#: 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/wxwindows/open.cpp:645
+#: modules/gui/wxwidgets/dialogs/open.cpp:698
 msgid "VCD"
 msgstr "VCD"
 
@@ -5460,7 +5785,7 @@ msgstr "VCD 入力"
 #: modules/access/vcd/vcd.c:53
 #, fuzzy
 msgid "[vcd:][device][@[title][,[chapter]]]"
-msgstr "[dvd:][device][@raw_device][@[title][,[chapter][,angle]]]"
+msgstr "[vcd:][device][@[title][,[chapter]]]"
 
 #: modules/access/vcdx/access.c:106
 msgid "The above message had unknown log level"
@@ -5470,45 +5795,33 @@ msgstr ""
 msgid "The above message had unknown vcdimager log level"
 msgstr ""
 
-#: modules/access/vcdx/access.c:282 modules/access/vcdx/access.c:690
-#: modules/access/vcdx/info.c:288 modules/access/vcdx/info.c:289
-#: modules/gui/gtk/open.c:276
+#: modules/access/vcdx/access.c:282 modules/access/vcdx/access.c:364
+#: modules/access/vcdx/access.c:690 modules/access/vcdx/info.c:290
+#: modules/access/vcdx/info.c:291
 msgid "Entry"
 msgstr "エントリ"
 
-#: modules/access/vcdx/access.c:364
-#, fuzzy
-msgid "Entry "
-msgstr "エントリ"
-
 #: modules/access/vcdx/access.c:409 modules/access/vcdx/info.c:102
-#, fuzzy
 msgid "Segments"
-msgstr "スクリーン"
-
-#: modules/access/vcdx/access.c:428 modules/demux/mkv.cpp:4966
-#, fuzzy
-msgid "Segment "
 msgstr "分割"
 
-#: modules/access/vcdx/access.c:472
-msgid "Track "
-msgstr "トラック "
-
-#: modules/access/vcdx/access.c:533
-msgid "LID "
-msgstr ""
-
-#: modules/access/vcdx/access.c:708 modules/access/vcdx/info.c:292
-#: modules/access/vcdx/info.c:293
+#: modules/access/vcdx/access.c:428 modules/access/vcdx/access.c:709
+#: modules/access/vcdx/info.c:294 modules/access/vcdx/info.c:295
+#: modules/demux/mkv.cpp:5200
 msgid "Segment"
 msgstr "分割"
 
+#: modules/access/vcdx/access.c:533
+#, fuzzy
+msgid "LID"
+msgstr "PBC LID"
+
 #: modules/access/vcdx/info.c:90
 msgid "VCD Format"
 msgstr "VCD フォーマット"
 
-#: modules/access/vcdx/info.c:91 modules/services_discovery/daap.c:610
+#: modules/access/vcdx/info.c:91 modules/demux/mpc.c:53
+#: modules/services_discovery/daap.c:610
 msgid "Album"
 msgstr "アルバム"
 
@@ -5532,11 +5845,6 @@ msgstr "最大音量 #"
 msgid "Volume Set"
 msgstr "音量設定"
 
-#: modules/access/vcdx/info.c:97 modules/gui/macosx/intf.m:438
-#: modules/gui/wxwindows/interface.cpp:1420
-msgid "Volume"
-msgstr "音量"
-
 #: modules/access/vcdx/info.c:98
 msgid "Publisher"
 msgstr ""
@@ -5549,64 +5857,64 @@ msgstr "システム ID"
 msgid "Entries"
 msgstr "エントリ"
 
-#: modules/access/vcdx/info.c:120
+#: modules/access/vcdx/info.c:122
 msgid "First Entry Point"
 msgstr "最初のエントリポイント"
 
-#: modules/access/vcdx/info.c:124
+#: modules/access/vcdx/info.c:126
 msgid "Last Entry Point"
 msgstr "最後のエントリポイント"
 
-#: modules/access/vcdx/info.c:125
+#: modules/access/vcdx/info.c:127
 msgid "Track size (in sectors)"
 msgstr ""
 
-#: modules/access/vcdx/info.c:137 modules/access/vcdx/info.c:140
-#: modules/access/vcdx/info.c:149 modules/access/vcdx/info.c:164
+#: modules/access/vcdx/info.c:139 modules/access/vcdx/info.c:142
+#: modules/access/vcdx/info.c:151 modules/access/vcdx/info.c:166
 #, fuzzy
 msgid "type"
 msgstr "タイプ"
 
-#: modules/access/vcdx/info.c:137
+#: modules/access/vcdx/info.c:139
 #, fuzzy
 msgid "end"
 msgstr "ブレンド"
 
-#: modules/access/vcdx/info.c:140
+#: modules/access/vcdx/info.c:142
 #, fuzzy
 msgid "play list"
 msgstr "リスト"
 
-#: modules/access/vcdx/info.c:151
+#: modules/access/vcdx/info.c:153
 #, fuzzy
 msgid "extended selection list"
 msgstr "選択"
 
-#: modules/access/vcdx/info.c:152
+#: modules/access/vcdx/info.c:154
 #, fuzzy
 msgid "selection list"
 msgstr "選択"
 
-#: modules/access/vcdx/info.c:164
+#: modules/access/vcdx/info.c:166
 #, fuzzy
 msgid "unknown type"
 msgstr "<不明>"
 
-#: modules/access/vcdx/info.c:296 modules/access/vcdx/info.c:297
-#: modules/access/vcdx/info.c:314
+#: modules/access/vcdx/info.c:298 modules/access/vcdx/info.c:299
+#: modules/access/vcdx/info.c:316
 msgid "List ID"
 msgstr "一覧 ID"
 
 #: modules/access/vcdx/vcd.c:95
-msgid "vcdx://[device-or-file][@{P,S,T}num]"
+msgid "(Super) Video CD"
 msgstr ""
 
 #: modules/access/vcdx/vcd.c:96
 msgid "Video CD (VCD 1.0, 1.1, 2.0, SVCD, HQVCD) input"
 msgstr "Video CD (VCD 1.0, 1.1, 2.0, SVCD, HQVCD) 入力"
 
-#: modules/access/vcdx/vcd.c:98
-msgid "(Super) Video CD"
+#: modules/access/vcdx/vcd.c:97
+msgid "vcdx://[device-or-file][@{P,S,T}num]"
 msgstr ""
 
 #: modules/access/vcdx/vcd.c:111 modules/access/vcdx/vcd.c:112
@@ -5647,12 +5955,12 @@ msgstr ""
 #: modules/access/vcdx/vcd.c:137
 #, fuzzy
 msgid "Format to use in the playlist's \"author\" field."
-msgstr "プレイリストの \"author\" フィールドで使用するフォーマット"
+msgstr "再生一覧の \"author\" フィールドで使用するフォーマット"
 
 #: modules/access/vcdx/vcd.c:143
 #, fuzzy
 msgid "Format to use in the playlist's \"title\" field."
-msgstr "プレイリストの \"author\" フィールドで使用するフォーマット"
+msgstr "再生一覧の \"author\" フィールドで使用するフォーマット"
 
 #: modules/access_filter/record.c:42
 #, fuzzy
@@ -5664,166 +5972,207 @@ msgstr "ソースディレクトリ"
 msgid "Allows you to specify the directory where the record will be stored"
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: modules/access_filter/timeshift.c:42 modules/access_filter/timeshift.c:43
+#: modules/access_filter/timeshift.c:42
 #, fuzzy
-msgid "Timeshift"
+msgid "Timeshift granularity"
 msgstr "垂直方向位置"
 
+#: modules/access_filter/timeshift.c:43
+msgid "Size of the temporary files use to store the timeshifted stream."
+msgstr ""
+
+#: modules/access_filter/timeshift.c:45
+#, fuzzy
+msgid "Timeshift directory"
+msgstr "ディレクトリを選択する"
+
+#: modules/access_filter/timeshift.c:46
+msgid "Directory used to store the timeshift temporary files."
+msgstr ""
+
+#: modules/access_filter/timeshift.c:50 modules/access_filter/timeshift.c:51
+msgid "Timeshift"
+msgstr "タイムシフト"
+
 #: modules/access_output/dummy.c:40 modules/stream_out/dummy.c:47
 msgid "Dummy stream output"
 msgstr "ダミーストリーム出力"
 
 #: modules/access_output/dummy.c:41 modules/misc/dummy/dummy.c:58
 msgid "Dummy"
-msgstr ""
+msgstr "ダミー"
 
 #: modules/access_output/file.c:65
-#, fuzzy
 msgid "Append to file"
-msgstr "ファイルを開く"
+msgstr "ファイルに追加する"
 
 #: modules/access_output/file.c:66
 msgid "Append to file if it exists instead of replacing it."
 msgstr ""
 
 #: modules/access_output/file.c:70
-#, fuzzy
 msgid "File stream output"
-msgstr "ストリームの出力先の選択"
+msgstr "ファイルストリーム出力"
 
-#: modules/access_output/http.c:47
+#: modules/access_output/http.c:60
 msgid "Username"
 msgstr "ユーザー名"
 
-#: modules/access_output/http.c:48
+#: modules/access_output/http.c:61
 msgid ""
 "Allows you to give a user name that will be requested to access the stream."
 msgstr ""
 
-#: modules/access_output/http.c:50
-msgid "Password"
-msgstr "パスワード"
-
-#: modules/access_output/http.c:51
+#: modules/access_output/http.c:64
 msgid ""
 "Allows you to give a password that will be requested to access the stream."
 msgstr ""
 
-#: modules/access_output/http.c:53
-#, fuzzy
+#: modules/access_output/http.c:66
 msgid "Mime"
-msgstr "時間"
+msgstr "Mime"
 
-#: modules/access_output/http.c:54
+#: modules/access_output/http.c:67
 #, fuzzy
 msgid "Allows you to give the mime returned by the server."
 msgstr ""
 "ファイルを見つけるときにオープンされるインタフェースの既定のパスを設定しま"
 "す。"
 
-#: modules/access_output/http.c:56 modules/control/http.c:81
-#, fuzzy
-msgid "Certificate file"
-msgstr "字幕ファイルを使用"
-
-#: modules/access_output/http.c:57
+#: modules/access_output/http.c:70
 msgid ""
 "Path to the x509 PEM certificate file that will be used by the HTTP/SSL "
 "stream output"
 msgstr ""
 
-#: modules/access_output/http.c:59 modules/control/http.c:84
-msgid "Private key file"
-msgstr ""
-
-#: modules/access_output/http.c:60
+#: modules/access_output/http.c:73
 msgid ""
 "Path to the x509 PEM private key file that will  be used by the HTTP/SSL "
 "stream output. Leave empty if you don't have one."
 msgstr ""
 
-#: modules/access_output/http.c:63 modules/control/http.c:86
-#, fuzzy
-msgid "Root CA file"
-msgstr "ファイルを選択する"
-
-#: modules/access_output/http.c:64
+#: modules/access_output/http.c:77
 msgid ""
 "Path to the x509 PEM trusted root CA certificates (certificate authority) "
 "file that will be used by the HTTP/SSL stream output. Leave empty if you "
 "don't have one."
 msgstr ""
 
-#: modules/access_output/http.c:68 modules/control/http.c:89
-#, fuzzy
-msgid "CRL file"
-msgstr "PLS ファイル"
-
-#: modules/access_output/http.c:69
+#: modules/access_output/http.c:82
 msgid ""
 "Path to the x509 PEM Certificates Revocation List file that will be HTTP/SSL "
 "stream output. Leave empty if you don't have one."
 msgstr ""
 
-#: modules/access_output/http.c:74
-#, fuzzy
+#: modules/access_output/http.c:85
+msgid "Advertise with Bonjour"
+msgstr ""
+
+#: modules/access_output/http.c:86
+msgid "Advertise the stream with the Bonjour protocol"
+msgstr ""
+
+#: modules/access_output/http.c:90
 msgid "HTTP stream output"
-msgstr "ストリームの出力先の選択"
+msgstr "HTTP ストリーム出力"
 
-#: modules/access_output/http.c:76 modules/control/http.c:93
-#: modules/gui/wxwindows/streamdata.h:137
-#: modules/gui/wxwindows/streamout.cpp:457
+#: modules/access_output/http.c:92 modules/control/http/http.c:58
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:473
 msgid "HTTP"
+msgstr "HTTP"
+
+#: modules/access_output/shout.c:58
+msgid "Stream-name"
+msgstr "ストリーム名"
+
+#: modules/access_output/shout.c:59
+msgid "The name this stream/channel will get on the icecast server."
 msgstr ""
 
-#: modules/access_output/udp.c:64 modules/demux/livedotcom.cpp:61
-msgid "Caching value (ms)"
-msgstr "キャッシング値 (ミリ秒)"
+#: modules/access_output/shout.c:61
+#, fuzzy
+msgid "Stream-description"
+msgstr "コーデック説明"
+
+#: modules/access_output/shout.c:62
+msgid "A description of the stream content. (Information about your channel)."
+msgstr ""
+
+#: modules/access_output/shout.c:65
+msgid "Stream MP3"
+msgstr "ストリーム MP3"
+
+#: modules/access_output/shout.c:66
+msgid ""
+"Normally you have to feed the shoutcast module with Ogg streams. This option "
+"allows you to feed MP3 streams instead, so you can forward MP3 streams to "
+"the icecast server."
+msgstr ""
 
-#: modules/access_output/udp.c:70
-msgid "Allows you to define the time to live of the outgoing stream."
+#: modules/access_output/shout.c:71
+msgid "libshout (icecast) output"
 msgstr ""
 
-#: modules/access_output/udp.c:73
+#: modules/access_output/udp.c:80 modules/gui/macosx/wizard.m:433
+#: modules/gui/macosx/wizard.m:1661
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:607
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:1332 modules/stream_out/rtp.c:80
+msgid "Time-To-Live (TTL)"
+msgstr "生存時間 (TTL):"
+
+#: modules/access_output/udp.c:81
+#, fuzzy
+msgid "Allows you to define the Time-To-Live of the outgoing stream."
+msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+
+#: modules/access_output/udp.c:84
 msgid "Group packets"
 msgstr "グループパケット"
 
-#: modules/access_output/udp.c:74
+#: modules/access_output/udp.c:85
 msgid ""
 "Packets can be sent one by one at the right time or by groups. This allows "
 "you to give the number of packets that will be sent at a time. It helps "
 "reducing the scheduling load on heavily-loaded systems."
 msgstr ""
 
-#: modules/access_output/udp.c:79
+#: modules/access_output/udp.c:90
 msgid "Raw write"
 msgstr ""
 
-#: modules/access_output/udp.c:80
+#: modules/access_output/udp.c:91
 msgid ""
 "If you enable this option, packets will be sent directly, without trying to "
 "fill the MTU (ie, without trying to make the biggest possible packets in "
 "order to improve streaming)."
 msgstr ""
 
-#: modules/access_output/udp.c:86
-#, fuzzy
+#: modules/access_output/udp.c:97
 msgid "UDP stream output"
 msgstr "UDP ストリーム出力"
 
-#: modules/access_output/udp.c:87 modules/gui/gtk/gnome_interface.c:2869
-#: modules/gui/wxwindows/streamout.cpp:459
+#: modules/access_output/udp.c:98
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:476
 msgid "UDP"
 msgstr "UDP"
 
+#: modules/audio_filter/channel_mixer/dolby.c:47
+msgid "Simple decoder for dolby surround encoded streams"
+msgstr ""
+
+#: modules/audio_filter/channel_mixer/dolby.c:48
+#, fuzzy
+msgid "Dolby surround decoder"
+msgstr "ドルビーサラウンド"
+
 #: modules/audio_filter/channel_mixer/headphone.c:49
 #, fuzzy
 msgid ""
 "This effect gives you the feeling that you are standing in a room with a "
-"complete 5.1 speaker set when using only a headphone, providing a more "
+"complete 7.1 speaker set when using only a headphone, providing a more "
 "realistic sound experience. It should also be more comfortable and less "
 "tiring when listening to music for long periods of time.\n"
-"It works with any source format from mono to 5.1."
+"It works with any source format from mono to 7.1."
 msgstr ""
 "このオプションは完全な5.1チャンネル・スピーカが設定された部屋で聞いているかの"
 "ような効果をヘッドホーンの音声に与えより臨場感を持たせます。また、長時間のリ"
@@ -5843,15 +6192,35 @@ msgstr ""
 "ヘッドホーンの仮想的な音の広がり効果：フロント左側スピーカとリスナーの間の距"
 "離をメートルで指定します。"
 
-#: modules/audio_filter/channel_mixer/headphone.c:61
+#: modules/audio_filter/channel_mixer/headphone.c:60
+msgid "Compensate delay"
+msgstr ""
+
+#: modules/audio_filter/channel_mixer/headphone.c:62
+msgid ""
+"The delay which is introduced by the physical algorithm may sometimes be "
+"disturbing for the lipsync. In that case, turn this on to compensate."
+msgstr ""
+
+#: modules/audio_filter/channel_mixer/headphone.c:66
+#, fuzzy
+msgid "No decoding of Dolby Surround"
+msgstr "ドルビーサラウンド"
+
+#: modules/audio_filter/channel_mixer/headphone.c:68
+msgid ""
+"If this option is turned on (not recommended), Dolby Surround encoded "
+"streams won't be decoded before being processed by this filter."
+msgstr ""
+
+#: modules/audio_filter/channel_mixer/headphone.c:73
 #, fuzzy
 msgid "Headphone channel mixer with virtual spatialization effect"
 msgstr "ヘッドホーンの仮想的な音の広がり効果"
 
-#: modules/audio_filter/channel_mixer/headphone.c:62
-#, fuzzy
+#: modules/audio_filter/channel_mixer/headphone.c:74
 msgid "Headphone effect"
-msgstr "スコープ効果"
+msgstr "ヘッドフォンエフェクト"
 
 #: modules/audio_filter/channel_mixer/simple.c:46
 #, fuzzy
@@ -5880,8 +6249,17 @@ msgstr ""
 "このオプションを無効にして再生すれば、映画館やリスニング・ルームなどでの再生"
 "により適切になります。"
 
-#: modules/audio_filter/converter/a52tofloat32.c:104
-#: modules/audio_filter/converter/a52tofloat32.c:112
+#: modules/audio_filter/converter/a52tofloat32.c:101
+#, fuzzy
+msgid "Enable internal upmixing"
+msgstr "字幕・デコーダ・モジュール"
+
+#: modules/audio_filter/converter/a52tofloat32.c:103
+msgid "Enable the internal upmixing algorithm (not recommended)."
+msgstr ""
+
+#: modules/audio_filter/converter/a52tofloat32.c:107
+#: modules/audio_filter/converter/a52tofloat32.c:116
 #, fuzzy
 msgid "ATSC A/52 (AC-3) audio decoder"
 msgstr "a52 ATSC A/52(AC-3)オーディオ・デコーダ・モジュール"
@@ -5968,22 +6346,20 @@ msgid "audio filter for u8->float32 conversion"
 msgstr "s16->float32変換のためのオーディオ・フィルター"
 
 #: modules/audio_filter/equalizer.c:52
-#, fuzzy
 msgid "Equalizer preset"
-msgstr "ビデオ・フィルター・モジュール"
+msgstr "イコライザーのプリセット"
 
 #: modules/audio_filter/equalizer.c:55
 msgid "Bands gain"
-msgstr ""
+msgstr "バンドゲイン"
 
 #: modules/audio_filter/equalizer.c:56
 msgid "Override preset bands gain in dB (-20 ... 20)"
 msgstr ""
 
 #: modules/audio_filter/equalizer.c:58
-#, fuzzy
 msgid "Two pass"
-msgstr "FTP パスワード"
+msgstr "2 パス"
 
 #: modules/audio_filter/equalizer.c:59
 msgid "Filter twice the audio"
@@ -5991,21 +6367,19 @@ msgstr ""
 
 #: modules/audio_filter/equalizer.c:61
 msgid "Global gain"
-msgstr ""
+msgstr "全体のゲイン"
 
 #: modules/audio_filter/equalizer.c:62
 msgid "Set the global gain in dB (-20 ... 20)"
 msgstr ""
 
 #: modules/audio_filter/equalizer.c:65
-#, fuzzy
 msgid "Equalizer 10 bands"
-msgstr "ビデオ・フィルター・モジュール"
+msgstr "10 バンドイコライザー"
 
 #: modules/audio_filter/equalizer_presets.h:39
-#, fuzzy
 msgid "Flat"
-msgstr "早送り"
+msgstr "フラット"
 
 #: modules/audio_filter/equalizer_presets.h:39
 #: modules/demux/util/id3genres.h:60
@@ -6013,9 +6387,8 @@ msgid "Classical"
 msgstr "クラシカル"
 
 #: modules/audio_filter/equalizer_presets.h:39
-#, fuzzy
 msgid "Club"
-msgstr "キューブ"
+msgstr "クラブ"
 
 #: modules/audio_filter/equalizer_presets.h:39
 #: modules/demux/util/id3genres.h:31
@@ -6024,35 +6397,31 @@ msgstr "ダンス"
 
 #: modules/audio_filter/equalizer_presets.h:39
 msgid "Full bass"
-msgstr ""
+msgstr "フルベース"
 
 #: modules/audio_filter/equalizer_presets.h:40
 msgid "Full bass and treble"
-msgstr ""
+msgstr "フルベースとトレブル"
 
 #: modules/audio_filter/equalizer_presets.h:40
-#, fuzzy
 msgid "Full treble"
-msgstr "全画面化"
+msgstr "フルトレブル"
 
 #: modules/audio_filter/equalizer_presets.h:40
 msgid "Headphones"
-msgstr ""
+msgstr "ヘッドフォン"
 
 #: modules/audio_filter/equalizer_presets.h:41
-#, fuzzy
 msgid "Large Hall"
-msgstr "大きい"
+msgstr "大きなホール大きい"
 
 #: modules/audio_filter/equalizer_presets.h:41
-#, fuzzy
 msgid "Live"
-msgstr "リニア"
+msgstr "ライブ"
 
 #: modules/audio_filter/equalizer_presets.h:41
-#, fuzzy
 msgid "Party"
-msgstr "ポート番号"
+msgstr "パーティ"
 
 #: modules/audio_filter/equalizer_presets.h:41
 #: modules/demux/util/id3genres.h:41
@@ -6075,14 +6444,12 @@ msgid "Ska"
 msgstr "スカ"
 
 #: modules/audio_filter/equalizer_presets.h:42
-#, fuzzy
 msgid "Soft"
-msgstr "ソート(&O)"
+msgstr "ソフト"
 
 #: modules/audio_filter/equalizer_presets.h:42
-#, fuzzy
 msgid "Soft rock"
-msgstr "西海岸ロック"
+msgstr "ソフトロック"
 
 #: modules/audio_filter/equalizer_presets.h:42
 #: modules/demux/util/id3genres.h:46
@@ -6095,9 +6462,8 @@ msgid "audio filter for PCM format conversion"
 msgstr "float32->s8変換のためのオーディオ・フィルター"
 
 #: modules/audio_filter/normvol.c:69
-#, fuzzy
 msgid "Number of audio buffers"
-msgstr "バンド数"
+msgstr "オーディオバッファの数"
 
 #: modules/audio_filter/normvol.c:70
 msgid ""
@@ -6107,9 +6473,8 @@ msgid ""
 msgstr ""
 
 #: modules/audio_filter/normvol.c:75
-#, fuzzy
 msgid "Max level"
-msgstr "品質レベル"
+msgstr "最大レベル"
 
 #: modules/audio_filter/normvol.c:76
 msgid ""
@@ -6120,18 +6485,13 @@ msgstr ""
 
 #: modules/audio_filter/normvol.c:82 modules/audio_filter/normvol.c:83
 msgid "Volume normalizer"
-msgstr ""
+msgstr "音量ノーマライザー"
 
 #: modules/audio_filter/resampler/bandlimited.c:84
 #, fuzzy
 msgid "audio filter for band-limited interpolation resampling"
 msgstr "微妙な再サンプリングのためのオーディオ・フィルター"
 
-#: modules/audio_filter/resampler/coreaudio.c:65
-#, fuzzy
-msgid "audio filter using CoreAudio for resampling"
-msgstr "荒れた再サンプリングのためのオーディオ・フィルター"
-
 #: modules/audio_filter/resampler/linear.c:65
 #: modules/audio_filter/resampler/linear.c:72
 #, fuzzy
@@ -6161,7 +6521,8 @@ msgstr "ダミーのspdifオーディオ・ミキサー・モジュール"
 msgid "Trivial audio mixer"
 msgstr "微妙なオーディオ・ミキサー・モジュール"
 
-#: modules/audio_output/alsa.c:84 modules/codec/x264.c:124
+#: modules/audio_output/alsa.c:84 modules/codec/x264.c:169
+#: modules/codec/x264.c:175
 msgid "default"
 msgstr "デフォルト"
 
@@ -6174,91 +6535,91 @@ msgstr "ALSAオーディオ・モジュール"
 msgid "ALSA Device Name"
 msgstr "ALSA デバイス名"
 
-#: modules/audio_output/alsa.c:130 modules/audio_output/auhal.c:95
-#: modules/audio_output/auhal.c:565 modules/audio_output/coreaudio.c:217
-#: modules/audio_output/directx.c:412 modules/audio_output/oss.c:132
-#: modules/audio_output/portaudio.c:394 modules/audio_output/sdl.c:179
-#: modules/audio_output/sdl.c:197 modules/audio_output/waveout.c:354
-#: modules/gui/macosx/intf.m:501 modules/gui/macosx/intf.m:502
+#: modules/audio_output/alsa.c:128 modules/audio_output/auhal.c:129
+#: modules/audio_output/auhal.c:966 modules/audio_output/directx.c:403
+#: modules/audio_output/oss.c:132 modules/audio_output/portaudio.c:394
+#: modules/audio_output/sdl.c:179 modules/audio_output/sdl.c:197
+#: modules/audio_output/waveout.c:371 modules/gui/macosx/intf.m:543
+#: modules/gui/macosx/intf.m:544
 msgid "Audio Device"
 msgstr "オーディオデバイス"
 
-#: modules/audio_output/alsa.c:184 modules/audio_output/directx.c:489
+#: modules/audio_output/alsa.c:185 modules/audio_output/directx.c:480
 #: modules/audio_output/oss.c:225 modules/audio_output/portaudio.c:400
 #: modules/audio_output/sdl.c:185 modules/audio_output/sdl.c:204
-#: modules/audio_output/waveout.c:416
+#: modules/audio_output/waveout.c:433
 msgid "Mono"
 msgstr "モノラル"
 
-#: modules/audio_output/alsa.c:197 modules/audio_output/directx.c:462
+#: modules/audio_output/alsa.c:198 modules/audio_output/directx.c:453
 #: modules/audio_output/oss.c:181 modules/audio_output/portaudio.c:419
-#: modules/audio_output/waveout.c:388
+#: modules/audio_output/waveout.c:405
 msgid "2 Front 2 Rear"
 msgstr "フロント 2, リア 2"
 
-#: modules/audio_output/alsa.c:203 modules/audio_output/directx.c:426
+#: modules/audio_output/alsa.c:204 modules/audio_output/directx.c:417
 #: modules/audio_output/oss.c:170 modules/audio_output/portaudio.c:435
-#: modules/audio_output/waveout.c:369
+#: modules/audio_output/waveout.c:386
 msgid "5.1"
 msgstr "5.1"
 
-#: modules/audio_output/alsa.c:245 modules/audio_output/directx.c:535
-#: modules/audio_output/oss.c:249 modules/audio_output/waveout.c:432
+#: modules/audio_output/alsa.c:246 modules/audio_output/directx.c:526
+#: 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:878
+#: modules/audio_output/alsa.c:928
+#, fuzzy
 msgid "Unknown soundcard"
-msgstr ""
+msgstr "不明のビデオ"
 
 #: modules/audio_output/arts.c:67
 #, fuzzy
 msgid "aRts audio output"
 msgstr "aRtsオーディオ・モジュール"
 
-#: modules/audio_output/auhal.c:96 modules/audio_output/coreaudio.c:218
+#: modules/audio_output/auhal.c:130
 msgid ""
 "Choose a number corresponding to the number of an audio device, as listed in "
 "your 'Audio Device' menu. This device will then be used by default for audio "
 "playback."
 msgstr ""
 
-#: modules/audio_output/auhal.c:102
+#: modules/audio_output/auhal.c:136
 #, fuzzy
 msgid "HAL AudioUnit output"
 msgstr "ALSAオーディオ・モジュール"
 
-#: modules/audio_output/coreaudio.c:224
-msgid "CoreAudio output"
-msgstr "コアオーディオ出力"
+#: modules/audio_output/auhal.c:1011
+#, c-format
+msgid "%s (Encoded Output)"
+msgstr ""
 
-#: modules/audio_output/directx.c:213 modules/audio_output/portaudio.c:107
-#, fuzzy
+#: modules/audio_output/directx.c:207 modules/audio_output/portaudio.c:107
 msgid "Output device"
-msgstr "出力フォーマット"
+msgstr "出力デバイス"
 
-#: modules/audio_output/directx.c:215
+#: modules/audio_output/directx.c:209
 msgid ""
 "DirectX device number: 0 default device, 1..N device by number(Note that the "
 "default device appears as 0 AND another number)."
 msgstr ""
 
-#: modules/audio_output/directx.c:217 modules/audio_output/waveout.c:133
-#, fuzzy
+#: modules/audio_output/directx.c:211 modules/audio_output/waveout.c:137
 msgid "Use float32 output"
-msgstr "ストリームの出力先の選択"
+msgstr "32 ビット浮動小数点を使う"
 
-#: modules/audio_output/directx.c:219 modules/audio_output/waveout.c:135
+#: modules/audio_output/directx.c:213 modules/audio_output/waveout.c:139
 msgid ""
 "The option allows you to enable or disable the high-quality float32 audio "
 "output mode (which is not well supported by some soundcards)."
 msgstr ""
 
-#: modules/audio_output/directx.c:223
+#: modules/audio_output/directx.c:217
 msgid "DirectX audio output"
 msgstr "DirectX オーディオ出力"
 
-#: modules/audio_output/directx.c:444 modules/audio_output/portaudio.c:427
+#: modules/audio_output/directx.c:435 modules/audio_output/portaudio.c:427
 msgid "3 Front 2 Rear"
 msgstr "フロント 3, リア 2"
 
@@ -6267,9 +6628,8 @@ msgid "EsounD audio output"
 msgstr "EsounD オーディオ出力"
 
 #: modules/audio_output/esd.c:72
-#, fuzzy
 msgid "Esound server"
-msgstr "サーバーなし"
+msgstr "Esound サーバー"
 
 #: modules/audio_output/file.c:80
 msgid "Output format"
@@ -6313,9 +6673,13 @@ msgid "File audio output"
 msgstr "ファイルオーディオ出力"
 
 #: modules/audio_output/hd1000a.cpp:76
-#, fuzzy
 msgid "Roku HD1000 audio output"
-msgstr "HD1000 オーディオ出力"
+msgstr "Roku HD1000 オーディオ出力"
+
+#: modules/audio_output/jack.c:66
+#, fuzzy
+msgid "JACK audio output"
+msgstr "ALSAオーディオ・モジュール"
 
 #: modules/audio_output/oss.c:101
 msgid "Try to work around buggy OSS drivers"
@@ -6353,15 +6717,15 @@ msgstr "ALSAオーディオ・モジュール"
 msgid "Simple DirectMedia Layer audio output"
 msgstr "シンプル DirectMedia レイヤオーディオ出力"
 
-#: modules/audio_output/waveout.c:140
+#: modules/audio_output/waveout.c:144
 msgid "Win32 waveOut extension output"
 msgstr "Win32 wave 出力用拡張モジュール"
 
-#: modules/codec/a52.c:90
+#: modules/codec/a52.c:91
 msgid "A/52 parser"
 msgstr "A/52 パーサー"
 
-#: modules/codec/a52.c:97
+#: modules/codec/a52.c:98
 msgid "A/52 audio packetizer"
 msgstr ""
 
@@ -6378,7 +6742,6 @@ msgid "Raw audio encoder"
 msgstr "生オーディオデコーダー"
 
 #: modules/codec/cinepak.c:38
-#, fuzzy
 msgid "Cinepak video decoder"
 msgstr "シネパックビデオデコーダー"
 
@@ -6407,39 +6770,77 @@ msgid "Allows you to specify a quality between 1.0 (low) and 10.0 (high)."
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
 #: modules/codec/dirac.c:73
-#, fuzzy
 msgid "Dirac video decoder"
-msgstr "DV ビデオデコーダ"
+msgstr "DV ビデオデコーダー"
 
 #: modules/codec/dirac.c:79
-#, fuzzy
 msgid "Dirac video encoder"
-msgstr "DVビデオ・デコーダ"
+msgstr "Dirac ビデオデコーダー"
 
 #: modules/codec/dmo/dmo.c:99
 msgid "DirectMedia Object decoder"
-msgstr ""
+msgstr "DirectMedia オブジェクトデコーダー"
 
 #: modules/codec/dmo/dmo.c:108
 msgid "DirectMedia Object encoder"
-msgstr ""
+msgstr "DirectMedia オブジェクトエンコーダー"
 
-#: modules/codec/dts.c:91
-#, fuzzy
+#: modules/codec/dts.c:95
 msgid "DTS parser"
 msgstr "DTS パーサー"
 
-#: modules/codec/dts.c:96
+#: modules/codec/dts.c:100
 #, fuzzy
 msgid "DTS audio packetizer"
 msgstr "DTS オーディオデコーダー"
 
-#: modules/codec/dvbsub.c:56
+#: modules/codec/dvbsub.c:45
+msgid "X coordinate of the subpicture"
+msgstr ""
+
+#: 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."
+msgstr ""
+
+#: modules/codec/dvbsub.c:48
+msgid "Y coordinate of the subpicture"
+msgstr ""
+
+#: modules/codec/dvbsub.c:51
+msgid "Subpicture position"
+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)."
+msgstr ""
+
+#: modules/codec/dvbsub.c:57
+msgid "X coordinate of the encoded subpicture"
+msgstr ""
+
+#: modules/codec/dvbsub.c:60
+msgid "Y coordinate of encoded the subpicture"
+msgstr ""
+
+#: modules/codec/dvbsub.c:63
+msgid "Timeout of subpictures"
+msgstr "字幕のタイムアウト"
+
+#: 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."
+msgstr ""
+
+#: modules/codec/dvbsub.c:86
 #, fuzzy
 msgid "DVB subtitles decoder"
 msgstr "DVB 字幕デコーダ"
 
-#: modules/codec/dvbsub.c:64
+#: modules/codec/dvbsub.c:99
 #, fuzzy
 msgid "DVB subtitles encoder"
 msgstr "DVB 字幕デコーダ"
@@ -6449,82 +6850,135 @@ msgstr "DVB 字幕デコーダ"
 msgid "AAC audio decoder (using libfaad2)"
 msgstr "AAC オーディオデコーダ (libfaad2)"
 
-#: modules/codec/fake.c:51 modules/video_output/image.c:63
-#, fuzzy
+#: modules/codec/fake.c:44 modules/video_output/image.c:63
 msgid "Image file"
-msgstr "サイズ"
+msgstr "画像ファイル"
 
-#: modules/codec/fake.c:53
+#: modules/codec/fake.c:46
 msgid "Path of the image file when using the fake input."
 msgstr ""
 
-#: modules/codec/fake.c:54
+#: modules/codec/fake.c:49 modules/stream_out/mosaic_bridge.c:109
+#: modules/stream_out/transcode.c:72
+msgid "Allows you to specify the output video width."
+msgstr ""
+
+#: modules/codec/fake.c:52 modules/stream_out/mosaic_bridge.c:112
+#: modules/stream_out/transcode.c:75
 #, fuzzy
-msgid "Background aspect ratio"
+msgid "Allows you to specify the output video height."
+msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+
+#: modules/codec/fake.c:53
+#, fuzzy
+msgid "Keep aspect ratio"
 msgstr "ソースのアスペクト比"
 
+#: modules/codec/fake.c:55
+msgid "If selected, width and height will be considered as maximum values."
+msgstr ""
+
 #: modules/codec/fake.c:56
-msgid "Aspect ratio of the image file (4:3, 16:9)."
+msgid "Background aspect ratio"
+msgstr "背景のアスペクト比"
+
+#: modules/codec/fake.c:58
+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
+#, fuzzy
+msgid "Deinterlace video"
+msgstr "ノンインタレース化モード"
+
 #: modules/codec/fake.c:61
 #, fuzzy
-msgid "fake video decoder"
-msgstr "シネパックビデオデコーダー"
+msgid "Allows you to deinterlace the image after loading."
+msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: modules/codec/ffmpeg/ffmpeg.c:74
-msgid "rd"
+#: modules/codec/fake.c:62 modules/stream_out/transcode.c:67
+#, 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:75
+#, fuzzy
+msgid "Fake video decoder"
+msgstr "DV ビデオデコーダ"
+
+#: modules/codec/ffmpeg/ffmpeg.c:75
+#, fuzzy
+msgid "Non-ref"
+msgstr "なし"
+
+#: modules/codec/ffmpeg/ffmpeg.c:75
+#, fuzzy
+msgid "Bidir"
+msgstr "リニア"
+
+#: modules/codec/ffmpeg/ffmpeg.c:75
+#, fuzzy
+msgid "Non-key"
+msgstr "なし"
+
+#: modules/codec/ffmpeg/ffmpeg.c:75
+msgid "All"
+msgstr "すべて"
+
+#: modules/codec/ffmpeg/ffmpeg.c:78
+msgid "rd"
 msgstr "rd"
 
-#: modules/codec/ffmpeg/ffmpeg.c:74
+#: modules/codec/ffmpeg/ffmpeg.c:78
 msgid "bits"
 msgstr "ビット"
 
-#: modules/codec/ffmpeg/ffmpeg.c:74
+#: modules/codec/ffmpeg/ffmpeg.c:78
 msgid "simple"
 msgstr "シンプル"
 
-#: modules/codec/ffmpeg/ffmpeg.c:85
+#: modules/codec/ffmpeg/ffmpeg.c:89
 #, fuzzy
 msgid ""
 "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:89
+#: modules/codec/ffmpeg/ffmpeg.c:93
 #, fuzzy
 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:92
-#, fuzzy
+#: modules/codec/ffmpeg/ffmpeg.c:96
 msgid "Decoding"
-msgstr "字幕エンコンコード中"
+msgstr "出k-土中"
 
-#: modules/codec/ffmpeg/ffmpeg.c:120
+#: modules/codec/ffmpeg/ffmpeg.c:127
 msgid "ffmpeg chroma conversion"
-msgstr ""
+msgstr "ffmpeg クロマ変換"
 
-#: modules/codec/ffmpeg/ffmpeg.c:124
-#, fuzzy
+#: modules/codec/ffmpeg/ffmpeg.c:131
 msgid "Encoding"
-msgstr "字幕エンコンコード中"
+msgstr "エンコード中"
 
-#: modules/codec/ffmpeg/ffmpeg.c:125
-#, fuzzy
+#: modules/codec/ffmpeg/ffmpeg.c:132
 msgid "ffmpeg audio/video encoder"
-msgstr "疑似AC3オーディオ・デコーダ"
+msgstr "ffmpeg オーディオ/ビデオエンコーダー"
 
-#: modules/codec/ffmpeg/ffmpeg.c:181
+#: modules/codec/ffmpeg/ffmpeg.c:190
 #, fuzzy
 msgid "ffmpeg demuxer"
 msgstr "MPEG 1/2レイヤ1/2オーディオ・デコーダ"
 
-#: modules/codec/ffmpeg/ffmpeg.c:189
+#: modules/codec/ffmpeg/ffmpeg.c:198
 #, fuzzy
 msgid "ffmpeg video filter"
 msgstr "ビデオ・フィルター・モジュール"
 
-#: modules/codec/ffmpeg/ffmpeg.c:195
+#: modules/codec/ffmpeg/ffmpeg.c:204
 #, fuzzy
 msgid "ffmpeg deinterlace video filter"
 msgstr "ビデオ逆転モジュール"
@@ -6561,8 +7015,8 @@ msgid ""
 "64 Qpel chroma"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:106 modules/codec/ffmpeg/ffmpeg.h:226
-#: modules/stream_out/transcode.c:140
+#: modules/codec/ffmpeg/ffmpeg.h:106 modules/codec/ffmpeg/ffmpeg.h:235
+#: modules/stream_out/transcode.c:152
 msgid "Hurry up"
 msgstr "急いで"
 
@@ -6615,125 +7069,146 @@ msgid "Will only decode a low resolution version of the video."
 msgstr ""
 
 #: modules/codec/ffmpeg/ffmpeg.h:131
+msgid "Skip the loop filter for H.264 decoding"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.h:132
+msgid ""
+"Skipping the loop filter (aka deblocking) usually has a detrimental effect "
+"on quality. However for HDTV streams this provides a big speedup."
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.h:136
 #, fuzzy
 msgid "ffmpeg post processing filter chains"
 msgstr "ffmpeg 後処理モジュール"
 
-#: modules/codec/ffmpeg/ffmpeg.h:173
+#: modules/codec/ffmpeg/ffmpeg.h:178
 msgid "Ratio of key frames"
 msgstr "キーフレームの割合"
 
-#: modules/codec/ffmpeg/ffmpeg.h:174
+#: modules/codec/ffmpeg/ffmpeg.h:179
 msgid ""
 "Allows you to specify the number of frames that will be coded for one key "
 "frame."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:177
+#: modules/codec/ffmpeg/ffmpeg.h:182
 msgid "Ratio of B frames"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:178
+#: modules/codec/ffmpeg/ffmpeg.h:183
 msgid ""
 "Allows you to specify the number of B frames that will be coded between two "
 "reference frames."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:181
+#: modules/codec/ffmpeg/ffmpeg.h:186
 #, fuzzy
 msgid "Video bitrate tolerance"
 msgstr "オーディオ"
 
-#: modules/codec/ffmpeg/ffmpeg.h:182
+#: modules/codec/ffmpeg/ffmpeg.h:187
 msgid "Allows you to specify the video bitrate tolerance in kbit/s."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:185
+#: modules/codec/ffmpeg/ffmpeg.h:190
 #, fuzzy
 msgid "Enable interlaced encoding"
 msgstr "字幕・デコーダ・モジュール"
 
-#: modules/codec/ffmpeg/ffmpeg.h:186
+#: modules/codec/ffmpeg/ffmpeg.h:191
 msgid "Allows you to enable dedicated algorithms for interlaced frames."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:189
+#: modules/codec/ffmpeg/ffmpeg.h:194
+#, fuzzy
+msgid "Enable 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:198
 msgid "Enable pre motion estimation"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:190
+#: modules/codec/ffmpeg/ffmpeg.h:199
 msgid "Allows you to enable the pre motion estimation."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:193
+#: modules/codec/ffmpeg/ffmpeg.h:202
 msgid "Enable strict rate control"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:194
+#: modules/codec/ffmpeg/ffmpeg.h:203
 msgid "Allows you to enable the strict rate control algorithm."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:197
+#: modules/codec/ffmpeg/ffmpeg.h:206
 #, fuzzy
 msgid "Rate control buffer size"
 msgstr "リモート・コントロール・インタフェース・モジュール"
 
-#: modules/codec/ffmpeg/ffmpeg.h:198
+#: modules/codec/ffmpeg/ffmpeg.h:207
 msgid "Allows you to specify the rate control buffer size."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:201
+#: modules/codec/ffmpeg/ffmpeg.h:210
 #, fuzzy
 msgid "Rate control buffer aggressiveness"
 msgstr "リモート・コントロール・インタフェース・モジュール"
 
-#: modules/codec/ffmpeg/ffmpeg.h:202
+#: modules/codec/ffmpeg/ffmpeg.h:211
 #, fuzzy
 msgid "Allows you to specify the rate control buffer aggressiveness."
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: modules/codec/ffmpeg/ffmpeg.h:205
+#: modules/codec/ffmpeg/ffmpeg.h:214
 msgid "I quantization factor"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:206
+#: modules/codec/ffmpeg/ffmpeg.h:215
 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)."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:210 modules/demux/mod.c:54
+#: modules/codec/ffmpeg/ffmpeg.h:219 modules/demux/mod.c:54
 msgid "Noise reduction"
 msgstr "ノイズリダクション"
 
-#: modules/codec/ffmpeg/ffmpeg.h:211
+#: modules/codec/ffmpeg/ffmpeg.h:220
 msgid ""
 "Allows you to 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:215
+#: modules/codec/ffmpeg/ffmpeg.h:224
 msgid "Enable MPEG4 quantization matrix"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:216
+#: modules/codec/ffmpeg/ffmpeg.h:225
 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."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:221
+#: modules/codec/ffmpeg/ffmpeg.h:230
 msgid "Quality level"
 msgstr "品質レベル"
 
-#: modules/codec/ffmpeg/ffmpeg.h:222
+#: modules/codec/ffmpeg/ffmpeg.h:231
 msgid ""
 "Allows you to specify the quality level for the encoding of motions vectors "
 "(this can slow down the encoding very much)."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:227
+#: modules/codec/ffmpeg/ffmpeg.h:236
 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 "
@@ -6741,113 +7216,113 @@ msgid ""
 "raise the noise reduction threshold to ease the encoder's task."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:233
+#: modules/codec/ffmpeg/ffmpeg.h:242
 msgid "Minimum video quantizer scale"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:234
+#: modules/codec/ffmpeg/ffmpeg.h:243
 msgid "Allows you to specify the minimum video quantizer scale."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:237
+#: modules/codec/ffmpeg/ffmpeg.h:246
 msgid "Maximum video quantizer scale"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:238
+#: modules/codec/ffmpeg/ffmpeg.h:247
 msgid "Allows you to specify the maximum video quantizer scale."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:241
+#: modules/codec/ffmpeg/ffmpeg.h:250
 msgid "Enable trellis quantization"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:242
+#: modules/codec/ffmpeg/ffmpeg.h:251
 msgid ""
 "Allows you to enable trellis quantization (rate distortion for block "
 "coefficients)."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:245
+#: modules/codec/ffmpeg/ffmpeg.h:254
 msgid "Use fixed video quantizer scale"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:246
+#: modules/codec/ffmpeg/ffmpeg.h:255
 msgid ""
 "Allows you to specify a fixed video quantizer scale for VBR encoding "
 "(accepted values: 0.01 to 255.0)."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:249
+#: modules/codec/ffmpeg/ffmpeg.h:258
 msgid "Strict standard compliance"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:250
+#: modules/codec/ffmpeg/ffmpeg.h:259
 msgid ""
 "Allows you to force a strict standard compliance when encoding (accepted "
 "values: -1, 0, 1)."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:253
+#: modules/codec/ffmpeg/ffmpeg.h:262
 msgid "Luminance masking"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:254
+#: modules/codec/ffmpeg/ffmpeg.h:263
 msgid ""
 "Allows you to raise the quantizer for very bright macroblocks (default: 0.0)."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:257
+#: modules/codec/ffmpeg/ffmpeg.h:266
 msgid "Darkness masking"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:258
+#: modules/codec/ffmpeg/ffmpeg.h:267
 msgid ""
 "Allows you to raise the quantizer for very dark macroblocks (default: 0.0)."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:261
+#: modules/codec/ffmpeg/ffmpeg.h:270
 #, fuzzy
 msgid "Motion masking"
 msgstr "自動縁取り"
 
-#: modules/codec/ffmpeg/ffmpeg.h:262
+#: modules/codec/ffmpeg/ffmpeg.h:271
 msgid ""
 "Allows you to raise the quantizer for macroblocks with a high temporal "
 "complexity (default: 0.0)."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:265
+#: modules/codec/ffmpeg/ffmpeg.h:274
 msgid "Border masking"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:266
+#: modules/codec/ffmpeg/ffmpeg.h:275
 msgid ""
 "Allows you to raise the quantizer for macroblocks at the border of the frame "
 "(default: 0.0)."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:269
+#: modules/codec/ffmpeg/ffmpeg.h:278
 msgid "Luminance elimination"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:270
+#: modules/codec/ffmpeg/ffmpeg.h:279
 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:274
+#: modules/codec/ffmpeg/ffmpeg.h:283
 msgid "Chrominance elimination"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:275
+#: modules/codec/ffmpeg/ffmpeg.h:284
 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:522
-#: modules/gui/macosx/intf.m:523
+#: modules/codec/ffmpeg/postprocess.c:88 modules/gui/macosx/intf.m:564
+#: modules/gui/macosx/intf.m:565
 msgid "Post processing"
 msgstr "後処理"
 
@@ -6859,22 +7334,22 @@ msgstr "1 (低い)"
 msgid "6 (Highest)"
 msgstr "6 (高い)"
 
-#: modules/codec/flac.c:170
+#: modules/codec/flac.c:171
 #, fuzzy
 msgid "Flac audio decoder"
 msgstr "疑似AC3オーディオ・デコーダ"
 
-#: modules/codec/flac.c:175
+#: modules/codec/flac.c:176
 #, fuzzy
 msgid "Flac audio encoder"
 msgstr "疑似AC3オーディオ・デコーダ"
 
-#: modules/codec/flac.c:181
+#: modules/codec/flac.c:182
 #, fuzzy
 msgid "Flac audio packetizer"
 msgstr "字幕・デコーダ・モジュール"
 
-#: modules/codec/libmpeg2.c:94
+#: modules/codec/libmpeg2.c:96
 #, fuzzy
 msgid "MPEG I/II video decoder (using libmpeg2)"
 msgstr "MPEG 1/2ビデオ・デコーダ・モジュール"
@@ -6922,6 +7397,16 @@ msgstr "疑似AC3オーディオ・デコーダ"
 msgid "Pseudo raw video packetizer"
 msgstr "疑似AC3オーディオ・デコーダ"
 
+#: modules/codec/realaudio.c:61
+#, fuzzy
+msgid "RealAudio library decoder"
+msgstr "Raw/Log オーディオデコーダー"
+
+#: modules/codec/sdl_image.c:54
+#, fuzzy
+msgid "SDL_image video decoder"
+msgstr "DV ビデオデコーダ"
+
 #: modules/codec/speex.c:105
 #, fuzzy
 msgid "Speex audio decoder"
@@ -6937,12 +7422,12 @@ msgstr "字幕・デコーダ・モジュール"
 msgid "Speex audio encoder"
 msgstr "疑似AC3オーディオ・デコーダ"
 
-#: modules/codec/speex.c:551 modules/codec/speex.c:568
+#: modules/codec/speex.c:552 modules/codec/speex.c:569
 #, fuzzy
 msgid "Speex comment"
 msgstr "スクリーン"
 
-#: modules/codec/speex.c:551
+#: modules/codec/speex.c:552
 #, fuzzy
 msgid "Mode"
 msgstr "モジュール"
@@ -7038,28 +7523,38 @@ msgstr ""
 msgid "Stereo mode"
 msgstr "ステレオ"
 
-#: modules/codec/twolame.c:57
-msgid "[0=stereo, 1=dual-mono, 2=joint-stereo]"
+#: modules/codec/twolame.c:56
+msgid "Select how stereo streams will be handled"
 msgstr ""
 
-#: modules/codec/twolame.c:58
+#: modules/codec/twolame.c:57
 #, fuzzy
 msgid "VBR mode"
 msgstr "ネットワーク"
 
-#: modules/codec/twolame.c:60
+#: modules/codec/twolame.c:59
 msgid "By default the encoding is CBR."
 msgstr ""
 
-#: modules/codec/twolame.c:61
+#: modules/codec/twolame.c:60
 msgid "Psycho-acoustic model"
 msgstr ""
 
-#: modules/codec/twolame.c:63
+#: modules/codec/twolame.c:62
 msgid "Integer from -1 (no model) to 4."
 msgstr ""
 
-#: modules/codec/twolame.c:67
+#: modules/codec/twolame.c:66
+#, fuzzy
+msgid "Dual mono"
+msgstr "モノラル"
+
+#: modules/codec/twolame.c:66
+#, fuzzy
+msgid "Joint stereo"
+msgstr "ステレオ"
+
+#: modules/codec/twolame.c:71
 #, fuzzy
 msgid "Libtwolame audio encoder"
 msgstr "疑似AC3オーディオ・デコーダ"
@@ -7106,7 +7601,7 @@ msgstr "字幕・デコーダ・モジュール"
 msgid "Vorbis audio encoder"
 msgstr "Vorbis オーディオエンコーダー"
 
-#: modules/codec/vorbis.c:617
+#: modules/codec/vorbis.c:618
 msgid "Vorbis comment"
 msgstr "Vorbis コメント"
 
@@ -7281,22 +7776,135 @@ msgid ""
 "quality)."
 msgstr ""
 
-#: modules/codec/x264.c:124
+#: modules/codec/x264.c:121
+msgid "Motion estimation algorithm."
+msgstr ""
+
+#: modules/codec/x264.c:122
+msgid ""
+"Selects the motion estimation algorithm:  - dia: diamond 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:128
+msgid "Motion estimation search range."
+msgstr ""
+
+#: modules/codec/x264.c:129
+msgid ""
+"Maximum distance to search for motion estimation, measured from predicted "
+"position(s). Default of 16 is good for most footage, high motion sequences "
+"may benefit from settings between 24-32."
+msgstr ""
+
+#: modules/codec/x264.c:133
+msgid "Disable PSNR calculation."
+msgstr ""
+
+#: modules/codec/x264.c:134
+msgid ""
+"This has no effect on actual encoding quality, it just prevents the stats "
+"from being calculated (for speed)."
+msgstr ""
+
+#: modules/codec/x264.c:137
+msgid "Disable adaptive B-frames."
+msgstr ""
+
+#: modules/codec/x264.c:138
+msgid ""
+"If this is on, the specified number of consecutive B-frames will always be "
+"used, except possibly before an I-frame. "
+msgstr ""
+
+#: modules/codec/x264.c:141
+msgid "Bias the choice to use B-frames."
+msgstr ""
+
+#: modules/codec/x264.c:142
+msgid ""
+"Positive values cause more B-frames, negative values cause less B-frames. "
+msgstr ""
+
+#: modules/codec/x264.c:144 modules/codec/x264.c:145
+msgid "CRF (1-pass Quality-based VBR (nominal QP))."
+msgstr ""
+
+#: modules/codec/x264.c:147
+msgid "Trellis RD quantization."
+msgstr ""
+
+#: modules/codec/x264.c:148
+msgid ""
+"Trellis RD quantization. Requires CABAC. \n"
+" - 0: disabled\n"
+" - 1: enabled only on the final encode of a MB\n"
+" - 2: enabled on all mode decisions\n"
+msgstr ""
+
+#: modules/codec/x264.c:153 modules/codec/x264.c:154
+msgid "Decide references on a per partition basis."
+msgstr ""
+
+#: modules/codec/x264.c:156
+msgid "RD based mode decision for B-frames."
+msgstr ""
+
+#: modules/codec/x264.c:157
+msgid "RD based mode decision for B-frames. Requires subme 6."
+msgstr ""
+
+#: modules/codec/x264.c:159 modules/codec/x264.c:160
+msgid "Disable early SKIP detection on P-frames."
+msgstr ""
+
+#: modules/codec/x264.c:162 modules/codec/x264.c:163
+msgid "Weighted prediction for B-frames."
+msgstr ""
+
+#: modules/codec/x264.c:169
+#, fuzzy
+msgid "dia"
+msgstr "ディスク"
+
+#: modules/codec/x264.c:169
+msgid "hex"
+msgstr ""
+
+#: modules/codec/x264.c:169
+msgid "umh"
+msgstr ""
+
+#: modules/codec/x264.c:169
+#, fuzzy
+msgid "esa"
+msgstr "はい"
+
+#: modules/codec/x264.c:175
 msgid "all"
 msgstr "すべて"
 
-#: modules/codec/x264.c:124
+#: modules/codec/x264.c:175
+#, fuzzy
+msgid "slow"
+msgstr "スロー"
+
+#: modules/codec/x264.c:175
 #, fuzzy
 msgid "normal"
 msgstr "なし"
 
-#: modules/codec/x264.c:124
+#: modules/codec/x264.c:176
 #, fuzzy
 msgid "fast"
 msgstr "早送り"
 
-#: modules/codec/x264.c:127
-msgid "h264 video encoder using x264 library"
+#: modules/codec/x264.c:179
+#, fuzzy
+msgid "H264 encoder (using x264 library)"
 msgstr "h264 ビデオエンコードに x264 ライブラリを使用する"
 
 #: modules/control/corba/corba.c:687
@@ -7340,209 +7948,171 @@ msgstr "ジャンル"
 msgid "Mouse gestures control interface"
 msgstr "赤外線リモート・コントロール・モジュール"
 
-#: modules/control/hotkeys.c:83
+#: modules/control/hotkeys.c:84
 #, fuzzy
 msgid "Playlist bookmark 1"
 msgstr "リスト"
 
-#: modules/control/hotkeys.c:84
+#: modules/control/hotkeys.c:85
 #, fuzzy
 msgid "Playlist bookmark 2"
 msgstr "リスト"
 
-#: modules/control/hotkeys.c:85
+#: modules/control/hotkeys.c:86
 #, fuzzy
 msgid "Playlist bookmark 3"
 msgstr "リスト"
 
-#: modules/control/hotkeys.c:86
+#: modules/control/hotkeys.c:87
 #, fuzzy
 msgid "Playlist bookmark 4"
 msgstr "リスト"
 
-#: modules/control/hotkeys.c:87
+#: modules/control/hotkeys.c:88
 #, fuzzy
 msgid "Playlist bookmark 5"
 msgstr "リスト"
 
-#: modules/control/hotkeys.c:88
+#: modules/control/hotkeys.c:89
 #, fuzzy
 msgid "Playlist bookmark 6"
 msgstr "リスト"
 
-#: modules/control/hotkeys.c:89
+#: modules/control/hotkeys.c:90
 #, fuzzy
 msgid "Playlist bookmark 7"
 msgstr "リスト"
 
-#: modules/control/hotkeys.c:90
+#: modules/control/hotkeys.c:91
 #, fuzzy
 msgid "Playlist bookmark 8"
 msgstr "リスト"
 
-#: modules/control/hotkeys.c:91
+#: modules/control/hotkeys.c:92
 #, fuzzy
 msgid "Playlist bookmark 9"
 msgstr "リスト"
 
-#: modules/control/hotkeys.c:92
+#: modules/control/hotkeys.c:93
 #, fuzzy
 msgid "Playlist bookmark 10"
 msgstr "リスト"
 
-#: modules/control/hotkeys.c:94
+#: modules/control/hotkeys.c:95
 msgid "This option allows you to define playlist bookmarks."
 msgstr ""
 
-#: modules/control/hotkeys.c:97
+#: modules/control/hotkeys.c:98
+#, fuzzy
+msgid "Hotkeys"
+msgstr "ホットキー"
+
+#: modules/control/hotkeys.c:99
 #, fuzzy
 msgid "Hotkeys management interface"
 msgstr "Gtk+インタフェース・モジュール"
 
-#: modules/control/hotkeys.c:512
+#: modules/control/hotkeys.c:481
 #, c-format
 msgid "Audio track: %s"
 msgstr "オーディオトラック: %s"
 
-#: modules/control/hotkeys.c:526 modules/control/hotkeys.c:554
+#: modules/control/hotkeys.c:495 modules/control/hotkeys.c:523
 #, c-format
 msgid "Subtitle track: %s"
 msgstr "字幕 トラック: %s"
 
-#: modules/control/hotkeys.c:526
+#: modules/control/hotkeys.c:495
 msgid "N/A"
 msgstr ""
 
-#: modules/control/http.c:76 modules/misc/rtsp.c:46
+#: modules/control/hotkeys.c:547
+#, fuzzy, c-format
+msgid "Aspect ratio: %s"
+msgstr "アスペクト比"
+
+#: modules/control/hotkeys.c:573
+#, fuzzy, c-format
+msgid "Crop: %s"
+msgstr "縁取り"
+
+#: modules/control/hotkeys.c:599
+#, fuzzy, c-format
+msgid "Deinterlace mode: %s"
+msgstr "ノンインタレース化モード"
+
+#: modules/control/http/http.c:34 modules/misc/rtsp.c:46
 msgid "Host address"
 msgstr "ホストアドレス"
 
-#: modules/control/http.c:78
+#: modules/control/http/http.c:36
 msgid "You can set the address and port the http interface will bind to."
 msgstr ""
 
-#: modules/control/http.c:79 modules/control/http.c:80
+#: modules/control/http/http.c:37 modules/control/http/http.c:38
 msgid "Source directory"
 msgstr "ソースディレクトリ"
 
-#: modules/control/http.c:82
-msgid "HTTP interface x509 PEM certificate file (enables SSL)"
-msgstr ""
+#: modules/control/http/http.c:39
+msgid "Charset"
+msgstr "文字セット"
 
-#: modules/control/http.c:85
-msgid "HTTP interface x509 PEM private key file"
+#: modules/control/http/http.c:41
+msgid "Charset declared in Content-Type header (default UTF-8)."
 msgstr ""
 
-#: modules/control/http.c:87
-msgid "HTTP interface x509 PEM trusted root CA certificates file"
+#: modules/control/http/http.c:42
+msgid "Handlers"
+msgstr "ハンドラー"
+
+#: modules/control/http/http.c:44
+msgid ""
+"List of extensions and executable paths (for instance: php=/usr/bin/php,pl=/"
+"usr/bin/perl)."
 msgstr ""
 
-#: modules/control/http.c:90
+#: modules/control/http/http.c:55
 msgid "HTTP interace Certificates Revocation List file"
 msgstr ""
 
-#: modules/control/http.c:94
-#, fuzzy
+#: modules/control/http/http.c:59
 msgid "HTTP remote control interface"
-msgstr "リモート・コントロール・インタフェース・モジュール"
+msgstr "HTTP リモート制御インターフェース"
 
-#: modules/control/http.c:99
+#: modules/control/http/http.c:68
 msgid "HTTP SSL"
-msgstr ""
-
-#: modules/control/joystick.c:135
-msgid "Motion threshold"
-msgstr ""
-
-#: modules/control/joystick.c:137
-msgid ""
-"Amount of joystick movement required for a movement to be recorded (0-"
-">32767)."
-msgstr ""
-
-#: modules/control/joystick.c:140
-msgid "Joystick device"
-msgstr ""
-
-#: modules/control/joystick.c:142
-msgid "The joystick device (usually /dev/js0 or /dev/input/js0)."
-msgstr ""
-
-#: modules/control/joystick.c:144
-#, fuzzy
-msgid "Repeat time (ms)"
-msgstr "ファイルの選択"
-
-#: modules/control/joystick.c:146
-msgid ""
-"Delay waited before the action is repeated if it is still triggered, in "
-"milliseconds."
-msgstr ""
-
-#: modules/control/joystick.c:149
-#, fuzzy
-msgid "Wait time (ms)"
-msgstr "ファイルの選択"
-
-#: modules/control/joystick.c:151
-msgid "The time waited before the repeat starts, in milliseconds."
-msgstr ""
-
-#: modules/control/joystick.c:153
-msgid "Max seek interval (seconds)"
-msgstr ""
-
-#: modules/control/joystick.c:155
-msgid "The maximum number of seconds that will be sought at a time."
-msgstr ""
-
-#: modules/control/joystick.c:157
-#, fuzzy
-msgid "Action mapping"
-msgstr "自動縁取り"
-
-#: modules/control/joystick.c:158
-msgid "Allows you to remap the actions."
-msgstr ""
-
-#: modules/control/joystick.c:175
-#, fuzzy
-msgid "Joystick control interface"
-msgstr "リモート・コントロール・インタフェース・モジュール"
+msgstr "HTTP SSL"
 
 #: modules/control/lirc.c:58
 #, fuzzy
 msgid "Infrared remote control interface"
 msgstr "赤外線リモート・コントロール・モジュール"
 
-#: modules/control/netsync.c:81
+#: modules/control/netsync.c:59
 msgid "Act as master for network synchronisation"
 msgstr ""
 
-#: modules/control/netsync.c:82
+#: modules/control/netsync.c:60
 msgid ""
 "Allows you to specify if this client should act as the master client for the "
 "network synchronisation."
 msgstr ""
 
-#: modules/control/netsync.c:85
+#: modules/control/netsync.c:63
 msgid "Master client ip address"
 msgstr ""
 
-#: modules/control/netsync.c:86
+#: modules/control/netsync.c:64
 #, fuzzy
 msgid ""
 "Allows you to specify the ip address of the master client used for the "
 "network synchronisation."
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: modules/control/netsync.c:90
-msgid "Netsync"
-msgstr ""
-
-#: modules/control/netsync.c:91
-msgid "Network synchronisation"
-msgstr ""
+#: modules/control/netsync.c:68
+#, fuzzy
+msgid "Network Sync"
+msgstr "ネットワーク: "
 
 #: modules/control/ntservice.c:39
 msgid "Install Windows Service"
@@ -7572,9 +8142,8 @@ msgstr ""
 "す。"
 
 #: modules/control/ntservice.c:48
-#, fuzzy
 msgid "Configuration options"
-msgstr "コンフィグレーション・オプションにツールチップを表示"
+msgstr "設定オプション"
 
 #: modules/control/ntservice.c:50
 #, fuzzy
@@ -7606,377 +8175,442 @@ msgstr "サーバーなし"
 msgid "Windows Service interface"
 msgstr "Windows サービスインターフェース"
 
-#: modules/control/rc.c:124
+#: modules/control/rc.c:153
 msgid "Show stream position"
 msgstr "ストリーム位置表示"
 
-#: modules/control/rc.c:125
+#: modules/control/rc.c:154
 msgid ""
 "Show the current position in seconds within the stream from time to time."
 msgstr "直ちに現在の位置を示します。"
 
-#: modules/control/rc.c:128
+#: modules/control/rc.c:157
 msgid "Fake TTY"
 msgstr "疑似 TTY"
 
-#: modules/control/rc.c:129
+#: modules/control/rc.c:158
 #, fuzzy
 msgid "Force the rc module to use stdin as if it was a TTY."
 msgstr "TTYの場合、強制的に標準入力をrcプラグインで使用します。"
 
-#: modules/control/rc.c:131
+#: modules/control/rc.c:160
 msgid "UNIX socket command input"
-msgstr ""
+msgstr "UNIX ソケットのコマンド入力"
 
-#: modules/control/rc.c:132
+#: modules/control/rc.c:161
 msgid "Accept commands over a Unix socket rather than stdin."
 msgstr ""
 
-#: modules/control/rc.c:135
-#, fuzzy
+#: modules/control/rc.c:164
 msgid "TCP command input"
-msgstr "TCP 入力"
+msgstr "TCP のコマンド入力"
 
-#: modules/control/rc.c:136
+#: modules/control/rc.c:165
 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:140 modules/misc/dummy/dummy.c:49
+#: modules/control/rc.c:169 modules/misc/dummy/dummy.c:49
 msgid "Do not open a DOS command box interface"
 msgstr "DOS コマンドボックスインターフェースを開かない"
 
-#: modules/control/rc.c:142
+#: modules/control/rc.c:171
 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:149
-#, fuzzy
+#: modules/control/rc.c:178
 msgid "RC"
-msgstr "ja"
+msgstr "RC"
 
-#: modules/control/rc.c:152
-#, fuzzy
+#: modules/control/rc.c:181
 msgid "Remote control interface"
-msgstr "リモート・コントロール・インタフェース・モジュール"
+msgstr "リモート制御インターフェース"
 
-#: modules/control/rc.c:303
-#, fuzzy
-msgid "Remote control interface initialized, `h' for help\n"
-msgstr "リモート・コントロール・インタフェース・モジュール"
+#: modules/control/rc.c:334
+msgid "Remote control interface initialized, `h' for help"
+msgstr "リモート制御インターフェースを初期化しました。「h」でヘルプです。"
 
-#: modules/control/rc.c:684
-msgid "+----[ Remote control commands ]\n"
-msgstr "+----[ リモート制御コマンド ]\n"
+#: modules/control/rc.c:846
+#, c-format
+msgid "unknown command `%s', type `help' for help"
+msgstr "不明のコマンド「%s」です。「help」を入力するとヘルプです。"
 
-#: modules/control/rc.c:686
-msgid "| add XYZ  . . . . . . . . . . add XYZ to playlist\n"
-msgstr "| add XYZ  . . . . . . . . . . XYZ をプレイリストに追加\n"
+#: modules/control/rc.c:879
+msgid "+----[ Remote control commands ]"
+msgstr "+----[ リモート制御コマンド ]"
 
-#: modules/control/rc.c:687
-msgid "| playlist . . .  show items currently in playlist\n"
-msgstr "| playlist . . . 現在のプレイリスト中の項目を表示\n"
+#: modules/control/rc.c:881
+msgid "| add XYZ  . . . . . . . . . . add XYZ to playlist"
+msgstr "| add XYZ  . . . . . . . . . . XYZ を再生一覧に追加"
 
-#: modules/control/rc.c:688
-msgid "| play . . . . . . . . . . . . . . . . play stream\n"
-msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
+#: modules/control/rc.c:882
+msgid "| playlist . . .  show items currently in playlist"
+msgstr "| playlist . . . 現在の再生一覧中の項目を表示する"
 
-#: modules/control/rc.c:689
-msgid "| stop . . . . . . . . . . . . . . . . stop stream\n"
-msgstr ""
+#: modules/control/rc.c:883
+msgid "| play . . . . . . . . . . . . . . . . play stream"
+msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生"
 
-#: modules/control/rc.c:690
-msgid "| next . . . . . . . . . . . .  next playlist item\n"
-msgstr ""
+#: modules/control/rc.c:884
+msgid "| stop . . . . . . . . . . . . . . . . stop stream"
+msgstr "| stop . . . . . . . . . . . . . . . . ストリーム停止"
 
-#: modules/control/rc.c:691
-msgid "| prev . . . . . . . . . .  previous playlist item\n"
-msgstr ""
+#: modules/control/rc.c:885
+msgid "| next . . . . . . . . . . . .  next playlist item"
+msgstr "| next . . . . . . . . . . . .  次の再生一覧項目"
+
+#: modules/control/rc.c:886
+msgid "| prev . . . . . . . . . .  previous playlist item"
+msgstr "| prev  . . . . . . . . . . 前の再生一覧の項目"
 
-#: modules/control/rc.c:692
+#: modules/control/rc.c:887
 #, fuzzy
-msgid "| goto . . . . . . . . . . . .  goto item at index\n"
+msgid "| goto . . . . . . . . . . . .  goto item at index"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:693
-msgid "| title [X]  . . . . set/get title in current item\n"
-msgstr ""
+#: modules/control/rc.c:888
+#, fuzzy
+msgid "| clear . . . . . . . . . . .   clear the playlist"
+msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:694
-msgid "| title_n  . . . . . .  next title in current item\n"
-msgstr ""
+#: modules/control/rc.c:889
+#, fuzzy
+msgid "| status . . . . . . . . . current playlist status"
+msgstr "| add XYZ  . . . . . . . . . . XYZ を再生一覧に追加\n"
 
-#: modules/control/rc.c:695
-msgid "| title_p  . . . .  previous title in current item\n"
+#: modules/control/rc.c:890
+msgid "| title [X]  . . . . set/get title in current item"
 msgstr ""
 
-#: modules/control/rc.c:696
-msgid "| chapter [X]  . . set/get chapter in current item\n"
-msgstr ""
+#: modules/control/rc.c:891
+#, fuzzy
+msgid "| title_n  . . . . . .  next title in current item"
+msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:697
-msgid "| chapter_n  . . . .  next chapter in current item\n"
+#: modules/control/rc.c:892
+msgid "| title_p  . . . .  previous title in current item"
 msgstr ""
 
-#: modules/control/rc.c:698
-msgid "| chapter_p  . .  previous chapter in current item\n"
+#: modules/control/rc.c:893
+msgid "| chapter [X]  . . set/get chapter in current item"
 msgstr ""
 
-#: modules/control/rc.c:700
-msgid "| seek X . seek in seconds, for instance `seek 12'\n"
+#: modules/control/rc.c:894
+msgid "| chapter_n  . . . .  next chapter in current item"
 msgstr ""
 
-#: modules/control/rc.c:701
-msgid "| pause  . . . . . . . . . . . . . .  toggle pause\n"
+#: modules/control/rc.c:895
+msgid "| chapter_p  . .  previous chapter in current item"
 msgstr ""
 
-#: modules/control/rc.c:702
-msgid "| fastforward  . . . . . .  .  set to maximum rate\n"
+#: modules/control/rc.c:897
+msgid "| seek X . seek in seconds, for instance `seek 12'"
 msgstr ""
 
-#: modules/control/rc.c:703
+#: modules/control/rc.c:898
 #, fuzzy
-msgid "| rewind  . . . . . . . . . .  set to minimum rate\n"
-msgstr "| add XYZ  . . . . . . . . . . XYZ をプレイリストに追加\n"
+msgid "| pause  . . . . . . . . . . . . . .  toggle pause"
+msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:704
-msgid "| f  . . . . . . . . . . . . . . toggle fullscreen\n"
-msgstr ""
+#: modules/control/rc.c:899
+#, fuzzy
+msgid "| fastforward  . . . . . .  .  set to maximum rate"
+msgstr "| add XYZ  . . . . . . . . . . XYZ を再生一覧に追加\n"
 
-#: modules/control/rc.c:705
-msgid "| info . . .  information about the current stream\n"
-msgstr ""
+#: modules/control/rc.c:900
+#, fuzzy
+msgid "| rewind  . . . . . . . . . .  set to minimum rate"
+msgstr "| add XYZ  . . . . . . . . . . XYZ を再生一覧に追加\n"
+
+#: modules/control/rc.c:901
+#, fuzzy
+msgid "| faster . . . . . . . .  faster playing of stream"
+msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
+
+#: modules/control/rc.c:902
+#, fuzzy
+msgid "| slower . . . . . . . .  slower playing of stream"
+msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
+
+#: modules/control/rc.c:903
+#, fuzzy
+msgid "| normal . . . . . . . .  normal playing of stream"
+msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
+
+#: modules/control/rc.c:904
+#, fuzzy
+msgid "| f [on|off] . . . . . . . . . . toggle fullscreen"
+msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:707
-msgid "| volume [X] . . . . . . . .  set/get audio volume\n"
+#: modules/control/rc.c:905
+msgid "| info . . .  information about the current stream"
 msgstr ""
 
-#: modules/control/rc.c:708
-msgid "| volup [X]  . . . . .  raise audio volume X steps\n"
+#: modules/control/rc.c:907
+#, fuzzy
+msgid "| volume [X] . . . . . . . .  set/get audio volume"
+msgstr "| add XYZ  . . . . . . . . . . XYZ を再生一覧に追加\n"
+
+#: modules/control/rc.c:908
+msgid "| volup [X]  . . . . .  raise audio volume X steps"
 msgstr ""
 
-#: modules/control/rc.c:709
-msgid "| voldown [X]  . . . .  lower audio volume X steps\n"
+#: modules/control/rc.c:909
+msgid "| voldown [X]  . . . .  lower audio volume X steps"
 msgstr ""
 
-#: modules/control/rc.c:710
-msgid "| adev [X] . . . . . . . . .  set/get audio device\n"
+#: modules/control/rc.c:910
+#, fuzzy
+msgid "| adev [X] . . . . . . . . .  set/get audio device"
+msgstr "| add XYZ  . . . . . . . . . . XYZ を再生一覧に追加\n"
+
+#: modules/control/rc.c:911
+msgid "| achan [X]. . . . . . . .  set/get audio channels"
 msgstr ""
 
-#: modules/control/rc.c:711
-msgid "| achan [X]. . . . . . . .  set/get audio channels\n"
+#: modules/control/rc.c:912
+msgid "| menu [on|off|up|down|left|right|select] use menu"
 msgstr ""
 
-#: modules/control/rc.c:716
-msgid "| marq-marquee STRING  . . overlay STRING in video\n"
+#: modules/control/rc.c:917
+msgid "| marq-marquee STRING  . . overlay STRING in video"
 msgstr ""
 
-#: modules/control/rc.c:717
+#: modules/control/rc.c:918
 #, fuzzy
-msgid "| marq-x X . . . . . . . . . . . .offset from left\n"
-msgstr "| add XYZ  . . . . . . . . . . XYZ をプレイリストに追加\n"
+msgid "| marq-x X . . . . . . . . . . . .offset from left"
+msgstr "| add XYZ  . . . . . . . . . . XYZ を再生一覧に追加\n"
 
-#: modules/control/rc.c:718
+#: modules/control/rc.c:919
 #, fuzzy
-msgid "| marq-y Y . . . . . . . . . . . . offset from top\n"
+msgid "| marq-y Y . . . . . . . . . . . . offset from top"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:719
-msgid "| marq-position #. . .  .relative position control\n"
-msgstr ""
+#: modules/control/rc.c:920
+#, fuzzy
+msgid "| marq-position #. . .  .relative position control"
+msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:720
+#: modules/control/rc.c:921
 #, fuzzy
-msgid "| marq-color # . . . . . . . . . . font color, RGB\n"
+msgid "| marq-color # . . . . . . . . . . font color, RGB"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:721
+#: modules/control/rc.c:922
 #, fuzzy
-msgid "| marq-opacity # . . . . . . . . . . . . . opacity\n"
+msgid "| marq-opacity # . . . . . . . . . . . . . opacity"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:722
+#: modules/control/rc.c:923
 #, fuzzy
-msgid "| marq-timeout T. . . . . . . . . . timeout, in ms\n"
+msgid "| marq-timeout T. . . . . . . . . . timeout, in ms"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:723
+#: modules/control/rc.c:924
 #, fuzzy
-msgid "| marq-size # . . . . . . . . font size, in pixels\n"
-msgstr "| add XYZ  . . . . . . . . . . XYZ をプレイリストに追加\n"
+msgid "| marq-size # . . . . . . . . font size, in pixels"
+msgstr "| add XYZ  . . . . . . . . . . XYZ を再生一覧に追加\n"
 
-#: modules/control/rc.c:725
-msgid "| time-format STRING . . . overlay STRING in video\n"
+#: modules/control/rc.c:926
+msgid "| time-format STRING . . . overlay STRING in video"
 msgstr ""
 
-#: modules/control/rc.c:726
+#: modules/control/rc.c:927
 #, fuzzy
-msgid "| time-x X . . . . . . . . . . . .offset from left\n"
-msgstr "| add XYZ  . . . . . . . . . . XYZ をプレイリストに追加\n"
+msgid "| time-x X . . . . . . . . . . . .offset from left"
+msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:727
+#: modules/control/rc.c:928
 #, fuzzy
-msgid "| time-y Y . . . . . . . . . . . . offset from top\n"
+msgid "| time-y Y . . . . . . . . . . . . offset from top"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:728
-msgid "| time-position #. . . . . . . . relative position\n"
-msgstr ""
+#: modules/control/rc.c:929
+#, fuzzy
+msgid "| time-position #. . . . . . . . relative position"
+msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:729
+#: modules/control/rc.c:930
 #, fuzzy
-msgid "| time-color # . . . . . . . . . . font color, RGB\n"
+msgid "| time-color # . . . . . . . . . . font color, RGB"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:730
+#: modules/control/rc.c:931
 #, fuzzy
-msgid "| time-opacity # . . . . . . . . . . . . . opacity\n"
+msgid "| time-opacity # . . . . . . . . . . . . . opacity"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:731
+#: modules/control/rc.c:932
 #, fuzzy
-msgid "| time-size # . . . . . . . . font size, in pixels\n"
+msgid "| time-size # . . . . . . . . font size, in pixels"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:733
-msgid "| logo-file STRING . . . the overlay file path/name\n"
+#: modules/control/rc.c:934
+msgid "| logo-file STRING . . . the overlay file path/name"
 msgstr ""
 
-#: modules/control/rc.c:734
+#: modules/control/rc.c:935
 #, fuzzy
-msgid "| logo-x X . . . . . . . . . . . .offset from left\n"
+msgid "| logo-x X . . . . . . . . . . . .offset from left"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:735
+#: modules/control/rc.c:936
 #, fuzzy
-msgid "| logo-y Y . . . . . . . . . . . . offset from top\n"
+msgid "| logo-y Y . . . . . . . . . . . . offset from top"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:736
+#: modules/control/rc.c:937
 #, fuzzy
-msgid "| logo-position #. . . . . . . . relative position\n"
+msgid "| logo-position #. . . . . . . . relative position"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:737
-msgid "| logo-transparency #. . . . . . . . .transparency\n"
-msgstr ""
+#: modules/control/rc.c:938
+#, fuzzy
+msgid "| logo-transparency #. . . . . . . . .transparency"
+msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:739
+#: modules/control/rc.c:940
 #, fuzzy
-msgid "| mosaic-alpha # . . . . . . . . . . . . . . alpha\n"
+msgid "| mosaic-alpha # . . . . . . . . . . . . . . alpha"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:740
+#: modules/control/rc.c:941
 #, fuzzy
-msgid "| mosaic-height #. . . . . . . . . . . . . .height\n"
+msgid "| mosaic-height #. . . . . . . . . . . . . .height"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:741
+#: modules/control/rc.c:942
 #, fuzzy
-msgid "| mosaic-width # . . . . . . . . . . . . . . width\n"
+msgid "| mosaic-width # . . . . . . . . . . . . . . width"
 msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:742
-msgid "| mosaic-xoffset # . . . .top left corner position\n"
+#: modules/control/rc.c:943
+msgid "| mosaic-xoffset # . . . .top left corner position"
 msgstr ""
 
-#: modules/control/rc.c:743
-msgid "| mosaic-yoffset # . . . .top left corner position\n"
+#: modules/control/rc.c:944
+msgid "| mosaic-yoffset # . . . .top left corner position"
 msgstr ""
 
-#: modules/control/rc.c:744
-msgid "| mosaic-align 0..2,4..6,8..10. . .mosaic alignment\n"
+#: modules/control/rc.c:945
+msgid "| mosaic-align 0..2,4..6,8..10. . .mosaic alignment"
 msgstr ""
 
-#: modules/control/rc.c:745
-msgid "| mosaic-vborder # . . . . . . . . vertical border\n"
-msgstr ""
+#: modules/control/rc.c:946
+#, fuzzy
+msgid "| mosaic-vborder # . . . . . . . . vertical border"
+msgstr "| add XYZ  . . . . . . . . . . XYZ を再生一覧に追加\n"
 
-#: modules/control/rc.c:746
-msgid "| mosaic-hborder # . . . . . . . horizontal border\n"
-msgstr ""
+#: modules/control/rc.c:947
+#, fuzzy
+msgid "| mosaic-hborder # . . . . . . . horizontal border"
+msgstr "| add XYZ  . . . . . . . . . . XYZ を再生一覧に追加\n"
 
-#: modules/control/rc.c:747
-msgid "| mosaic-position {0=auto,1=fixed} . . . .position\n"
+#: modules/control/rc.c:948
+msgid "| mosaic-position {0=auto,1=fixed} . . . .position"
 msgstr ""
 
-#: modules/control/rc.c:748
+#: modules/control/rc.c:949
 #, fuzzy
-msgid "| mosaic-rows #. . . . . . . . . . .number of rows\n"
-msgstr "| add XYZ  . . . . . . . . . . XYZ をプレイリストに追加\n"
+msgid "| mosaic-rows #. . . . . . . . . . .number of rows"
+msgstr "| add XYZ  . . . . . . . . . . XYZ を再生一覧に追加\n"
 
-#: modules/control/rc.c:749
-msgid "| mosaic-cols #. . . . . . . . . . .number of cols\n"
-msgstr ""
+#: modules/control/rc.c:950
+#, fuzzy
+msgid "| mosaic-cols #. . . . . . . . . . .number of cols"
+msgstr "| add XYZ  . . . . . . . . . . XYZ を再生一覧に追加\n"
 
-#: modules/control/rc.c:750
-msgid "| mosaic-keep-aspect-ratio {0,1} . . .aspect ratio\n"
+#: modules/control/rc.c:951
+msgid "| mosaic-keep-aspect-ratio {0,1} . . .aspect ratio"
 msgstr ""
 
-#: modules/control/rc.c:753
-msgid "| help . . . . . . . . . . . . . this help message\n"
+#: modules/control/rc.c:953
+msgid ""
+"| check-updates [newer] [equal] [older]\n"
+"|               [undef] [info] [source] [binary] [plugin]"
 msgstr ""
 
-#: modules/control/rc.c:754
-msgid "| longhelp . . . . . . . . . a longer help message\n"
-msgstr ""
+#: modules/control/rc.c:957
+#, fuzzy
+msgid "| help . . . . . . . . . . . . . this help message"
+msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:755
-msgid "| logout . . . . .  exit (if in socket connection)\n"
-msgstr ""
+#: modules/control/rc.c:958
+#, fuzzy
+msgid "| longhelp . . . . . . . . . a longer help message"
+msgstr "| play . . . . . . . . . . . . . . . . ストリーム再生\n"
 
-#: modules/control/rc.c:756
-msgid "| quit . . . . . . . . . . . . . . . . .  quit vlc\n"
+#: modules/control/rc.c:959
+msgid "| logout . . . . .  exit (if in socket connection)"
+msgstr "| logout . . . . .  終了する (ソケット接続の場合)"
+
+#: modules/control/rc.c:960
+msgid "| quit . . . . . . . . . . . . . . . . .  quit vlc"
+msgstr "| quit . . . . . . . . . . . . . . . . .  VLC を終了する"
+
+#: modules/control/rc.c:962
+msgid "+----[ end of help ]"
+msgstr "+----[ ヘルプの終り ]"
+
+#: modules/control/rc.c:1069 modules/control/rc.c:1237
+#: modules/control/rc.c:1724 modules/control/rc.c:1794
+#: modules/control/rc.c:1843 modules/control/rc.c:1942
+msgid "press menu select or pause to continue"
 msgstr ""
 
-#: modules/control/rc.c:758
-msgid "+----[ end of help ]\n"
+#: modules/control/rc.c:1384
+#, fuzzy
+msgid "press pause to continue"
 msgstr ""
+"\n"
+"続けるにはEnterキーを押してください。\n"
 
-#: modules/control/rc.c:788
-#, c-format
-msgid "unknown command `%s', type `help' for help\n"
+#: modules/control/rc.c:1927 modules/control/rc.c:1966
+msgid "please provide one of the following paramaters"
 msgstr ""
 
 #: modules/control/showintf.c:62
 msgid "Threshold"
-msgstr ""
+msgstr "閾値"
 
 #: modules/control/showintf.c:63
 #, fuzzy
 msgid "Height of the zone triggering the interface"
 msgstr "ネットワーク・インタフェースのMTU"
 
-#: modules/control/showintf.c:70
+#: modules/control/telnet.c:79
+msgid "Telnet Interface host"
+msgstr "Telnet インターフェースのホスト"
+
+#: modules/control/telnet.c:80
 #, fuzzy
-msgid "Interface showing control interface"
-msgstr "赤外線リモート・コントロール・モジュール"
+msgid "Default to listen on all network interfaces"
+msgstr "ネットワーク・インタフェースのMTU"
 
-#: modules/control/telnet.c:79
+#: modules/control/telnet.c:81
 msgid "Telnet Interface port"
 msgstr "Telnet インターフェースポート"
 
-#: modules/control/telnet.c:80
+#: modules/control/telnet.c:82
 msgid "Default to 4212"
 msgstr ""
 
-#: modules/control/telnet.c:81
+#: modules/control/telnet.c:84
 msgid "Telnet Interface password"
 msgstr "Telnet インターフェースパスワード"
 
-#: modules/control/telnet.c:82
+#: modules/control/telnet.c:85
 #, fuzzy
 msgid "Default to admin"
 msgstr "削除"
 
-#: modules/control/telnet.c:92
-#, fuzzy
+#: modules/control/telnet.c:98
 msgid "VLM remote control interface"
-msgstr "リモート・コントロール・インタフェース・モジュール"
+msgstr "VLM リモート制御インターフェース"
 
 #: modules/demux/a52.c:44
 #, fuzzy
@@ -7997,26 +8631,46 @@ 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:42 modules/demux/avi/avi.c:43
 #, fuzzy
 msgid "Force interleaved method"
 msgstr "ノンインタレース化モード"
 
-#: modules/demux/avi/avi.c:43
+#: modules/demux/avi/avi.c:45
 #, fuzzy
 msgid "Force index creation"
 msgstr "ソースのアスペクト・レシオ"
 
-#: modules/demux/avi/avi.c:45
+#: modules/demux/avi/avi.c:47
 msgid ""
-"Recreate a index for the AVI file so we can seek trough it more reliably."
+"Recreate a index for the AVI file. Use this if your AVI file is damaged or "
+"incomplete (not seekable)"
 msgstr ""
 
-#: modules/demux/avi/avi.c:52
+#: modules/demux/avi/avi.c:55
 msgid "AVI demuxer"
 msgstr ""
 
-#: modules/demux/demuxdump.c:37
+#: modules/demux/avi/avi.c:547
+#, fuzzy
+msgid "AVI Index"
+msgstr "インデックス"
+
+#: modules/demux/avi/avi.c:548
+msgid ""
+"This AVI file is broken. Seeking will not work correctly.\n"
+"Do you want to try to repair it (this might take a long time) ?"
+msgstr ""
+
+#: modules/demux/avi/avi.c:2266
+msgid "Fixing AVI Index"
+msgstr ""
+
+#: modules/demux/avi/avi.c:2267 modules/demux/avi/avi.c:2290
+msgid "Creating AVI Index ..."
+msgstr ""
+
+#: modules/demux/demuxdump.c:37 modules/demux/ts.c:110
 msgid "Filename of dump"
 msgstr "ダンプのファイル名"
 
@@ -8024,12 +8678,11 @@ msgstr "ダンプのファイル名"
 msgid "Specify a file name to which the raw stream will be dumped."
 msgstr ""
 
-#: modules/demux/demuxdump.c:40
-#, fuzzy
+#: modules/demux/demuxdump.c:40 modules/demux/ts.c:113
 msgid "Append"
-msgstr "開く"
+msgstr "追加する"
 
-#: modules/demux/demuxdump.c:42
+#: modules/demux/demuxdump.c:42 modules/demux/ts.c:115
 msgid ""
 "If the file exists and this option is selected, the existing file will not "
 "be overwritten."
@@ -8050,15 +8703,6 @@ msgstr "MPEG 1/2レイヤ1/2オーディオ・デコーダ"
 msgid "FLAC demuxer"
 msgstr "MPEG 1/2レイヤ1/2オーディオ・デコーダ"
 
-#: modules/demux/livedotcom.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/livedotcom.cpp:66
 msgid "Kasenna RTSP dialect"
 msgstr ""
@@ -8071,7 +8715,7 @@ msgid ""
 msgstr ""
 
 #: modules/demux/livedotcom.cpp:72
-msgid "live.com (RTSP/RTP/SDP) demuxer"
+msgid "RTP/RTSP/SDP demuxer (using Live555.com)"
 msgstr ""
 
 #: modules/demux/livedotcom.cpp:81
@@ -8082,10 +8726,32 @@ msgstr ""
 msgid "Use RTP over RTSP (TCP)"
 msgstr "RTP オーバー RTSP (TCP)を使う"
 
+#: modules/demux/livedotcom.cpp:90
+#, fuzzy
+msgid "Client port"
+msgstr "ビデオポート"
+
+#: modules/demux/livedotcom.cpp:91
+msgid "Port to use for the RTP source of the session"
+msgstr ""
+
+#: modules/demux/livedotcom.cpp:94 modules/demux/livedotcom.cpp:95
+msgid "Tunnel RTSP and RTP over HTTP"
+msgstr ""
+
+#: modules/demux/livedotcom.cpp:97
+#, fuzzy
+msgid "HTTP tunnel port"
+msgstr "HTTP 入力"
+
+#: modules/demux/livedotcom.cpp:98
+msgid "Port to use for tunneling the RTSP/RTP over HTTP"
+msgstr ""
+
 #: modules/demux/m3u.c:68
 #, fuzzy
 msgid "Playlist metademux"
-msgstr "プレイリストを開く"
+msgstr "再生一覧を開く"
 
 #: modules/demux/mjpeg.c:43 modules/demux/mpeg/h264.c:39
 msgid "Frames per Second"
@@ -8102,71 +8768,82 @@ msgstr ""
 msgid "JPEG camera demuxer"
 msgstr "MPEG 1/2レイヤ1/2オーディオ・デコーダ"
 
-#: modules/demux/mkv.cpp:385
+#: modules/demux/mkv.cpp:394
 #, fuzzy
 msgid "Matroska stream demuxer"
 msgstr "MPEG 1/2レイヤ1/2オーディオ・デコーダ"
 
-#: modules/demux/mkv.cpp:392
+#: modules/demux/mkv.cpp:401
 #, fuzzy
 msgid "Ordered chapters"
-msgstr "次のチャプター"
+msgstr "次のチャプターを選択"
 
-#: modules/demux/mkv.cpp:393
+#: modules/demux/mkv.cpp:402
 msgid "Play ordered chapters as specified in the segment."
 msgstr ""
 
-#: modules/demux/mkv.cpp:396
+#: modules/demux/mkv.cpp:405
 #, fuzzy
 msgid "Chapter codecs"
-msgstr "ステレオ"
+msgstr "チャプター %d"
 
-#: modules/demux/mkv.cpp:397
+#: modules/demux/mkv.cpp:406
 msgid "Use chapter codecs found in the segment."
 msgstr ""
 
-#: modules/demux/mkv.cpp:400 modules/demux/mkv.cpp:401
+#: modules/demux/mkv.cpp:409
+#, fuzzy
+msgid "Preload Directory"
+msgstr "ソースディレクトリ"
+
+#: modules/demux/mkv.cpp:410
+msgid ""
+"Preload matroska files from the same family in the same directory (not good "
+"for broken files)."
+msgstr ""
+
+#: modules/demux/mkv.cpp:413
+msgid "Seek based on percent not time"
+msgstr ""
+
+#: modules/demux/mkv.cpp:414
 msgid "Seek based on percent not time."
 msgstr ""
 
-#: modules/demux/mkv.cpp:404
-#, fuzzy
+#: modules/demux/mkv.cpp:417
 msgid "Dummy Elements"
-msgstr "ストリームの出力先の選択"
+msgstr "ダミー要素"
 
-#: modules/demux/mkv.cpp:405
+#: modules/demux/mkv.cpp:418
 msgid "Read and discard unknown EBML elements (not good for broken files)."
 msgstr ""
 
-#: modules/demux/mkv.cpp:2971
-#, fuzzy
+#: modules/demux/mkv.cpp:3159
 msgid "---  DVD Menu"
-msgstr "DVD メニューを使用"
+msgstr "---  DVD メニュー"
 
-#: modules/demux/mkv.cpp:2977
+#: modules/demux/mkv.cpp:3165
 msgid "First Played"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2979
-#, fuzzy
+#: modules/demux/mkv.cpp:3167
 msgid "Video Manager"
-msgstr "ビデオエンコーダー"
+msgstr "ビデオ管理"
 
-#: modules/demux/mkv.cpp:2985
-#, fuzzy
+#: modules/demux/mkv.cpp:3173
 msgid "----- Title"
-msgstr "タイトル"
+msgstr "--- 題名"
 
-#: modules/demux/mkv.cpp:4667
+#: modules/demux/mkv.cpp:4928
 msgid "Segment filename"
 msgstr "分割ファイル名"
 
-#: modules/demux/mkv.cpp:4671
+#: modules/demux/mkv.cpp:4932
 #, fuzzy
 msgid "Muxing application"
 msgstr "このアプリケーションについて"
 
-#: modules/demux/mkv.cpp:4675
+#: modules/demux/mkv.cpp:4936
 #, fuzzy
 msgid "Writing application"
 msgstr "垂直方向位置"
@@ -8235,11 +8912,21 @@ msgstr "サラウンドディレイ (ミリ秒)"
 msgid "Surround delay in ms (usually 5-40ms)"
 msgstr ""
 
-#: modules/demux/mp4/mp4.c:50
+#: 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
+#, fuzzy
+msgid "Replay Gain type"
+msgstr "再生と停止"
+
+#: modules/demux/mpc.c:57
+#, fuzzy
+msgid "MPC demuxer"
+msgstr "MPEG 1/2レイヤ1/2オーディオ・デコーダ"
+
 #: modules/demux/mpeg/h264.c:40
 #, fuzzy
 msgid "Allows you to set the desired frame rate."
@@ -8270,6 +8957,10 @@ msgstr "MPEG 1/2レイヤ1/2オーディオ・デコーダ"
 msgid "MPEG-I/II video demuxer"
 msgstr "MPEG 1/2レイヤ1/2オーディオ・デコーダ"
 
+#: modules/demux/nsc.c:43
+msgid "Windows Media NSC metademux"
+msgstr ""
+
 #: modules/demux/nsv.c:45
 msgid "NullSoft demuxer"
 msgstr ""
@@ -8284,7 +8975,7 @@ msgstr "MPEG 1/2レイヤ1/2オーディオ・デコーダ"
 msgid "Ogg stream demuxer"
 msgstr "MPEG 1/2レイヤ1/2オーディオ・デコーダ"
 
-#: modules/demux/playlist/b4s.c:340
+#: modules/demux/playlist/b4s.c:341
 #, fuzzy
 msgid "Listeners"
 msgstr "リニア"
@@ -8298,28 +8989,81 @@ msgstr "製作者メタデータ"
 msgid "Automatically start the playlist when it's loaded.\n"
 msgstr ""
 
-#: modules/demux/playlist/playlist.c:48
-#, fuzzy
-msgid "Old playlist open"
-msgstr "プレイリストの最後でループ"
-
-#: modules/demux/playlist/playlist.c:54
+#: modules/demux/playlist/playlist.c:55
 #, fuzzy
 msgid "Native playlist import"
-msgstr "プレイリストを開く"
+msgstr "再生一覧を開く"
 
-#: modules/demux/playlist/playlist.c:61
+#: modules/demux/playlist/playlist.c:62
 msgid "M3U playlist import"
-msgstr "M3U プレイリストからインポート"
+msgstr "M3U 再生一覧からインポート"
 
-#: modules/demux/playlist/playlist.c:66
+#: modules/demux/playlist/playlist.c:67
 msgid "PLS playlist import"
-msgstr "PLS プレイリストからインポート"
+msgstr "PLS 再生一覧からインポート"
 
-#: modules/demux/playlist/playlist.c:71
+#: modules/demux/playlist/playlist.c:72
 #, fuzzy
 msgid "B4S playlist import"
-msgstr "PLS プレイリストからインポート"
+msgstr "PLS 再生一覧からインポート"
+
+#: modules/demux/playlist/playlist.c:78
+#, fuzzy
+msgid "DVB playlist import"
+msgstr "PLS 再生一覧からインポート"
+
+#: modules/demux/playlist/playlist.c:83
+msgid "Podcast playlist import"
+msgstr "PLS 再生一覧をインポートする"
+
+#: modules/demux/playlist/podcast.c:290
+msgid "Podcast Link"
+msgstr "Podcast リンク"
+
+#: modules/demux/playlist/podcast.c:299
+msgid "Podcast Copyright"
+msgstr "Podcast コピーライト"
+
+#: modules/demux/playlist/podcast.c:308
+msgid "Podcast Category"
+msgstr "Podcast カテゴリ"
+
+#: modules/demux/playlist/podcast.c:317 modules/demux/playlist/podcast.c:405
+msgid "Podcast Keywords"
+msgstr "Podcast キーワード"
+
+#: modules/demux/playlist/podcast.c:326 modules/demux/playlist/podcast.c:413
+msgid "Podcast Subtitle"
+msgstr "Podcast 字幕"
+
+#: modules/demux/playlist/podcast.c:336 modules/demux/playlist/podcast.c:421
+msgid "Podcast Summary"
+msgstr "Podcast 要約"
+
+#: modules/demux/playlist/podcast.c:373
+#, fuzzy
+msgid "Podcast Publication Date"
+msgstr "モジュレーションタイプ"
+
+#: modules/demux/playlist/podcast.c:381
+msgid "Podcast Author"
+msgstr "Podcast 作成者"
+
+#: modules/demux/playlist/podcast.c:389
+msgid "Podcast Subcategory"
+msgstr "Podcast サブカテゴリ"
+
+#: modules/demux/playlist/podcast.c:397
+msgid "Podcast Duration"
+msgstr "Podcast 期間"
+
+#: modules/demux/playlist/podcast.c:429
+msgid "Podcast Size"
+msgstr "Podcast サイズ"
+
+#: modules/demux/playlist/podcast.c:437
+msgid "Podcast Type"
+msgstr ""
 
 #: modules/demux/ps.c:47 modules/demux/ps.c:55
 #, fuzzy
@@ -8350,7 +9094,7 @@ msgstr ""
 msgid "Text subtitles demux"
 msgstr "字幕の選択"
 
-#: modules/demux/subtitle.c:67 modules/gui/wxwindows/subtitles.cpp:210
+#: modules/demux/subtitle.c:67 modules/gui/wxwidgets/dialogs/subtitles.cpp:202
 msgid "Frames per second"
 msgstr ""
 
@@ -8359,59 +9103,84 @@ msgstr ""
 msgid "Subtitles delay"
 msgstr "字幕"
 
-#: modules/demux/ts.c:81
+#: modules/demux/ts.c:82
 msgid "Extra PMT"
 msgstr ""
 
-#: modules/demux/ts.c:83
+#: modules/demux/ts.c:84
 msgid "Allows a user to specify an extra pmt (pmt_pid=pid:stream_type[,...])"
 msgstr ""
 
-#: modules/demux/ts.c:85
+#: modules/demux/ts.c:86
 msgid "Set id of ES to PID"
 msgstr ""
 
-#: modules/demux/ts.c:86
+#: modules/demux/ts.c:87
 msgid "set id of es to pid"
 msgstr ""
 
-#: modules/demux/ts.c:88
+#: modules/demux/ts.c:89
 #, fuzzy
 msgid "Fast udp streaming"
 msgstr "ストリームの転送"
 
-#: modules/demux/ts.c:90
+#: modules/demux/ts.c:91
 msgid "Sends TS to specific ip:port by udp (you must know what you are doing)"
 msgstr ""
 
-#: modules/demux/ts.c:92 modules/demux/ts.c:93
+#: modules/demux/ts.c:93 modules/demux/ts.c:94
 msgid "MTU for out mode"
 msgstr ""
 
-#: modules/demux/ts.c:95 modules/demux/ts.c:96
+#: modules/demux/ts.c:96 modules/demux/ts.c:97
 #, fuzzy
 msgid "CSA ck"
 msgstr "CSA キー"
 
-#: modules/demux/ts.c:98
+#: modules/demux/ts.c:99
 #, fuzzy
 msgid "Silent mode"
 msgstr "湾曲モード"
 
-#: modules/demux/ts.c:99
+#: modules/demux/ts.c:100
 msgid "do not complain on encrypted PES"
 msgstr ""
 
-#: modules/demux/ts.c:101
+#: modules/demux/ts.c:102
 #, fuzzy
 msgid "CAPMT System ID"
 msgstr "システム ID"
 
-#: modules/demux/ts.c:102
+#: modules/demux/ts.c:103
 msgid "only forward descriptors from this SysID to the CAM"
 msgstr ""
 
 #: modules/demux/ts.c:105
+msgid "Packet size in bytes to decrypt"
+msgstr ""
+
+#: modules/demux/ts.c:106
+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"
+msgstr ""
+
+#: modules/demux/ts.c:118
+#, fuzzy
+msgid "Dump buffer size"
+msgstr "ログ・ファイル名"
+
+#: modules/demux/ts.c:120
+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
 #, fuzzy
 msgid "MPEG Transport Stream demuxer"
 msgstr "ストリームの再生"
@@ -8724,7 +9493,7 @@ msgstr "ハードロック"
 msgid "ID3 tag parser using libid3tag"
 msgstr "id3タグパーサでlibid3tagを使用"
 
-#: modules/demux/vobsub.c:48
+#: modules/demux/vobsub.c:47
 #, fuzzy
 msgid "Vobsub subtitles demux"
 msgstr "字幕の選択"
@@ -8756,113 +9525,114 @@ msgstr "BeOS標準APIモジュール"
 msgid "Open files from all sub-folders as well?"
 msgstr ""
 
-#: modules/gui/beos/InterfaceWindow.cpp:159
-#: modules/gui/gtk/gtk_interface.c:2412 modules/gui/gtk/gtk_interface.c:2657
-#: modules/gui/gtk/gtk_interface.c:2888 modules/gui/gtk/gtk_interface.c:3269
-#: modules/gui/gtk/preferences.c:620 modules/gui/macosx/open.m:158
-#: modules/gui/macosx/playlistinfo.m:58 modules/gui/macosx/prefs.m:117
-#: modules/gui/macosx/prefs.m:137 modules/gui/macosx/wizard.m:104
-#: modules/gui/wxwindows/bookmarks.cpp:170
-#: modules/gui/wxwindows/iteminfo.cpp:93 modules/gui/wxwindows/open.cpp:293
-#: modules/gui/wxwindows/open.cpp:462
-#: modules/gui/wxwindows/preferences.cpp:212
-#: modules/gui/wxwindows/streamout.cpp:208
-#: modules/gui/wxwindows/subtitles.cpp:253
+#: 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/prefs.m:122 modules/gui/macosx/prefs.m:142
+#: modules/gui/macosx/wizard.m:355
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:108
+#: modules/gui/wxwidgets/dialogs/interaction.cpp:173
+#: modules/gui/wxwidgets/dialogs/interaction.cpp:184
+#: 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:207
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:198
+#: modules/gui/wxwidgets/dialogs/subtitles.cpp:245
 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/wxwindows/interface.cpp:479
-#: modules/gui/wxwindows/menus.cpp:311
+#: modules/gui/macosx/open.m:784 modules/gui/wxwidgets/interface.cpp:659
+#: modules/gui/wxwidgets/menus.cpp:315
 msgid "Open"
 msgstr "開く"
 
-#: modules/gui/beos/InterfaceWindow.cpp:208
-#: modules/gui/beos/InterfaceWindow.cpp:309 modules/gui/macosx/prefs.m:115
-#: modules/gui/wxwindows/preferences.cpp:189
+#: modules/gui/beos/InterfaceWindow.cpp:225
+#: modules/gui/beos/InterfaceWindow.cpp:326 modules/gui/macosx/prefs.m:120
+#: modules/gui/wxwidgets/dialogs/preferences.cpp:184
 msgid "Preferences"
 msgstr "設定"
 
-#: modules/gui/beos/InterfaceWindow.cpp:218
-#: modules/gui/beos/InterfaceWindow.cpp:307
-#: modules/gui/gtk/gnome_interface.c:2704 modules/gui/gtk/gtk_interface.c:2959
-#: modules/gui/kde/info.cpp:32 modules/gui/kde/messages.cpp:31
-#: modules/gui/macosx/intf.m:443 modules/gui/macosx/intf.m:532
-#: modules/gui/wxwindows/messages.cpp:64
+#: modules/gui/beos/InterfaceWindow.cpp:235
+#: modules/gui/beos/InterfaceWindow.cpp:324 modules/gui/macosx/intf.m:483
+#: modules/gui/macosx/intf.m:576 modules/gui/wxwidgets/dialogs/messages.cpp:53
 msgid "Messages"
 msgstr "メッセージ"
 
-#: modules/gui/beos/InterfaceWindow.cpp:246
-#: modules/gui/beos/PlayListWindow.cpp:87
-#: modules/gui/gtk/gnome_interface.c:2191 modules/gui/macosx/open.m:439
+#: modules/gui/beos/InterfaceWindow.cpp:263
+#: modules/gui/beos/PlayListWindow.cpp:87 modules/gui/macosx/open.m:439
 #: modules/gui/macosx/open.m:737 modules/gui/macosx/open.m:783
-#: modules/gui/wxwindows/dialogs.cpp:389 modules/gui/wxwindows/open.cpp:1126
-#: modules/gui/wxwindows/wizard.cpp:1258
+#: modules/gui/wxwidgets/dialogs.cpp:419
+#: modules/gui/wxwidgets/dialogs/open.cpp:1260
 msgid "Open File"
 msgstr "ファイルを開く"
 
-#: modules/gui/beos/InterfaceWindow.cpp:248
-#: modules/gui/beos/PlayListWindow.cpp:92 modules/gui/gtk/gtk_interface.c:630
+#: modules/gui/beos/InterfaceWindow.cpp:265
+#: modules/gui/beos/PlayListWindow.cpp:92
 msgid "Open Disc"
 msgstr "ディスクを開く"
 
-#: modules/gui/beos/InterfaceWindow.cpp:249
+#: modules/gui/beos/InterfaceWindow.cpp:266
 msgid "Open Subtitles"
 msgstr "字幕を開く"
 
-#: modules/gui/beos/InterfaceWindow.cpp:253
-#: modules/gui/gtk/gtk_interface.c:1580 modules/gui/pda/pda_interface.c:300
-#: modules/gui/pda/pda_interface.c:301 modules/gui/pda/pda_interface.c:1362
+#: modules/gui/beos/InterfaceWindow.cpp:270
+#: modules/gui/pda/pda_interface.c:300 modules/gui/pda/pda_interface.c:301
+#: modules/gui/pda/pda_interface.c:1362
 msgid "About"
 msgstr "VideoLAN について"
 
-#: modules/gui/beos/InterfaceWindow.cpp:268
+#: modules/gui/beos/InterfaceWindow.cpp:285
 msgid "Prev Title"
 msgstr "前のタイトル"
 
-#: modules/gui/beos/InterfaceWindow.cpp:269
+#: modules/gui/beos/InterfaceWindow.cpp:286
 msgid "Next Title"
 msgstr "次のタイトル"
 
-#: modules/gui/beos/InterfaceWindow.cpp:278
+#: modules/gui/beos/InterfaceWindow.cpp:295
 msgid "Go to Title"
 msgstr "タイトルに行く"
 
-#: modules/gui/beos/InterfaceWindow.cpp:282
+#: modules/gui/beos/InterfaceWindow.cpp:299
 msgid "Go to Chapter"
 msgstr "チャプターに行く"
 
-#: modules/gui/beos/InterfaceWindow.cpp:285
+#: modules/gui/beos/InterfaceWindow.cpp:302
 msgid "Speed"
 msgstr "速度"
 
-#: modules/gui/beos/InterfaceWindow.cpp:304 modules/gui/macosx/intf.m:525
+#: modules/gui/beos/InterfaceWindow.cpp:321 modules/gui/macosx/intf.m:567
 msgid "Window"
 msgstr "ウィンドウ"
 
-#: modules/gui/beos/InterfaceWindow.cpp:381
-#: modules/gui/gtk/gtk_interface.c:1661 modules/gui/gtk/gtk_interface.c:2405
-#: modules/gui/gtk/gtk_interface.c:2650 modules/gui/gtk/gtk_interface.c:2881
-#: modules/gui/gtk/gtk_interface.c:2988 modules/gui/gtk/gtk_interface.c:3262
-#: modules/gui/gtk/preferences.c:608 modules/gui/macosx/open.m:157
+#: modules/gui/beos/InterfaceWindow.cpp:398 modules/gui/macosx/bookmarks.m:106
+#: modules/gui/macosx/bookmarks.m:233 modules/gui/macosx/bookmarks.m:241
+#: modules/gui/macosx/bookmarks.m:291 modules/gui/macosx/bookmarks.m:301
+#: modules/gui/macosx/extended.m:602 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/wxwindows/bookmarks.cpp:167
-#: modules/gui/wxwindows/iteminfo.cpp:90 modules/gui/wxwindows/open.cpp:290
-#: modules/gui/wxwindows/open.cpp:459
-#: modules/gui/wxwindows/preferences.cpp:209
-#: modules/gui/wxwindows/streamout.cpp:205
-#: modules/gui/wxwindows/subtitles.cpp:250
+#: modules/gui/macosx/playlistinfo.m:57 modules/gui/macosx/wizard.m:475
+#: modules/gui/macosx/wizard.m:605 modules/gui/macosx/wizard.m:671
+#: modules/gui/macosx/wizard.m:1063 modules/gui/macosx/wizard.m:1129
+#: modules/gui/macosx/wizard.m:1694
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:105
+#: modules/gui/wxwidgets/dialogs/interaction.cpp:171
+#: 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/preferences.cpp:204
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:195
+#: modules/gui/wxwidgets/dialogs/subtitles.cpp:242
 msgid "OK"
 msgstr "OK"
 
-#: modules/gui/beos/InterfaceWindow.cpp:389
+#: modules/gui/beos/InterfaceWindow.cpp:406
 #, fuzzy
 msgid "VLC media player: Open Media Files"
 msgstr "字幕の選択"
 
-#: modules/gui/beos/InterfaceWindow.cpp:393
+#: modules/gui/beos/InterfaceWindow.cpp:410
 #, fuzzy
 msgid "VLC media player: Open Subtitle File"
 msgstr "字幕の選択"
@@ -8877,17 +9647,21 @@ msgid "playlist"
 msgstr "リスト"
 
 #: modules/gui/beos/PlayListWindow.cpp:96
-#: modules/gui/wxwindows/messages.cpp:89
+#: 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/intf.m:466
-#: modules/gui/wxwindows/bookmarks.cpp:227
+#: modules/gui/beos/PlayListWindow.cpp:101 modules/gui/macosx/bookmarks.m:95
+#: modules/gui/macosx/intf.m:508
+#: 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
 msgid "Edit"
 msgstr "編集"
 
-#: modules/gui/beos/PlayListWindow.cpp:103 modules/gui/macosx/intf.m:471
-#: modules/gui/macosx/playlist.m:231
+#: modules/gui/beos/PlayListWindow.cpp:103 modules/gui/macosx/intf.m:513
+#: modules/gui/macosx/playlist.m:503
 msgid "Select All"
 msgstr "すべてを選択"
 
@@ -8911,8 +9685,8 @@ msgstr "パスでソート"
 msgid "Randomize"
 msgstr "ランダム"
 
-#: modules/gui/beos/PlayListWindow.cpp:127
-#: modules/gui/wxwindows/bookmarks.cpp:223
+#: modules/gui/beos/PlayListWindow.cpp:127 modules/gui/macosx/bookmarks.m:97
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:161
 msgid "Remove"
 msgstr "削除"
 
@@ -8928,22 +9702,23 @@ msgstr "表示"
 msgid "Path"
 msgstr "パス"
 
-#: modules/gui/beos/PlayListWindow.cpp:147 modules/gui/gtk/preferences.c:327
-#: modules/gui/kde/pluginsbox.cpp:45 modules/gui/macosx/playlist.m:236
-#: modules/gui/macosx/wizard.m:123 modules/gui/wxwindows/bookmarks.cpp:159
-#: modules/gui/wxwindows/iteminfo.cpp:148 modules/gui/wxwindows/wizard.cpp:575
+#: modules/gui/beos/PlayListWindow.cpp:147 modules/gui/macosx/bookmarks.m:108
+#: modules/gui/macosx/playlist.m:132
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:97
+#: modules/gui/wxwidgets/dialogs/infopanels.cpp:70
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:369
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:583
 msgid "Name"
 msgstr "名前"
 
 #: modules/gui/beos/PreferencesWindow.cpp:249
-#: modules/gui/gtk/preferences.c:612
 msgid "Apply"
 msgstr "適用"
 
-#: modules/gui/beos/PreferencesWindow.cpp:254
-#: modules/gui/gtk/preferences.c:599 modules/gui/gtk/preferences.c:616
-#: modules/gui/macosx/output.m:512 modules/gui/macosx/playlist.m:388
-#: modules/gui/macosx/prefs.m:116 modules/gui/wxwindows/preferences.cpp:213
+#: 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:208
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:77
 msgid "Save"
 msgstr "保存"
 
@@ -8984,1753 +9759,1680 @@ msgstr "常に最前面"
 msgid "Take Screen Shot"
 msgstr "スクリーンショットを取る"
 
-#: modules/gui/gtk/gnome.c:55 modules/gui/gtk/gtk.c:57
-msgid "Show tooltips"
-msgstr "ツールチップを表示"
+#: modules/gui/macosx/about.m:73 modules/gui/macosx/intf.m:487
+#: modules/gui/wxwidgets/interface.cpp:592
+msgid "About VLC media player"
+msgstr "VLC メディア・プレイヤーについて"
+
+#: modules/gui/macosx/about.m:80
+#, c-format
+msgid "Compiled by %s, based on SVN revision %s"
+msgstr ""
 
-#: modules/gui/gtk/gnome.c:56 modules/gui/gtk/gtk.c:58
-msgid "Show tooltips for configuration options."
-msgstr "コンフィグレーション・オプションにツールチップを表示"
+#: modules/gui/macosx/bookmarks.m:92 modules/gui/macosx/intf.m:573
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:139
+msgid "Bookmarks"
+msgstr "ブックマーク"
 
-#: modules/gui/gtk/gnome.c:58
-#, fuzzy
-msgid "Show text on toolbar buttons"
-msgstr "ツールバー・ボタン上のテキストを表示"
+#: modules/gui/macosx/bookmarks.m:93
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:159
+msgid "Add"
+msgstr "追加"
+
+#: modules/gui/macosx/bookmarks.m:94 modules/gui/macosx/intf.m:512
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:163
+#: modules/gui/wxwidgets/dialogs/interaction.cpp:198
+#: modules/gui/wxwidgets/dialogs/messages.cpp:83
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:399
+msgid "Clear"
+msgstr "クリア"
+
+#: modules/gui/macosx/bookmarks.m:96
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:167
+msgid "Extract"
+msgstr "展開"
+
+#: modules/gui/macosx/bookmarks.m:101
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:197
+msgid "Size offset"
+msgstr "サイズオフセット"
+
+#: modules/gui/macosx/bookmarks.m:103
+#: 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/gtk/gnome.c:59
-msgid "Show the text below icons on the toolbar."
-msgstr "ツールバーのアイコン上に表示されるテキストを表示します。"
+#: modules/gui/macosx/bookmarks.m:136 modules/gui/macosx/playlist.m:764
+msgid "Untitled"
+msgstr "タイトルなし"
 
-#: modules/gui/gtk/gnome.c:61 modules/gui/gtk/gtk.c:60
+#: modules/gui/macosx/bookmarks.m:233
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:443
 #, fuzzy
-msgid "Maximum height for the configuration windows"
-msgstr "コンフィグレーション・ウィンドウの高さの最大値"
+msgid "No input"
+msgstr "入力がありません。\n"
 
-#: modules/gui/gtk/gnome.c:63 modules/gui/gtk/gtk.c:62
+#: modules/gui/macosx/bookmarks.m:234
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:441
 msgid ""
-"You can set the maximum height that the configuration windows in the "
-"preferences menu will occupy."
+"No input found. The stream must be playing or paused for bookmarks to work."
 msgstr ""
-"設定メニューのコンフィグレーション・ウィンドウが占める高さの最大値を設定でき"
-"ます。"
 
-#: modules/gui/gtk/gnome.c:66 modules/gui/gtk/gtk.c:65
-msgid "Interface default search path"
-msgstr "インタフェースの既定の検索パス"
+#: modules/gui/macosx/bookmarks.m:241
+msgid "Input has changed"
+msgstr ""
 
-#: modules/gui/gtk/gnome.c:68 modules/gui/gtk/gtk.c:67
+#: modules/gui/macosx/bookmarks.m:242
 msgid ""
-"This option allows you to set the default path that the interface will open "
-"when looking for a file."
+"Input has changed, unable to save bookmark. Use \"Pause\" while editing "
+"bookmarks to keep the same input."
 msgstr ""
-"ファイルを見つけるときにオープンされるインタフェースの既定のパスを設定しま"
-"す。"
 
-#: modules/gui/gtk/gnome.c:77
+#: modules/gui/macosx/bookmarks.m:291 modules/gui/macosx/wizard.m:1063
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:348
 #, fuzzy
-msgid "GNOME interface"
-msgstr "GNOMEインタフェース・モジュール"
-
-#: modules/gui/gtk/gnome_interface.c:19 modules/gui/gtk/gnome_interface.c:985
-#: modules/gui/gtk/gtk_interface.c:165 modules/gui/gtk/gtk_interface.c:1391
-msgid "_Open File..."
-msgstr "ファイルを開く(_O)..."
+msgid "Invalid selection"
+msgstr "選択"
 
-#: modules/gui/gtk/gnome_interface.c:20 modules/gui/gtk/gnome_interface.c:504
-#: modules/gui/gtk/gnome_interface.c:986 modules/gui/gtk/gtk_interface.c:173
-#: modules/gui/gtk/gtk_interface.c:619 modules/gui/gtk/gtk_interface.c:1399
+#: modules/gui/macosx/bookmarks.m:292
 #, fuzzy
-msgid "Open a file"
-msgstr "ファイルを開く"
+msgid "You have to select two bookmarks."
+msgstr "2 つのブックマークを選ばなければなりません"
 
-#: modules/gui/gtk/gnome_interface.c:26 modules/gui/gtk/gnome_interface.c:992
-#: modules/gui/gtk/gtk_interface.c:180 modules/gui/gtk/gtk_interface.c:1403
-msgid "Open _Disc..."
-msgstr "ディスクを開く(_D)..."
+#: modules/gui/macosx/bookmarks.m:301
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:358
+#, fuzzy
+msgid "No input found"
+msgstr "%@s は見つかりません"
 
-#: modules/gui/gtk/gnome_interface.c:27 modules/gui/gtk/gnome_interface.c:993
-#: modules/gui/gtk/gtk_interface.c:188 modules/gui/gtk/gtk_interface.c:1411
-msgid "Open Disc Media"
-msgstr "ディスクメディアを開く"
+#: modules/gui/macosx/bookmarks.m:302
+msgid "The stream must be playing or paused for bookmarks to work."
+msgstr ""
 
-#: modules/gui/gtk/gnome_interface.c:33
-msgid "_Network stream..."
-msgstr "ネットワークストリーム(_N)..."
+#: modules/gui/macosx/controls.m:127
+msgid "Random On"
+msgstr "ランダムオン"
 
-#: modules/gui/gtk/gnome_interface.c:34 modules/gui/gtk/gnome_interface.c:528
-#: modules/gui/gtk/gnome_interface.c:1000 modules/gui/gtk/gtk_interface.c:203
-#: modules/gui/gtk/gtk_interface.c:641 modules/gui/gtk/gtk_interface.c:1423
-msgid "Select a network stream"
-msgstr "ネットワークストリームを選択する"
+#: modules/gui/macosx/controls.m:131
+msgid "Random Off"
+msgstr "ランダムオフ"
 
-#: modules/gui/gtk/gnome_interface.c:41 modules/gui/gtk/gtk_interface.c:218
-msgid "_Eject Disc"
-msgstr "ディスクの取出し(_E)"
+#: modules/gui/macosx/controls.m:159 modules/gui/macosx/controls.m:605
+#: modules/gui/macosx/intf.m:523 modules/gui/macosx/playlist.m:518
+#: modules/gui/macosx/playlist.m:1192
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:54
+msgid "Repeat One"
+msgstr "1 回繰り返す"
 
-#: modules/gui/gtk/gnome_interface.c:42 modules/gui/gtk/gnome_interface.c:579
-#: modules/gui/gtk/gtk_interface.c:226
-msgid "Eject disc"
-msgstr "ディスクの取出し"
+#: modules/gui/macosx/controls.m:163 modules/gui/macosx/controls.m:195
+#: modules/gui/macosx/playlist.m:1211
+msgid "Repeat Off"
+msgstr "繰り返しオフ"
 
-#: modules/gui/gtk/gnome_interface.c:56 modules/gui/gtk/gtk_interface.c:286
-msgid "_Hide interface"
-msgstr "インタフェースを隠す(_H)"
+#: modules/gui/macosx/controls.m:191 modules/gui/macosx/controls.m:612
+#: modules/gui/macosx/intf.m:524 modules/gui/macosx/playlist.m:519
+#: modules/gui/macosx/playlist.m:1200
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:53
+msgid "Repeat All"
+msgstr "すべて繰り返す"
 
-#: modules/gui/gtk/gnome_interface.c:64 modules/gui/gtk/gtk_interface.c:306
-msgid "Progr_am"
-msgstr "プログラム(_a)"
+#: modules/gui/macosx/controls.m:290 modules/gui/macosx/controls.m:633
+#: modules/gui/macosx/intf.m:549
+msgid "Half Size"
+msgstr "1/2 サイズ"
 
-#: modules/gui/gtk/gnome_interface.c:65 modules/gui/gtk/gtk_interface.c:315
-msgid "Choose the program"
-msgstr "プログラムの選択"
+#: modules/gui/macosx/controls.m:292 modules/gui/macosx/controls.m:634
+#: modules/gui/macosx/intf.m:550
+msgid "Normal Size"
+msgstr "通常サイズ"
 
-#: modules/gui/gtk/gnome_interface.c:71 modules/gui/gtk/gtk_interface.c:319
-msgid "_Title"
-msgstr "タイトル(_T)"
+#: modules/gui/macosx/controls.m:294 modules/gui/macosx/controls.m:635
+#: modules/gui/macosx/intf.m:551
+msgid "Double Size"
+msgstr "2倍サイズ"
 
-#: modules/gui/gtk/gnome_interface.c:72
-msgid "Choose title"
-msgstr "タイトルの選択"
+#: modules/gui/macosx/controls.m:296 modules/gui/macosx/controls.m:639
+#: modules/gui/macosx/controls.m:650 modules/gui/macosx/intf.m:554
+msgid "Float on Top"
+msgstr "常に前面"
 
-#: modules/gui/gtk/gnome_interface.c:78 modules/gui/gtk/gtk_interface.c:332
-msgid "_Chapter"
-msgstr "チャプター(_C)"
+#: modules/gui/macosx/controls.m:298 modules/gui/macosx/controls.m:636
+#: modules/gui/macosx/intf.m:552
+msgid "Fit to Screen"
+msgstr "画面にあわせる"
 
-#: modules/gui/gtk/gnome_interface.c:79
-msgid "Choose chapter"
-msgstr "チャプターの選択"
+#: modules/gui/macosx/controls.m:598 modules/gui/macosx/intf.m:522
+#: modules/gui/macosx/playlist.m:512
+msgid "Random"
+msgstr "ランダム"
 
-#: modules/gui/gtk/gnome_interface.c:86 modules/gui/gtk/gtk_interface.c:352
-msgid "_Playlist..."
-msgstr "プレイリスト(_P)..."
+#: modules/gui/macosx/controls.m:619 modules/gui/macosx/intf.m:525
+#, fuzzy
+msgid "Step Forward"
+msgstr "転送"
 
-#: modules/gui/gtk/gnome_interface.c:87 modules/gui/gtk/gtk_interface.c:360
-msgid "Open the playlist window"
-msgstr "プレイリストを開く"
+#: modules/gui/macosx/controls.m:620 modules/gui/macosx/intf.m:526
+#, fuzzy
+msgid "Step Backward"
+msgstr "逆転再生"
 
-#: modules/gui/gtk/gnome_interface.c:93 modules/gui/gtk/gtk_interface.c:364
-msgid "_Modules..."
-msgstr "モジュール(_M)..."
+#: modules/gui/macosx/embeddedwindow.m:42 modules/gui/macosx/intf.m:472
+#: modules/gui/pda/pda_interface.c:238 modules/gui/pda/pda_interface.c:239
+msgid "Rewind"
+msgstr "巻き戻す"
 
-#: modules/gui/gtk/gnome_interface.c:94 modules/gui/gtk/gtk_interface.c:373
-msgid "Open the module manager"
-msgstr "モジュール・マネージャー"
+#: modules/gui/macosx/embeddedwindow.m:43 modules/gui/macosx/intf.m:475
+#, fuzzy
+msgid "Fast Forward"
+msgstr "転送"
 
-#: modules/gui/gtk/gnome_interface.c:100 modules/gui/gtk/gtk_interface.c:375
-#: modules/gui/kde/interface.cpp:133
-msgid "Messages..."
-msgstr "メッセージ..."
+#: modules/gui/macosx/embeddedwindow.m:45
+#: modules/gui/macosx/embeddedwindow.m:72 modules/gui/macosx/intf.m:473
+#: modules/gui/macosx/intf.m:516 modules/gui/macosx/intf.m:590
+#: modules/gui/macosx/intf.m:1312 modules/gui/macosx/intf.m:1313
+#: modules/gui/macosx/intf.m:1314 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:269
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:277
+#: 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/gtk/gnome_interface.c:101 modules/gui/gtk/gtk_interface.c:381
-msgid "Open the messages window"
-msgstr "メッセージウィンドウを表示"
+#: modules/gui/macosx/embeddedwindow.m:66 modules/gui/macosx/intf.m:1304
+#: modules/gui/macosx/intf.m:1305 modules/gui/macosx/intf.m:1306
+#: 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/gtk/gnome_interface.c:118 modules/gui/gtk/gnome_interface.c:901
-#: modules/gui/gtk/gtk_interface.c:433 modules/gui/gtk/gtk_interface.c:1235
+#: modules/gui/macosx/equalizer.m:141 modules/gui/wxwidgets/extrapanel.cpp:473
 #, fuzzy
-msgid "_Language"
-msgstr "言語"
-
-#: modules/gui/gtk/gnome_interface.c:119 modules/gui/gtk/gnome_interface.c:902
-#: modules/gui/gtk/gtk_interface.c:442
-msgid "Select audio channel"
-msgstr "オーディオ・チャンネルの選択"
-
-#: modules/gui/gtk/gnome_interface.c:126 modules/gui/gtk/gtk_interface.c:452
-#: modules/gui/gtk/gtk_interface.c:1253 modules/gui/macosx/intf.m:494
-msgid "Volume Up"
-msgstr "ボリュームを上げる"
-
-#: modules/gui/gtk/gnome_interface.c:133 modules/gui/gtk/gtk_interface.c:459
-#: modules/gui/gtk/gtk_interface.c:1260 modules/gui/macosx/intf.m:495
-msgid "Volume Down"
-msgstr "ボリュームを下げる"
+msgid "2 Pass"
+msgstr "バス"
 
-#: modules/gui/gtk/gnome_interface.c:167 modules/gui/gtk/gnome_interface.c:950
-#: modules/gui/gtk/gtk_interface.c:515 modules/gui/gtk/gtk_interface.c:1312
-msgid "_Subtitles"
-msgstr "字幕(_S)"
+#: modules/gui/macosx/equalizer.m:142
+msgid ""
+"If you enable this settting, the equalizer filter will be applied twice. The "
+"effect will be sharper."
+msgstr ""
 
-#: modules/gui/gtk/gnome_interface.c:168 modules/gui/gtk/gnome_interface.c:951
-#: modules/gui/gtk/gtk_interface.c:524
-msgid "Select subtitles channel"
-msgstr "字幕の選択"
+#: modules/gui/macosx/equalizer.m:145
+msgid ""
+"Enable the equalizer. You can either manually change the bands or use a "
+"preset."
+msgstr ""
 
-#: modules/gui/gtk/gnome_interface.c:175 modules/gui/gtk/gnome_interface.c:958
-#: modules/gui/gtk/gtk_interface.c:536 modules/gui/gtk/gtk_interface.c:1332
-msgid "_Fullscreen"
-msgstr "全画面化(_F)"
+#: modules/gui/macosx/equalizer.m:147
+#, fuzzy
+msgid "Preamp"
+msgstr "ストリーム"
 
-#: modules/gui/gtk/gnome_interface.c:211 modules/gui/gtk/gtk_interface.c:415
-msgid "_Audio"
-msgstr "オーディオ(_A)"
+#: modules/gui/macosx/extended.m:79 modules/gui/wxwidgets/extrapanel.cpp:1214
+#, fuzzy
+msgid "Extended controls"
+msgstr "リモート・コントロール"
 
-#: modules/gui/gtk/gnome_interface.c:218 modules/gui/gtk/gtk_interface.c:497
-msgid "_Video"
-msgstr "ビデオ"
+#: modules/gui/macosx/extended.m:83 modules/gui/wxwidgets/extrapanel.cpp:302
+#, fuzzy
+msgid "Video filters"
+msgstr "ビデオタイトル"
 
-#: modules/gui/gtk/gnome_interface.c:274 modules/gui/gtk/gtk_interface.c:121
-#: modules/gui/gtk/gtk_interface.c:1595 modules/gui/macosx/intf.m:428
-#: modules/gui/macosx/intf.m:817 modules/gui/macosx/intf.m:1125
-#: modules/gui/pda/pda_interface.c:212 modules/gui/pda/pda_interface.c:1355
-msgid "VLC media player"
-msgstr "VLC メディアプレイヤー"
+#: modules/gui/macosx/extended.m:84 modules/gui/wxwidgets/extrapanel.cpp:206
+msgid "Adjust Image"
+msgstr "画像調整"
 
-#: modules/gui/gtk/gnome_interface.c:516
-msgid "Open disc"
-msgstr "ディスクを開く"
+#: modules/gui/macosx/extended.m:85 modules/gui/macosx/wizard.m:363
+#: modules/gui/macosx/wizard.m:364 modules/gui/macosx/wizard.m:434
+#: modules/gui/macosx/wizard.m:436 modules/gui/macosx/wizard.m:438
+#: modules/gui/macosx/wizard.m:447
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:470
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:477
+#, fuzzy
+msgid "More Info"
+msgstr "デバイス名"
 
-#: modules/gui/gtk/gnome_interface.c:527 modules/gui/gtk/gtk_interface.c:640
-msgid "Net"
-msgstr "ネット"
+#: modules/gui/macosx/extended.m:86 modules/gui/wxwidgets/extrapanel.cpp:153
+msgid "Blurring"
+msgstr ""
 
-#: modules/gui/gtk/gnome_interface.c:539 modules/gui/gtk/gtk_interface.c:651
-msgid "Sat"
-msgstr "衛星"
+#: modules/gui/macosx/extended.m:87 modules/gui/wxwidgets/extrapanel.cpp:153
+msgid "Creates a motion blurring on the image"
+msgstr ""
 
-#: modules/gui/gtk/gnome_interface.c:540
-msgid "Open a satellite card"
-msgstr "衛星カードを開く"
+#: modules/gui/macosx/extended.m:88 modules/gui/wxwidgets/extrapanel.cpp:151
+#: modules/video_filter/distort.c:78
+#, fuzzy
+msgid "Distortion"
+msgstr "湾曲モード"
 
-#: modules/gui/gtk/gnome_interface.c:553
-#: modules/gui/gtk/gnome_interface.c:1034 modules/gui/gtk/gtk_interface.c:664
-#: modules/gui/gtk/gtk_interface.c:1134
-msgid "Back"
-msgstr "逆転"
+#: modules/gui/macosx/extended.m:89 modules/gui/wxwidgets/extrapanel.cpp:151
+msgid "Adds distorsion effects"
+msgstr ""
 
-#: modules/gui/gtk/gnome_interface.c:554
+#: modules/gui/macosx/extended.m:90 modules/gui/wxwidgets/extrapanel.cpp:150
 #, fuzzy
-msgid "Go backward"
-msgstr "逆転再生"
+msgid "Image clone"
+msgstr "サイズ"
 
-#: modules/gui/gtk/gnome_interface.c:567
-msgid "Stop stream"
-msgstr "ストリームの停止"
+#: modules/gui/macosx/extended.m:91 modules/gui/wxwidgets/extrapanel.cpp:150
+msgid "Creates several clones of the image"
+msgstr ""
 
-#: modules/gui/gtk/gnome_interface.c:578 modules/gui/gtk/gtk_interface.c:687
-msgid "Eject"
-msgstr "取出し"
+#: modules/gui/macosx/extended.m:92
+msgid "Image cropping"
+msgstr "画像縁取り"
 
-#: modules/gui/gtk/gnome_interface.c:590
-#: modules/gui/gtk/gnome_interface.c:1013 modules/gui/gtk/gtk_interface.c:698
-#: modules/gui/macosx/intf.m:433 modules/gui/macosx/intf.m:474
-#: modules/gui/macosx/intf.m:544 modules/gui/macosx/intf.m:1224
-#: modules/gui/macosx/intf.m:1225 modules/gui/macosx/intf.m:1226
-#: modules/gui/macosx/playlist.m:229 modules/gui/pda/pda_interface.c:262
-#: modules/gui/pda/pda_interface.c:263 modules/gui/wxwindows/interface.cpp:481
-#: modules/gui/wxwindows/interface.cpp:1272
-#: modules/gui/wxwindows/menus.cpp:288 modules/gui/wxwindows/menus.cpp:302
-#: modules/gui/wxwindows/playlist.cpp:269
-#: modules/gui/wxwindows/playlist.cpp:277
-msgid "Play"
-msgstr "再生"
+#: modules/gui/macosx/extended.m:93
+msgid "Crops the image"
+msgstr "画像の縁取り"
 
-#: modules/gui/gtk/gnome_interface.c:591
-msgid "Play stream"
-msgstr "ストリームの再生"
+#: modules/gui/macosx/extended.m:94 modules/gui/wxwidgets/extrapanel.cpp:152
+#, fuzzy
+msgid "Image inversion"
+msgstr "サイズ"
 
-#: modules/gui/gtk/gnome_interface.c:602
-#: modules/gui/gtk/gnome_interface.c:1020 modules/gui/gtk/gtk_interface.c:709
-#: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:1216
-#: modules/gui/macosx/intf.m:1217 modules/gui/macosx/intf.m:1218
-#: modules/gui/pda/pda_interface.c:250 modules/gui/pda/pda_interface.c:251
-#: modules/gui/wxwindows/interface.cpp:482
-#: modules/gui/wxwindows/interface.cpp:1266
-#: modules/gui/wxwindows/menus.cpp:290 modules/visualization/xosd.c:238
-#: modules/visualization/xosd.c:239
-#, c-format
-msgid "Pause"
-msgstr "一時停止"
+#: modules/gui/macosx/extended.m:95 modules/gui/wxwidgets/extrapanel.cpp:152
+msgid "Inverts the image colors"
+msgstr ""
 
-#: modules/gui/gtk/gnome_interface.c:603
-msgid "Pause stream"
-msgstr "ストリームの一時停止"
+#: modules/gui/macosx/extended.m:96 modules/gui/wxwidgets/extrapanel.cpp:154
+#: modules/video_filter/transform.c:67
+#, fuzzy
+msgid "Transformation"
+msgstr "バージョン情報の印刷"
 
-#: modules/gui/gtk/gnome_interface.c:617
-#: modules/gui/gtk/gnome_interface.c:1041 modules/gui/gtk/gtk_interface.c:723
-#: modules/gui/gtk/gtk_interface.c:1142 modules/gui/kde/interface.cpp:160
-msgid "Slow"
-msgstr "スロー"
+#: modules/gui/macosx/extended.m:97 modules/gui/wxwidgets/extrapanel.cpp:154
+msgid "Rotates or flips the image"
+msgstr ""
 
-#: modules/gui/gtk/gnome_interface.c:618
-#: modules/gui/wxwindows/interface.cpp:486
-msgid "Play slower"
-msgstr "スロー再生"
+#: modules/gui/macosx/extended.m:98 modules/gui/wxwidgets/extrapanel.cpp:403
+#, fuzzy
+msgid "Volume normalization"
+msgstr "ビジュアル化"
 
-#: modules/gui/gtk/gnome_interface.c:630
-#: modules/gui/gtk/gnome_interface.c:1048 modules/gui/gtk/gtk_interface.c:735
-#: modules/gui/gtk/gtk_interface.c:1150 modules/gui/kde/interface.cpp:161
-msgid "Fast"
-msgstr "早送り"
+#: modules/gui/macosx/extended.m:99
+msgid ""
+"This filters prevents the audio output power from going over a defined value."
+msgstr ""
 
-#: modules/gui/gtk/gnome_interface.c:631
-#: modules/gui/wxwindows/interface.cpp:487
-msgid "Play faster"
-msgstr "早送り再生"
+#: modules/gui/macosx/extended.m:101 modules/gui/wxwidgets/extrapanel.cpp:398
+#, fuzzy
+msgid "Headphone virtualization"
+msgstr "ヘッドホーンの仮想的な音の広がり効果"
 
-#: modules/gui/gtk/gnome_interface.c:644
-#: modules/gui/skins2/src/dialogs.cpp:233
-#: modules/gui/wxwindows/playlist.cpp:936
-msgid "Open playlist"
-msgstr "プレイリストを開く"
-
-#: modules/gui/gtk/gnome_interface.c:655
-#: modules/gui/gtk/gnome_interface.c:1063 modules/gui/gtk/gtk_interface.c:758
-#: modules/gui/gtk/gtk_interface.c:844 modules/gui/gtk/gtk_interface.c:888
-#: modules/gui/gtk/gtk_interface.c:1173 modules/gui/kde/interface.cpp:129
-#: modules/gui/kde/interface.cpp:162
-msgid "Prev"
-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."
+msgstr ""
 
-#: modules/gui/gtk/gnome_interface.c:656
-msgid "Previous file"
-msgstr "前のファイル"
+#: modules/gui/macosx/extended.m:104 modules/gui/wxwidgets/extrapanel.cpp:408
+#, fuzzy
+msgid "Maximum level"
+msgstr "品質レベル"
 
-#: modules/gui/gtk/gnome_interface.c:668
-msgid "Next file"
-msgstr "次のファイル"
+#: modules/gui/macosx/extended.m:105 modules/gui/wxwidgets/extrapanel.cpp:223
+#: modules/gui/wxwidgets/extrapanel.cpp:483
+msgid "Restore Defaults"
+msgstr "デフォルトの復元"
 
-#: modules/gui/gtk/gnome_interface.c:732 modules/gui/gtk/gtk_interface.c:830
-msgid "Title:"
-msgstr "タイトル:"
+#: modules/gui/macosx/extended.m:109 modules/gui/wxwidgets/extrapanel.cpp:246
+msgid "Gamma"
+msgstr "ガンマ"
 
-#: modules/gui/gtk/gnome_interface.c:752
-msgid "Select previous title"
-msgstr "前のタイトルを選択"
+#: modules/gui/macosx/extended.m:111 modules/gui/wxwidgets/extrapanel.cpp:241
+#, fuzzy
+msgid "Saturation"
+msgstr "持続期間"
 
-#: modules/gui/gtk/gnome_interface.c:775 modules/gui/gtk/gtk_interface.c:874
-msgid "Chapter:"
-msgstr "チャプター:"
+#: modules/gui/macosx/extended.m:112 modules/gui/macosx/macosx.m:59
+#: modules/gui/macosx/sfilters.m:82 modules/gui/macosx/sfilters.m:91
+#: modules/gui/macosx/sfilters.m:101
+msgid "Opaqueness"
+msgstr ""
 
-#: modules/gui/gtk/gnome_interface.c:795
-msgid "Select previous chapter"
-msgstr "前のチャプターを選択"
+#: modules/gui/macosx/extended.m:602
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:499
+#: modules/gui/wxwidgets/extrapanel.cpp:1011
+#, fuzzy
+msgid "More information"
+msgstr "バージョン情報の印刷"
 
-#: modules/gui/gtk/gnome_interface.c:803
-msgid "Select next chapter"
-msgstr "次のチャプターを選択"
+#: modules/gui/macosx/extended.m:603 modules/gui/wxwidgets/extrapanel.cpp:1001
+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)."
+msgstr ""
 
-#: modules/gui/gtk/gnome_interface.c:811 modules/gui/gtk/gtk_interface.c:911
-msgid "No server"
-msgstr "サーバーなし"
+#: modules/gui/macosx/intf.m:467
+#, fuzzy
+msgid "VLC - Controller"
+msgstr "コントロール"
 
-#: modules/gui/gtk/gnome_interface.c:959
-msgid "Toggle fullscreen mode"
-msgstr "全画面表示の切替え"
+#: modules/gui/macosx/intf.m:468 modules/gui/macosx/intf.m:899
+#: modules/gui/macosx/intf.m:1213 modules/gui/pda/pda_interface.c:212
+#: modules/gui/pda/pda_interface.c:1355
+msgid "VLC media player"
+msgstr "VLC メディアプレイヤー"
 
-#: modules/gui/gtk/gnome_interface.c:999 modules/gui/gtk/gtk_interface.c:195
-#: modules/gui/gtk/gtk_interface.c:1415
-msgid "_Network Stream..."
-msgstr "ネットワークストリーム(_N)..."
+#: modules/gui/macosx/intf.m:484
+msgid "Open CrashLog"
+msgstr "クラッシュログを開く"
 
-#: modules/gui/gtk/gnome_interface.c:1070 modules/gui/gtk/gtk_interface.c:1182
-msgid "_Jump..."
-msgstr "ジャンプ(_J)..."
+#: modules/gui/macosx/intf.m:490
+msgid "Preferences..."
+msgstr "設定..."
 
-#: modules/gui/gtk/gnome_interface.c:1071
-msgid "Got directly so specified point"
-msgstr "特定位置を直接指定"
+#: modules/gui/macosx/intf.m:493
+msgid "Services"
+msgstr "サービス"
 
-#: modules/gui/gtk/gnome_interface.c:1079
-msgid "Switch program"
-msgstr "プログラムの切替え"
+#: modules/gui/macosx/intf.m:494
+msgid "Hide VLC"
+msgstr "VLCを隠す"
 
-#: modules/gui/gtk/gnome_interface.c:1085 modules/gui/gtk/gtk_interface.c:1209
-msgid "_Navigation"
-msgstr "ナビゲーション(_N)"
+#: modules/gui/macosx/intf.m:495
+msgid "Hide Others"
+msgstr "インタフェースを隠す"
 
-#: modules/gui/gtk/gnome_interface.c:1086
-msgid "Navigate through titles and chapters"
-msgstr "タイトルとチャプターからナビゲート"
+#: modules/gui/macosx/intf.m:496
+msgid "Show All"
+msgstr "すべてを表示"
 
-#: modules/gui/gtk/gnome_interface.c:1108 modules/gui/gtk/gtk_interface.c:1446
-msgid "Toggle _Interface"
-msgstr "メインウィンドウの表示/非表示(_I)"
+#: modules/gui/macosx/intf.m:497 modules/gui/wxwidgets/interface.cpp:1487
+msgid "Quit VLC"
+msgstr "VLCを終了"
 
-#: modules/gui/gtk/gnome_interface.c:1115 modules/gui/gtk/gtk_interface.c:1455
-msgid "Playlist..."
-msgstr "プレイリスト..."
+#: modules/gui/macosx/intf.m:499
+msgid "1:File"
+msgstr "1:ファイル"
 
-#: modules/gui/gtk/gnome_interface.c:1361 modules/gui/gtk/gtk_interface.c:1603
-#: modules/gui/kde/kde.cpp:112 modules/gui/pda/pda_interface.c:1349
-msgid "(c) 1996-2004 the VideoLAN team"
-msgstr "(c) 1996-2004 the VideoLAN チーム"
+#: modules/gui/macosx/intf.m:500
+msgid "Open File..."
+msgstr "ファイルを開く..."
 
-#: modules/gui/gtk/gnome_interface.c:1363 modules/gui/gtk/gtk_interface.c:1646
-#: modules/gui/kde/kde.cpp:109
+#: modules/gui/macosx/intf.m:501
 #, fuzzy
-msgid ""
-"This is the VLC media player, a DVD, MPEG and DivX player. It can play MPEG "
-"and MPEG2 files from a file or from a network source."
-msgstr ""
-"このソフトウェアはDVDおよび、MPEGを再生するVideoLANクライアントです。\n"
-"ファイルまたは、ネットワークからMPEGとMPEG 2データを再生することができます。"
+msgid "Quick Open File..."
+msgstr "ファイルを開く..."
 
-#: modules/gui/gtk/gnome_interface.c:1460
-msgid "Open Stream"
-msgstr "ストリームを開く"
+#: modules/gui/macosx/intf.m:502
+msgid "Open Disc..."
+msgstr "ディスクを開く..."
 
-#: modules/gui/gtk/gnome_interface.c:1499 modules/gui/gtk/gtk_interface.c:1814
-msgid "Open Target:"
-msgstr "ターゲットを開く:"
+#: modules/gui/macosx/intf.m:503
+msgid "Open Network..."
+msgstr "ネットワークを開く"
 
-#: modules/gui/gtk/gnome_interface.c:1519 modules/gui/gtk/gtk_interface.c:1834
-#: modules/gui/wince/open.cpp:146 modules/gui/wxwindows/open.cpp:408
-msgid ""
-"Alternatively, you can build an MRL using one of the following predefined "
-"targets:"
-msgstr ""
-"別の方法として、あらかじめ以下に定義されたターゲットの一つを使ってMRLを構成で"
-"きます。:"
+#: modules/gui/macosx/intf.m:504
+msgid "Open Recent"
+msgstr "最近使った項目を開く"
 
-#: modules/gui/gtk/gnome_interface.c:1563
-#: modules/gui/gtk/gnome_interface.c:2007 modules/gui/gtk/gtk_interface.c:1878
-#: modules/gui/gtk/gtk_interface.c:2324 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:1177
-#: modules/gui/wince/preferences_widgets.cpp:508
-#: modules/gui/wxwindows/open.cpp:600
-#: modules/gui/wxwindows/preferences_widgets.cpp:670
-#: modules/gui/wxwindows/streamout.cpp:484
-#: modules/gui/wxwindows/subtitles.cpp:91
-msgid "Browse..."
-msgstr "ブラウズ..."
+#: modules/gui/macosx/intf.m:505 modules/gui/macosx/intf.m:1866
+msgid "Clear Menu"
+msgstr "メニューをクリアする"
 
-#: modules/gui/gtk/gnome_interface.c:1587 modules/gui/gtk/gtk_interface.c:1902
-#: modules/gui/wxwindows/open.cpp:649
-msgid "Disc type"
-msgstr "ディスクタイプ"
+#: modules/gui/macosx/intf.m:506
+#, fuzzy
+msgid "Streaming/Exporting Wizard..."
+msgstr "ストリームの情報..."
 
-#: modules/gui/gtk/gnome_interface.c:1606 modules/gui/gtk/gtk_interface.c:1921
-#: modules/gui/macosx/open.m:174 modules/gui/macosx/open.m:595
-#: modules/gui/wxwindows/open.cpp:644
-msgid "DVD"
-msgstr "DVD"
+#: modules/gui/macosx/intf.m:509
+msgid "Cut"
+msgstr "カット"
 
-#: modules/gui/gtk/gnome_interface.c:1630 modules/gui/gtk/gtk_interface.c:1945
-#: modules/gui/macosx/open.m:167 modules/gui/wxwindows/open.cpp:656
-msgid "Device name"
-msgstr "デバイス名"
+#: modules/gui/macosx/intf.m:510
+msgid "Copy"
+msgstr "コピー"
 
-#: modules/gui/gtk/gnome_interface.c:1669 modules/gui/gtk/gtk_interface.c:2005
-#: modules/gui/macosx/open.m:171
-msgid "Use DVD menus"
-msgstr "DVD メニューを使用"
+#: modules/gui/macosx/intf.m:511
+msgid "Paste"
+msgstr "ペースト"
 
-#: modules/gui/gtk/gnome_interface.c:1726 modules/gui/gtk/gtk_interface.c:2041
-#: modules/gui/macosx/open.m:184 modules/gui/macosx/open.m:655
-#: modules/gui/macosx/open.m:704 modules/gui/wxwindows/open.cpp:701
-msgid "UDP/RTP Multicast"
-msgstr "UDP/RTP マルチキャスト"
+#: modules/gui/macosx/intf.m:515
+#, fuzzy
+msgid "Playback"
+msgstr "再生一時停止"
 
-#: modules/gui/gtk/gnome_interface.c:1746
-#: modules/gui/gtk/gnome_interface.c:1795
-#: modules/gui/gtk/gnome_interface.c:2924 modules/gui/gtk/gtk_interface.c:2061
-#: modules/gui/gtk/gtk_interface.c:2110 modules/gui/gtk/gtk_interface.c:3237
-#: modules/gui/macosx/open.m:178 modules/gui/macosx/open.m:180
-#: modules/gui/macosx/output.m:147 modules/gui/wxwindows/open.cpp:726
-#: modules/gui/wxwindows/open.cpp:753 modules/gui/wxwindows/streamout.cpp:514
-#: modules/stream_out/rtp.c:67
-msgid "Port"
-msgstr "ポート番号"
+#: modules/gui/macosx/intf.m:536
+msgid "Volume Up"
+msgstr "ボリュームを上げる"
 
-#: modules/gui/gtk/gnome_interface.c:1756 modules/gui/gtk/gtk_interface.c:2071
-#: modules/gui/macosx/open.m:179 modules/gui/macosx/output.m:146
-#: modules/gui/wxwindows/open.cpp:745 modules/gui/wxwindows/streamout.cpp:503
-msgid "Address"
-msgstr "アドレス"
+#: modules/gui/macosx/intf.m:537
+msgid "Volume Down"
+msgstr "ボリュームを下げる"
 
-#: modules/gui/gtk/gnome_interface.c:1856 modules/gui/gtk/gtk_interface.c:2171
-msgid "Symbol Rate"
-msgstr "シンボル・レート"
+#: modules/gui/macosx/intf.m:558 modules/gui/macosx/intf.m:559
+#: modules/gui/macosx/vout.m:193
+msgid "Video Device"
+msgstr "ビデオデバイス"
 
-#: modules/gui/gtk/gnome_interface.c:1876 modules/gui/gtk/gtk_interface.c:2191
-msgid "Polarization"
-msgstr "極性"
+#: modules/gui/macosx/intf.m:568
+msgid "Minimize Window"
+msgstr "ウィンドウを最小化"
 
-#: modules/gui/gtk/gnome_interface.c:1896 modules/gui/gtk/gtk_interface.c:2211
-msgid "FEC"
-msgstr ""
+#: modules/gui/macosx/intf.m:569
+msgid "Close Window"
+msgstr "ウィンドウを閉じる"
 
-#: modules/gui/gtk/gnome_interface.c:1915 modules/gui/gtk/gtk_interface.c:2230
-msgid "Vertical"
-msgstr "垂直"
+#: modules/gui/macosx/intf.m:570
+msgid "Controller"
+msgstr "コントローラー"
 
-#: modules/gui/gtk/gnome_interface.c:1923 modules/gui/gtk/gtk_interface.c:2238
-msgid "Horizontal"
-msgstr "æ°´å¹³"
+#: modules/gui/macosx/intf.m:572
+#, fuzzy
+msgid "Extended Controls"
+msgstr "リモート・コントロール"
 
-#: modules/gui/gtk/gnome_interface.c:1965 modules/gui/gtk/gtk_interface.c:2280
-msgid "Satellite"
-msgstr "衛星"
+#: modules/gui/macosx/intf.m:575 modules/gui/macosx/intf.m:606
+#: modules/gui/macosx/playlistinfo.m:202
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:274
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:280
+msgid "Info"
+msgstr "情報"
 
-#: modules/gui/gtk/gnome_interface.c:2014 modules/gui/gtk/gtk_interface.c:2331
-#: modules/gui/macosx/open.m:244
-msgid "delay"
-msgstr "ディレイ"
+#: modules/gui/macosx/intf.m:578
+msgid "Bring All to Front"
+msgstr "すべてを前に"
 
-#: modules/gui/gtk/gnome_interface.c:2029 modules/gui/gtk/gtk_interface.c:2347
-#: modules/gui/macosx/open.m:246
-msgid "fps"
-msgstr "fps"
+#: modules/gui/macosx/intf.m:580
+msgid "Help"
+msgstr "ヘルプ"
 
-#: modules/gui/gtk/gnome_interface.c:2051
-msgid "stream output"
-msgstr "ストリーム出力"
+#: modules/gui/macosx/intf.m:581
+msgid "ReadMe..."
+msgstr "読んでください..."
 
-#: modules/gui/gtk/gnome_interface.c:2058 modules/gui/gtk/gtk_interface.c:2378
-#: modules/gui/macosx/open.m:241 modules/gui/macosx/output.m:137
-#: modules/gui/wxwindows/open.cpp:423 modules/gui/wxwindows/open.cpp:612
-msgid "Settings..."
-msgstr "設定..."
+#: modules/gui/macosx/intf.m:582
+msgid "Online Documentation"
+msgstr "オンラインドキュメント"
 
-#: modules/gui/gtk/gnome_interface.c:2228
-msgid "Modules"
-msgstr "モジュール"
+#: modules/gui/macosx/intf.m:583
+msgid "Report a Bug"
+msgstr "バグ報告"
 
-#: modules/gui/gtk/gnome_interface.c:2236
-msgid ""
-"Sorry, the module manager isn't functional yet. Please retry in a later "
-"version."
-msgstr ""
-"すみませんが、このモジュール・マネージャーはまだ機能しません。新しいバージョ"
-"ンで試してみてください。"
+#: modules/gui/macosx/intf.m:584
+msgid "VideoLAN Website"
+msgstr "VideoLAN ウェブサイト"
 
-#: modules/gui/gtk/gnome_interface.c:2312 modules/gui/gtk/gtk_interface.c:2780
-msgid "All"
-msgstr "すべて"
+#: modules/gui/macosx/intf.m:585
+msgid "License"
+msgstr "ライセンス"
 
-#: modules/gui/gtk/gnome_interface.c:2319
-msgid "Item"
-msgstr "項目"
+#: modules/gui/macosx/intf.m:586
+#, fuzzy
+msgid "Make a donation"
+msgstr "マケドニア語"
 
-#: modules/gui/gtk/gnome_interface.c:2331 modules/video_filter/crop.c:62
-msgid "Crop"
-msgstr "縁取り"
+#: modules/gui/macosx/intf.m:587
+#, fuzzy
+msgid "Online Forum"
+msgstr "オンラインドキュメント"
 
-#: modules/gui/gtk/gnome_interface.c:2338
-msgid "Invert"
-msgstr "逆転"
+#: modules/gui/macosx/intf.m:597 modules/gui/wxwidgets/dialogs/wizard.cpp:80
+msgid "Error"
+msgstr "エラー"
 
-#: modules/gui/gtk/gnome_interface.c:2345 modules/gui/gtk/preferences.c:384
-#: modules/gui/kde/pluginsbox.cpp:48 modules/gui/macosx/prefs_widgets.m:1217
-msgid "Select"
-msgstr "選択"
+#: modules/gui/macosx/intf.m:598
+#, fuzzy
+msgid ""
+"An error has occurred which probably prevented the execution of your request:"
+msgstr "要求された処理の実行でエラーが発生しました :"
 
-#: modules/gui/gtk/gnome_interface.c:2357 modules/gui/gtk/gtk_interface.c:2724
-#: modules/gui/wxwindows/bookmarks.cpp:221
-msgid "Add"
-msgstr "追加"
+#: modules/gui/macosx/intf.m:600
+#, fuzzy
+msgid "If you believe that it is a bug, please follow the instructions at:"
+msgstr "もし、バグであると思われるなら、以下の手順にしたがってください :"
 
-#: modules/gui/gtk/gnome_interface.c:2364 modules/gui/gtk/gtk_interface.c:2766
-#: modules/gui/macosx/playlist.m:230 modules/gui/pda/pda_interface.c:1254
-#: modules/gui/wxwindows/playlist.cpp:273
-#: modules/gui/wxwindows/playlist.cpp:279
-msgid "Delete"
-msgstr "削除"
+#: modules/gui/macosx/intf.m:602
+msgid "Open Messages Window"
+msgstr "メッセージウィンドウを表示"
 
-#: modules/gui/gtk/gnome_interface.c:2371 modules/gui/gtk/gtk_interface.c:2794
-msgid "Selection"
-msgstr "選択"
+#: modules/gui/macosx/intf.m:603
+msgid "Dismiss"
+msgstr "やり直し"
 
-#: modules/gui/gtk/gnome_interface.c:2600
-msgid "Jump to: "
-msgstr "指定時間へジャンプ: "
+#: modules/gui/macosx/intf.m:604
+msgid "Suppress further errors"
+msgstr ""
 
-#: modules/gui/gtk/gnome_interface.c:2808
-msgid "stream output (MRL)"
-msgstr "ストリームの出力 (MRL)"
+#: modules/gui/macosx/intf.m:1071
+#, fuzzy, c-format
+msgid "Volume: %d%%"
+msgstr "音量 %d%%"
 
-#: modules/gui/gtk/gnome_interface.c:2823 modules/gui/gtk/gtk_interface.c:3078
+#: modules/gui/macosx/intf.m:1733
 #, fuzzy
-msgid "Destination Target: "
-msgstr "送信先のアスペクト・レシオ"
+msgid "No CrashLog found"
+msgstr "%@s は見つかりません"
 
-#: modules/gui/gtk/gnome_interface.c:2879 modules/stream_out/rtp.c:87
-msgid "RTP"
-msgstr "RTP"
+#: modules/gui/macosx/intf.m:1733
+msgid "You haven't experienced any heavy crashes yet."
+msgstr ""
 
-#: modules/gui/gtk/gnome_interface.c:2889 modules/gui/gtk/gtk_interface.c:3144
+#: modules/gui/macosx/macosx.m:50
 #, fuzzy
-msgid "Path:"
-msgstr "ポート番号"
-
-#: modules/gui/gtk/gnome_interface.c:2899 modules/gui/gtk/gtk_interface.c:3169
-#: modules/gui/pda/pda_interface.c:432
-msgid "Address:"
-msgstr "アドレス:"
+msgid "Use embedded video output"
+msgstr "QT埋め込みモジュール"
 
-#: modules/gui/gtk/gnome_interface.c:2968 modules/gui/gtk/gtk_interface.c:3213
-#: modules/gui/pda/pda_interface.c:1051
-msgid "TS"
-msgstr "TS"
+#: modules/gui/macosx/macosx.m:51
+msgid ""
+"Disable this if you want the video output to be opened in a separate window "
+"instead of in the control window."
+msgstr ""
 
-#: modules/gui/gtk/gnome_interface.c:2976 modules/gui/gtk/gtk_interface.c:3221
-#: modules/gui/pda/pda_interface.c:1050
-msgid "PS"
-msgstr "PS"
+#: modules/gui/macosx/macosx.m:54
+msgid "Video device"
+msgstr "ビデオデバイス"
 
-#: modules/gui/gtk/gnome_interface.c:2984 modules/gui/gtk/gtk_interface.c:3229
-#: modules/gui/pda/pda_interface.c:1053
-msgid "AVI"
-msgstr "AVI"
+#: 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'."
+msgstr ""
 
-#: modules/gui/gtk/gnome_support.c:100 modules/gui/gtk/gnome_support.c:138
-#: modules/gui/gtk/gtk_support.c:121 modules/gui/pda/pda_support.c:90
-#: modules/gui/pda/pda_support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "ピックスマップ・ファイル %s が見つかりません。"
+#: 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/gtk/gnome_support.c:116
-#, c-format
-msgid "Couldn't create pixmap from file: %s"
-msgstr "ファイル %s からピックスマップを生成できません"
+#: modules/gui/macosx/macosx.m:64
+msgid "Stretch video to fill window"
+msgstr ""
 
-#: modules/gui/gtk/gtk.c:76
-msgid "Gtk+ interface"
-msgstr "Gtk+ インタフェース"
+#: 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."
+msgstr ""
 
-#: modules/gui/gtk/gtk_interface.c:147 modules/gui/gtk/gtk_interface.c:1373
-msgid "_File"
-msgstr "ファイル(_F)"
+#: modules/gui/macosx/macosx.m:69
+msgid "Fill fullscreen"
+msgstr "全画面化"
 
-#: modules/gui/gtk/gtk_interface.c:238
-msgid "_Close"
-msgstr "閉じる(_C)"
+#: 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/gtk/gtk_interface.c:246
-msgid "Close the window"
-msgstr "ウィンドウを閉じる"
+#: modules/gui/macosx/macosx.m:74
+msgid "Use as Desktop Background"
+msgstr ""
 
-#: modules/gui/gtk/gtk_interface.c:253 modules/gui/gtk/gtk_interface.c:1483
-msgid "E_xit"
-msgstr "終了(_x)"
+#: modules/gui/macosx/macosx.m:75
+msgid ""
+"Use the video as the Desktop Background of the Finder. Desktop icons cannot "
+"be interacted with in this mode."
+msgstr ""
 
-#: modules/gui/gtk/gtk_interface.c:261
-msgid "Exit the program"
-msgstr "プログラムの終了"
+#: modules/gui/macosx/macosx.m:79
+#, fuzzy
+msgid "Mac OS X interface"
+msgstr "ネットワーク・インタフェース"
 
-#: modules/gui/gtk/gtk_interface.c:268
-msgid "_View"
-msgstr "表示(_V)"
+#: modules/gui/macosx/macosx.m:88
+msgid "Quartz video"
+msgstr ""
 
-#: modules/gui/gtk/gtk_interface.c:294
-msgid "Hide the main interface window"
-msgstr "インタフェースウィンドウを隠す"
+#: modules/gui/macosx/open.m:154
+msgid "Open Source"
+msgstr "ソースを開く"
 
-#: modules/gui/gtk/gtk_interface.c:328
-msgid "Navigate through the stream"
-msgstr "ストリームをナビゲートする"
+#: modules/gui/macosx/open.m:155 modules/gui/wince/open.cpp:130
+msgid "Media Resource Locator (MRL)"
+msgstr "メディア・リソース・ロケータ (MRL)"
 
-#: modules/gui/gtk/gtk_interface.c:385
-msgid "_Settings"
-msgstr "設定(_S)"
+#: 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/wince/preferences_widgets.cpp:512
+#: modules/gui/wxwidgets/dialogs/open.cpp:631
+#: modules/gui/wxwidgets/dialogs/open.cpp:665
+#: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:660
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:502
+#: modules/gui/wxwidgets/dialogs/subtitles.cpp:82
+msgid "Browse..."
+msgstr "参照..."
 
-#: modules/gui/gtk/gtk_interface.c:403 modules/gui/gtk/gtk_interface.c:1464
-msgid "_Preferences..."
-msgstr "設定(_P)..."
+#: modules/gui/macosx/open.m:165
+msgid "Treat as a pipe rather than as a file"
+msgstr "ファイルとしてではなく、パイプとして扱う"
 
-#: modules/gui/gtk/gtk_interface.c:411
-msgid "Configure the application"
-msgstr "アプリケーションの設定"
+#: modules/gui/macosx/open.m:167 modules/gui/wxwidgets/dialogs/open.cpp:723
+msgid "Device name"
+msgstr "デバイス名"
 
-#: modules/gui/gtk/gtk_interface.c:569
-msgid "_Help"
-msgstr "ヘルプ(_H)"
+#: modules/gui/macosx/open.m:171
+msgid "Use DVD menus"
+msgstr "DVD メニューを使用"
 
-#: modules/gui/gtk/gtk_interface.c:587 modules/gui/gtk/gtk_interface.c:1435
-msgid "_About..."
-msgstr "VideoLAN について(_A)..."
+#: modules/gui/macosx/open.m:173 modules/gui/macosx/open.m:478
+msgid "VIDEO_TS folder"
+msgstr "VIDEO_TS フォルダ"
 
-#: modules/gui/gtk/gtk_interface.c:595
-msgid "About this application"
-msgstr "このアプリケーションについて"
+#: modules/gui/macosx/open.m:174 modules/gui/macosx/open.m:595
+#: modules/gui/wxwidgets/dialogs/open.cpp:697
+msgid "DVD"
+msgstr "DVD"
 
-#: modules/gui/gtk/gtk_interface.c:652
-msgid "Open a Satellite Card"
-msgstr "衛星カードを開く"
+#: modules/gui/macosx/open.m:178 modules/gui/macosx/open.m:180
+#: modules/gui/macosx/output.m:147 modules/gui/wxwidgets/dialogs/open.cpp:827
+#: modules/gui/wxwidgets/dialogs/open.cpp:854
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:532 modules/stream_out/rtp.c:70
+msgid "Port"
+msgstr "ポート番号"
 
-#: modules/gui/gtk/gtk_interface.c:665
-msgid "Go Backward"
-msgstr "逆転再生"
+#: modules/gui/macosx/open.m:179 modules/gui/macosx/output.m:146
+#: modules/gui/wxwidgets/dialogs/open.cpp:846
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:521
+msgid "Address"
+msgstr "アドレス"
 
-#: modules/gui/gtk/gtk_interface.c:677
-msgid "Stop Stream"
-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:802
+msgid "UDP/RTP Multicast"
+msgstr "UDP/RTP マルチキャスト"
 
-#: modules/gui/gtk/gtk_interface.c:699
-msgid "Play Stream"
-msgstr "ストリームの再生"
+#: modules/gui/macosx/open.m:185 modules/gui/macosx/open.m:656
+#: modules/gui/macosx/open.m:717
+msgid "HTTP/FTP/MMS/RTSP"
+msgstr "HTTP/FTP/MMS/RTSP"
 
-#: modules/gui/gtk/gtk_interface.c:710
-msgid "Pause Stream"
-msgstr "ストリームの一時停止"
+#: modules/gui/macosx/open.m:186 modules/gui/wxwidgets/dialogs/open.cpp:820
+#: modules/services_discovery/sap.c:109
+msgid "Allow timeshifting"
+msgstr "タイムシフトを許可する"
 
-#: modules/gui/gtk/gtk_interface.c:724
-msgid "Play Slower"
-msgstr "スロー再生"
+#: modules/gui/macosx/open.m:240
+msgid "Load subtitles file:"
+msgstr "読み込む字幕ファイル:"
 
-#: modules/gui/gtk/gtk_interface.c:736
-msgid "Play Faster"
-msgstr "早送り再生"
+#: modules/gui/macosx/open.m:241 modules/gui/macosx/output.m:137
+#: modules/gui/wxwidgets/dialogs/open.cpp:436
+msgid "Settings..."
+msgstr "設定..."
 
-#: modules/gui/gtk/gtk_interface.c:748
-msgid "Open Playlist"
-msgstr "プレイリストを開く"
+#: modules/gui/macosx/open.m:243
+msgid "Override"
+msgstr "上書き"
 
-#: modules/gui/gtk/gtk_interface.c:759
-msgid "Previous File"
-msgstr "前のファイル"
+#: modules/gui/macosx/open.m:244
+msgid "delay"
+msgstr "ディレイ"
 
-#: modules/gui/gtk/gtk_interface.c:770
-msgid "Next File"
-msgstr "次のファイル"
+#: modules/gui/macosx/open.m:246
+msgid "fps"
+msgstr "fps"
 
-#: modules/gui/gtk/gtk_interface.c:1110
-msgid "_Play"
-msgstr "再生(_P)"
+#: modules/gui/macosx/open.m:248
+#: modules/gui/wxwidgets/dialogs/subtitles.cpp:97
+msgid "Subtitles encoding"
+msgstr "字幕エンコンコード中"
 
-#: modules/gui/gtk/gtk_interface.c:1612
-msgid "Authors"
-msgstr "作成者"
+#: modules/gui/macosx/open.m:250 modules/misc/freetype.c:96
+#: modules/misc/win32text.c:67
+msgid "Font size"
+msgstr "フォントサイズ"
 
-#: modules/gui/gtk/gtk_interface.c:1626
-msgid "the VideoLAN team <videolan@videolan.org>"
-msgstr ""
+#: modules/gui/macosx/open.m:255
+#, fuzzy
+msgid "Font Properties"
+msgstr "プロパティ"
 
-#: modules/gui/gtk/gtk_interface.c:1778
-msgid "Open Target"
-msgstr "ファイルを開く"
+#: modules/gui/macosx/open.m:256
+#, fuzzy
+msgid "Subtitle File"
+msgstr "字幕ファイル"
 
-#: modules/gui/gtk/gtk_interface.c:2051
-msgid "HTTP/FTP/MMS"
-msgstr ""
+#: modules/gui/macosx/open.m:530 modules/gui/macosx/open.m:582
+#: modules/gui/macosx/open.m:590 modules/gui/macosx/open.m:598
+#, objc-format
+msgid "No %@s found"
+msgstr "%@s は見つかりません"
 
-#: modules/gui/gtk/gtk_interface.c:2293
-msgid "Use a subtitles file"
-msgstr "字幕ファイルを使う"
+#: modules/gui/macosx/open.m:633
+msgid "Open VIDEO_TS Directory"
+msgstr "VIDEO_TSディレクトリを開く"
 
-#: modules/gui/gtk/gtk_interface.c:2315
+#: modules/gui/macosx/output.m:136
 #, fuzzy
-msgid "Select a subtitles file"
-msgstr "字幕の選択"
+msgid "Advanced output:"
+msgstr "ALSAオーディオ・モジュール"
 
-#: modules/gui/gtk/gtk_interface.c:2345
-msgid "Set the delay (in seconds)"
-msgstr "ディレイの設定 (秒)"
+#: modules/gui/macosx/output.m:140
+msgid "Output Options"
+msgstr "出力オプション"
 
-#: modules/gui/gtk/gtk_interface.c:2361
-msgid "Set the number of Frames Per Second"
-msgstr ""
+#: modules/gui/macosx/output.m:141
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:471
+#, fuzzy
+msgid "Play locally"
+msgstr "スロー再生"
 
-#: modules/gui/gtk/gtk_interface.c:2376
+#: modules/gui/macosx/output.m:144
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:511
 #, fuzzy
-msgid "Use stream output"
+msgid "Dump raw input"
 msgstr "ストリームの出力先の選択"
 
-#: modules/gui/gtk/gtk_interface.c:2384
-msgid "Stream output configuration "
-msgstr "ストリーム出力の設定"
-
-#: modules/gui/gtk/gtk_interface.c:2530
-msgid "Select File"
-msgstr "ファイルの選択"
-
-#: modules/gui/gtk/gtk_interface.c:2577
-msgid "Jump"
-msgstr "ジャンプ"
-
-#: modules/gui/gtk/gtk_interface.c:2584
-msgid "Go To:"
+#: modules/gui/macosx/output.m:155
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:659
+msgid "Encapsulation Method"
 msgstr ""
 
-#: modules/gui/gtk/gtk_interface.c:2600
-msgid "s."
-msgstr "秒"
-
-#: modules/gui/gtk/gtk_interface.c:2615
-msgid "m:"
-msgstr "分:"
-
-#: modules/gui/gtk/gtk_interface.c:2630
-msgid "h:"
-msgstr "時:"
-
-#: modules/gui/gtk/gtk_interface.c:2787
-msgid "Selected"
-msgstr "選択済み"
-
-#: modules/gui/gtk/gtk_interface.c:2810
-msgid "_Crop"
-msgstr "縁取り(_C)"
+#: modules/gui/macosx/output.m:159
+#, fuzzy
+msgid "Transcode options"
+msgstr "ストリームの一時停止"
 
-#: modules/gui/gtk/gtk_interface.c:2821
-msgid "_Invert"
-msgstr "逆転(_I)"
+#: modules/gui/macosx/output.m:163 modules/gui/macosx/output.m:173
+#: modules/gui/macosx/wizard.m:416
+#: 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
+msgid "Bitrate (kb/s)"
+msgstr "ビットレート (kb/秒)"
 
-#: modules/gui/gtk/gtk_interface.c:2832
-msgid "_Select"
-msgstr "選択(_S)"
+#: modules/gui/macosx/output.m:166
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:780
+msgid "Scale"
+msgstr "スケール"
 
-#: modules/gui/gtk/gtk_interface.c:3063
+#: modules/gui/macosx/output.m:180
 #, fuzzy
-msgid "Stream output (MRL)"
-msgstr "ストリームの出力MRL"
-
-#: modules/gui/gtk/gtk_support.c:130
-#, c-format
-msgid "Error loading pixmap file: %s"
-msgstr "ピックスマップ・ファイル %s のロードでエラーが発生しました。"
-
-#: modules/gui/gtk/menu.c:867
-#, c-format
-msgid "Title %d (%d)"
-msgstr "タイトル %d (%d)"
+msgid "Stream Announcing"
+msgstr "ストリーム出力"
 
-#: modules/gui/gtk/menu.c:934
-#, c-format
-msgid "Chapter %d"
-msgstr "チャプター %d"
+#: modules/gui/macosx/output.m:181
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:591
+msgid "SAP announce"
+msgstr "SAP アナウンス"
 
-#: modules/gui/gtk/open.c:276
-msgid "PBC LID"
-msgstr "PBC LID"
+#: modules/gui/macosx/output.m:182 modules/gui/macosx/output.m:635
+#, fuzzy
+msgid "RTSP announce"
+msgstr "SAP アナウンス"
 
-#: modules/gui/gtk/preferences.c:396 modules/gui/kde/pluginsbox.cpp:51
-msgid "Selected:"
-msgstr "選択済み:"
+#: modules/gui/macosx/output.m:183 modules/gui/macosx/output.m:641
+msgid "HTTP announce"
+msgstr "HTTP アナウンス"
 
-#: modules/gui/kde/disc.cpp:31
-#, fuzzy
-msgid "Disk type"
-msgstr "ディスク・タイプ"
+#: modules/gui/macosx/output.m:184 modules/gui/macosx/output.m:647
+msgid "Export SDP as file"
+msgstr "ファイルとして SDP をエクスポートする"
 
-#: modules/gui/kde/disc.cpp:37 modules/gui/kde/net.cpp:39
-#, fuzzy
-msgid "Starting position"
-msgstr "垂直方向位置"
+#: modules/gui/macosx/output.m:186
+msgid "Channel Name"
+msgstr "チャンネル名"
 
-#: modules/gui/kde/disc.cpp:40
-msgid "Title "
-msgstr "タイトル "
+#: modules/gui/macosx/output.m:187
+msgid "SDP URL"
+msgstr "SDP URL"
 
-#: modules/gui/kde/disc.cpp:43
-msgid "Chapter "
-msgstr "チャプター "
+#: modules/gui/macosx/output.m:525
+msgid "Save File"
+msgstr "ファイルの保存"
 
-#: modules/gui/kde/disc.cpp:47
-msgid "Device name "
-msgstr "デバイス名"
+#: modules/gui/macosx/playlist.m:499
+msgid "Save Playlist..."
+msgstr "再生一覧の保存..."
 
-#: modules/gui/kde/interface.cpp:88
-msgid "Languages"
-msgstr "言語"
+#: modules/gui/macosx/playlist.m:501 modules/gui/pda/pda_interface.c:1254
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:273
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:279
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_streampanel.cpp:104
+msgid "Delete"
+msgstr "削除"
 
-#: modules/gui/kde/interface.cpp:89
-msgid "language"
-msgstr "言語"
+#: modules/gui/macosx/playlist.m:502
+msgid "Expand Node"
+msgstr "ノードを展開する"
 
-#: modules/gui/kde/interface.cpp:110
-msgid "Open &Disk"
-msgstr "ディスクを開く(&D)"
+#: modules/gui/macosx/playlist.m:504 modules/gui/macosx/playlistinfo.m:53
+msgid "Properties"
+msgstr "プロパティ"
 
-#: modules/gui/kde/interface.cpp:113
+#: modules/gui/macosx/playlist.m:505
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:271
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:278
 #, fuzzy
-msgid "Open &Stream"
-msgstr "ストリームを開く(&S)"
+msgid "Preparse"
+msgstr "準備"
 
-#: modules/gui/kde/interface.cpp:116
-msgid "&Backward"
-msgstr "逆転再生(&B)"
+#: modules/gui/macosx/playlist.m:506
+msgid "Sort Node by Name"
+msgstr "名前でノードをソートする"
 
-#: modules/gui/kde/interface.cpp:119
-msgid "&Stop"
-msgstr "停止(&S)"
+#: modules/gui/macosx/playlist.m:507
+msgid "Sort Node by Author"
+msgstr "著者でノードをソートする"
 
-#: modules/gui/kde/interface.cpp:121
-msgid "&Play"
-msgstr "再生(&P)"
+#: modules/gui/macosx/playlist.m:510 modules/gui/macosx/playlist.m:1518
+msgid "No items in the playlist"
+msgstr "再生一覧に項目がありません"
 
-#: modules/gui/kde/interface.cpp:123
-msgid "P&ause"
-msgstr "一時停止(&A)"
+#: modules/gui/macosx/playlist.m:514
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:317
+msgid "Search"
+msgstr "検索"
 
-#: modules/gui/kde/interface.cpp:125
-msgid "&Slow"
-msgstr "スロー(&S)"
+#: modules/gui/macosx/playlist.m:516
+#, fuzzy
+msgid "Search in Playlist"
+msgstr "再生一覧を開く"
 
-#: modules/gui/kde/interface.cpp:127
-msgid "Fas&t"
-msgstr "早送り(&T)"
+#: modules/gui/macosx/playlist.m:517
+msgid "Standard Play"
+msgstr "標準再生"
 
-#: modules/gui/kde/interface.cpp:137
-msgid "Stream info..."
-msgstr "ストリームの情報..."
+#: modules/gui/macosx/playlist.m:765
+msgid "Save Playlist"
+msgstr "再生一覧を保存"
 
-#: modules/gui/kde/interface.cpp:148
-msgid "Opens an existing document"
-msgstr "既存のウィンドウを開く"
+#: modules/gui/macosx/playlist.m:1512
+#, fuzzy, c-format
+msgid "%i items in the playlist"
+msgstr "デフォルトで再生一覧に追加"
 
-#: modules/gui/kde/interface.cpp:149
+#: modules/gui/macosx/playlist.m:1522
 #, fuzzy
-msgid "Opens a recently used file"
-msgstr "ファイルを開く"
+msgid "1 item in the playlist"
+msgstr "デフォルトで再生一覧に追加"
 
-#: modules/gui/kde/interface.cpp:150
-#, fuzzy
-msgid "Quits the application"
-msgstr "このアプリケーションについて"
+#: modules/gui/macosx/playlistinfo.m:54
+#: modules/gui/wxwidgets/dialogs/infopanels.cpp:61
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:584
+msgid "URI"
+msgstr "URI"
 
-#: modules/gui/kde/interface.cpp:151
-msgid "Enables/disables the toolbar"
-msgstr "ツールバーの有効/無効"
+#: modules/gui/macosx/prefs.m:123
+#: modules/gui/wxwidgets/dialogs/preferences.cpp:210
+msgid "Reset All"
+msgstr "すべてリセット"
 
-#: modules/gui/kde/interface.cpp:152
-msgid "Enables/disables the status bar"
-msgstr "ステータスバーの有効/無効"
+#: modules/gui/macosx/prefs.m:142
+#: modules/gui/wxwidgets/dialogs/preferences.cpp:291
+msgid "Reset Preferences"
+msgstr "設定をリセットする"
 
-#: modules/gui/kde/interface.cpp:154
-msgid "Opens a disk"
-msgstr "ディスクを開く"
+#: modules/gui/macosx/prefs.m:143
+msgid "Continue"
+msgstr "続ける"
+
+#: modules/gui/macosx/prefs.m:145
+#: modules/gui/wxwidgets/dialogs/preferences.cpp:289
+msgid ""
+"Beware this will reset your 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."
+msgstr ""
+
+#: modules/gui/macosx/prefs_widgets.m:1222
+msgid "Select a directory"
+msgstr "ディレクトリを選択する"
+
+#: modules/gui/macosx/prefs_widgets.m:1222
+msgid "Select a file"
+msgstr "ファイルを瀬何託する"
 
-#: modules/gui/kde/interface.cpp:155
+#: modules/gui/macosx/prefs_widgets.m:1223
+msgid "Select"
+msgstr "選択"
+
+#: modules/gui/macosx/sfilters.m:71
 #, fuzzy
-msgid "Opens a network stream"
-msgstr "ネットワークストリームを選択する"
+msgid "Subpicture Filters"
+msgstr "字幕ファイル"
 
-#: modules/gui/kde/interface.cpp:156
+#: modules/gui/macosx/sfilters.m:72
 #, fuzzy
-msgid "Backward"
-msgstr "逆転再生"
+msgid "Logo"
+msgstr "ループ"
 
-#: modules/gui/kde/interface.cpp:157
-msgid "Stops playback"
-msgstr "再生停止"
+#: modules/gui/macosx/sfilters.m:74 modules/gui/macosx/sfilters.m:99
+#: modules/video_filter/marq.c:114
+msgid "Marquee"
+msgstr ""
 
-#: modules/gui/kde/interface.cpp:158
-msgid "Starts playback"
-msgstr "再生開始"
+#: modules/gui/macosx/sfilters.m:75
+#, fuzzy
+msgid "Save settings"
+msgstr "トラック設定"
 
-#: modules/gui/kde/interface.cpp:159
-msgid "Pauses playback"
-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
+msgid "Enabled"
+msgstr "有効"
 
-#: modules/gui/kde/interface.cpp:175 modules/gui/kde/interface.cpp:217
-#: modules/gui/kde/interface.cpp:223 modules/gui/kde/interface.cpp:230
-#: modules/gui/kde/interface.cpp:247 modules/gui/kde/interface.cpp:264
+#: modules/gui/macosx/sfilters.m:78
 #, fuzzy
-msgid "Ready."
-msgstr "メッセージ..."
+msgid "Image"
+msgstr "サイズ"
 
-#: modules/gui/kde/interface.cpp:200 modules/gui/kde/interface.cpp:222
-msgid "Opening file..."
-msgstr "ファイルを開く..."
+#: modules/gui/macosx/sfilters.m:85
+#, fuzzy
+msgid "Timestamp"
+msgstr "タイムシフト"
 
-#: modules/gui/kde/interface.cpp:202 modules/gui/macosx/intf.m:458
-msgid "Open File..."
-msgstr "ファイルを開く..."
+#: modules/gui/macosx/sfilters.m:87 modules/gui/macosx/sfilters.m:108
+#: modules/gui/pda/pda.c:232
+msgid "Size"
+msgstr "サイズ"
 
-#: modules/gui/kde/interface.cpp:228
-msgid "Exiting..."
-msgstr "終了..."
+#: modules/gui/macosx/sfilters.m:95 modules/gui/macosx/sfilters.m:110
+#, fuzzy
+msgid "(in pixels)"
+msgstr "ピクセル指定の幅"
 
-#: modules/gui/kde/interface.cpp:235
-msgid "Toggling toolbar..."
-msgstr ""
+#: modules/gui/macosx/sfilters.m:103
+#, fuzzy
+msgid "Timeout"
+msgstr "時間"
 
-#: modules/gui/kde/interface.cpp:252
-msgid "Toggle the status bar..."
-msgstr ""
+#: modules/gui/macosx/sfilters.m:105
+#, fuzzy
+msgid "ms"
+msgstr "mms"
 
-#: modules/gui/kde/interface.cpp:438
-msgid "Off"
-msgstr "オフ"
+#: modules/gui/macosx/sfilters.m:136 modules/misc/freetype.c:120
+#: modules/misc/win32text.c:79 modules/video_filter/marq.c:52
+#: modules/video_filter/rss.c:55 modules/video_filter/time.c:52
+msgid "Black"
+msgstr "黒"
+
+#: modules/gui/macosx/sfilters.m:137 modules/misc/freetype.c:120
+#: modules/misc/win32text.c:79 modules/video_filter/marq.c:53
+#: modules/video_filter/rss.c:56 modules/video_filter/time.c:53
+msgid "Gray"
+msgstr "灰"
 
-#: modules/gui/kde/kde.cpp:56
-msgid "KDE interface"
-msgstr "KDE インタフェース"
+#: modules/gui/macosx/sfilters.m:138 modules/misc/freetype.c:120
+#: modules/misc/win32text.c:79 modules/video_filter/marq.c:53
+#: modules/video_filter/rss.c:56 modules/video_filter/time.c:53
+msgid "Silver"
+msgstr "銀"
 
-#: modules/gui/kde/kde.cpp:57
-msgid "path to ui.rc file"
-msgstr "ui.rc ファイルのパス"
+#: modules/gui/macosx/sfilters.m:139 modules/misc/freetype.c:120
+#: modules/misc/win32text.c:79 modules/video_filter/marq.c:53
+#: modules/video_filter/rss.c:56 modules/video_filter/time.c:53
+msgid "White"
+msgstr "白"
 
-#: modules/gui/kde/messages.cpp:52
-msgid "Messages:"
-msgstr "メッセージ:"
+#: modules/gui/macosx/sfilters.m:140 modules/misc/freetype.c:120
+#: modules/misc/win32text.c:79 modules/video_filter/marq.c:53
+#: modules/video_filter/rss.c:56 modules/video_filter/time.c:53
+#, fuzzy
+msgid "Maroon"
+msgstr "モノラル"
 
-#: modules/gui/kde/net.cpp:31
-msgid "Protocol"
-msgstr "プロトコル"
+#: modules/gui/macosx/sfilters.m:141 modules/misc/freetype.c:121
+#: modules/misc/win32text.c:80 modules/video_filter/marq.c:53
+#: modules/video_filter/rss.c:56 modules/video_filter/time.c:53
+msgid "Red"
+msgstr "赤"
 
-#: modules/gui/kde/net.cpp:42
+#: modules/gui/macosx/sfilters.m:142 modules/misc/freetype.c:121
+#: modules/misc/win32text.c:80 modules/video_filter/marq.c:54
+#: modules/video_filter/rss.c:57 modules/video_filter/time.c:54
 #, fuzzy
-msgid "Address "
-msgstr "ホスト名/アドレス"
+msgid "Fuchsia"
+msgstr "フュージョン"
 
-#: modules/gui/kde/net.cpp:45
-msgid "Port "
-msgstr "ポート "
+#: modules/gui/macosx/sfilters.m:143 modules/misc/freetype.c:121
+#: modules/misc/win32text.c:80 modules/video_filter/marq.c:54
+#: modules/video_filter/rss.c:57 modules/video_filter/time.c:54
+msgid "Yellow"
+msgstr "黄"
 
-#: modules/gui/kde/preferences.cpp:56
-msgid "&Save"
-msgstr "保存(&S)"
+#: modules/gui/macosx/sfilters.m:144 modules/misc/freetype.c:121
+#: modules/misc/win32text.c:80 modules/video_filter/marq.c:54
+#: modules/video_filter/rss.c:57 modules/video_filter/time.c:54
+msgid "Olive"
+msgstr "オリーブ"
 
-#: modules/gui/macosx/about.m:76 modules/gui/macosx/intf.m:447
-#: modules/gui/wxwindows/interface.cpp:434
-msgid "About VLC media player"
-msgstr "VLC メディア・プレイヤーについて"
+#: modules/gui/macosx/sfilters.m:145 modules/misc/freetype.c:121
+#: modules/misc/win32text.c:80 modules/video_filter/marq.c:54
+#: modules/video_filter/rss.c:57 modules/video_filter/time.c:54
+msgid "Green"
+msgstr "緑"
 
-#: modules/gui/macosx/controls.m:126
-msgid "Random On"
-msgstr "ランダムオン"
+#: modules/gui/macosx/sfilters.m:146 modules/misc/freetype.c:121
+#: modules/misc/win32text.c:80 modules/video_filter/marq.c:55
+#: modules/video_filter/rss.c:58 modules/video_filter/time.c:55
+#, fuzzy
+msgid "Teal"
+msgstr "メタル"
 
-#: modules/gui/macosx/controls.m:130
-msgid "Random Off"
-msgstr "ランダムオフ"
+#: modules/gui/macosx/sfilters.m:147 modules/misc/freetype.c:122
+#: modules/misc/win32text.c:81 modules/video_filter/marq.c:55
+#: modules/video_filter/rss.c:58 modules/video_filter/time.c:55
+msgid "Lime"
+msgstr "ライム"
 
-#: modules/gui/macosx/controls.m:158 modules/gui/macosx/controls.m:588
-#: modules/gui/macosx/intf.m:481 modules/gui/macosx/playlist.m:248
-#: modules/gui/macosx/playlist.m:769 modules/gui/wxwindows/playlist.cpp:53
-msgid "Repeat One"
-msgstr "1 回繰り返す"
+#: modules/gui/macosx/sfilters.m:148 modules/misc/freetype.c:122
+#: modules/misc/win32text.c:81 modules/video_filter/marq.c:55
+#: modules/video_filter/rss.c:58 modules/video_filter/time.c:55
+msgid "Purple"
+msgstr "ç´«"
 
-#: modules/gui/macosx/controls.m:162 modules/gui/macosx/controls.m:194
-#: modules/gui/macosx/playlist.m:788
-msgid "Repeat Off"
-msgstr "繰り返しオフ"
+#: modules/gui/macosx/sfilters.m:149 modules/misc/freetype.c:122
+#: modules/misc/win32text.c:81 modules/video_filter/marq.c:55
+#: modules/video_filter/rss.c:58 modules/video_filter/time.c:55
+msgid "Navy"
+msgstr "ネイビー"
 
-#: modules/gui/macosx/controls.m:190 modules/gui/macosx/controls.m:595
-#: modules/gui/macosx/intf.m:482 modules/gui/macosx/playlist.m:249
-#: modules/gui/macosx/playlist.m:777 modules/gui/wxwindows/playlist.cpp:52
-msgid "Repeat All"
-msgstr "すべて繰り返す"
+#: modules/gui/macosx/sfilters.m:150 modules/misc/freetype.c:122
+#: modules/misc/win32text.c:81 modules/video_filter/marq.c:55
+#: modules/video_filter/rss.c:58 modules/video_filter/time.c:55
+msgid "Blue"
+msgstr "青"
 
-#: modules/gui/macosx/controls.m:273 modules/gui/macosx/controls.m:616
-#: modules/gui/macosx/intf.m:507
-msgid "Half Size"
-msgstr "1/2 サイズ"
+#: modules/gui/macosx/sfilters.m:151 modules/misc/freetype.c:122
+#: modules/misc/win32text.c:81 modules/video_filter/marq.c:56
+#: modules/video_filter/rss.c:59 modules/video_filter/time.c:56
+msgid "Aqua"
+msgstr "アクア"
 
-#: modules/gui/macosx/controls.m:275 modules/gui/macosx/controls.m:617
-#: modules/gui/macosx/intf.m:508
-msgid "Normal Size"
-msgstr "通常サイズ"
+#: modules/gui/macosx/sfilters.m:191
+#, fuzzy
+msgid "Center-Center"
+msgstr "中央"
 
-#: modules/gui/macosx/controls.m:277 modules/gui/macosx/controls.m:618
-#: modules/gui/macosx/intf.m:509
-msgid "Double Size"
-msgstr "2倍サイズ"
+#: modules/gui/macosx/sfilters.m:192
+#, fuzzy
+msgid "Left-Center"
+msgstr "中央"
 
-#: modules/gui/macosx/controls.m:279 modules/gui/macosx/controls.m:622
-#: modules/gui/macosx/controls.m:633 modules/gui/macosx/intf.m:512
-msgid "Float on Top"
-msgstr "常に前面"
+#: modules/gui/macosx/sfilters.m:193
+#, fuzzy
+msgid "Right-Center"
+msgstr "中央"
 
-#: modules/gui/macosx/controls.m:281 modules/gui/macosx/controls.m:619
-#: modules/gui/macosx/intf.m:510
-msgid "Fit to Screen"
-msgstr "画面にあわせる"
+#: modules/gui/macosx/sfilters.m:194
+#, fuzzy
+msgid "Center-Top"
+msgstr "中央"
 
-#: modules/gui/macosx/controls.m:602 modules/gui/macosx/intf.m:483
+#: modules/gui/macosx/sfilters.m:195
 #, fuzzy
-msgid "Step Forward"
-msgstr "転送"
+msgid "Left-Top"
+msgstr "å·¦"
 
-#: modules/gui/macosx/controls.m:603 modules/gui/macosx/intf.m:484
+#: modules/gui/macosx/sfilters.m:196
 #, fuzzy
-msgid "Step Backward"
-msgstr "逆転再生"
+msgid "Right-Top"
+msgstr "右"
 
-#: modules/gui/macosx/equalizer.m:141 modules/gui/wxwindows/extrapanel.cpp:473
+#: modules/gui/macosx/sfilters.m:197
 #, fuzzy
-msgid "2 Pass"
-msgstr "バス"
+msgid "Center-Bottom"
+msgstr "下"
 
-#: modules/gui/macosx/equalizer.m:142 modules/gui/wxwindows/extrapanel.cpp:475
-msgid ""
-"If you enable this settting, the equalizer filter will be applied twice. The "
-"effect will be sharper."
+#: modules/gui/macosx/sfilters.m:198
+#, fuzzy
+msgid "Left-Bottom"
+msgstr "下"
+
+#: modules/gui/macosx/sfilters.m:199
+#, fuzzy
+msgid "Right-Bottom"
+msgstr "下"
+
+#: modules/gui/macosx/wizard.m:114
+msgid "MPEG-1 Video codec (usable with MPEG PS, MPEG TS, MPEG1, OGG and RAW)"
 msgstr ""
 
-#: modules/gui/macosx/equalizer.m:145
+#: modules/gui/macosx/wizard.m:118
+msgid "MPEG-2 Video codec (usable with MPEG PS, MPEG TS, MPEG1, OGG and RAW)"
+msgstr ""
+
+#: modules/gui/macosx/wizard.m:122
 msgid ""
-"Enable the equalizer. You can either manually change the bands or use a "
-"preset."
+"MPEG-4 Video codec (useable with MPEG PS, MPEG TS, MPEG1, ASF, MP4, OGG and "
+"RAW)"
 msgstr ""
 
-#: modules/gui/macosx/equalizer.m:147
-#, fuzzy
-msgid "Preamp"
-msgstr "ストリーム"
+#: modules/gui/macosx/wizard.m:126 modules/gui/wxwidgets/streamdata.cpp:43
+msgid "DivX first version (useable with MPEG TS, MPEG1, ASF and OGG)"
+msgstr ""
 
-#: modules/gui/macosx/intf.m:427
-#, fuzzy
-msgid "VLC - Controller"
-msgstr "コントロール"
+#: modules/gui/macosx/wizard.m:130 modules/gui/wxwidgets/streamdata.cpp:47
+msgid "DivX second version (useable with MPEG TS, MPEG1, ASF and OGG)"
+msgstr ""
 
-#: modules/gui/macosx/intf.m:432 modules/gui/pda/pda_interface.c:238
-#: modules/gui/pda/pda_interface.c:239
-msgid "Rewind"
-msgstr "巻き戻す"
+#: modules/gui/macosx/wizard.m:134 modules/gui/wxwidgets/streamdata.cpp:50
+msgid "DivX third version (useable with MPEG TS, MPEG1, ASF and OGG)"
+msgstr ""
 
-#: modules/gui/macosx/intf.m:435
+#: modules/gui/macosx/wizard.m:138 modules/gui/wxwidgets/streamdata.cpp:53
+msgid ""
+"H263 is a video codec optimized for videoconference (low rates, useable with "
+"MPEG TS)"
+msgstr ""
+
+#: modules/gui/macosx/wizard.m:142
 #, fuzzy
-msgid "Fast Forward"
-msgstr "転送"
+msgid "H264 is a new video codec (useable with MPEG TS and MP4)"
+msgstr "送信先のアスペクト・レシオ"
 
-#: modules/gui/macosx/intf.m:444
-msgid "Open CrashLog"
-msgstr "クラッシュログを開く"
+#: modules/gui/macosx/wizard.m:146
+msgid "WMV (Windows Media Video) 1 (useable with MPEG TS, MPEG1, ASF and OGG)"
+msgstr ""
 
-#: modules/gui/macosx/intf.m:448
-msgid "Preferences..."
-msgstr "設定..."
+#: modules/gui/macosx/wizard.m:150
+msgid "WMV (Windows Media Video) 2 (useable with MPEG TS, MPEG1, ASF and OGG)"
+msgstr ""
 
-#: modules/gui/macosx/intf.m:451
-msgid "Services"
-msgstr "サービス"
+#: modules/gui/macosx/wizard.m:154 modules/gui/wxwidgets/streamdata.cpp:70
+msgid ""
+"MJPEG consists of a series of JPEG pictures (useable with MPEG TS, MPEG1, "
+"ASF and OGG)"
+msgstr ""
 
-#: modules/gui/macosx/intf.m:452
-msgid "Hide VLC"
-msgstr "VLCを隠す"
+#: 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/intf.m:453
-msgid "Hide Others"
-msgstr "インタフェースを隠す"
+#: modules/gui/macosx/wizard.m:161 modules/gui/macosx/wizard.m:212
+#: 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/intf.m:454
-msgid "Show All"
-msgstr "すべてを表示"
+#: modules/gui/macosx/wizard.m:180 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/intf.m:455 modules/gui/wxwindows/interface.cpp:1540
-msgid "Quit VLC"
-msgstr "VLCを終了"
+#: modules/gui/macosx/wizard.m:184 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/intf.m:457
-msgid "1:File"
-msgstr "1:ファイル"
+#: modules/gui/macosx/wizard.m:188 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
+msgid ""
+"DVD audio format (useable with MPEG PS, MPEG TS, MPEG1, ASF, OGG and RAW)"
+msgstr ""
 
-#: modules/gui/macosx/intf.m:459
+#: modules/gui/macosx/wizard.m:195 modules/gui/wxwidgets/streamdata.cpp:99
 #, fuzzy
-msgid "Quick Open File..."
-msgstr "ファイルを開く..."
+msgid "Vorbis is a free audio codec (useable with OGG)"
+msgstr "Vorbis オーディオデコーダー"
 
-#: modules/gui/macosx/intf.m:460
-msgid "Open Disc..."
-msgstr "ディスクを開く..."
+#: modules/gui/macosx/wizard.m:198 modules/gui/wxwidgets/streamdata.cpp:101
+msgid "FLAC is a lossless audio codec (useable with OGG and RAW)"
+msgstr ""
 
-#: modules/gui/macosx/intf.m:461
-msgid "Open Network..."
-msgstr "ネットワークを開く"
+#: modules/gui/macosx/wizard.m:202 modules/gui/wxwidgets/streamdata.cpp:104
+msgid "A free audio codec dedicated to compression of voice (useable with OGG)"
+msgstr ""
 
-#: modules/gui/macosx/intf.m:462
-msgid "Open Recent"
-msgstr "最近使った項目を開く"
+#: modules/gui/macosx/wizard.m:206 modules/gui/macosx/wizard.m:209
+#: modules/gui/wxwidgets/streamdata.cpp:107
+#: modules/gui/wxwidgets/streamdata.cpp:110
+msgid "Uncompressed audio samples (useable with WAV)"
+msgstr ""
 
-#: modules/gui/macosx/intf.m:463 modules/gui/macosx/intf.m:1666
-msgid "Clear Menu"
-msgstr "メニューをクリアする"
+#: modules/gui/macosx/wizard.m:234 modules/gui/wxwidgets/streamdata.cpp:148
+#, fuzzy
+msgid "MPEG Program Stream"
+msgstr "ISO 13818-1 MPEGプログラム・ストリーム入力"
 
-#: modules/gui/macosx/intf.m:464
+#: modules/gui/macosx/wizard.m:236 modules/gui/wxwidgets/streamdata.cpp:149
 #, fuzzy
-msgid "Wizard..."
-msgstr "新規ウィザード..."
+msgid "MPEG Transport Stream"
+msgstr "ストリームの再生"
 
-#: modules/gui/macosx/intf.m:467
-msgid "Cut"
-msgstr "カット"
+#: modules/gui/macosx/wizard.m:238 modules/gui/wxwidgets/streamdata.cpp:150
+#, fuzzy
+msgid "MPEG 1 Format"
+msgstr "VCD フォーマット"
 
-#: modules/gui/macosx/intf.m:468
-msgid "Copy"
-msgstr "コピー"
+#: modules/gui/macosx/wizard.m:257 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/macosx/intf.m:469
-msgid "Paste"
-msgstr "ペースト"
+#: modules/gui/macosx/wizard.m:261 modules/gui/wxwidgets/streamdata.cpp:134
+msgid ""
+"Use this to stream to several computers. This method is less efficient, as "
+"the server needs to send the stream several times."
+msgstr ""
 
-#: modules/gui/macosx/intf.m:470 modules/gui/wxwindows/bookmarks.cpp:225
-#: modules/gui/wxwindows/messages.cpp:94
-msgid "Clear"
-msgstr "クリア"
+#: modules/gui/macosx/wizard.m:264
+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 mms://yourip:8080 by default."
+msgstr ""
 
-#: modules/gui/macosx/intf.m:473
-msgid "Controls"
-msgstr "コントロール"
+#: modules/gui/macosx/wizard.m:268
+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. "
+"Note that only a small part of the MMS protocol is supported (MMS "
+"encapsulated in HTTP)."
+msgstr ""
 
-#: modules/gui/macosx/intf.m:516 modules/gui/macosx/intf.m:517
-#: modules/gui/macosx/vout.m:167
-msgid "Video Device"
-msgstr "ビデオデバイス"
+#: modules/gui/macosx/wizard.m:273 modules/gui/macosx/wizard.m:283
+#: modules/gui/macosx/wizard.m:400 modules/gui/wxwidgets/streamdata.cpp:123
+msgid "Enter the address of the computer to stream to."
+msgstr ""
 
-#: modules/gui/macosx/intf.m:526
-msgid "Minimize Window"
-msgstr "ウィンドウを最小化"
+#: modules/gui/macosx/wizard.m:274 modules/gui/macosx/wizard.m:284
+#: modules/gui/macosx/wizard.m:404 modules/gui/wxwidgets/streamdata.cpp:122
+#, fuzzy
+msgid "Use this to stream to a single computer."
+msgstr "ネットワークを開く"
 
-#: modules/gui/macosx/intf.m:527
-msgid "Close Window"
-msgstr "ウィンドウを閉じる"
+#: modules/gui/macosx/wizard.m:276 modules/gui/macosx/wizard.m:286
+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/intf.m:528
-msgid "Controller"
-msgstr "コントローラー"
+#: modules/gui/macosx/wizard.m:279 modules/gui/macosx/wizard.m:289
+#: modules/gui/wxwidgets/streamdata.cpp:126
+msgid ""
+"Use this to stream to a dynamic group of computers on a multicast-enabled "
+"network. This is the most efficient method to stream to several computers, "
+"but it does not work over Internet."
+msgstr ""
 
-#: modules/gui/macosx/intf.m:531 modules/gui/macosx/intf.m:558
-#: modules/gui/macosx/playlistinfo.m:202
-#: modules/gui/wxwindows/playlist.cpp:274
-#: modules/gui/wxwindows/playlist.cpp:280
-msgid "Info"
-msgstr "情報"
+#: modules/gui/macosx/wizard.m:354
+msgid "Back"
+msgstr "逆転"
 
-#: modules/gui/macosx/intf.m:534
-msgid "Bring All to Front"
-msgstr "すべてを前に"
+#: modules/gui/macosx/wizard.m:357 modules/gui/macosx/wizard.m:360
+#: modules/gui/macosx/wizard.m:1152
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:81
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:84
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:1400
+#, fuzzy
+msgid "Streaming/Transcoding Wizard"
+msgstr "ストリームの情報..."
 
-#: modules/gui/macosx/intf.m:536
-msgid "Help"
-msgstr "ヘルプ"
+#: modules/gui/macosx/wizard.m:361 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/intf.m:537
-msgid "ReadMe..."
-msgstr "読んでください..."
-
-#: modules/gui/macosx/intf.m:538
-msgid "Online Documentation"
-msgstr "オンラインドキュメント"
-
-#: modules/gui/macosx/intf.m:539
-msgid "Report a Bug"
-msgstr "バグ報告"
-
-#: modules/gui/macosx/intf.m:540
-msgid "VideoLAN Website"
-msgstr "VideoLAN ウェブサイト"
-
-#: modules/gui/macosx/intf.m:541
-msgid "License"
-msgstr "ライセンス"
-
-#: modules/gui/macosx/intf.m:551 modules/gui/wxwindows/wizard.cpp:86
-msgid "Error"
-msgstr "エラー"
+#: modules/gui/macosx/wizard.m:365 modules/gui/wxwidgets/dialogs/wizard.cpp:91
+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."
+msgstr ""
 
-#: modules/gui/macosx/intf.m:552
+#: modules/gui/macosx/wizard.m:368 modules/gui/macosx/wizard.m:519
+#: modules/gui/macosx/wizard.m:1466
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:87
 #, fuzzy
-msgid ""
-"An error has occurred which probably prevented the execution of your request:"
-msgstr "要求された処理の実行でエラーが発生しました :"
+msgid "Stream to network"
+msgstr "ネットワークを開く"
 
-#: modules/gui/macosx/intf.m:553
+#: modules/gui/macosx/wizard.m:370 modules/gui/macosx/wizard.m:1478
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:89
 #, fuzzy
-msgid "If you believe that it is a bug, please follow the instructions at:"
-msgstr "もし、バグであると思われるなら、以下の手順にしたがってください :"
+msgid "Transcode/Save to file"
+msgstr "キャンセル"
 
-#: modules/gui/macosx/intf.m:554
-msgid "Open Messages Window"
-msgstr "メッセージウィンドウを表示"
+#: modules/gui/macosx/wizard.m:374
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:100
+msgid "Choose input"
+msgstr "入力の選択"
 
-#: modules/gui/macosx/intf.m:555
-msgid "Dismiss"
-msgstr "やり直し"
+#: modules/gui/macosx/wizard.m:375
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:101
+msgid "Choose here your input stream."
+msgstr "入力ストリームをここで選択してください。"
 
-#: modules/gui/macosx/intf.m:556
-msgid "Suppress further errors"
-msgstr ""
+#: modules/gui/macosx/wizard.m:377 modules/gui/macosx/wizard.m:553
+#: modules/gui/macosx/wizard.m:1515
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:103
+msgid "Select a stream"
+msgstr "ストリームを選択する"
 
-#: modules/gui/macosx/intf.m:985
-#, fuzzy, c-format
-msgid "Volume: %d"
-msgstr "ボリュームは %d です。\n"
+#: modules/gui/macosx/wizard.m:379
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:104
+msgid "Existing playlist item"
+msgstr "存在する再生一覧の項目"
 
-#: modules/gui/macosx/intf.m:1533
-#, fuzzy
-msgid "No CrashLog found"
-msgstr "%@s は見つかりません"
+#: modules/gui/macosx/wizard.m:380 modules/gui/macosx/wizard.m:445
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:566
+msgid "Choose..."
+msgstr "選択..."
 
-#: modules/gui/macosx/intf.m:1533
-msgid "You haven't experienced any heavy crashes yet."
+#: modules/gui/macosx/wizard.m:385 modules/gui/macosx/wizard.m:459
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:618
+msgid "Partial Extract"
 msgstr ""
 
-#: modules/gui/macosx/macosx.m:50
-msgid "Video device"
-msgstr "ビデオデバイス"
-
-#: modules/gui/macosx/macosx.m:51
+#: modules/gui/macosx/wizard.m:387
 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'."
-msgstr ""
-
-#: modules/gui/macosx/macosx.m:55
-msgid "Opaqueness"
+"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)."
 msgstr ""
 
-#: modules/gui/macosx/macosx.m:57
-msgid ""
-"Set the transparency of the video output. 1 is non-transparent (default) 0 "
-"is fully transparent."
+#: modules/gui/macosx/wizard.m:391
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:629
+msgid "From"
 msgstr ""
 
-#: modules/gui/macosx/macosx.m:60
+#: modules/gui/macosx/wizard.m:392
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:634
 #, fuzzy
-msgid "Stretch Aspect Ratio"
-msgstr "ソースのアスペクト・レシオ"
-
-#: modules/gui/macosx/macosx.m:61
-msgid ""
-"Instead of keeping the aspect ratio of the movie when resizing the video, "
-"stretch the video to fill the entire window."
-msgstr ""
+msgid "To"
+msgstr "上"
 
-#: modules/gui/macosx/macosx.m:65
-msgid "Fill fullscreen"
-msgstr "全画面化"
+#: modules/gui/macosx/wizard.m:395
+#: modules/gui/wxwidgets/dialogs/infopanels.cpp:216
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:132
+#: modules/video_filter/deinterlace.c:131
+msgid "Streaming"
+msgstr "すとリー民具"
 
-#: modules/gui/macosx/macosx.m:66
-msgid ""
-"In fullscreen mode, crop the picture if necessary in order to fill the "
-"screen without black borders (OpenGL only)."
+#: modules/gui/macosx/wizard.m:396
+#: 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/macosx.m:71
+#: modules/gui/macosx/wizard.m:398 modules/gui/macosx/wizard.m:453
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:1045 modules/stream_out/rtp.c:44
 #, fuzzy
-msgid "Mac OS X interface"
-msgstr "ネットワーク・インタフェース"
-
-#: modules/gui/macosx/macosx.m:77
-msgid "Quartz video"
-msgstr ""
+msgid "Destination"
+msgstr "送信先のアスペクト・レシオ"
 
-#: modules/gui/macosx/open.m:154
-msgid "Open Source"
-msgstr "ソースを開く"
+#: modules/gui/macosx/wizard.m:399 modules/gui/macosx/wizard.m:465
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:1031
+#, fuzzy
+msgid "Streaming method"
+msgstr "ストリームの停止"
 
-#: modules/gui/macosx/open.m:155 modules/gui/wince/open.cpp:130
-#: modules/gui/wxwindows/open.cpp:390
-msgid "Media Resource Locator (MRL)"
-msgstr "メディア・リソース・ロケータ (MRL)"
+#: modules/gui/macosx/wizard.m:402
+msgid "UDP Unicast"
+msgstr "UDP ユニキャスト"
 
-#: modules/gui/macosx/open.m:165
-msgid "Treat as a pipe rather than as a file"
-msgstr "ファイルとしてではなく、パイプとして扱う"
+#: modules/gui/macosx/wizard.m:403
+msgid "UDP Multicast"
+msgstr "UDP マルチキャスト"
 
-#: modules/gui/macosx/open.m:173 modules/gui/macosx/open.m:478
-msgid "VIDEO_TS folder"
-msgstr "VIDEO_TS フォルダ"
+#: modules/gui/macosx/wizard.m:408 modules/gui/pda/pda_interface.c:1221
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:118
+#: modules/stream_out/transcode.c:167
+#, fuzzy
+msgid "Transcode"
+msgstr "キャンセル"
 
-#: modules/gui/macosx/open.m:185 modules/gui/macosx/open.m:656
-#: modules/gui/macosx/open.m:717
-msgid "HTTP/FTP/MMS/RTSP"
+#: modules/gui/macosx/wizard.m:409
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:119
+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.)"
 msgstr ""
 
-#: modules/gui/macosx/open.m:186 modules/gui/wxwindows/open.cpp:719
-msgid "Allow timeshifting"
-msgstr ""
+#: modules/gui/macosx/wizard.m:414 modules/gui/macosx/wizard.m:467
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:861
+#, fuzzy
+msgid "Transcode audio"
+msgstr "ストリームの一時停止"
 
-#: modules/gui/macosx/open.m:240
+#: modules/gui/macosx/wizard.m:415 modules/gui/macosx/wizard.m:469
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:822
 #, fuzzy
-msgid "Load subtitles file:"
-msgstr "字幕"
+msgid "Transcode video"
+msgstr "ストリームの一時停止"
 
-#: modules/gui/macosx/open.m:243
-msgid "Override"
+#: modules/gui/macosx/wizard.m:418 modules/gui/macosx/wizard.m:1617
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:126
+msgid "If your stream has audio and you want to transcode it, enable this."
 msgstr ""
 
-#: modules/gui/macosx/open.m:248 modules/gui/wxwindows/subtitles.cpp:105
-msgid "Subtitles encoding"
-msgstr "字幕エンコンコード中"
-
-#: modules/gui/macosx/open.m:250 modules/misc/freetype.c:96
-#: modules/misc/win32text.c:67
-msgid "Font size"
-msgstr "フォントサイズ"
-
-#: modules/gui/macosx/open.m:255
-#, fuzzy
-msgid "Font Properties"
-msgstr "プロパティ"
+#: modules/gui/macosx/wizard.m:420 modules/gui/macosx/wizard.m:1634
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:121
+msgid "If your stream has video and you want to transcode it, enable this."
+msgstr ""
 
-#: modules/gui/macosx/open.m:256
+#: modules/gui/macosx/wizard.m:424
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:141
 #, fuzzy
-msgid "Subtitle File"
-msgstr "字幕ファイル"
+msgid "Encapsulation format"
+msgstr "出力フォーマット"
 
-#: modules/gui/macosx/open.m:530 modules/gui/macosx/open.m:582
-#: modules/gui/macosx/open.m:590 modules/gui/macosx/open.m:598
-#, objc-format
-msgid "No %@s found"
-msgstr "%@s は見つかりません"
+#: modules/gui/macosx/wizard.m:425
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:142
+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."
+msgstr ""
 
-#: modules/gui/macosx/open.m:633
-msgid "Open VIDEO_TS Directory"
-msgstr "VIDEO_TSディレクトリを開く"
+#: modules/gui/macosx/wizard.m:430
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:155
+msgid "Additional streaming options"
+msgstr "追加ストリーミングオプション"
 
-#: modules/gui/macosx/output.m:136
-#, fuzzy
-msgid "Advanced output:"
-msgstr "ALSAオーディオ・モジュール"
+#: modules/gui/macosx/wizard.m:431
+msgid ""
+"In this page, you will define a few additional parameters for your stream."
+msgstr ""
 
-#: modules/gui/macosx/output.m:140
-msgid "Output Options"
-msgstr "出力オプション"
+#: modules/gui/macosx/wizard.m:435 modules/gui/macosx/wizard.m:461
+#: modules/gui/macosx/wizard.m:1676
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:1340
+msgid "SAP Announce"
+msgstr "SAP アナウンス"
 
-#: modules/gui/macosx/output.m:141 modules/gui/wxwindows/streamout.cpp:455
-#, fuzzy
-msgid "Play locally"
-msgstr "スロー再生"
+#: modules/gui/macosx/wizard.m:437 modules/gui/macosx/wizard.m:446
+#: modules/gui/macosx/wizard.m:471 modules/gui/macosx/wizard.m:1693
+msgid "Local playback"
+msgstr "ローカル再生"
 
-#: modules/gui/macosx/output.m:144 modules/gui/wxwindows/streamout.cpp:493
+#: modules/gui/macosx/wizard.m:441
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:148
 #, fuzzy
-msgid "Dump raw input"
-msgstr "ストリームの出力先の選択"
+msgid "Additional transcode options"
+msgstr "ストリームの一時停止"
 
-#: modules/gui/macosx/output.m:155 modules/gui/wxwindows/streamout.cpp:632
-msgid "Encapsulation Method"
+#: modules/gui/macosx/wizard.m:442
+msgid ""
+"In this page, you will define a few additional parameters for your "
+"transcoding."
 msgstr ""
 
-#: modules/gui/macosx/output.m:159
+#: modules/gui/macosx/wizard.m:444
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:1264
 #, fuzzy
-msgid "Transcode options"
-msgstr "ストリームの一時停止"
+msgid "Select the file to save to"
+msgstr "再生に使うホットキーを選択"
 
-#: modules/gui/macosx/output.m:163 modules/gui/macosx/output.m:173
-#: modules/gui/macosx/wizard.m:145 modules/gui/wxwindows/streamout.cpp:747
-#: modules/gui/wxwindows/streamout.cpp:822
-#: modules/gui/wxwindows/wizard.cpp:816 modules/gui/wxwindows/wizard.cpp:855
-msgid "Bitrate (kb/s)"
-msgstr "ビットレート (kb/秒)"
+#: modules/gui/macosx/wizard.m:450
+msgid ""
+"This page lists all your selections. Click \"Finish\" to start your "
+"streaming or transcoding."
+msgstr ""
+
+#: modules/gui/macosx/wizard.m:452
+msgid "Summary"
+msgstr "要約"
 
-#: modules/gui/macosx/output.m:166 modules/gui/wxwindows/streamout.cpp:753
+#: modules/gui/macosx/wizard.m:455
 #, fuzzy
-msgid "Scale"
-msgstr "衛星"
+msgid "Encap. format"
+msgstr "出力フォーマット"
 
-#: modules/gui/macosx/output.m:180
+#: modules/gui/macosx/wizard.m:457
+msgid "Input stream"
+msgstr "ストリーム入力"
+
+#: modules/gui/macosx/wizard.m:463
 #, fuzzy
-msgid "Stream Announcing"
-msgstr "ストリーム出力"
+msgid "Save file to"
+msgstr "ファイルの保存"
 
-#: modules/gui/macosx/output.m:181 modules/gui/wxwindows/streamout.cpp:571
-msgid "SAP announce"
-msgstr "SAP アナウンス"
+#: modules/gui/macosx/wizard.m:604
+msgid "No input selected"
+msgstr "入力は選択されていません"
 
-#: modules/gui/macosx/output.m:182 modules/gui/wxwindows/streamout.cpp:573
-msgid "SLP announce"
-msgstr "SLP アナウンス"
+#: modules/gui/macosx/wizard.m:606
+msgid ""
+"You have selected neither a new stream nor a valid playlist item. VLC is "
+"unable to guess, which input you want use.\n"
+"\n"
+"Choose one before going to the next page."
+msgstr ""
 
-#: modules/gui/macosx/output.m:183 modules/gui/macosx/output.m:621
+#: modules/gui/macosx/wizard.m:670
 #, fuzzy
-msgid "RTSP announce"
-msgstr "SAP アナウンス"
+msgid "No valid destination"
+msgstr "送信先のアスペクト・レシオ"
 
-#: modules/gui/macosx/output.m:184 modules/gui/macosx/output.m:627
-#, fuzzy
-msgid "HTTP announce"
-msgstr "SAP アナウンス"
+#: modules/gui/macosx/wizard.m:672
+msgid ""
+"You need to enter a valid destination you want to stream to. 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/output.m:185 modules/gui/macosx/output.m:633
-msgid "Export SDP as file"
+#: modules/gui/macosx/wizard.m:1064
+msgid ""
+"Your chosen codecs are not compatible with each other. For example: you "
+"cannot mix uncompressed audio with any video codec.\n"
+"\n"
+"Correct your selection and try again."
 msgstr ""
 
-#: modules/gui/macosx/output.m:187
-msgid "Channel Name"
-msgstr "チャンネル名"
+#: modules/gui/macosx/wizard.m:1129
+msgid "No file selected"
+msgstr "ファイルは選択されていません"
 
-#: modules/gui/macosx/output.m:188
-#, fuzzy
-msgid "SDP URL"
-msgstr "SDP"
+#: modules/gui/macosx/wizard.m:1130
+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."
+msgstr ""
 
-#: modules/gui/macosx/output.m:511
-msgid "Save File"
-msgstr "ファイルの保存"
+#: modules/gui/macosx/wizard.m:1209
+msgid "Finish"
+msgstr "終了"
 
-#: modules/gui/macosx/playlist.m:228
-msgid "Save Playlist..."
-msgstr "プレイリストを保存..."
+#: modules/gui/macosx/wizard.m:1214 modules/gui/macosx/wizard.m:1221
+#: modules/gui/macosx/wizard.m:1233 modules/gui/macosx/wizard.m:1247
+#: modules/gui/macosx/wizard.m:1273
+msgid "yes"
+msgstr "はい"
 
-#: modules/gui/macosx/playlist.m:232 modules/gui/macosx/playlistinfo.m:53
-msgid "Properties"
-msgstr "プロパティ"
+#: modules/gui/macosx/wizard.m:1216 modules/gui/macosx/wizard.m:1228
+#: modules/gui/macosx/wizard.m:1243 modules/gui/macosx/wizard.m:1257
+#: modules/gui/macosx/wizard.m:1275
+msgid "no"
+msgstr "いいえ"
 
-#: modules/gui/macosx/playlist.m:233
+#: modules/gui/macosx/wizard.m:1223
 #, fuzzy
-msgid "Sort Node by Name"
-msgstr "名前でソート"
+msgid "from "
+msgstr "オロモ語"
 
-#: modules/gui/macosx/playlist.m:234
-#, fuzzy
-msgid "Sort Node by Author"
-msgstr "作成者でソート(&A)"
+#: modules/gui/macosx/wizard.m:1225 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/playlist.m:240 modules/gui/macosx/playlist.m:1139
+#: modules/gui/macosx/wizard.m:1467
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:88
 #, fuzzy
-msgid "no items in playlist"
-msgstr "デフォルトでプレイリストに追加"
+msgid "Use this to stream on a network."
+msgstr "ネットワークを開く"
 
-#: modules/gui/macosx/playlist.m:244 modules/gui/wxwindows/playlist.cpp:317
-msgid "Search"
-msgstr "検索"
+#: modules/gui/macosx/wizard.m:1479
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:95
+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."
+msgstr ""
 
-#: modules/gui/macosx/playlist.m:246
-#, fuzzy
-msgid "Search in Playlist"
-msgstr "プレイリストを開く"
+#: modules/gui/macosx/wizard.m:1612
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:128
+msgid "Select your audio codec. Click one to get more information."
+msgstr ""
 
-#: modules/gui/macosx/playlist.m:247
-msgid "Standard Play"
-msgstr "標準再生"
-
-#: modules/gui/macosx/playlist.m:386
-msgid "Untitled"
-msgstr "タイトルなし"
-
-#: modules/gui/macosx/playlist.m:387
-msgid "Save Playlist"
-msgstr "プレイリストを保存"
-
-#: modules/gui/macosx/playlist.m:1132 modules/gui/wxwindows/playlist.cpp:587
-#: modules/gui/wxwindows/playlist.cpp:799
-#, fuzzy, c-format
-msgid "%i items in playlist"
-msgstr "デフォルトでプレイリストに追加"
-
-#: modules/gui/macosx/playlist.m:1144
-#, fuzzy
-msgid "1 item in playlist"
-msgstr "デフォルトでプレイリストに追加"
-
-#: modules/gui/macosx/playlistinfo.m:54 modules/gui/wxwindows/iteminfo.cpp:137
-#: modules/gui/wxwindows/wizard.cpp:576
-msgid "URI"
-msgstr "URI"
-
-#: modules/gui/macosx/prefs.m:118 modules/gui/wxwindows/preferences.cpp:215
-msgid "Reset All"
-msgstr "すべてリセット"
-
-#: modules/gui/macosx/prefs.m:137 modules/gui/wxwindows/preferences.cpp:296
-msgid "Reset Preferences"
-msgstr "設定をリセット"
-
-#: modules/gui/macosx/prefs.m:138
-msgid "Continue"
-msgstr "続ける"
-
-#: modules/gui/macosx/prefs.m:140 modules/gui/wxwindows/preferences.cpp:294
-msgid ""
-"Beware this will reset your VLC media player preferences.\n"
-"Are you sure you want to continue?"
-msgstr ""
-
-#: modules/gui/macosx/prefs.m:662
-msgid "Some options are available but hidden. Check \"Advanced\" to see them."
-msgstr ""
-
-#: modules/gui/macosx/prefs_widgets.m:1216
-#, fuzzy
-msgid "Select a directory"
-msgstr "ソースのアスペクト・レシオ"
-
-#: modules/gui/macosx/prefs_widgets.m:1216
-#, fuzzy
-msgid "Select a file"
-msgstr "ファイルの選択"
-
-#: modules/gui/macosx/wizard.m:103
-#, fuzzy
-msgid "< Back"
-msgstr "逆転"
-
-#: modules/gui/macosx/wizard.m:105
-#, fuzzy
-msgid "Next >"
-msgstr "次"
-
-#: modules/gui/macosx/wizard.m:106 modules/gui/macosx/wizard.m:109
-#: modules/gui/wxwindows/wizard.cpp:87 modules/gui/wxwindows/wizard.cpp:90
-#: modules/gui/wxwindows/wizard.cpp:1375
-#, fuzzy
-msgid "Streaming/Transcoding Wizard"
-msgstr "ストリームの情報..."
-
-#: modules/gui/macosx/wizard.m:110
-msgid "This wizard helps you to stream, transcode or save a stream"
-msgstr ""
-
-#: modules/gui/macosx/wizard.m:111 modules/gui/macosx/wizard.m:112
-#: modules/gui/macosx/wizard.m:163 modules/gui/macosx/wizard.m:165
-#: modules/gui/wxwindows/wizard.cpp:475 modules/gui/wxwindows/wizard.cpp:482
-#, fuzzy
-msgid "More Info"
-msgstr "デバイス名"
-
-#: modules/gui/macosx/wizard.m:113
-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"
-msgstr ""
-
-#: modules/gui/macosx/wizard.m:114 modules/gui/wxwindows/wizard.cpp:93
-#, fuzzy
-msgid "Stream to network"
-msgstr "ネットワークを開く"
-
-#: modules/gui/macosx/wizard.m:115 modules/gui/wxwindows/wizard.cpp:95
-#, fuzzy
-msgid "Transcode/Save to file"
-msgstr "キャンセル"
-
-#: modules/gui/macosx/wizard.m:118 modules/gui/wxwindows/wizard.cpp:106
-#, fuzzy
-msgid "Choose input"
-msgstr "タイトルの選択"
-
-#: modules/gui/macosx/wizard.m:119
-#, fuzzy
-msgid "Choose here your input stream"
-msgstr "ストリームの一時停止"
-
-#: modules/gui/macosx/wizard.m:120 modules/gui/wxwindows/wizard.cpp:109
-#, fuzzy
-msgid "Select a stream"
-msgstr "ネットワークストリームを選択する"
-
-#: modules/gui/macosx/wizard.m:121 modules/gui/wxwindows/wizard.cpp:110
-#, fuzzy
-msgid "Existing playlist item"
-msgstr "プレイリストを開く"
-
-#: modules/gui/macosx/wizard.m:122 modules/gui/macosx/wizard.m:172
-#: modules/gui/wxwindows/wizard.cpp:557
-msgid "Choose..."
-msgstr "選択..."
-
-#: modules/gui/macosx/wizard.m:124 modules/gui/wxwindows/wizard.cpp:608
-msgid "Partial Extract"
-msgstr ""
-
-#: modules/gui/macosx/wizard.m:126 modules/gui/wxwindows/wizard.cpp:619
-msgid "From"
-msgstr ""
-
-#: modules/gui/macosx/wizard.m:127 modules/gui/wxwindows/wizard.cpp:624
-#, fuzzy
-msgid "To"
-msgstr "上"
-
-#: modules/gui/macosx/wizard.m:130 modules/gui/wxwindows/wizard.cpp:138
-#, fuzzy
-msgid "Streaming"
-msgstr "ストリームの停止"
-
-#: modules/gui/macosx/wizard.m:131 modules/gui/wxwindows/wizard.cpp:139
-msgid "In this page, you will select how your input stream will be sent."
-msgstr ""
-
-#: modules/gui/macosx/wizard.m:132 modules/gui/wxwindows/wizard.cpp:1022
-#: modules/stream_out/rtp.c:41
-#, fuzzy
-msgid "Destination"
-msgstr "送信先のアスペクト・レシオ"
-
-#: modules/gui/macosx/wizard.m:133 modules/gui/wxwindows/wizard.cpp:1008
-#, fuzzy
-msgid "Streaming method"
-msgstr "ストリームの停止"
-
-#: modules/gui/macosx/wizard.m:134 modules/gui/wxwindows/streamdata.h:127
-msgid "Enter the address of the computer to stream to"
-msgstr ""
-
-#: modules/gui/macosx/wizard.m:135 modules/gui/wxwindows/streamdata.h:126
-#, fuzzy
-msgid "UDP Unicast"
-msgstr "湯にキャスト"
-
-#: modules/gui/macosx/wizard.m:136 modules/gui/wxwindows/streamdata.h:129
-#, fuzzy
-msgid "UDP Multicast"
-msgstr "UDP/RTP マルチキャスト"
-
-#: modules/gui/macosx/wizard.m:139 modules/gui/pda/pda_interface.c:1221
-#: modules/gui/wxwindows/wizard.cpp:124 modules/stream_out/transcode.c:150
-#, fuzzy
-msgid "Transcode"
-msgstr "キャンセル"
-
-#: modules/gui/macosx/wizard.m:140 modules/gui/wxwindows/wizard.cpp:125
-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)."
-msgstr ""
-
-#: modules/gui/macosx/wizard.m:143 modules/gui/wxwindows/wizard.cpp:838
-#, fuzzy
-msgid "Transcode audio"
-msgstr "ストリームの一時停止"
-
-#: modules/gui/macosx/wizard.m:144 modules/gui/wxwindows/wizard.cpp:799
-#, fuzzy
-msgid "Transcode video"
-msgstr "ストリームの一時停止"
-
-#: modules/gui/macosx/wizard.m:147
-msgid "If your stream has audio and you want to transcode it, enable this"
-msgstr ""
-
-#: modules/gui/macosx/wizard.m:149
-msgid "If your stream has video and you want to transcode it, enable this"
+#: modules/gui/macosx/wizard.m:1629
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:123
+msgid "Select your video codec. Click one to get more information."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:153 modules/gui/wxwindows/wizard.cpp:147
-#, fuzzy
-msgid "Encapsulation format"
-msgstr "出力フォーマット"
-
-#: modules/gui/macosx/wizard.m:154 modules/gui/wxwindows/wizard.cpp:148
+#: modules/gui/macosx/wizard.m:1662
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:159
 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."
+"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:159 modules/gui/wxwindows/wizard.cpp:161
-#, fuzzy
-msgid "Additional streaming options"
-msgstr "ストリームの一時停止"
-
-#: modules/gui/macosx/wizard.m:160 modules/gui/wxwindows/wizard.cpp:162
+#: modules/gui/macosx/wizard.m:1677
 msgid ""
-"In this page, you will define a few additional parameters for your stream."
+"When streaming using UDP, you can announce your streams using the SAP/SDP "
+"announcing protocol. This way, the clients won't have to type in the "
+"multicast address, it will appear in their playlist if they enable the SAP "
+"extra interface.\n"
+"If you want to give a name to your stream, enter it here, else, a default "
+"name will be used."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:162 modules/gui/wxwindows/wizard.cpp:1307
-#, fuzzy
-msgid "Time-To-Live (TTL)"
-msgstr "生存時間 (TTL):"
-
-#: modules/gui/macosx/wizard.m:164 modules/gui/wxwindows/wizard.cpp:1315
-#, fuzzy
-msgid "SAP Announce"
-msgstr "SAP アナウンス:"
-
-#: modules/gui/macosx/wizard.m:168 modules/gui/wxwindows/wizard.cpp:154
-#, fuzzy
-msgid "Additional transcode options"
-msgstr "ストリームの一時停止"
-
-#: modules/gui/macosx/wizard.m:169 modules/gui/wxwindows/wizard.cpp:155
+#: modules/gui/macosx/wizard.m:1695
 msgid ""
-"In this page, you will define a few additionnal parameters for your "
-"transcoding."
+"When this option is enabled, the stream will be both played and transcoded/"
+"streamed.\n"
+"\n"
+"Note that this requires much more CPU power than simple transcoding or "
+"streaming."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:171 modules/gui/wxwindows/wizard.cpp:1239
-#, fuzzy
-msgid "Select the file to save to"
-msgstr "再生に使うホットキーを選択"
-
 #: modules/gui/ncurses.c:93
 msgid "Filebrowser starting point"
 msgstr ""
@@ -10763,7 +11465,7 @@ msgid "PDA Linux Gtk2+ interface"
 msgstr "PDA Linux Gtk+ インタフェース"
 
 #: modules/gui/pda/pda.c:220 modules/gui/pda/pda.c:275
-#: modules/gui/wxwindows/streamout.cpp:480
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:498
 msgid "Filename"
 msgstr "ファイル名"
 
@@ -10771,10 +11473,6 @@ msgstr "ファイル名"
 msgid "Permissions"
 msgstr "パーミッション"
 
-#: modules/gui/pda/pda.c:232
-msgid "Size"
-msgstr "サイズ"
-
 #: modules/gui/pda/pda.c:238
 msgid "Owner"
 msgstr "所有者"
@@ -10783,10 +11481,6 @@ msgstr "所有者"
 msgid "Group"
 msgstr "グループ"
 
-#: modules/gui/pda/pda.c:281 modules/gui/wxwindows/bookmarks.cpp:161
-msgid "Time"
-msgstr "時間"
-
 #: modules/gui/pda/pda.c:288
 msgid "Index"
 msgstr "インデックス"
@@ -10802,7 +11496,7 @@ msgstr ""
 #: modules/gui/pda/pda_interface.c:361 modules/gui/pda/pda_interface.c:543
 #: modules/gui/pda/pda_interface.c:869 modules/gui/pda/pda_interface.c:1216
 msgid "Add to Playlist"
-msgstr "プレイリストに追加"
+msgstr "再生一覧に追加"
 
 #: modules/gui/pda/pda_interface.c:384
 msgid "MRL:"
@@ -10812,9 +11506,13 @@ msgstr ""
 msgid "Port:"
 msgstr "ポート:"
 
+#: modules/gui/pda/pda_interface.c:432
+msgid "Address:"
+msgstr "アドレス:"
+
 #: modules/gui/pda/pda_interface.c:471
 msgid "unicast"
-msgstr "湯にキャスト"
+msgstr "ユニキャスト"
 
 #: modules/gui/pda/pda_interface.c:472
 msgid "multicast"
@@ -11074,11 +11772,23 @@ msgstr "localhost.localdomain"
 msgid "239.0.0.42"
 msgstr "239.0.0.42"
 
+#: modules/gui/pda/pda_interface.c:1050
+msgid "PS"
+msgstr "PS"
+
+#: modules/gui/pda/pda_interface.c:1051
+msgid "TS"
+msgstr "TS"
+
 #: modules/gui/pda/pda_interface.c:1052
 msgid "MPEG1"
 msgstr "MPEG1"
 
-#: modules/gui/pda/pda_interface.c:1054 modules/gui/wxwindows/streamdata.h:161
+#: modules/gui/pda/pda_interface.c:1053
+msgid "AVI"
+msgstr "AVI"
+
+#: modules/gui/pda/pda_interface.c:1054
 msgid "OGG"
 msgstr "OGG"
 
@@ -11086,11 +11796,11 @@ msgstr "OGG"
 msgid "MP4"
 msgstr "MP4"
 
-#: modules/gui/pda/pda_interface.c:1056 modules/gui/wxwindows/streamdata.h:166
+#: modules/gui/pda/pda_interface.c:1056
 msgid "MOV"
 msgstr "MOV"
 
-#: modules/gui/pda/pda_interface.c:1057 modules/gui/wxwindows/streamdata.h:163
+#: modules/gui/pda/pda_interface.c:1057
 msgid "ASF"
 msgstr "ASF"
 
@@ -11180,1168 +11890,1140 @@ msgstr ""
 msgid "Authors: the VideoLAN Team, http://www.videolan.org/team/"
 msgstr ""
 
+#: modules/gui/pda/pda_interface.c:1349
+#, fuzzy
+msgid "(c) 1996-2004 the the VideoLAN team team"
+msgstr "(c) 1996-2004 the VideoLAN チーム"
+
+#: modules/gui/pda/pda_support.c:90 modules/gui/pda/pda_support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "ピックスマップ・ファイル %s が見つかりません。"
+
 #: modules/gui/qnx/qnx.c:44
 #, fuzzy
 msgid "QNX RTOS video and audio output"
 msgstr "オーディオ出力を強制的にモノラルにします。"
 
-#: modules/gui/qt/qt.cpp:47
-#, fuzzy
-msgid "Qt interface"
-msgstr "Qtインタフェース・モジュール"
-
-#: modules/gui/skins2/src/dialogs.cpp:225
+#: modules/gui/skins2/src/dialogs.cpp:223
 msgid "Open a skin file"
 msgstr "スキンファイルを開く"
 
-#: modules/gui/skins2/src/dialogs.cpp:226
-msgid "Skin files (*.vlt)|*.vlt|Skin files (*.xml)|*.xml|"
+#: modules/gui/skins2/src/dialogs.cpp:224
+#, 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:234
+#: modules/gui/skins2/src/dialogs.cpp:231
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:938
+msgid "Open playlist"
+msgstr "再生一覧を開く"
+
+#: modules/gui/skins2/src/dialogs.cpp:232
 msgid "All playlists|*.pls;*.m3u;*.asx;*.b4s|M3U files|*.m3u"
-msgstr ""
+msgstr "すべての 再生一覧|*.pls;*.m3u;*.asx;*.b4s|M3U files|*.m3u"
 
-#: modules/gui/skins2/src/dialogs.cpp:241
-#: modules/gui/wxwindows/playlist.cpp:920
+#: modules/gui/skins2/src/dialogs.cpp:239
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:922
 msgid "Save playlist"
-msgstr "プレイリストを保存"
+msgstr "再生一覧を保存"
 
-#: modules/gui/skins2/src/dialogs.cpp:241
-#, fuzzy
+#: modules/gui/skins2/src/dialogs.cpp:239
 msgid "M3U file|*.m3u"
-msgstr "M3U ファイル"
+msgstr "M3U ファイル|*.m3u"
 
-#: modules/gui/skins2/src/skin_main.cpp:333
+#: modules/gui/skins2/src/skin_main.cpp:343
 msgid "Last skin used"
-msgstr ""
+msgstr "最後に使用したスキン"
 
-#: modules/gui/skins2/src/skin_main.cpp:334
+#: modules/gui/skins2/src/skin_main.cpp:344
 msgid "Select the path to the last skin used."
-msgstr ""
+msgstr "最後に使用したスキンのパスを選択します。"
 
-#: modules/gui/skins2/src/skin_main.cpp:335
+#: modules/gui/skins2/src/skin_main.cpp:345
 msgid "Config of last used skin"
-msgstr ""
+msgstr "最後に使用したスキンの設定"
 
-#: modules/gui/skins2/src/skin_main.cpp:336
+#: modules/gui/skins2/src/skin_main.cpp:346
 msgid "Config of last used skin."
-msgstr ""
+msgstr "最後に使用したスキンの設定です。"
 
-#: modules/gui/skins2/src/skin_main.cpp:337
+#: modules/gui/skins2/src/skin_main.cpp:347
 msgid "Enable transparency effects"
-msgstr ""
+msgstr "透過エフェクトを有効にする"
 
-#: modules/gui/skins2/src/skin_main.cpp:338
+#: modules/gui/skins2/src/skin_main.cpp:348
 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:355
+#: modules/gui/skins2/src/skin_main.cpp:365
 msgid "Skins"
-msgstr ""
+msgstr "スキン"
 
-#: modules/gui/skins2/src/skin_main.cpp:356
-#, fuzzy
+#: modules/gui/skins2/src/skin_main.cpp:366
 msgid "Skinnable Interface"
-msgstr "メインウィンドウの表示/非表示(_I)"
+msgstr "スキン化インターフェース"
 
-#: modules/gui/skins2/src/skin_main.cpp:363
+#: modules/gui/skins2/src/skin_main.cpp:373
 msgid "Skins loader demux"
 msgstr ""
 
 #: modules/gui/skins2/src/theme_repository.cpp:69
-#, fuzzy
 msgid "Select skin"
-msgstr "選択"
+msgstr "スキン選択"
 
 #: modules/gui/skins2/src/theme_repository.cpp:83
-#, fuzzy
 msgid "Open skin..."
-msgstr "ディスクを開く(_D)..."
+msgstr "スキンを開く"
 
 #: modules/gui/wince/interface.cpp:496
-#, fuzzy
 msgid ""
 "\n"
 "(WinCE interface)\n"
 "\n"
 msgstr ""
-"(wxWindows インタフェース)\n"
+"\n"
+"(WinCE インタフェース)\n"
 "\n"
 
-#: modules/gui/wince/interface.cpp:497 modules/gui/wxwindows/interface.cpp:858
+#: modules/gui/wince/interface.cpp:497 modules/gui/wxwidgets/interface.cpp:910
 #, fuzzy
 msgid ""
-"(c) 1996-2005 - the VideoLAN Team\n"
+"(c) 1996-2006 - the VideoLAN Team\n"
+"\n"
+msgstr ""
+"(c) 1996-2005 VideoLAN チーム\n"
 "\n"
-msgstr "(c) 1996-2004 the VideoLAN チーム"
 
-#: modules/gui/wince/interface.cpp:498 modules/gui/wxwindows/interface.cpp:860
+#: modules/gui/wince/interface.cpp:498 modules/gui/wxwidgets/interface.cpp:911
+#, fuzzy
+msgid "Compiled by "
+msgstr "コメディ"
+
+#: modules/gui/wince/interface.cpp:500 modules/gui/wxwidgets/interface.cpp:913
+msgid "Compiler: "
+msgstr "コンパイラー: "
+
+#: modules/gui/wince/interface.cpp:501 modules/gui/wxwidgets/interface.cpp:914
+msgid "Based on SVN revision: "
+msgstr ""
+
+#: modules/gui/wince/interface.cpp:502
+#, fuzzy
 msgid ""
 "The VideoLAN team <videolan@videolan.org>\n"
+"http://www.videolan.org/"
+msgstr ""
+"VideoLAN チーム <videolan@videolan.org>\n"
 "http://www.videolan.org/\n"
 "\n"
-msgstr ""
 
-#: modules/gui/wince/open.cpp:134 modules/gui/wxwindows/open.cpp:394
+#: modules/gui/wince/open.cpp:134 modules/gui/wxwidgets/dialogs/open.cpp:626
 msgid "Open:"
 msgstr "開く:"
 
-#: modules/gui/wince/preferences_widgets.cpp:523
-#: modules/gui/wxwindows/preferences_widgets.cpp:685
+#: modules/gui/wince/open.cpp:146
+msgid ""
+"Alternatively, you can build an MRL using one of the following predefined "
+"targets:"
+msgstr ""
+"別の方法として、あらかじめ以下に定義されたターゲットの一つを使ってMRLを構成で"
+"きます。:"
+
+#: modules/gui/wince/preferences_widgets.cpp:527
+#: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:675
 msgid "Choose directory"
 msgstr "ディレクトリを選択する"
 
-#: modules/gui/wince/preferences_widgets.cpp:532
-#: modules/gui/wxwindows/preferences_widgets.cpp:694
+#: modules/gui/wince/preferences_widgets.cpp:536
+#: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:684
 msgid "Choose file"
 msgstr "ファイルを選択する"
 
-#: modules/gui/wince/wince.cpp:55 modules/gui/wxwindows/wxwindows.cpp:90
+#: modules/gui/wince/wince.cpp:55 modules/gui/wxwidgets/wxwidgets.cpp:86
 #, fuzzy
 msgid "Embed video in interface"
 msgstr "インターフェースのビデオ組み込み"
 
-#: modules/gui/wince/wince.cpp:56 modules/gui/wxwindows/wxwindows.cpp:91
+#: modules/gui/wince/wince.cpp:56 modules/gui/wxwidgets/wxwidgets.cpp:87
 msgid ""
 "Embed the video inside the interface instead of having it in a separate "
 "window."
 msgstr ""
 
 #: modules/gui/wince/wince.cpp:60
-#, fuzzy
 msgid "WinCE interface module"
-msgstr "wxWindows インターフェースモジュール"
+msgstr "WinCE インターフェースモジュール"
 
 #: modules/gui/wince/wince.cpp:70
-#, fuzzy
 msgid "WinCE dialogs provider"
-msgstr "wxWindows ダイアログ提供"
+msgstr "WinCE ダイアログ提供"
 
-#: modules/gui/wxwindows/bookmarks.cpp:137
-#, fuzzy
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:75
 msgid "Edit bookmark"
-msgstr "リスト"
+msgstr "ブックマーク編集"
 
-#: modules/gui/wxwindows/bookmarks.cpp:163
-#, fuzzy
-msgid "Bytes"
-msgstr "ブルース"
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:347
+msgid "You must select two bookmarks"
+msgstr "2 つのブックマークを選ばなければなりません"
 
-#: modules/gui/wxwindows/bookmarks.cpp:201
-msgid "Bookmarks"
-msgstr "ブックマーク"
-
-#: modules/gui/wxwindows/bookmarks.cpp:229
-msgid "Extract"
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:357
+msgid "The stream must be playing or paused for bookmarks to work"
 msgstr ""
 
-#: modules/gui/wxwindows/bookmarks.cpp:259
-msgid "Size offset"
-msgstr "サイズオフセット"
-
-#: modules/gui/wxwindows/bookmarks.cpp:260
-msgid "Time offset"
-msgstr "時間オフセット"
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:449
+msgid ""
+"Input has changed, unable to save bookmark. Use \"pause\" while editing "
+"bookmarks to keep the same input."
+msgstr ""
 
-#: modules/gui/wxwindows/bookmarks.cpp:409
-msgid "You must select two bookmarks"
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:452
+msgid "Input has changed "
 msgstr ""
 
-#: modules/gui/wxwindows/bookmarks.cpp:410
-#, fuzzy
-msgid "Invalid selection"
-msgstr "選択"
+#: modules/gui/wxwidgets/dialogs/fileinfo.cpp:54
+msgid "Stream and media info"
+msgstr "ストリームとメディアの情報"
 
-#: modules/gui/wxwindows/bookmarks.cpp:419
-msgid "The stream must be playing or paused for bookmarks to work"
+#: modules/gui/wxwidgets/dialogs/fileinfo.cpp:76
+msgid "Statistics"
 msgstr ""
 
-#: modules/gui/wxwindows/bookmarks.cpp:420
-#, fuzzy
-msgid "No input found"
-msgstr "%@s は見つかりません"
-
-#: modules/gui/wxwindows/bookmarks.cpp:503
+#: modules/gui/wxwidgets/dialogs/interaction.cpp:115
 msgid ""
-"No input found. The stream must be playing or paused for bookmarks to work."
+"The following errors happened. More details might be available in the "
+"Messages window."
 msgstr ""
 
-#: modules/gui/wxwindows/bookmarks.cpp:505
+#: modules/gui/wxwidgets/dialogs/interaction.cpp:180
 #, fuzzy
-msgid "No input"
-msgstr "入力がありません。\n"
+msgid "Yes"
+msgstr "はい"
 
-#: modules/gui/wxwindows/bookmarks.cpp:511
-msgid ""
-"Input has changed, unable to save bookmark. Use \"pause\" while editing "
-"bookmarks to keep the same input."
-msgstr ""
+#: modules/gui/wxwidgets/dialogs/interaction.cpp:182
+#, fuzzy
+msgid "No"
+msgstr "なし"
 
-#: modules/gui/wxwindows/bookmarks.cpp:514
-msgid "Input has changed "
+#: modules/gui/wxwidgets/dialogs/interaction.cpp:195
+msgid "Don't show"
 msgstr ""
 
-#: modules/gui/wxwindows/extrapanel.cpp:42
-msgid ""
-"If this setting is not zero, the bands will move together when you move one. "
-"The higher the value is, the more correlated their movement will be."
-msgstr ""
+#: modules/gui/wxwidgets/dialogs/iteminfo.cpp:58
+msgid "Playlist item info"
+msgstr "再生一覧項目情報"
+
+#: modules/gui/wxwidgets/dialogs/messages.cpp:88
+msgid "Save As..."
+msgstr "名前を付けて保存..."
 
-#: modules/gui/wxwindows/extrapanel.cpp:150
+#: modules/gui/wxwidgets/dialogs/messages.cpp:206
 #, fuzzy
-msgid "Image clone"
-msgstr "サイズ"
+msgid "Save Messages As..."
+msgstr "メッセージ..."
 
-#: modules/gui/wxwindows/extrapanel.cpp:150
-msgid "Creates several clones of the image"
-msgstr ""
+#: modules/gui/wxwidgets/dialogs/open.cpp:259
+msgid "Advanced options..."
+msgstr "高度なオプション..."
+
+#: 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:214
+msgid "Advanced options"
+msgstr "高度なオプション"
+
+#: modules/gui/wxwidgets/dialogs/open.cpp:279
+msgid "Options:"
+msgstr "オプション:"
+
+#: modules/gui/wxwidgets/dialogs/open.cpp:388
+#: modules/gui/wxwidgets/dialogs/open.cpp:396
+msgid "Open..."
+msgstr "開く..."
 
-#: modules/gui/wxwindows/extrapanel.cpp:151 modules/video_filter/distort.c:67
+#: modules/gui/wxwidgets/dialogs/open.cpp:430
 #, fuzzy
-msgid "Distortion"
-msgstr "湾曲モード"
+msgid "Stream/Save"
+msgstr "ストリーム名"
 
-#: modules/gui/wxwindows/extrapanel.cpp:151
-msgid "Adds distorsion effects"
+#: modules/gui/wxwidgets/dialogs/open.cpp:431
+msgid "Use VLC as a server of streams"
 msgstr ""
 
-#: modules/gui/wxwindows/extrapanel.cpp:152
+#: modules/gui/wxwidgets/dialogs/open.cpp:457
 #, fuzzy
-msgid "Image inversion"
-msgstr "サイズ"
+msgid "Caching"
+msgstr "評価"
 
-#: modules/gui/wxwindows/extrapanel.cpp:152
-msgid "Inverts the image colors"
-msgstr ""
+#: modules/gui/wxwidgets/dialogs/open.cpp:458
+#, fuzzy
+msgid "Change the default caching value (in milliseconds)"
+msgstr "キャッシング値 (ms)"
 
-#: modules/gui/wxwindows/extrapanel.cpp:153
+#: modules/gui/wxwidgets/dialogs/open.cpp:471
 #, fuzzy
-msgid "Image cropping"
-msgstr "自動縁取り"
+msgid "Customize:"
+msgstr "コンパイラー: "
 
-#: modules/gui/wxwindows/extrapanel.cpp:153
-msgid "Crops the image"
+#: 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/wxwindows/extrapanel.cpp:154
-msgid "Blurring"
-msgstr ""
+#: modules/gui/wxwidgets/dialogs/open.cpp:638
+msgid "Use a subtitles file"
+msgstr "字幕ファイルを使う"
 
-#: modules/gui/wxwindows/extrapanel.cpp:154
-msgid "Creates a motion blurring on the image"
-msgstr ""
+#: modules/gui/wxwidgets/dialogs/open.cpp:639
+#, fuzzy
+msgid "Use an external subtitles file."
+msgstr "字幕ファイルを使う"
 
-#: modules/gui/wxwindows/extrapanel.cpp:155
-#: modules/video_filter/transform.c:67
+#: modules/gui/wxwidgets/dialogs/open.cpp:643
 #, fuzzy
-msgid "Transformation"
-msgstr "バージョン情報の印刷"
+msgid "Advanced Settings..."
+msgstr "高度なオプション..."
 
-#: modules/gui/wxwindows/extrapanel.cpp:155
-msgid "Rotates or flips the image"
+#: 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:702
+msgid "Disc type"
+msgstr "ディスクタイプ"
+
+#: modules/gui/wxwidgets/dialogs/open.cpp:709
+msgid "Probe Disc(s)"
 msgstr ""
 
-#: modules/gui/wxwindows/extrapanel.cpp:206
-msgid "Adjust Image"
-msgstr "画像調整"
+#: 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 "
+"media, try any device for the Disc type.  If that doesn't work, then try "
+"looking for CD-ROMs or DVD drives. The Disc type, Device name, and some "
+"parameter ranges are set based on media we find."
+msgstr ""
 
-#: modules/gui/wxwindows/extrapanel.cpp:223
-#: modules/gui/wxwindows/extrapanel.cpp:483
-msgid "Restore Defaults"
-msgstr "デフォルトの復元"
+#: modules/gui/wxwidgets/dialogs/open.cpp:803
+msgid "HTTP/HTTPS/FTP/MMS"
+msgstr ""
 
-#: modules/gui/wxwindows/extrapanel.cpp:241
-#, fuzzy
-msgid "Saturation"
-msgstr "持続期間"
+#: modules/gui/wxwidgets/dialogs/open.cpp:804
+msgid "RTSP"
+msgstr "RTSP"
 
-#: modules/gui/wxwindows/extrapanel.cpp:246
-msgid "Gamma"
-msgstr "ガンマ"
+#: modules/gui/wxwidgets/dialogs/open.cpp:924
+msgid "Name of DVD device to read from."
+msgstr ""
 
-#: modules/gui/wxwindows/extrapanel.cpp:272
-msgid "Video Options"
-msgstr "ビデオオプション"
+#: modules/gui/wxwidgets/dialogs/open.cpp:955
+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/wxwindows/extrapanel.cpp:286
-msgid "Aspect Ratio"
-msgstr "アスペクト比"
+#: modules/gui/wxwidgets/dialogs/open.cpp:964
+msgid "Name of CD-ROM device to read Video CD from."
+msgstr ""
 
-#: modules/gui/wxwindows/extrapanel.cpp:302
-#, fuzzy
-msgid "Video Filters"
-msgstr "ビデオタイトル"
+#: modules/gui/wxwidgets/dialogs/open.cpp:983
+msgid ""
+"Name of CD-ROM device to read audio CD from. If this field is left empty, we "
+"will scan for a CD-ROM with an audio CD in it."
+msgstr ""
+
+#: modules/gui/wxwidgets/dialogs/open.cpp:988
+msgid "Name of CD-ROM device to read audio CD from."
+msgstr ""
 
-#: modules/gui/wxwindows/extrapanel.cpp:319
+#: modules/gui/wxwidgets/dialogs/open.cpp:1287
 #, fuzzy
-msgid "More info"
-msgstr "デバイス名"
+msgid "Open subtitles file"
+msgstr "字幕の選択"
 
-#: modules/gui/wxwindows/extrapanel.cpp:398
+#: modules/gui/wxwidgets/dialogs/open.cpp:1664
 #, fuzzy
-msgid "Headphone virtualization"
-msgstr "ヘッドホーンの仮想的な音の広がり効果"
+msgid "Title number."
+msgstr "チューナー番号"
 
-#: modules/gui/wxwindows/extrapanel.cpp:399
+#: modules/gui/wxwidgets/dialogs/open.cpp:1666
 msgid ""
-"This filter gives the feeling of a 5.1 speaker set when using a headphone."
+"DVD's can have up to 32 subtitles numbered 0..31. Note this is not the same "
+"thing as a subtitle name e.g. 'en'. If a value -1 is used, no subtitle will "
+"be shown."
 msgstr ""
 
-#: modules/gui/wxwindows/extrapanel.cpp:403
-#, fuzzy
-msgid "Volume normalization"
-msgstr "ビジュアル化"
+#: modules/gui/wxwidgets/dialogs/open.cpp:1669
+msgid "Audio track number. DVD's can have up to 8 audio tracks numbered 0..7."
+msgstr ""
 
-#: modules/gui/wxwindows/extrapanel.cpp:404
-msgid ""
-"This filter prevents the audio output power from going over a defined value."
+#: modules/gui/wxwidgets/dialogs/open.cpp:1690
+msgid "Playback control (PBC) usually starts with number 1."
+msgstr ""
+
+#: modules/gui/wxwidgets/dialogs/open.cpp:1696
+msgid "The first entry (the beginning of the first MPEG track) is 0."
 msgstr ""
 
-#: modules/gui/wxwindows/extrapanel.cpp:408
+#: modules/gui/wxwidgets/dialogs/open.cpp:1701
 #, fuzzy
-msgid "Maximum level"
-msgstr "品質レベル"
+msgid "Track number."
+msgstr "トラック番号"
 
-#: modules/gui/wxwindows/extrapanel.cpp:468
+#: modules/gui/wxwidgets/dialogs/open.cpp:1707
 msgid ""
-"Enable the equalizer. You can either manually change the bands or use a "
-"preset (Audio Menu->Equalizer)."
+"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/wxwindows/extrapanel.cpp:1000
+#: modules/gui/wxwidgets/dialogs/open.cpp:1709
 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 / General / Video)."
+"Audio track number. VCD's can have up to 2 audio tracks numbered 0 or 1. "
 msgstr ""
 
-#: modules/gui/wxwindows/extrapanel.cpp:1010
-#: modules/gui/wxwindows/wizard.cpp:504
-#, fuzzy
-msgid "More information"
-msgstr "バージョン情報の印刷"
+#: modules/gui/wxwidgets/dialogs/open.cpp:1721
+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/wxwindows/extrapanel.cpp:1213
-#, fuzzy
-msgid "Extended controls"
-msgstr "リモート・コントロール"
+#: modules/gui/wxwidgets/dialogs/open.cpp:1725
+msgid "Audio CDs can have up to 100 tracks, the first track is usually 1."
+msgstr ""
 
-#: modules/gui/wxwindows/fileinfo.cpp:59
-msgid "Stream and media info"
-msgstr "ストリームとメディアの情報"
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:52
+msgid "Shuffle"
+msgstr "シャッフル"
 
-#: modules/gui/wxwindows/interface.cpp:399
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:231
 #, fuzzy
-msgid "Quick &Open File...\tCtrl-O"
-msgstr "ファイルを開く..."
+msgid "&Simple Add File..."
+msgstr "シンプル追加(&S)..."
 
-#: modules/gui/wxwindows/interface.cpp:402
-msgid "Open &File...\tCtrl-F"
-msgstr "ファイルを開く(&F)...\tCtrl-F"
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:232
+msgid "Add &Directory..."
+msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:403
-#, fuzzy
-msgid "Open Dir&ectory...\tCtrl-E"
-msgstr "ファイルを開く(&F)...\tCtrl-F"
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:233
+msgid "&Add MRL..."
+msgstr "MRL 追加(&A)..."
 
-#: modules/gui/wxwindows/interface.cpp:404
-msgid "Open &Disc...\tCtrl-D"
-msgstr "ディスクを開く(&D)...\tCtrl-D"
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:238
+msgid "&Open Playlist..."
+msgstr "再生一覧を開く(&O)"
 
-#: modules/gui/wxwindows/interface.cpp:406
-msgid "Open &Network Stream...\tCtrl-N"
-msgstr "ネットワークストリームを開く(&N)...\tCtrl-N"
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:239
+msgid "&Save Playlist..."
+msgstr "再生一覧を保存(&S)..."
 
-#: modules/gui/wxwindows/interface.cpp:408
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:241
 #, fuzzy
-msgid "Open C&apture Device...\tCtrl-A"
-msgstr "キャプチャデバイスを開く(&C)...\tCtrl-C"
+msgid "&Close"
+msgstr "閉じる(&C)"
 
-#: modules/gui/wxwindows/interface.cpp:411
-#, fuzzy
-msgid "&Wizard...\tCtrl-W"
-msgstr "ストリーミングウィザード(&W)...\tCtrl-W"
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:245
+msgid "Sort by &title"
+msgstr "タイトルでソート(&T)"
 
-#: modules/gui/wxwindows/interface.cpp:414
-msgid "E&xit\tCtrl-X"
-msgstr "終了(&X)\tCtrl-X"
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:246
+msgid "&Reverse sort by title"
+msgstr "タイトルで逆ソート(&R)"
 
-#: modules/gui/wxwindows/interface.cpp:420
-msgid "&Playlist...\tCtrl-P"
-msgstr "プレイリスト(&P)...\tCtrl-P"
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:248
+msgid "&Shuffle Playlist"
+msgstr "再生一覧をシャッフル(&S)"
 
-#: modules/gui/wxwindows/interface.cpp:422
-msgid "&Messages...\tCtrl-M"
-msgstr "メッセージ(&M)...\tCtrl-M"
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:252
+msgid "D&elete"
+msgstr "削除(&E)"
 
-#: modules/gui/wxwindows/interface.cpp:424
-msgid "Stream and Media &info...\tCtrl-I"
-msgstr "ストリームとメディア情報(&I)...\tCtrl-I"
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:259
+msgid "&Manage"
+msgstr "管理(&M)"
 
-#: modules/gui/wxwindows/interface.cpp:438
-msgid "&File"
-msgstr "ファイル(&F)"
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:260
+msgid "S&ort"
+msgstr "ソート(&O)"
 
-#: modules/gui/wxwindows/interface.cpp:439
-msgid "&View"
-msgstr "表示(&V)"
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:261
+msgid "&Selection"
+msgstr "選択(&S)"
 
-#: modules/gui/wxwindows/interface.cpp:440
-msgid "&Settings"
-msgstr "設定(&S)"
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:262
+#, fuzzy
+msgid "&View items"
+msgstr "ビデオタイトル"
 
-#: modules/gui/wxwindows/interface.cpp:441
-msgid "&Audio"
-msgstr "オーディオ(&A)"
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:270
+msgid "Play this branch"
+msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:442
-msgid "&Video"
-msgstr "ビデオ(&I)"
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:272
+msgid "Sort this branch"
+msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:443
-msgid "&Navigation"
-msgstr "ナビゲーション(&N)"
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:352
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:785
+#: modules/gui/wxwidgets/playlist_manager.cpp:425
+#, fuzzy
+msgid "root"
+msgstr "ルート"
 
-#: modules/gui/wxwindows/interface.cpp:444
-msgid "&Help"
-msgstr "ヘルプ(&H)"
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:582
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:802
+#, fuzzy, c-format
+msgid "%i items in playlist (%i not shown)"
+msgstr "デフォルトで再生一覧に追加"
 
-#: modules/gui/wxwindows/interface.cpp:484
-msgid "Previous playlist item"
-msgstr "前のプレイリスト項目"
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:595
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:809
+#, fuzzy, c-format
+msgid "%i items in playlist"
+msgstr "デフォルトで再生一覧に追加"
 
-#: modules/gui/wxwindows/interface.cpp:485
-msgid "Next playlist item"
-msgstr "次のプレイリスト項目プレイリストを開く"
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:904
+msgid "M3U file"
+msgstr "M3U ファイル"
 
-#: modules/gui/wxwindows/interface.cpp:794
-#, fuzzy
-msgid "Extended &GUI\tCtrl-G"
-msgstr "GUI 拡張(&E)"
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:910
+msgid "Playlist is empty"
+msgstr "再生一覧が空です"
 
-#: modules/gui/wxwindows/interface.cpp:798
-msgid "&Undock Ext. GUI"
-msgstr ""
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:910
+msgid "Can't save"
+msgstr "保存できません"
+
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:1233 modules/misc/freetype.c:100
+#: modules/misc/win32text.c:71
+msgid "Normal"
+msgstr "通常"
 
-#: modules/gui/wxwindows/interface.cpp:802
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:1235
 #, fuzzy
-msgid "&Bookmarks...\tCtrl-B"
-msgstr "ブックマーク(&B)"
+msgid "Sorted by artist"
+msgstr "タイトルでソート(&T)"
 
-#: modules/gui/wxwindows/interface.cpp:804
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:1237
 #, fuzzy
-msgid "Preference&s...\tCtrl-S"
-msgstr "設定..."
+msgid "Sorted by Album"
+msgstr "名前でソート"
 
-#: modules/gui/wxwindows/interface.cpp:857
+#: modules/gui/wxwidgets/dialogs/preferences.cpp:1015
 msgid ""
-" (wxWindows interface)\n"
-"\n"
+"Some options are available but hidden. Check \"Advanced options\" to see "
+"them."
 msgstr ""
-"(wxWindows インタフェース)\n"
-"\n"
 
-#: modules/gui/wxwindows/interface.cpp:863
-#, c-format
-msgid "About %s"
-msgstr "%s について"
+#: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:196
+msgid "Alt"
+msgstr "Alt"
 
-#: modules/gui/wxwindows/interface.cpp:1551
-#, fuzzy
-msgid "Show/Hide interface"
-msgstr "インターフェース表示"
+#: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:198
+msgid "Ctrl"
+msgstr "Ctrl"
 
-#: modules/gui/wxwindows/iteminfo.cpp:70
-msgid "Playlist item info"
-msgstr "プレイリスト項目情報"
+#: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:200
+msgid "Shift"
+msgstr ""
+
+#: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:433
+msgid ""
+"Select modules that you want. To get more advanced control, you can also "
+"modify the resulting chain by yourself"
+msgstr ""
 
-#: modules/gui/wxwindows/iteminfo.cpp:129
-msgid "Item Info"
-msgstr "項目情報"
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:167
+msgid "Stream output MRL"
+msgstr "ストリームの出力 MRL"
 
-#: modules/gui/wxwindows/menus.cpp:129
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:171
 #, fuzzy
-msgid "Quick &Open File..."
-msgstr "ファイルを開く(&O)..."
+msgid "Destination Target:"
+msgstr "送信先のアスペクト・レシオ"
 
-#: modules/gui/wxwindows/menus.cpp:130
-msgid "Open &File..."
-msgstr "ファイルを開く(&F)..."
+#: 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"
+msgstr ""
 
-#: modules/gui/wxwindows/menus.cpp:131
-msgid "Open &Disc..."
-msgstr "ディスクを開く(&D)..."
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:463
+msgid "Output methods"
+msgstr "出力方法"
 
-#: modules/gui/wxwindows/menus.cpp:132
-msgid "Open &Network Stream..."
-msgstr "ネットワークストリームを開く(&N)..."
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:474
+msgid "MMSH"
+msgstr ""
 
-#: modules/gui/wxwindows/menus.cpp:133
-msgid "Open &Capture Device..."
-msgstr "キャプチャデバイスを開く(&C)..."
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:475 modules/stream_out/rtp.c:90
+msgid "RTP"
+msgstr "RTP"
 
-#: modules/gui/wxwindows/menus.cpp:140
-#, fuzzy
-msgid "Media &Info..."
-msgstr "ストリームの情報..."
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:579
+msgid "Miscellaneous options"
+msgstr "その他のオプション"
 
-#: modules/gui/wxwindows/menus.cpp:141
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:593
 #, fuzzy
-msgid "&Messages..."
-msgstr "メッセージ..."
-
-#: modules/gui/wxwindows/menus.cpp:142
-msgid "&Preferences..."
-msgstr "設定(&P)..."
-
-#: modules/gui/wxwindows/menus.cpp:561 modules/gui/wxwindows/menus.cpp:588
-msgid "Empty"
-msgstr "空"
+msgid "Group name"
+msgstr "グループ情報"
 
-#: modules/gui/wxwindows/messages.cpp:99
-msgid "Save As..."
-msgstr "名前を付けて保存..."
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:600
+msgid "Channel name"
+msgstr "チャンネル名"
 
-#: modules/gui/wxwindows/messages.cpp:216
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:625
 #, fuzzy
-msgid "Save Messages As..."
-msgstr "メッセージ..."
-
-#: modules/gui/wxwindows/open.cpp:229
-msgid "Advanced options..."
-msgstr "高度なオプション..."
-
-#: modules/gui/wxwindows/open.cpp:234 modules/gui/wxwindows/open.cpp:245
-#: modules/gui/wxwindows/preferences.cpp:219
-msgid "Advanced options"
-msgstr "高度なオプション"
-
-#: modules/gui/wxwindows/open.cpp:249
-msgid "Options:"
-msgstr "オプション:"
+msgid "Select all elementary streams"
+msgstr "ネットワークストリームを選択する"
 
-#: modules/gui/wxwindows/open.cpp:358 modules/gui/wxwindows/open.cpp:366
-msgid "Open..."
-msgstr "開く..."
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:709
+#, fuzzy
+msgid "Transcoding options"
+msgstr "持続期間"
 
-#: modules/gui/wxwindows/open.cpp:397
-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/streamout.cpp:766
+msgid "Video codec"
+msgstr "ビデオコーデック"
 
-#: modules/gui/wxwindows/open.cpp:418
-msgid "Use VLC as a server of streams"
-msgstr ""
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:836
+msgid "Audio codec"
+msgstr "オーディオコーデック"
 
-#: modules/gui/wxwindows/open.cpp:444
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:886
 #, fuzzy
-msgid "Caching"
-msgstr "評価"
+msgid "Subtitles codec"
+msgstr "字幕・デコーダ・モジュール"
 
-#: modules/gui/wxwindows/open.cpp:445
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:895
 #, fuzzy
-msgid "Change the default caching value (in milliseconds)"
-msgstr "キャッシング値 (ms)"
+msgid "Subtitles overlay"
+msgstr "字幕"
+
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:1009
+msgid "Save file"
+msgstr "ファイルの保存"
 
-#: modules/gui/wxwindows/open.cpp:607 modules/gui/wxwindows/subtitles.cpp:65
+#: modules/gui/wxwidgets/dialogs/subtitles.cpp:55
 msgid "Subtitle options"
 msgstr "字幕オプション"
 
-#: modules/gui/wxwindows/open.cpp:608
-msgid "Force options for separate subtitle files."
-msgstr "分離された字幕ファイルをの強制オプション"
-
-#: modules/gui/wxwindows/open.cpp:643
-msgid "DVD (menus)"
-msgstr "DVD(メニュー)"
+#: modules/gui/wxwidgets/dialogs/subtitles.cpp:73
+msgid "Subtitles file"
+msgstr "字幕ファイル"
 
-#: modules/gui/wxwindows/open.cpp:675
-#, fuzzy
-msgid "Subtitles track"
-msgstr "字幕トラック"
+#: modules/gui/wxwidgets/dialogs/subtitles.cpp:129
+msgid "Subtitles options"
+msgstr "字幕オプション"
 
-#: modules/gui/wxwindows/open.cpp:702
-msgid "HTTP/HTTPS/FTP/MMS"
+#: modules/gui/wxwidgets/dialogs/subtitles.cpp:211
+msgid ""
+"Override frames per second. It will only work with MicroDVD and SubRIP "
+"subtitles."
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:703
-msgid "RTSP"
-msgstr "RTSP"
-
-#: modules/gui/wxwindows/playlist.cpp:51
-msgid "Shuffle"
-msgstr ""
+#: modules/gui/wxwidgets/dialogs/subtitles.cpp:218
+#: modules/stream_out/bridge.c:40 modules/stream_out/display.c:41
+#: modules/video_filter/mosaic.c:109
+msgid "Delay"
+msgstr "ディレイ"
 
-#: modules/gui/wxwindows/playlist.cpp:231
+#: modules/gui/wxwidgets/dialogs/subtitles.cpp:227
 #, fuzzy
-msgid "&Simple Add File..."
-msgstr "シンプル追加(&S)..."
-
-#: modules/gui/wxwindows/playlist.cpp:232
-msgid "Add &Directory..."
-msgstr ""
-
-#: modules/gui/wxwindows/playlist.cpp:233
-msgid "&Add MRL..."
-msgstr "MRL 追加(&A)..."
-
-#: modules/gui/wxwindows/playlist.cpp:238
-msgid "&Open Playlist..."
-msgstr "プレイリストを開く(&O)"
+msgid "Set subtitle delay (in 1/10s)"
+msgstr "字幕の選択"
 
-#: modules/gui/wxwindows/playlist.cpp:239
-msgid "&Save Playlist..."
-msgstr "プレイリストを保存(&S)..."
+#: modules/gui/wxwidgets/dialogs/subtitles.cpp:287
+msgid "Open file"
+msgstr "ファイルを開く"
 
-#: modules/gui/wxwindows/playlist.cpp:241
+#: modules/gui/wxwidgets/dialogs/updatevlc.cpp:65
 #, fuzzy
-msgid "&Close"
-msgstr "閉じる(&C)"
-
-#: modules/gui/wxwindows/playlist.cpp:245
-msgid "Sort by &title"
-msgstr "タイトルでソート(&T)"
-
-#: modules/gui/wxwindows/playlist.cpp:246
-msgid "&Reverse sort by title"
-msgstr "タイトルで逆ソート(&R)"
-
-#: modules/gui/wxwindows/playlist.cpp:248
-msgid "&Shuffle Playlist"
-msgstr "プレイリストをシャッフル(&S)"
-
-#: modules/gui/wxwindows/playlist.cpp:252
-msgid "D&elete"
-msgstr "削除(&E)"
-
-#: modules/gui/wxwindows/playlist.cpp:259
-msgid "&Manage"
-msgstr "管理(&M)"
+msgid "VLC media player - Updates"
+msgstr "VLC メディアプレイヤー"
 
-#: modules/gui/wxwindows/playlist.cpp:260
-msgid "S&ort"
-msgstr "ソート(&O)"
+#: modules/gui/wxwidgets/dialogs/updatevlc.cpp:77
+msgid "Check for updates now !"
+msgstr ""
 
-#: modules/gui/wxwindows/playlist.cpp:261
-msgid "&Selection"
-msgstr "選択(&S)"
+#: modules/gui/wxwidgets/dialogs/updatevlc.cpp:153
+msgid ""
+"\n"
+"Available updates and related downloads:\n"
+"(Double click on a file to download it)\n"
+msgstr ""
 
-#: modules/gui/wxwindows/playlist.cpp:262
+#: modules/gui/wxwidgets/dialogs/updatevlc.cpp:179
 #, fuzzy
-msgid "&View items"
-msgstr "ビデオタイトル"
+msgid "Save file..."
+msgstr "ファイルの保存"
 
-#: modules/gui/wxwindows/playlist.cpp:270
-msgid "Play this branch"
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:65
+msgid "Broadcasts"
+msgstr "ブロードキャスト"
+
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:76
+msgid "Load"
 msgstr ""
 
-#: modules/gui/wxwindows/playlist.cpp:271
-#: modules/gui/wxwindows/playlist.cpp:278
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:215
 #, fuzzy
-msgid "Preparse"
-msgstr "準備"
+msgid "Load configuration"
+msgstr "YLM 設定"
 
-#: modules/gui/wxwindows/playlist.cpp:272
-msgid "Sort this branch"
-msgstr ""
-
-#: modules/gui/wxwindows/playlist.cpp:352
-#: modules/gui/wxwindows/playlist.cpp:775
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:229
 #, fuzzy
-msgid "root"
-msgstr "ルート"
+msgid "Save configuration"
+msgstr "YLM 設定"
 
-#: modules/gui/wxwindows/playlist.cpp:574
-#: modules/gui/wxwindows/playlist.cpp:792
-#, fuzzy, c-format
-msgid "%i items in playlist (%i not shown)"
-msgstr "デフォルトでプレイリストに追加"
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:245
+msgid "New broadcast"
+msgstr "新規ブロードキャスト"
 
-#: modules/gui/wxwindows/playlist.cpp:902
-msgid "M3U file"
-msgstr "M3U ファイル"
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:380
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:391
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:115
+msgid "Choose"
+msgstr "選択..."
 
-#: modules/gui/wxwindows/playlist.cpp:908
-msgid "Playlist is empty"
-msgstr "プレイリストが空です"
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:385
+msgid "Output"
+msgstr "出力"
 
-#: modules/gui/wxwindows/playlist.cpp:908
-msgid "Can't save"
-msgstr "保存できません"
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:397
+msgid "Create"
+msgstr "作成"
 
-#: modules/gui/wxwindows/playlist.cpp:1225 modules/misc/freetype.c:100
-#: modules/misc/win32text.c:71
-msgid "Normal"
-msgstr "通常"
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:407
+msgid "Loop"
+msgstr "ループ"
 
-#: modules/gui/wxwindows/playlist.cpp:1227
-#, fuzzy
-msgid "Sorted by artist"
-msgstr "作成者でソート(&A)"
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:510
+msgid "VLM configuration"
+msgstr "YLM 設定"
 
-#: modules/gui/wxwindows/preferences.cpp:1014
-msgid ""
-"Some options are available but hidden. Check \"Advanced options\" to see "
-"them."
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:544
+msgid "VLM stream"
+msgstr "VLM ストリーム"
+
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:90
+msgid "Use this to re-encode a stream and save it to a file."
 msgstr ""
 
-#: modules/gui/wxwindows/preferences_widgets.cpp:206
-msgid "Alt"
-msgstr "Alt"
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:93
+msgid "Use this to stream on a network"
+msgstr ""
 
-#: modules/gui/wxwindows/preferences_widgets.cpp:208
-msgid "Ctrl"
-msgstr "Ctrl"
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:106
+msgid "You must choose a stream"
+msgstr "ストリームを選択しなければなりません"
 
-#: modules/gui/wxwindows/preferences_widgets.cpp:210
-msgid "Shift"
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:107
+msgid "Uh Oh! Unable to find playlist !"
 msgstr ""
 
-#: modules/gui/wxwindows/preferences_widgets.cpp:443
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:109
 msgid ""
-"Select modules that you want. To get more advanced control, you can also "
-"modify the resulting chain by yourself"
+"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)."
 msgstr ""
 
-#: modules/gui/wxwindows/streamdata.h:54
-#, fuzzy
-msgid "MPEG-1 Video codec"
-msgstr "ビデオコーデック"
-
-#: modules/gui/wxwindows/streamdata.h:57
-#, fuzzy
-msgid "MPEG-2 Video codec"
-msgstr "ビデオコーデック"
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:136
+msgid "This does not appear to be a valid multicast address"
+msgstr ""
 
-#: modules/gui/wxwindows/streamdata.h:60
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:138
 #, fuzzy
-msgid "MPEG-4 Video codec"
-msgstr "ビデオコーデック"
+msgid "You need to enter an address"
+msgstr "ネットワークインタフェースアドレス"
 
-#: modules/gui/wxwindows/streamdata.h:63
-msgid "DivX first version"
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:149
+msgid ""
+"In this page, you will define a few additionnal parameters for your "
+"transcoding"
 msgstr ""
 
-#: modules/gui/wxwindows/streamdata.h:66
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:152
 #, fuzzy
-msgid "DivX second version"
-msgstr "MMX 変換元 "
+msgid "You must choose a file to save to"
+msgstr "ストリームの出力先の選択"
 
-#: modules/gui/wxwindows/streamdata.h:68
-msgid "DivX third version"
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:156
+msgid ""
+"In this page, you will define a few additionnal parameters for your stream"
 msgstr ""
 
-#: modules/gui/wxwindows/streamdata.h:70
-msgid "H263 is a video codec optimized for videoconference (low rates)"
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:164
+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"
 msgstr ""
 
-#: modules/gui/wxwindows/streamdata.h:72
-#, fuzzy
-msgid "H264 is a new video codec"
-msgstr "送信先のアスペクト・レシオ"
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:1283
+msgid "Save to file"
+msgstr "ファイルへ保存する"
 
-#: modules/gui/wxwindows/streamdata.h:74
-msgid "WMV (Windows Media Video) 1"
+#: modules/gui/wxwidgets/extrapanel.cpp:42
+msgid ""
+"If this setting is not zero, the bands will move together when you move one. "
+"The higher the value is, the more correlated their movement will be."
 msgstr ""
 
-#: modules/gui/wxwindows/streamdata.h:76
-msgid "WMV (Windows Media Video) 2"
+#: modules/gui/wxwidgets/extrapanel.cpp:155 modules/video_filter/magnify.c:60
+msgid "Magnify"
 msgstr ""
 
-#: modules/gui/wxwindows/streamdata.h:78
-msgid "MJPEG consists of a series of JPEG pictures"
+#: modules/gui/wxwidgets/extrapanel.cpp:155
+msgid "Magnifies part of the image"
 msgstr ""
 
-#: modules/gui/wxwindows/streamdata.h:80
-msgid "Theora is a free general-purpose codec"
-msgstr ""
+#: modules/gui/wxwidgets/extrapanel.cpp:272
+msgid "Video Options"
+msgstr "ビデオオプション"
 
-#: modules/gui/wxwindows/streamdata.h:82
-#: modules/gui/wxwindows/streamdata.h:110
-msgid "Dummy codec (do not transcode)"
-msgstr ""
+#: modules/gui/wxwidgets/extrapanel.cpp:286
+msgid "Aspect Ratio"
+msgstr "アスペクト比"
+
+#: modules/gui/wxwidgets/extrapanel.cpp:319
+msgid "More info"
+msgstr "更なる情報"
 
-#: modules/gui/wxwindows/streamdata.h:89
-msgid "The standard MPEG audio (1/2) format"
+#: modules/gui/wxwidgets/extrapanel.cpp:404
+msgid ""
+"This filter prevents the audio output power from going over a defined value."
 msgstr ""
 
-#: modules/gui/wxwindows/streamdata.h:92
-#, fuzzy
-msgid "MPEG Audio Layer 3"
-msgstr "MPEG オーディオデコーダー"
+#: modules/gui/wxwidgets/extrapanel.cpp:468
+msgid ""
+"Enable the equalizer. You can either manually change the bands or use a "
+"preset (Audio Menu->Equalizer)."
+msgstr ""
 
-#: modules/gui/wxwindows/streamdata.h:95
-msgid "Audio format for MPEG4"
+#: modules/gui/wxwidgets/extrapanel.cpp:475
+msgid ""
+"If you enable this setting, the equalizer filter will be applied twice. The "
+"effect will be sharper."
 msgstr ""
 
-#: modules/gui/wxwindows/streamdata.h:97
-#, fuzzy
-msgid "DVD audio format"
-msgstr "VCD フォーマット"
+#: modules/gui/wxwidgets/input_manager.cpp:178
+msgid "Stopped"
+msgstr "停止"
 
-#: modules/gui/wxwindows/streamdata.h:100
-#, fuzzy
-msgid "Vorbis is a free audio codec"
-msgstr "Vorbis オーディオデコーダー"
+#: modules/gui/wxwidgets/input_manager.cpp:200
+msgid "Paused"
+msgstr "一時停止"
 
-#: modules/gui/wxwindows/streamdata.h:102
-msgid "FLAC is a lossless audio codec"
-msgstr ""
+#: modules/gui/wxwidgets/input_manager.cpp:200
+msgid "Playing"
+msgstr "再生中"
 
-#: modules/gui/wxwindows/streamdata.h:104
-msgid "A free audio codec dedicated to compression of voice"
-msgstr ""
+#: modules/gui/wxwidgets/input_manager.cpp:214
+msgid "Menu"
+msgstr "メニュー"
 
-#: modules/gui/wxwindows/streamdata.h:106
-#: modules/gui/wxwindows/streamdata.h:108
-msgid "Uncompressed audio samples"
-msgstr ""
+#: modules/gui/wxwidgets/input_manager.cpp:217
+msgid "Previous track"
+msgstr "前のトラック"
 
-#: modules/gui/wxwindows/streamdata.h:126
-msgid "Use this to stream to a single computer"
-msgstr ""
+#: modules/gui/wxwidgets/input_manager.cpp:218
+msgid "Next track"
+msgstr "次のトラック"
 
-#: modules/gui/wxwindows/streamdata.h:130
-msgid ""
-"Use this to stream to a dynamic group of computers on a multicast-enabled "
-"network. This is the most efficient method to stream to several computers, "
-"but it does not work over Internet."
-msgstr ""
+#: modules/gui/wxwidgets/interface.cpp:555
+msgid "Quick &Open File...\tCtrl-O"
+msgstr "ファイルを開く...\tCtrl-O"
 
-#: modules/gui/wxwindows/streamdata.h:133
-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."
-msgstr ""
+#: modules/gui/wxwidgets/interface.cpp:558
+msgid "Open &File...\tCtrl-F"
+msgstr "ファイルを開く(&F)...\tCtrl-F"
 
-#: modules/gui/wxwindows/streamdata.h:138
-msgid ""
-"Use this to stream to several computers. This method is less efficient, as "
-"the server needs to send several times the stream."
-msgstr ""
+#: modules/gui/wxwidgets/interface.cpp:559
+msgid "Open Dir&ectory...\tCtrl-E"
+msgstr "ディレクトリを開く(&D)...\tCtrl-E"
 
-#: modules/gui/wxwindows/streamdata.h:141
-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/interface.cpp:560
+msgid "Open &Disc...\tCtrl-D"
+msgstr "ディスクを開く(&D)...\tCtrl-D"
 
-#: modules/gui/wxwindows/streamdata.h:158
-#, fuzzy
-msgid "MPEG Program Stream"
-msgstr "ISO 13818-1 MPEGプログラム・ストリーム入力"
+#: modules/gui/wxwidgets/interface.cpp:562
+msgid "Open &Network Stream...\tCtrl-N"
+msgstr "ネットワークストリームを開く(&N)...\tCtrl-N"
 
-#: modules/gui/wxwindows/streamdata.h:159
-#, fuzzy
-msgid "MPEG Transport Stream"
-msgstr "ストリームの再生"
+#: modules/gui/wxwidgets/interface.cpp:564
+msgid "Open C&apture Device...\tCtrl-A"
+msgstr "キャプチャデバイスを開く(&A)...\tCtrl-C"
 
-#: modules/gui/wxwindows/streamdata.h:160
-#, fuzzy
-msgid "MPEG 1 Format"
-msgstr "VCD フォーマット"
+#: modules/gui/wxwidgets/interface.cpp:567
+msgid "&Wizard...\tCtrl-W"
+msgstr "ウィザード(&W)...\tCtrl-W"
 
-#: modules/gui/wxwindows/streamdata.h:162
-msgid "RAW"
-msgstr ""
+#: modules/gui/wxwidgets/interface.cpp:570
+msgid "E&xit\tCtrl-X"
+msgstr "終了(&X)\tCtrl-X"
 
-#: modules/gui/wxwindows/streamdata.h:165
-#, fuzzy
-msgid "MPEG4"
-msgstr "MPEG1"
+#: modules/gui/wxwidgets/interface.cpp:576
+msgid "&Playlist...\tCtrl-P"
+msgstr "再生一覧(&P)...\tCtrl-P"
 
-#: modules/gui/wxwindows/streamdata.h:167
-#, fuzzy
-msgid "WAV"
-msgstr "AVI"
+#: modules/gui/wxwidgets/interface.cpp:578
+msgid "&Messages...\tCtrl-M"
+msgstr "メッセージ(&M)...\tCtrl-M"
 
-#: modules/gui/wxwindows/streamout.cpp:174
-msgid "Stream output MRL"
-msgstr "ストリームの出力 MRL"
+#: modules/gui/wxwidgets/interface.cpp:580
+msgid "Stream and Media &info...\tCtrl-I"
+msgstr "ストリームとメディア情報(&I)...\tCtrl-I"
 
-#: modules/gui/wxwindows/streamout.cpp:178
+#: modules/gui/wxwidgets/interface.cpp:582
 #, fuzzy
-msgid "Destination Target:"
-msgstr "送信先のアスペクト・レシオ"
+msgid "VLM Control...\tCtrl-V"
+msgstr "VLM 制御...\\tCtrl-I"
 
-#: modules/gui/wxwindows/streamout.cpp:181
-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"
+#: modules/gui/wxwidgets/interface.cpp:594
+msgid "Check for updates ..."
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:448
-msgid "Output methods"
-msgstr "出力方法"
+#: modules/gui/wxwidgets/interface.cpp:598
+msgid "&File"
+msgstr "ファイル(&F)"
 
-#: modules/gui/wxwindows/streamout.cpp:458
-msgid "MMSH"
-msgstr ""
+#: modules/gui/wxwidgets/interface.cpp:599
+msgid "&View"
+msgstr "表示(&V)"
 
-#: modules/gui/wxwindows/streamout.cpp:561
-msgid "Miscellaneous options"
-msgstr "その他のオプション"
+#: modules/gui/wxwidgets/interface.cpp:600
+msgid "&Settings"
+msgstr "設定(&S)"
 
-#: modules/gui/wxwindows/streamout.cpp:576
-#, fuzzy
-msgid "Group name"
-msgstr "グループ情報"
+#: modules/gui/wxwidgets/interface.cpp:601
+msgid "&Audio"
+msgstr "オーディオ(&A)"
 
-#: modules/gui/wxwindows/streamout.cpp:583
-msgid "Channel name"
-msgstr "チャンネル名"
+#: modules/gui/wxwidgets/interface.cpp:602
+msgid "&Video"
+msgstr "ビデオ(&I)"
 
-#: modules/gui/wxwindows/streamout.cpp:611
-#, fuzzy
-msgid "Select all elementary streams"
-msgstr "ネットワークストリームを選択する"
+#: modules/gui/wxwidgets/interface.cpp:603
+msgid "&Navigation"
+msgstr "ナビゲーション(&N)"
+
+#: modules/gui/wxwidgets/interface.cpp:604
+msgid "&Help"
+msgstr "ヘルプ(&H)"
 
-#: modules/gui/wxwindows/streamout.cpp:682
+#: modules/gui/wxwidgets/interface.cpp:664
 #, fuzzy
-msgid "Transcoding options"
-msgstr "持続期間"
+msgid "Small playlist"
+msgstr "再生一覧を保存"
 
-#: modules/gui/wxwindows/streamout.cpp:739
-msgid "Video codec"
-msgstr "ビデオコーデック"
+#: modules/gui/wxwidgets/interface.cpp:665
+msgid "Previous playlist item"
+msgstr "前の再生一覧項目"
 
-#: modules/gui/wxwindows/streamout.cpp:809
-msgid "Audio codec"
-msgstr "オーディオコーデック"
+#: modules/gui/wxwidgets/interface.cpp:666
+msgid "Next playlist item"
+msgstr "次の再生一覧項目再生一覧を開く"
 
-#: modules/gui/wxwindows/streamout.cpp:859
-#, fuzzy
-msgid "Subtitles codec"
-msgstr "字幕・デコーダ・モジュール"
+#: modules/gui/wxwidgets/interface.cpp:667
+msgid "Play slower"
+msgstr "スロー再生"
 
-#: modules/gui/wxwindows/streamout.cpp:868
-#, fuzzy
-msgid "Subtitles overlay"
-msgstr "字幕"
+#: modules/gui/wxwidgets/interface.cpp:668
+msgid "Play faster"
+msgstr "早送り再生"
 
-#: modules/gui/wxwindows/streamout.cpp:992
-msgid "Save file"
-msgstr "ファイルの保存"
+#: modules/gui/wxwidgets/interface.cpp:851
+msgid "Extended &GUI\tCtrl-G"
+msgstr "GUI 拡張(&G)\tCtrl-G"
 
-#: modules/gui/wxwindows/subtitles.cpp:82
-msgid "Subtitles file"
-msgstr "字幕ファイル"
+#: modules/gui/wxwidgets/interface.cpp:854
+msgid "&Bookmarks...\tCtrl-B"
+msgstr "ブックマーク(&B)...\tCtrl-B"
 
-#: modules/gui/wxwindows/subtitles.cpp:137
-msgid "Subtitles options"
-msgstr "字幕オプション"
+#: modules/gui/wxwidgets/interface.cpp:856
+msgid "Preference&s...\tCtrl-S"
+msgstr "設定(&S)...\tCtrl-S"
 
-#: modules/gui/wxwindows/subtitles.cpp:219
+#: modules/gui/wxwidgets/interface.cpp:909
 msgid ""
-"Override frames per second. It will only work with MicroDVD and SubRIP "
-"subtitles."
+" (wxWidgets interface)\n"
+"\n"
 msgstr ""
+"(wxWidgets インタフェース)\n"
+"\n"
 
-#: modules/gui/wxwindows/subtitles.cpp:226 modules/stream_out/bridge.c:40
-#: modules/stream_out/display.c:41 modules/video_filter/mosaic.c:109
-msgid "Delay"
-msgstr "ディレイ"
+#: modules/gui/wxwidgets/interface.cpp:920
+msgid ""
+"The VideoLAN team <videolan@videolan.org>\n"
+"http://www.videolan.org/\n"
+"\n"
+msgstr ""
+"VideoLAN チーム <videolan@videolan.org>\n"
+"http://www.videolan.org/\n"
+"\n"
 
-#: modules/gui/wxwindows/subtitles.cpp:235
-#, fuzzy
-msgid "Set subtitle delay (in 1/10s)"
-msgstr "字幕の選択"
+#: modules/gui/wxwidgets/interface.cpp:923
+#, c-format
+msgid "About %s"
+msgstr "%s について"
 
-#: modules/gui/wxwindows/subtitles.cpp:294
-msgid "Open file"
-msgstr "ファイルを開く"
+#: modules/gui/wxwidgets/interface.cpp:1498
+msgid "Show/Hide interface"
+msgstr "インターフェース表示/非表示"
 
-#: modules/gui/wxwindows/timer.cpp:156 modules/gui/wxwindows/timer.cpp:337
+#: modules/gui/wxwidgets/menus.cpp:132
 #, fuzzy
-msgid "Playing"
-msgstr "再生"
+msgid "Quick &Open File..."
+msgstr "ファイルを開く(&O)..."
 
-#: modules/gui/wxwindows/timer.cpp:176
-#, fuzzy
-msgid "Stopped"
-msgstr "停止"
+#: modules/gui/wxwidgets/menus.cpp:133
+msgid "Open &File..."
+msgstr "ファイルを開く(&F)..."
 
-#: modules/gui/wxwindows/timer.cpp:223
-#, fuzzy
-msgid "Menu"
-msgstr "メディア"
+#: modules/gui/wxwidgets/menus.cpp:134
+msgid "Open D&irectory..."
+msgstr "ディレクトリを開く(&I)..."
 
-#: modules/gui/wxwindows/timer.cpp:226
-#, fuzzy
-msgid "Previous track"
-msgstr "前のチャプター"
+#: modules/gui/wxwidgets/menus.cpp:135
+msgid "Open &Disc..."
+msgstr "ディスクを開く(&D)..."
 
-#: modules/gui/wxwindows/timer.cpp:227
-#, fuzzy
-msgid "Next track"
-msgstr "ビデオ"
+#: modules/gui/wxwidgets/menus.cpp:136
+msgid "Open &Network Stream..."
+msgstr "ネットワークストリームを開く(&N)..."
 
-#: modules/gui/wxwindows/timer.cpp:333
-#, fuzzy
-msgid "Paused"
-msgstr "一時停止"
+#: modules/gui/wxwidgets/menus.cpp:137
+msgid "Open &Capture Device..."
+msgstr "キャプチャデバイスを開く(&C)..."
 
-#: modules/gui/wxwindows/wizard.cpp:91
-#, fuzzy
-msgid "This wizard helps you to stream, transcode or save a stream."
-msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+#: modules/gui/wxwidgets/menus.cpp:144
+msgid "Media &Info..."
+msgstr "メディア情報(&I)"
 
-#: modules/gui/wxwindows/wizard.cpp:94 modules/gui/wxwindows/wizard.cpp:99
-#, fuzzy
-msgid "Use this to stream on a network."
-msgstr "ネットワークを開く"
+#: modules/gui/wxwidgets/menus.cpp:145
+msgid "&Messages..."
+msgstr "メッセージ(&M)..."
 
-#: modules/gui/wxwindows/wizard.cpp:96
-msgid "Use this to re-encode a stream and save it to a file."
-msgstr ""
+#: modules/gui/wxwidgets/menus.cpp:146
+msgid "&Preferences..."
+msgstr "設定(&P)..."
 
-#: modules/gui/wxwindows/wizard.cpp:97
-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."
-msgstr ""
+#: modules/gui/wxwidgets/menus.cpp:565 modules/gui/wxwidgets/menus.cpp:592
+msgid "Empty"
+msgstr "空"
 
-#: modules/gui/wxwindows/wizard.cpp:101
-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."
+#: modules/gui/wxwidgets/streamdata.cpp:31
+msgid "MPEG-1 Video codec (useable with MPEG PS, MPEG TS, MPEG1, OGG and RAW)"
 msgstr ""
 
-#: modules/gui/wxwindows/wizard.cpp:107
-#, fuzzy
-msgid "Choose here your input stream."
-msgstr "ストリームの一時停止"
-
-#: modules/gui/wxwindows/wizard.cpp:112
-#, fuzzy
-msgid "You must choose a stream"
-msgstr "ストリームの出力先の選択"
-
-#: modules/gui/wxwindows/wizard.cpp:113
-msgid "Uh Oh! Unable to find playlist !"
+#: modules/gui/wxwidgets/streamdata.cpp:35
+msgid "MPEG-2 Video codec (useable with MPEG PS, MPEG TS, MPEG1, OGG and RAW)"
 msgstr ""
 
-#: modules/gui/wxwindows/wizard.cpp:115
+#: modules/gui/wxwidgets/streamdata.cpp:39
 msgid ""
-"Use this to read only a part of the stream. You must be able to control the "
-"incoming stream (for example, a file or a disc, but not an UDP network "
-"stream.)\n"
-"Enter the starting and ending times (in seconds)."
+"MPEG-4 Video codec (useable with MPEG PS, MPEG TS, MPEG1, ASF, MPEG4, OGG "
+"and RAW)"
 msgstr ""
 
-#: modules/gui/wxwindows/wizard.cpp:121
+#: modules/gui/wxwidgets/streamdata.cpp:56
 #, fuzzy
-msgid "Choose"
-msgstr "ブラウズ..."
-
-#: modules/gui/wxwindows/wizard.cpp:127
-msgid "If your stream has video and you want to transcode it, enable this."
-msgstr ""
-
-#: modules/gui/wxwindows/wizard.cpp:129
-msgid "Select your video codec. Click one to get more information."
-msgstr ""
+msgid "H264 is a new video codec (useable with MPEG TS and MPEG4)"
+msgstr "送信先のアスペクト・レシオ"
 
-#: modules/gui/wxwindows/wizard.cpp:132
-msgid "If your stream has audio and you want to transcode it, enable this."
+#: modules/gui/wxwidgets/streamdata.cpp:59
+msgid "WMV (Windows Media Video) 7 (useable with MPEG TS, MPEG1, ASF and OGG)"
 msgstr ""
 
-#: modules/gui/wxwindows/wizard.cpp:134
-msgid "Select your audio codec. Click one to get more information."
+#: modules/gui/wxwidgets/streamdata.cpp:62
+msgid "WMV (Windows Media Video) 8 (useable with MPEG TS, MPEG1, ASF and OGG)"
 msgstr ""
 
-#: modules/gui/wxwindows/wizard.cpp:142
-msgid "This does not appear to be a valid multicast address."
+#: modules/gui/wxwidgets/streamdata.cpp:66
+msgid "WMV (Windows Media Video) 9 (useable with MPEG TS, MPEG1, ASF and OGG)"
 msgstr ""
 
-#: modules/gui/wxwindows/wizard.cpp:144
-#, fuzzy
-msgid "You need to enter an address."
-msgstr "ネットワークインタフェースアドレス"
+#: modules/gui/wxwidgets/streamdata.cpp:122
+msgid "RTP Unicast"
+msgstr "RTP ユニキャスト"
 
-#: modules/gui/wxwindows/wizard.cpp:158
+#: modules/gui/wxwidgets/streamdata.cpp:125
 #, fuzzy
-msgid "You must choose a file to save to"
-msgstr "ストリームの出力先の選択"
-
-#: modules/gui/wxwindows/wizard.cpp:165
-msgid ""
-"Define the TTL (Time-To-Live) of the stream. This parameter is the maximum "
-"number of routers your stream can go through. If you don't know what it "
-"means, or if you want to stream on your local network only, leave this "
-"setting to 1."
-msgstr ""
+msgid "RTP Multicast"
+msgstr "RTP マルチキャスト"
 
-#: modules/gui/wxwindows/wizard.cpp:170
+#: modules/gui/wxwidgets/streamdata.cpp:129
 msgid ""
-"When streaming using UDP, you can announce your streams using the SAP/SDP "
-"announcing protocol. This way, the clients won't have to type in the "
-"multicast address, it will appear in their playlist if they enable the SAP "
-"extra interface.\n"
-"If you want to give a name to your stream, enter it here, else, a default "
-"name will be used."
+"Enter the 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."
 msgstr ""
 
-#: modules/gui/wxwindows/wxwindows.cpp:93
+#: modules/gui/wxwidgets/wxwidgets.cpp:89
 msgid "Show bookmarks dialog"
 msgstr "ブックマークダイアログを表示"
 
-#: modules/gui/wxwindows/wxwindows.cpp:94
+#: modules/gui/wxwidgets/wxwidgets.cpp:90
 msgid "Show bookmarks dialog when the interface starts."
 msgstr ""
 
-#: modules/gui/wxwindows/wxwindows.cpp:96
-#: modules/gui/wxwindows/wxwindows.cpp:97
+#: modules/gui/wxwidgets/wxwidgets.cpp:92
+#: modules/gui/wxwidgets/wxwidgets.cpp:93
+msgid "Show extended GUI"
+msgstr "拡張 GUI を表示する"
+
+#: modules/gui/wxwidgets/wxwidgets.cpp:94
+#: modules/gui/wxwidgets/wxwidgets.cpp:95
 msgid "Show taskbar entry"
-msgstr ""
+msgstr "タスクバーに入れて表示する"
 
-#: modules/gui/wxwindows/wxwindows.cpp:98
-#, fuzzy
+#: modules/gui/wxwidgets/wxwidgets.cpp:96
 msgid "Minimal interface"
-msgstr "スキン化インターフェース"
+msgstr "最小化インターフェース"
 
-#: modules/gui/wxwindows/wxwindows.cpp:99
+#: modules/gui/wxwidgets/wxwidgets.cpp:97
 msgid "Use minimal interface, no toolbar, few menus"
 msgstr ""
 
-#: modules/gui/wxwindows/wxwindows.cpp:100
+#: modules/gui/wxwidgets/wxwidgets.cpp:98
 #, fuzzy
 msgid "Size to video"
 msgstr "ビデオズーム"
 
-#: modules/gui/wxwindows/wxwindows.cpp:101
+#: modules/gui/wxwidgets/wxwidgets.cpp:99
 msgid "Resize VLC to match the video resolution"
 msgstr ""
 
-#: modules/gui/wxwindows/wxwindows.cpp:102
-#: modules/gui/wxwindows/wxwindows.cpp:103
-#, fuzzy
+#: modules/gui/wxwidgets/wxwidgets.cpp:100
+#: modules/gui/wxwidgets/wxwidgets.cpp:101
 msgid "Show systray icon"
-msgstr "ストリーム位置表示"
+msgstr "システムトレイアイコンを表示する"
 
-#: modules/gui/wxwindows/wxwindows.cpp:112
-msgid "wxWindows interface module"
-msgstr "wxWindows インターフェースモジュール"
+#: modules/gui/wxwidgets/wxwidgets.cpp:110
+msgid "wxWidgets interface module"
+msgstr "wxWidgets インターフェースモジュール"
 
-#: modules/gui/wxwindows/wxwindows.cpp:141
-msgid "wxWindows dialogs provider"
-msgstr "wxWindows ダイアログ提供"
+#: modules/gui/wxwidgets/wxwidgets.cpp:149
+msgid "wxWidgets dialogs provider"
+msgstr "wxWidgets ダイアログ提供"
 
 #: modules/misc/dummy/dummy.c:37
 msgid "Dummy image chroma format"
@@ -12381,9 +13063,8 @@ msgid "Dummy interface function"
 msgstr "ダミーのインターフェース機能"
 
 #: modules/misc/dummy/dummy.c:66
-#, fuzzy
 msgid "Dummy Interface"
-msgstr "インタフェース"
+msgstr "ダミーインタフェース"
 
 #: modules/misc/dummy/dummy.c:71
 msgid "Dummy access function"
@@ -12395,9 +13076,8 @@ msgid "Dummy demux function"
 msgstr "ダミーの機能モジュール"
 
 #: modules/misc/dummy/dummy.c:79
-#, fuzzy
 msgid "Dummy decoder"
-msgstr "ダミーのデコーダー機能"
+msgstr "ダミーのデコーダー"
 
 #: modules/misc/dummy/dummy.c:80
 msgid "Dummy decoder function"
@@ -12416,20 +13096,16 @@ msgid "Dummy video output function"
 msgstr "ダミーのビデオ出力機能"
 
 #: modules/misc/dummy/dummy.c:94
-#, fuzzy
 msgid "Dummy Video output"
-msgstr "ダミーストリーム出力"
+msgstr "ダミーのビデオ出力"
 
 #: modules/misc/dummy/dummy.c:100
 msgid "Dummy font renderer function"
 msgstr "ダミーのフォントレンダラー機能"
 
-#: modules/misc/externrun.c:79
-msgid "Execution of extern programs interface function"
-msgstr ""
-
 #: modules/misc/freetype.c:83 modules/misc/win32text.c:54
-#: modules/video_filter/marq.c:125 modules/visualization/xosd.c:73
+#: modules/video_filter/marq.c:126 modules/video_filter/rss.c:164
+#: modules/visualization/xosd.c:73
 msgid "Font"
 msgstr "フォント"
 
@@ -12448,24 +13124,26 @@ msgid ""
 msgstr ""
 
 #: modules/misc/freetype.c:89 modules/misc/win32text.c:60
-#: modules/video_filter/time.c:77
 msgid "Opacity, 0..255"
 msgstr ""
 
 #: modules/misc/freetype.c:90 modules/misc/win32text.c:61
-#: modules/video_filter/marq.c:87 modules/video_filter/time.c:78
+#: modules/video_filter/marq.c:87 modules/video_filter/rss.c:125
+#: modules/video_filter/time.c:78
 msgid ""
 "The opacity (inverse of transparency) of overlay text. 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/time.c:84
+#: modules/video_filter/marq.c:93 modules/video_filter/rss.c:131
+#: modules/video_filter/time.c:84
 msgid "Text Default Color"
-msgstr ""
+msgstr "テキストのデフォルト色"
 
 #: modules/misc/freetype.c:93 modules/misc/win32text.c:64
-#: modules/video_filter/marq.c:94 modules/video_filter/time.c:85
+#: modules/video_filter/marq.c:94 modules/video_filter/rss.c:132
+#: modules/video_filter/time.c:85
 msgid ""
 "The color of overlay text. 1 byte for each color, hexadecimal. #000000 = all "
 "colors off, 0xFF0000 = just Red, 0xFFFFFF = all color on [White]"
@@ -12491,101 +13169,45 @@ msgstr "大きい"
 msgid "Larger"
 msgstr "とても大きい"
 
-#: modules/misc/freetype.c:108 modules/misc/win32text.c:79
-#: modules/video_filter/marq.c:52 modules/video_filter/time.c:52
-#, fuzzy
-msgid "Black"
-msgstr "逆転"
-
-#: modules/misc/freetype.c:108 modules/misc/win32text.c:79
-#: modules/video_filter/marq.c:53 modules/video_filter/time.c:53
-msgid "Gray"
-msgstr ""
-
-#: modules/misc/freetype.c:108 modules/misc/win32text.c:79
-#: modules/video_filter/marq.c:53 modules/video_filter/time.c:53
+#: modules/misc/freetype.c:102
 #, fuzzy
-msgid "Silver"
-msgstr "スロー"
-
-#: modules/misc/freetype.c:108 modules/misc/win32text.c:79
-#: modules/video_filter/marq.c:53 modules/video_filter/time.c:53
-msgid "White"
-msgstr ""
+msgid "Use yuvp renderer"
+msgstr "テキストレンダラー設定"
 
-#: modules/misc/freetype.c:108 modules/misc/win32text.c:79
-#: modules/video_filter/marq.c:53 modules/video_filter/time.c:53
-msgid "Maroon"
+#: modules/misc/freetype.c:103
+msgid "Render into paletized YUV. Needed to encode into dvbsubs"
 msgstr ""
 
-#: modules/misc/freetype.c:109 modules/misc/win32text.c:80
-#: modules/video_filter/marq.c:53 modules/video_filter/time.c:53
-#, fuzzy
-msgid "Red"
-msgstr "ブレンド"
-
-#: modules/misc/freetype.c:109 modules/misc/win32text.c:80
-#: modules/video_filter/marq.c:54 modules/video_filter/time.c:54
+#: modules/misc/freetype.c:104
 #, fuzzy
-msgid "Fuchsia"
-msgstr "フュージョン"
+msgid "Font Effect"
+msgstr "取出し"
 
-#: modules/misc/freetype.c:109 modules/misc/win32text.c:80
-#: modules/video_filter/marq.c:54 modules/video_filter/time.c:54
-msgid "Yellow"
+#: modules/misc/freetype.c:105
+msgid "Select effects to apply to rendered text"
 msgstr ""
 
-#: modules/misc/freetype.c:109 modules/misc/win32text.c:80
-#: modules/video_filter/marq.c:54 modules/video_filter/time.c:54
-#, fuzzy
-msgid "Olive"
-msgstr "オールディーズ"
-
-#: modules/misc/freetype.c:109 modules/misc/win32text.c:80
-#: modules/video_filter/marq.c:54 modules/video_filter/time.c:54
-#, fuzzy
-msgid "Green"
-msgstr "スクリーン"
-
-#: modules/misc/freetype.c:109 modules/misc/win32text.c:80
-#: modules/video_filter/marq.c:55 modules/video_filter/time.c:55
+#: modules/misc/freetype.c:112
 #, fuzzy
-msgid "Teal"
-msgstr "タイトル"
+msgid "Background"
+msgstr "逆転再生"
 
-#: modules/misc/freetype.c:110 modules/misc/win32text.c:81
-#: modules/video_filter/marq.c:55 modules/video_filter/time.c:55
+#: modules/misc/freetype.c:112
 #, fuzzy
-msgid "Lime"
-msgstr "時間"
-
-#: modules/misc/freetype.c:110 modules/misc/win32text.c:81
-#: modules/video_filter/marq.c:55 modules/video_filter/time.c:55
-msgid "Purple"
-msgstr ""
-
-#: modules/misc/freetype.c:110 modules/misc/win32text.c:81
-#: modules/video_filter/marq.c:55 modules/video_filter/time.c:55
-msgid "Navy"
-msgstr ""
+msgid "Outline"
+msgstr "オリーブ"
 
-#: modules/misc/freetype.c:110 modules/misc/win32text.c:81
-#: modules/video_filter/marq.c:55 modules/video_filter/time.c:55
+#: modules/misc/freetype.c:113
 #, fuzzy
-msgid "Blue"
-msgstr "ブルース"
-
-#: modules/misc/freetype.c:110 modules/misc/win32text.c:81
-#: modules/video_filter/marq.c:56 modules/video_filter/time.c:56
-msgid "Aqua"
-msgstr ""
+msgid "Fat Outline"
+msgstr "早送り"
 
-#: modules/misc/freetype.c:113 modules/misc/win32text.c:84
+#: modules/misc/freetype.c:125 modules/misc/win32text.c:84
 #, fuzzy
 msgid "Text renderer"
-msgstr "ダイレクトレンダリング"
+msgstr "テキストレンダラー設定"
 
-#: modules/misc/freetype.c:114
+#: modules/misc/freetype.c:126
 msgid "Freetype2 font renderer"
 msgstr ""
 
@@ -12638,21 +13260,30 @@ msgstr ""
 
 #: modules/misc/gnutls.c:92
 msgid "GnuTLS TLS encryption layer"
-msgstr ""
+msgstr "GnuTLS TLS 暗号化レイヤー"
 
 #: modules/misc/gtk_main.c:60
 msgid "Gtk+ GUI helper"
 msgstr "Gtk+ GUI ヘルパー"
 
-#: modules/misc/logger.c:95
+#: modules/misc/logger.c:111
 msgid "Text"
 msgstr "テキスト"
 
-#: modules/misc/logger.c:97
+#: modules/misc/logger.c:117
 msgid "Log format"
 msgstr "ログフォーマット"
 
-#: modules/misc/logger.c:98
+#: modules/misc/logger.c:119
+#, fuzzy
+msgid ""
+"Specify the log format. Available choices are \"text\" (default), \"html\", "
+"and \"syslog\"."
+msgstr ""
+"ログ・フォーマットを指定します。\"text\" (デフォルト) and \"html\"が選択でき"
+"ます。"
+
+#: modules/misc/logger.c:121
 #, fuzzy
 msgid ""
 "Specify the log format. Available choices are \"text\" (default) and \"html"
@@ -12661,23 +13292,32 @@ msgstr ""
 "ログ・フォーマットを指定します。\"text\" (デフォルト) and \"html\"が選択でき"
 "ます。"
 
-#: modules/misc/logger.c:103
+#: modules/misc/logger.c:125
 msgid "Logging"
 msgstr ""
 
-#: modules/misc/logger.c:104
+#: modules/misc/logger.c:126
 #, fuzzy
 msgid "File logging"
 msgstr "ファイルロギングインターフェース"
 
-#: modules/misc/logger.c:106
+#: modules/misc/logger.c:129
 msgid "Log filename"
 msgstr "ログファイル名"
 
-#: modules/misc/logger.c:106
+#: modules/misc/logger.c:129
 msgid "Specify the log filename."
 msgstr "ログ・ファイル名を指定します。"
 
+#: modules/misc/logger.c:134
+#, fuzzy
+msgid "RRD output file"
+msgstr "出力フォーマット"
+
+#: modules/misc/logger.c:135
+msgid "Output data for RRDTool in this file"
+msgstr ""
+
 #: modules/misc/memcpy/memcpy.c:83
 msgid "libc memcpy"
 msgstr "libc memcpy"
@@ -12698,32 +13338,52 @@ msgstr "MMX 拡張memcpy"
 msgid "AltiVec memcpy"
 msgstr "AltiVec memcpy"
 
-#: modules/misc/network/ipv4.c:95
-#, fuzzy
-msgid "Multicast output interface"
-msgstr "リモート・コントロール・インタフェース・モジュール"
+#: modules/misc/msn.c:63
+msgid "MSN Title format string"
+msgstr "MSN 題名書式文字列"
 
-#: modules/misc/network/ipv4.c:97
-msgid ""
-"Indicate here the multicast output interface. This overrides the routing "
-"table."
+#: modules/misc/msn.c:64
+msgid "MSN Title format string. {0} artist, {1} title, {2} album"
 msgstr ""
+"MSN の題名の書式文字列です。「{0}はアーティスト、{1}は題名、{2}はアルバムです"
+
+#: modules/misc/msn.c:70
+msgid "MSN"
+msgstr "MSN"
+
+#: modules/misc/msn.c:71
+msgid "MSN Title Plugin"
+msgstr "MSN 題名プラグイン"
+
+#: modules/misc/msn.c:194
+msgid "(no title)"
+msgstr "(タイトルなし)"
+
+#: modules/misc/msn.c:195
+msgid "(no artist)"
+msgstr "(アーティストなし)"
+
+#: modules/misc/msn.c:196
+msgid "(no album)"
+msgstr "(アルバムなし)"
 
-#: modules/misc/network/ipv4.c:101
-msgid "IPv4 network abstraction layer"
+#: modules/misc/network/ipv4.c:96
+#, fuzzy
+msgid "UDP/IPv4 network abstraction layer"
 msgstr "IPv4ネットワーク抽象レイヤ"
 
-#: modules/misc/network/ipv6.c:82
-msgid "IPv6 network abstraction layer"
+#: modules/misc/network/ipv6.c:95
+#, fuzzy
+msgid "UDP/IPv6 network abstraction layer"
 msgstr "IPv6ネットワーク抽象レイヤ"
 
 #: modules/misc/playlist/export.c:44
 msgid "M3U playlist exporter"
-msgstr "M3U プレイリストをエクスポートする"
+msgstr "M3U 再生一覧をエクスポートする"
 
 #: modules/misc/playlist/export.c:50
 msgid "Old playlist exporter"
-msgstr "古いプレイリストをエクスポートする"
+msgstr "古い再生一覧をエクスポートする"
 
 #: modules/misc/qte_main.cpp:66
 msgid "Run as standalone Qt/Embedded GUI Server"
@@ -12736,43 +13396,39 @@ msgid ""
 msgstr ""
 
 #: modules/misc/qte_main.cpp:72
-#, fuzzy
 msgid "Qt Embedded GUI helper"
 msgstr "QT 埋め込み GUI ヘルパー"
 
 #: modules/misc/qte_main.cpp:184
-#, fuzzy
 msgid "video"
 msgstr "ビデオ"
 
 #: modules/misc/rtsp.c:48
 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 localhost address on "
-"port 554, with no path. Use 0.0.0.0 to bind to all addresses."
+"Syntax is address:port/path. Default is to bind to any address on port 554, "
+"with no path."
 msgstr ""
 
 #: modules/misc/rtsp.c:52
-#, fuzzy
 msgid "RTSP VoD"
-msgstr "サーバーなし"
+msgstr "RTSP VoD"
 
 #: modules/misc/rtsp.c:53
-#, fuzzy
 msgid "RTSP VoD server"
-msgstr "サーバーなし"
+msgstr "RTSP VoD サーバー"
 
-#: modules/misc/screensaver.c:46
+#: modules/misc/screensaver.c:44
 #, 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 ""
@@ -12780,7 +13436,7 @@ msgstr ""
 #: modules/misc/testsuite/playlist.c:94
 #, fuzzy
 msgid "Playlist stress tests"
-msgstr "プレイリストが空です"
+msgstr "再生一覧が空です"
 
 #: modules/misc/testsuite/test1.c:33
 msgid "C module that does nothing"
@@ -12791,13 +13447,12 @@ msgid "Miscellaneous stress tests"
 msgstr "その他 負荷テスト"
 
 #: modules/misc/win32text.c:85
-#, fuzzy
 msgid "Win32 font renderer"
-msgstr "ダイレクトレンダリング"
+msgstr "Win32 フォントレンダラー"
 
 #: modules/misc/xml/libxml.c:43
 msgid "XML Parser (using libxml2)"
-msgstr ""
+msgstr "XML パーサー (libxml2 を使用する)"
 
 #: modules/misc/xml/xtag.c:90
 #, fuzzy
@@ -12830,9 +13485,8 @@ msgid "Allows you to define the \"rating\" that will be put in ASF comments."
 msgstr ""
 
 #: modules/mux/asf.c:63
-#, fuzzy
 msgid "Packet Size"
-msgstr "準備されているパケッタライザー一覧の選択"
+msgstr "パケットサイズ"
 
 #: modules/mux/asf.c:64
 msgid "The ASF packet size -- default is 4096 bytes"
@@ -12843,7 +13497,7 @@ msgstr ""
 msgid "ASF muxer"
 msgstr "MPEG 1/2レイヤ1/2オーディオ・デコーダ"
 
-#: modules/mux/asf.c:535
+#: modules/mux/asf.c:540
 msgid "Unknown Video"
 msgstr "不明のビデオ"
 
@@ -12871,7 +13525,7 @@ msgstr ""
 msgid "MP4/MOV muxer"
 msgstr ""
 
-#: modules/mux/mpeg/ps.c:45 modules/mux/mpeg/ts.c:118
+#: modules/mux/mpeg/ps.c:45 modules/mux/mpeg/ts.c:131
 msgid "DTS delay (ms)"
 msgstr "DTS ディレイ (ミリ秒)"
 
@@ -12896,81 +13550,105 @@ msgstr ""
 msgid "PS muxer"
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:77
+#: modules/mux/mpeg/ts.c:83
 msgid "Video PID"
 msgstr "ビデオ PID"
 
-#: modules/mux/mpeg/ts.c:78
+#: modules/mux/mpeg/ts.c:84
 msgid ""
 "Assigns a fixed PID to the video stream. The PCR PID will automatically be "
 "the video."
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:80
+#: modules/mux/mpeg/ts.c:86
 msgid "Audio PID"
 msgstr "オーディオ PID"
 
-#: modules/mux/mpeg/ts.c:81
+#: modules/mux/mpeg/ts.c:87
 msgid "Assigns a fixed PID to the audio stream."
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:82
+#: modules/mux/mpeg/ts.c:88
 msgid "SPU PID"
-msgstr ""
+msgstr "SPU PID"
 
-#: modules/mux/mpeg/ts.c:83
+#: modules/mux/mpeg/ts.c:89
 msgid "Assigns a fixed PID to the SPU."
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:84
+#: modules/mux/mpeg/ts.c:90
 msgid "PMT PID"
-msgstr ""
+msgstr "PMT PID"
 
-#: modules/mux/mpeg/ts.c:85
+#: modules/mux/mpeg/ts.c:91
 msgid "Assigns a fixed PID to the PMT"
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:86
+#: modules/mux/mpeg/ts.c:92
 msgid "TS ID"
-msgstr ""
+msgstr "TS ID"
 
-#: modules/mux/mpeg/ts.c:87
+#: modules/mux/mpeg/ts.c:93
 msgid "Assigns a fixed Transport Stream ID."
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:88
-msgid "PMT Program number"
+#: 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:89
-msgid "Assigns a program number to the PMT."
+#: modules/mux/mpeg/ts.c:96
+msgid "PMT Program numbers (requires --sout-ts-es-id-pid)"
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:91
+#: modules/mux/mpeg/ts.c:97
+msgid "Assigns a program number to each PMT"
+msgstr ""
+
+#: modules/mux/mpeg/ts.c:98
+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."
+msgstr ""
+
+#: modules/mux/mpeg/ts.c:101
+msgid "SDT Descriptors (requires --sout-ts-es-id-pid)"
+msgstr ""
+
+#: modules/mux/mpeg/ts.c:102
+msgid "Defines the descriptors of each SDT"
+msgstr ""
+
+#: modules/mux/mpeg/ts.c:104
 msgid "Set PID to id of ES"
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:92
+#: modules/mux/mpeg/ts.c:105
 msgid "set PID to id of es"
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:94
+#: modules/mux/mpeg/ts.c:107
 #, fuzzy
 msgid "Shaping delay (ms)"
 msgstr "キャッシング値 (ms)"
 
-#: modules/mux/mpeg/ts.c:95
+#: modules/mux/mpeg/ts.c:108
 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."
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:99
+#: modules/mux/mpeg/ts.c:112
 msgid "Use keyframes"
 msgstr "キーフレームを使用"
 
-#: modules/mux/mpeg/ts.c:100
+#: modules/mux/mpeg/ts.c:113
 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 "
@@ -12979,64 +13657,74 @@ msgid ""
 "the biggest frames in the stream."
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:107
+#: modules/mux/mpeg/ts.c:120
 msgid "PCR delay (ms)"
 msgstr "PCR ディレイ (ミリ秒)"
 
-#: modules/mux/mpeg/ts.c:108
+#: modules/mux/mpeg/ts.c:121
 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)"
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:112
+#: modules/mux/mpeg/ts.c:125
 msgid "Minimum B (deprecated)"
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:113 modules/mux/mpeg/ts.c:116
+#: modules/mux/mpeg/ts.c:126 modules/mux/mpeg/ts.c:129
 msgid "This setting is deprecated and not used anymore"
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:115
+#: modules/mux/mpeg/ts.c:128
 msgid "Maximum B (deprecated)"
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:119
+#: modules/mux/mpeg/ts.c:132
 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."
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:124
+#: modules/mux/mpeg/ts.c:137
 msgid "Crypt audio"
 msgstr "暗号オーディオオーディオ"
 
-#: modules/mux/mpeg/ts.c:125
+#: modules/mux/mpeg/ts.c:138
 msgid "Crypt audio using CSA"
 msgstr "暗号オーディオに CVS を使用する"
 
-#: modules/mux/mpeg/ts.c:126
+#: modules/mux/mpeg/ts.c:139
 #, fuzzy
 msgid "Crypt video"
 msgstr "暗号オーディオオーディオ"
 
-#: modules/mux/mpeg/ts.c:127
+#: modules/mux/mpeg/ts.c:140
 #, fuzzy
 msgid "Crypt video using CSA"
 msgstr "暗号オーディオに CVS を使用する"
 
-#: modules/mux/mpeg/ts.c:129
+#: modules/mux/mpeg/ts.c:142
 msgid "CSA Key"
 msgstr "CSA キー"
 
-#: modules/mux/mpeg/ts.c:130
+#: modules/mux/mpeg/ts.c:143
 msgid ""
 "Defines the CSA encryption key. This must be a 16 char string (8 hexadecimal "
 "bytes)."
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:136
+#: modules/mux/mpeg/ts.c:146
+msgid "Packet size in bytes to encrypt"
+msgstr ""
+
+#: modules/mux/mpeg/ts.c:147
+msgid ""
+"Specify the 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
 msgid "TS muxer (libdvbpsi)"
 msgstr ""
 
@@ -13083,55 +13771,90 @@ msgstr "字幕・デコーダ・モジュール"
 msgid "MPEG4 video packetizer"
 msgstr "MPEG 1/2ビデオ・デコーダ・モジュール"
 
-#: modules/packetizer/mpegvideo.c:60
+#: modules/packetizer/mpegvideo.c:52
+#, fuzzy
+msgid "Sync on intraframe"
+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."
+msgstr ""
+
+#: modules/packetizer/mpegvideo.c:66
 #, fuzzy
 msgid "MPEG-I/II video packetizer"
 msgstr "MPEG 1/2ビデオ・デコーダ・モジュール"
 
+#: modules/services_discovery/bonjour.c:51
+#, fuzzy
+msgid "Bonjour services"
+msgstr "サーバーなし"
+
+#: modules/services_discovery/bonjour.c:307
+msgid "Bonjour"
+msgstr ""
+
 #: modules/services_discovery/daap.c:53 modules/services_discovery/daap.c:187
 msgid "DAAP shares"
-msgstr ""
+msgstr "DAAP 共有"
 
 #: modules/services_discovery/daap.c:61
-#, fuzzy
 msgid "DAAP access"
-msgstr "アクセス:"
+msgstr "DAAP アクセス"
 
 #: modules/services_discovery/hal.c:63
-#, fuzzy
 msgid "HAL device detection"
-msgstr "選択"
+msgstr "HAL デバイス検知"
 
-#: modules/services_discovery/hal.c:127
-#, fuzzy
+#: modules/services_discovery/hal.c:153
 msgid "Devices"
 msgstr "デバイス"
 
+#: modules/services_discovery/podcast.c:57
+msgid "Podcast URLs list"
+msgstr "Podcast URL 一覧"
+
+#: modules/services_discovery/podcast.c:58
+msgid "Podcast '|' (pipe) seperated URLs list"
+msgstr ""
+
+#: modules/services_discovery/podcast.c:62
+#, fuzzy
+msgid "Podcast Service Discovery"
+msgstr "ソースディレクトリ"
+
+#: modules/services_discovery/podcast.c:154
+#, fuzzy
+msgid "Podcast"
+msgstr "ペースト"
+
 #: modules/services_discovery/sap.c:79
 msgid "SAP multicast address"
 msgstr "SAP マルチキャストアドレス"
 
 #: modules/services_discovery/sap.c:80
-msgid "Listen for SAP announces on another address"
+msgid "Listen for SAP announcements on another address"
 msgstr ""
 
 #: modules/services_discovery/sap.c:81
 msgid "IPv4-SAP listening"
-msgstr ""
+msgstr "IPv4-SAP の待ちうけ"
 
 #: modules/services_discovery/sap.c:83
 msgid ""
-"Set this if you want the SAP module to listen to IPv4 announces on the "
+"Set this if you want the SAP module to listen to IPv4 announcements on the "
 "standard address."
 msgstr ""
 
 #: modules/services_discovery/sap.c:85
 msgid "IPv6-SAP listening"
-msgstr ""
+msgstr "IPv6-SAP の待ち受け"
 
 #: modules/services_discovery/sap.c:87
 msgid ""
-"Set this if you want the SAP module to listen to IPv6 announces on the "
+"Set this if you want the SAP module to listen to IPv6 announcements on the "
 "standard address."
 msgstr ""
 
@@ -13140,7 +13863,7 @@ msgid "IPv6 SAP scope"
 msgstr "IPv6 SAP スコープ"
 
 #: modules/services_discovery/sap.c:91
-msgid "Sets the scope for IPv6 announces (default is 8)."
+msgid "Sets the scope for IPv6 announcements (default is 8)."
 msgstr ""
 
 #: modules/services_discovery/sap.c:92
@@ -13149,7 +13872,8 @@ msgstr "SAP タイムアウト (秒)"
 
 #: modules/services_discovery/sap.c:94
 msgid ""
-"Sets the time before SAP items get deleted if no new announce is received."
+"Sets the time before SAP items get deleted if no new announcement is "
+"received."
 msgstr ""
 
 #: modules/services_discovery/sap.c:96
@@ -13159,22 +13883,22 @@ msgstr ""
 #: modules/services_discovery/sap.c:98
 msgid ""
 "When SAP can it will try to parse the SAP. If you don't select this, all "
-"announces will be parsed by the livedotcom module."
+"announcements will be parsed by the livedotcom module."
 msgstr ""
 
 #: modules/services_discovery/sap.c:100
-#, fuzzy
 msgid "SAP Strict mode"
-msgstr "インタフェース・モジュール"
+msgstr "SAP 厳密モード"
 
 #: modules/services_discovery/sap.c:102
 msgid ""
-"When this is set, the SAP parser will discard some non-compliant announces."
+"When this is set, the SAP parser will discard some non-compliant "
+"announcements."
 msgstr ""
 
 #: modules/services_discovery/sap.c:104
 msgid "Use SAP cache"
-msgstr ""
+msgstr "SAP キャッシュを使う"
 
 #: modules/services_discovery/sap.c:106
 msgid ""
@@ -13183,43 +13907,58 @@ msgid ""
 "corresponding to legacy streams."
 msgstr ""
 
-#: modules/services_discovery/sap.c:118
+#: modules/services_discovery/sap.c:111
+msgid ""
+"Enable timeshifting automatically for streams discovered through SAP "
+"announcements."
+msgstr ""
+
+#: modules/services_discovery/sap.c:122
 #, fuzzy
-msgid "SAP announces"
-msgstr "SAP アナウンス"
+msgid "SAP Announcements"
+msgstr "SAP アナウンス:"
 
-#: modules/services_discovery/sap.c:141
+#: modules/services_discovery/sap.c:147
 msgid "SDP file parser for UDP"
 msgstr ""
 
-#: modules/services_discovery/sap.c:809 modules/services_discovery/sap.c:814
+#: modules/services_discovery/sap.c:316
 #, fuzzy
+msgid "Session Announcements (SAP)"
+msgstr "セッション・アナウンスメント・プロトコルをサポートする"
+
+#: modules/services_discovery/sap.c:812 modules/services_discovery/sap.c:817
 msgid "Session"
-msgstr "セッション名"
+msgstr "セッション"
 
-#: modules/services_discovery/sap.c:810
-#, fuzzy
+#: modules/services_discovery/sap.c:813
 msgid "Tool"
-msgstr "上"
+msgstr "ツール"
 
-#: modules/services_discovery/sap.c:815
-#, fuzzy
+#: modules/services_discovery/sap.c:818
 msgid "User"
-msgstr "ユーザー名"
+msgstr "ユーザー"
 
-#: modules/services_discovery/shout.c:60
+#: modules/services_discovery/shout.c:62
 #, fuzzy
 msgid "Maximum number of shoutcast servers to be listed"
 msgstr "ログ・ウィンドウの最大行数"
 
-#: modules/services_discovery/shout.c:65
+#: modules/services_discovery/shout.c:68
 msgid "Shoutcast radio listings"
 msgstr ""
 
-#: modules/services_discovery/shout.c:137
-#, fuzzy
+#: modules/services_discovery/shout.c:140
 msgid "Shoutcast"
-msgstr "マルチキャスト"
+msgstr ""
+
+#: modules/services_discovery/upnp_cc.cpp:58
+msgid "Universal Plug'n'Play discovery"
+msgstr ""
+
+#: modules/services_discovery/upnp_intel.cpp:258
+msgid "Universal Plug'n'Play discovery ( Intel SDK )"
+msgstr ""
 
 #: modules/stream_out/bridge.c:38
 msgid "Specify an identifier integer for this elementary stream"
@@ -13233,8 +13972,9 @@ msgid ""
 msgstr ""
 
 #: modules/stream_out/bridge.c:45
+#, fuzzy
 msgid "ID Offset"
-msgstr ""
+msgstr "時間オフセット"
 
 #: modules/stream_out/bridge.c:46
 msgid ""
@@ -13243,18 +13983,18 @@ msgid ""
 msgstr ""
 
 #: modules/stream_out/bridge.c:58
-#, fuzzy
 msgid "Bridge"
-msgstr "ブライトネス"
+msgstr "ブリッジ"
 
 #: modules/stream_out/bridge.c:59
 #, fuzzy
 msgid "Bridge stream output"
-msgstr "ストリームの出力先の選択"
+msgstr "ファイルストリーム出力"
 
 #: modules/stream_out/bridge.c:61
+#, fuzzy
 msgid "Bridge out"
-msgstr ""
+msgstr "ビデオポート"
 
 #: modules/stream_out/bridge.c:72
 msgid "Bridge in"
@@ -13277,10 +14017,9 @@ msgstr "ビデオレンダリングの有効/無効"
 msgid "Introduces a delay in the display of the stream."
 msgstr ""
 
-#: modules/stream_out/display.c:50
-#, fuzzy
+#: modules/stream_out/display.c:50 modules/video_filter/deinterlace.c:121
 msgid "Display"
-msgstr "再生"
+msgstr "表示"
 
 #: modules/stream_out/display.c:51
 msgid "Display stream output"
@@ -13290,11 +14029,11 @@ msgstr "ストリーム出力の表示"
 msgid "Duplicate stream output"
 msgstr "ストリーム出力の複製"
 
-#: modules/stream_out/es.c:37 modules/stream_out/standard.c:43
+#: modules/stream_out/es.c:37 modules/stream_out/standard.c:42
 msgid "Output access method"
 msgstr "出力アクセス方法"
 
-#: modules/stream_out/es.c:39 modules/stream_out/standard.c:45
+#: 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 ""
@@ -13319,12 +14058,12 @@ msgid ""
 "output."
 msgstr ""
 
-#: modules/stream_out/es.c:50 modules/stream_out/standard.c:47
+#: modules/stream_out/es.c:50 modules/stream_out/standard.c:46
 #, fuzzy
 msgid "Output muxer"
 msgstr "出力フォーマット"
 
-#: modules/stream_out/es.c:52 modules/stream_out/rtp.c:52
+#: modules/stream_out/es.c:52 modules/stream_out/rtp.c:55
 #, fuzzy
 msgid "Allows you to specify the muxer used for the streaming output."
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
@@ -13349,12 +14088,11 @@ msgstr "ビデオ出力モジュール"
 msgid "Allows you to specify the muxer used for the video streaming output."
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: modules/stream_out/es.c:60 modules/stream_out/standard.c:51
+#: modules/stream_out/es.c:60
 msgid "Output URL"
 msgstr "出力 URL"
 
-#: modules/stream_out/es.c:62 modules/stream_out/rtp.c:43
-#: modules/stream_out/standard.c:53
+#: modules/stream_out/es.c:62 modules/stream_out/rtp.c:46
 #, fuzzy
 msgid "Allows you to specify the output URL used for the streaming output."
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
@@ -13388,177 +14126,174 @@ msgstr "ストリームの出力先の選択"
 msgid "Gathering stream output"
 msgstr "ストリームの出力先の選択"
 
-#: modules/stream_out/mosaic_bridge.c:102
+#: modules/stream_out/mosaic_bridge.c:105
 msgid "Specify an identifier string for this subpicture"
 msgstr ""
 
-#: modules/stream_out/mosaic_bridge.c:106 modules/stream_out/transcode.c:70
-msgid "Allows you to specify the output video width."
-msgstr ""
-
-#: modules/stream_out/mosaic_bridge.c:109 modules/stream_out/transcode.c:73
-#, fuzzy
-msgid "Allows you to specify the output video height."
-msgstr "VLCが選択するパケッタライザーの順序を選択します。"
-
-#: modules/stream_out/mosaic_bridge.c:110
-#, fuzzy
+#: modules/stream_out/mosaic_bridge.c:113
 msgid "Sample aspect ratio"
-msgstr "ソースのアスペクト比"
+msgstr "サンプルのアスペクト比"
 
-#: modules/stream_out/mosaic_bridge.c:112
+#: modules/stream_out/mosaic_bridge.c:115
 msgid "Sample aspect ratio of the destination (1:1, 3:4, 2:3)."
 msgstr ""
 
-#: modules/stream_out/mosaic_bridge.c:117
+#: modules/stream_out/mosaic_bridge.c:120
 #, fuzzy
 msgid "Mosaic bridge"
 msgstr "設定"
 
-#: modules/stream_out/mosaic_bridge.c:118
+#: modules/stream_out/mosaic_bridge.c:121
 #, fuzzy
 msgid "Mosaic bridge stream output"
 msgstr "ストリームの出力先の選択"
 
-#: modules/stream_out/rtp.c:44
+#: modules/stream_out/rtp.c:47
 msgid "SDP"
 msgstr "SDP"
 
-#: modules/stream_out/rtp.c:46
+#: modules/stream_out/rtp.c:49
 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."
 msgstr ""
 
-#: modules/stream_out/rtp.c:50
+#: modules/stream_out/rtp.c:53
 #, fuzzy
 msgid "Muxer"
 msgstr "ミュートする"
 
-#: modules/stream_out/rtp.c:54 modules/stream_out/standard.c:55
+#: modules/stream_out/rtp.c:57 modules/stream_out/standard.c:59
 msgid "Session name"
 msgstr "セッション名"
 
-#: modules/stream_out/rtp.c:56
+#: 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:57
-#, fuzzy
+#: modules/stream_out/rtp.c:60
 msgid "Session description"
-msgstr "コーデック説明"
+msgstr "セッションの説明"
 
-#: modules/stream_out/rtp.c:59
+#: modules/stream_out/rtp.c:62
 #, fuzzy
 msgid "Allows you to give a broader description of the stream."
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: modules/stream_out/rtp.c:60
-#, fuzzy
+#: modules/stream_out/rtp.c:63
 msgid "Session URL"
-msgstr "セッション名"
+msgstr "セッション URL"
 
-#: modules/stream_out/rtp.c:62
+#: 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:63
+#: modules/stream_out/rtp.c:66
 #, fuzzy
 msgid "Session email"
 msgstr "セッション名"
 
-#: modules/stream_out/rtp.c:65
+#: 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:69
+#: modules/stream_out/rtp.c:72
 #, fuzzy
 msgid "Allows you to specify the base port used for the RTP streaming."
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: modules/stream_out/rtp.c:70
-#, fuzzy
+#: modules/stream_out/rtp.c:73
 msgid "Audio port"
-msgstr "設定"
+msgstr "オーディオポート"
 
-#: modules/stream_out/rtp.c:72
+#: modules/stream_out/rtp.c:75
 #, fuzzy
 msgid ""
 "Allows you to specify the default audio port used for the RTP streaming."
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: modules/stream_out/rtp.c:73
-#, fuzzy
+#: modules/stream_out/rtp.c:76
 msgid "Video port"
-msgstr "ビデオビットレート"
+msgstr "ビデオポート"
 
-#: modules/stream_out/rtp.c:75
+#: modules/stream_out/rtp.c:78
 #, fuzzy
 msgid ""
 "Allows you to specify the default video port used for the RTP streaming."
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: modules/stream_out/rtp.c:79
-msgid "Allows you to specify the time to live for the output stream."
-msgstr ""
-
-#: modules/stream_out/rtp.c:88
+#: modules/stream_out/rtp.c:82
 #, fuzzy
+msgid "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 "ストリームの出力先の選択"
+msgstr "RTP ストリーム出力"
 
-#: modules/stream_out/standard.c:49
+#: modules/stream_out/standard.c:48
 #, fuzzy
 msgid ""
 "Allows you to specify the output muxer method used for the streaming output."
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
+#: modules/stream_out/standard.c:50
+#, fuzzy
+msgid "Output URL (deprecated)"
+msgstr "出力デバイス"
+
+#: modules/stream_out/standard.c:52
+#, fuzzy
+msgid ""
+"Allows you to specify the output URL used for the streaming output."
+"Deprecated, use dst instead."
+msgstr "VLCが選択するパケッタライザーの順序を選択します。"
+
+#: modules/stream_out/standard.c:55
+#, fuzzy
+msgid "Output destination"
+msgstr "送信先のアスペクト・レシオ"
+
 #: modules/stream_out/standard.c:57
-msgid "Name of the session that will be announced with SAP or SLP"
+#, fuzzy
+msgid ""
+"Allows you to specify the output destination used for the streaming output."
+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:59
-#, fuzzy
+#: modules/stream_out/standard.c:63
 msgid "Session groupname"
-msgstr "セッション名"
+msgstr "セッショングループ名"
 
-#: modules/stream_out/standard.c:61
+#: modules/stream_out/standard.c:65
 msgid "Name of the group that will be announced for the session"
 msgstr ""
 
-#: modules/stream_out/standard.c:63
+#: modules/stream_out/standard.c:67
 #, fuzzy
 msgid "SAP announcing"
 msgstr "ストリーム出力"
 
-#: modules/stream_out/standard.c:64
+#: modules/stream_out/standard.c:68
 msgid "Announce this session with SAP"
 msgstr ""
 
-#: modules/stream_out/standard.c:66
-#, fuzzy
-msgid "SLP announcing"
-msgstr "ストリーム出力"
+#: modules/stream_out/standard.c:76
+msgid "Standard"
+msgstr "標準"
 
-#: modules/stream_out/standard.c:67
-msgid "Announce this session with SLP"
-msgstr ""
-
-#: modules/stream_out/standard.c:75
-#, fuzzy
-msgid "Standard"
-msgstr "標準再生"
-
-#: modules/stream_out/standard.c:76
+#: modules/stream_out/standard.c:77
 msgid "Standard stream output"
 msgstr "標準ストリーム出力"
 
 #: modules/stream_out/switcher.c:81
-#, fuzzy
 msgid "Files"
 msgstr "ファイル"
 
@@ -13577,22 +14312,20 @@ msgid "List of sizes separated by colons (720x576:480x576)."
 msgstr ""
 
 #: modules/stream_out/switcher.c:87
-#, fuzzy
 msgid "Aspect ratio"
 msgstr "アスペクト比"
 
 #: modules/stream_out/switcher.c:89
 msgid "Aspect ratio (4:3, 16:9)."
-msgstr ""
+msgstr "アスペクト比(4:3 や 16:9)です。"
 
 #: modules/stream_out/switcher.c:90
-#, fuzzy
 msgid "Command UDP port"
-msgstr "ポート番号"
+msgstr "コマンド UDP ポート"
 
 #: modules/stream_out/switcher.c:92
 msgid "UDP port to listen to for commands."
-msgstr ""
+msgstr "コマンドを待ち受ける UDP ポートです。"
 
 #: modules/stream_out/switcher.c:93
 msgid "Command"
@@ -13604,7 +14337,7 @@ msgstr ""
 
 #: modules/stream_out/switcher.c:96
 msgid "GOP size"
-msgstr ""
+msgstr "GOP サイズ"
 
 #: modules/stream_out/switcher.c:98
 msgid "Number of P frames between two I frames."
@@ -13612,259 +14345,277 @@ msgstr ""
 
 #: modules/stream_out/switcher.c:99
 msgid "Quantizer scale"
-msgstr ""
+msgstr "スケールクオンタイズ"
 
 #: modules/stream_out/switcher.c:101
 msgid "Fixed quantizer scale to use."
 msgstr ""
 
+#: modules/stream_out/switcher.c:102
+#, fuzzy
+msgid "Mute audio"
+msgstr "暗号オーディオオーディオ"
+
 #: modules/stream_out/switcher.c:104
+msgid "Mute audio when command is not 0."
+msgstr ""
+
+#: modules/stream_out/switcher.c:107
 #, fuzzy
 msgid "MPEG2 video switcher stream output"
 msgstr "ビデオ・ストリームの出力を有効にする"
 
-#: modules/stream_out/transcode.c:43
+#: modules/stream_out/transcode.c:46
 msgid "Video encoder"
 msgstr "ビデオエンコーダー"
 
-#: modules/stream_out/transcode.c:45
+#: modules/stream_out/transcode.c:48
 msgid ""
 "Allows you to specify the video encoder to use and its associated options."
 msgstr ""
 
-#: modules/stream_out/transcode.c:47
+#: modules/stream_out/transcode.c:50
 #, fuzzy
 msgid "Destination video codec"
 msgstr "送信先のアスペクト・レシオ"
 
-#: modules/stream_out/transcode.c:49
+#: modules/stream_out/transcode.c:52
 msgid ""
 "Allows you to specify the destination video codec used for the streaming "
 "output."
 msgstr ""
 
-#: modules/stream_out/transcode.c:51
+#: modules/stream_out/transcode.c:54
 msgid "Video bitrate"
 msgstr "ビデオビットレート"
 
-#: modules/stream_out/transcode.c:53
+#: modules/stream_out/transcode.c:56
 #, fuzzy
 msgid "Allows you to specify the video bitrate used for the streaming output."
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: modules/stream_out/transcode.c:55
-#, fuzzy
+#: modules/stream_out/transcode.c:58
 msgid "Video scaling"
-msgstr "設定"
+msgstr "ビデオスケーリング"
 
-#: modules/stream_out/transcode.c:57
+#: modules/stream_out/transcode.c:60
 msgid "Allows you to scale the video before encoding."
 msgstr ""
 
-#: modules/stream_out/transcode.c:58
-#, fuzzy
+#: modules/stream_out/transcode.c:61
 msgid "Video frame-rate"
-msgstr "ビデオビットレート"
+msgstr "ビデオフレームレート"
 
-#: modules/stream_out/transcode.c:60
+#: modules/stream_out/transcode.c:63
 #, fuzzy
 msgid "Allows you to specify an output frame rate for the video."
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: modules/stream_out/transcode.c:61
-#, fuzzy
-msgid "Deinterlace video"
-msgstr "ノンインタレース化モード"
-
-#: modules/stream_out/transcode.c:63
+#: modules/stream_out/transcode.c:66
 msgid "Allows you to deinterlace the video before encoding."
 msgstr ""
 
-#: modules/stream_out/transcode.c:64
+#: modules/stream_out/transcode.c:76
+msgid "Maximum video width"
+msgstr "ビデオの最大の幅"
+
+#: modules/stream_out/transcode.c:78
 #, fuzzy
-msgid "Deinterlace module"
-msgstr "ノンインタレース化モード"
+msgid "Allows you to specify a maximum output video width."
+msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: modules/stream_out/transcode.c:66
-msgid ""
-"Specifies the deinterlace module to use (ffmpeg-deinterlace or deinterlace)."
-msgstr ""
+#: modules/stream_out/transcode.c:79
+msgid "Maximum video height"
+msgstr "ビデオの最大の高さ"
+
+#: modules/stream_out/transcode.c:81
+#, fuzzy
+msgid "Allows you to specify a maximum output video height."
+msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: modules/stream_out/transcode.c:74
+#: modules/stream_out/transcode.c:82
 #, fuzzy
 msgid "Video filter"
-msgstr "ビデオタイトル"
+msgstr "ビデオフィルター"
 
-#: modules/stream_out/transcode.c:76
+#: modules/stream_out/transcode.c:84
 #, fuzzy
 msgid ""
 "Allows you to specify video filters used after the video transcoding and "
 "subpictures overlaying."
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: modules/stream_out/transcode.c:79
+#: modules/stream_out/transcode.c:87
 #, fuzzy
 msgid "Video crop top"
 msgstr "設定"
 
-#: modules/stream_out/transcode.c:81
+#: modules/stream_out/transcode.c:89
 msgid "Allows you to specify the top coordinate for the video cropping."
 msgstr ""
 
-#: modules/stream_out/transcode.c:82
+#: modules/stream_out/transcode.c:90
 #, fuzzy
 msgid "Video crop left"
 msgstr "DVDデバイス"
 
-#: modules/stream_out/transcode.c:84
+#: modules/stream_out/transcode.c:92
 msgid "Allows you to specify the left coordinate for the video cropping."
 msgstr ""
 
-#: modules/stream_out/transcode.c:85
+#: modules/stream_out/transcode.c:93
 #, fuzzy
 msgid "Video crop bottom"
 msgstr "設定"
 
-#: modules/stream_out/transcode.c:87
+#: modules/stream_out/transcode.c:95
 msgid "Allows you to specify the bottom coordinate for the video cropping."
 msgstr ""
 
-#: modules/stream_out/transcode.c:88
+#: modules/stream_out/transcode.c:96
 #, fuzzy
 msgid "Video crop right"
 msgstr "ビデオの高さ"
 
-#: modules/stream_out/transcode.c:90
+#: modules/stream_out/transcode.c:98
 msgid "Allows you to specify the right coordinate for the video cropping."
 msgstr ""
 
-#: modules/stream_out/transcode.c:92
+#: modules/stream_out/transcode.c:100
 msgid "Audio encoder"
 msgstr "オーディオエンコーダー"
 
-#: modules/stream_out/transcode.c:94
+#: modules/stream_out/transcode.c:102
 msgid ""
 "Allows you to specify the audio encoder to use and its associated options."
 msgstr ""
 
-#: modules/stream_out/transcode.c:96
+#: modules/stream_out/transcode.c:104
 #, fuzzy
 msgid "Destination audio codec"
 msgstr "送信先のアスペクト・レシオ"
 
-#: modules/stream_out/transcode.c:98
+#: modules/stream_out/transcode.c:106
 msgid ""
 "Allows you to specify the destination audio codec used for the streaming "
 "output."
 msgstr ""
 
-#: modules/stream_out/transcode.c:100
+#: modules/stream_out/transcode.c:108
 msgid "Audio bitrate"
 msgstr "オーディオビットレート"
 
-#: modules/stream_out/transcode.c:102
+#: modules/stream_out/transcode.c:110
 #, fuzzy
 msgid "Allows you to specify the audio bitrate used for the streaming output."
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: modules/stream_out/transcode.c:104
+#: modules/stream_out/transcode.c:112
 msgid "Audio sample rate"
 msgstr "シンボルサンプルレート"
 
-#: modules/stream_out/transcode.c:106
+#: modules/stream_out/transcode.c:114
 #, fuzzy
 msgid ""
 "Allows you to specify the audio sample rate used for the streaming output."
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: modules/stream_out/transcode.c:108
+#: modules/stream_out/transcode.c:116
 msgid "Audio channels"
 msgstr "オーディオチャンネル数"
 
-#: modules/stream_out/transcode.c:110
+#: modules/stream_out/transcode.c:118
 msgid ""
 "Allows you to specify the number of audio channels used for the streaming "
 "output."
 msgstr ""
 
-#: modules/stream_out/transcode.c:113
+#: modules/stream_out/transcode.c:121
 #, fuzzy
 msgid "Subtitles encoder"
 msgstr "字幕・デコーダ・モジュール"
 
-#: modules/stream_out/transcode.c:115
+#: modules/stream_out/transcode.c:123
 #, fuzzy
 msgid ""
 "Allows you to specify the subtitles encoder to use and its associated "
 "options."
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: modules/stream_out/transcode.c:117
+#: modules/stream_out/transcode.c:125
 #, fuzzy
 msgid "Destination subtitles codec"
 msgstr "送信先のアスペクト・レシオ"
 
-#: modules/stream_out/transcode.c:119
+#: 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:121
+#: modules/stream_out/transcode.c:129
 #, fuzzy
 msgid "Subpictures filter"
 msgstr "字幕ファイル"
 
-#: modules/stream_out/transcode.c:123
+#: modules/stream_out/transcode.c:131
 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."
 msgstr ""
 
-#: modules/stream_out/transcode.c:127
+#: modules/stream_out/transcode.c:135 modules/video_filter/osdmenu.c:118
+msgid "OSD menu"
+msgstr "OSD メニュー"
+
+#: modules/stream_out/transcode.c:137
+msgid ""
+"Enable streaming of the On Screen Display. It uses the osdmenu subfilter."
+msgstr ""
+
+#: modules/stream_out/transcode.c:139
 msgid "Number of threads"
 msgstr "スレッドの数"
 
-#: modules/stream_out/transcode.c:129
+#: modules/stream_out/transcode.c:141
 msgid "Allows you to specify the number of threads used for the transcoding."
 msgstr ""
 
-#: modules/stream_out/transcode.c:130
+#: modules/stream_out/transcode.c:142
 msgid "High priority"
-msgstr ""
+msgstr "高優先度"
 
-#: modules/stream_out/transcode.c:132
+#: modules/stream_out/transcode.c:144
 msgid ""
 "Runs the optional encoder thread at the OUTPUT priority instead of VIDEO."
 msgstr ""
 
-#: modules/stream_out/transcode.c:135
+#: modules/stream_out/transcode.c:147
 msgid "Synchronise on audio track"
 msgstr ""
 
-#: modules/stream_out/transcode.c:137
+#: modules/stream_out/transcode.c:149
 msgid ""
 "This option will drop/duplicate video frames to synchronise the video track "
 "on the audio track."
 msgstr ""
 
-#: modules/stream_out/transcode.c:141
+#: modules/stream_out/transcode.c:153
 msgid ""
 "Allows you to specify if the transcoder should drop frames if your CPU can't "
 "keep up with the encoding rate."
 msgstr ""
 
-#: modules/stream_out/transcode.c:151
+#: modules/stream_out/transcode.c:168
 #, fuzzy
 msgid "Transcode stream output"
 msgstr "ストリームの一時停止"
 
-#: modules/stream_out/transcode.c:206
-#, fuzzy
+#: modules/stream_out/transcode.c:228
 msgid "Overlays/Subtitles"
-msgstr "字幕を開く"
+msgstr "オーバーレイ/字幕"
 
 #: modules/stream_out/transrate/transrate.c:58
 #, fuzzy
@@ -13885,13 +14636,6 @@ 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 "
@@ -13903,57 +14647,64 @@ msgid "AltiVec conversions from "
 msgstr "変換元 "
 
 #: modules/video_filter/adjust.c:60
+msgid "Enable brightness threshold"
+msgstr ""
+
+#: modules/video_filter/adjust.c:61
+msgid "Show black and white pixels with brightness as threshold value"
+msgstr ""
+
+#: modules/video_filter/adjust.c:62
 msgid "Image contrast (0-2)"
 msgstr "画像コントラスト (0〜2)"
 
-#: modules/video_filter/adjust.c:61
+#: modules/video_filter/adjust.c:63
 msgid "Set the image contrast, between 0 and 2. Defaults to 1"
 msgstr ""
 
-#: modules/video_filter/adjust.c:62
+#: modules/video_filter/adjust.c:64
 msgid "Image hue (0-360)"
 msgstr ""
 
-#: modules/video_filter/adjust.c:63
+#: modules/video_filter/adjust.c:65
 msgid "Set the image hue, between 0 and 360. Defaults to 0"
 msgstr ""
 
-#: modules/video_filter/adjust.c:64
+#: modules/video_filter/adjust.c:66
 msgid "Image saturation (0-3)"
 msgstr ""
 
-#: modules/video_filter/adjust.c:65
+#: modules/video_filter/adjust.c:67
 msgid "Set the image saturation, between 0 and 3. Defaults to 1"
 msgstr ""
 
-#: modules/video_filter/adjust.c:66
+#: modules/video_filter/adjust.c:68
 msgid "Image brightness (0-2)"
 msgstr "画像ブライトネス (0〜2)"
 
-#: modules/video_filter/adjust.c:67
+#: modules/video_filter/adjust.c:69
 msgid "Set the image brightness, between 0 and 2. Defaults to 1"
-msgstr ""
+msgstr "画像ブライトネス設定。0〜2 の間でデフォルトは 1 です。"
 
-#: modules/video_filter/adjust.c:68
+#: modules/video_filter/adjust.c:70
 msgid "Image gamma (0-10)"
 msgstr "画像ガンマ (0〜10)"
 
-#: modules/video_filter/adjust.c:69
+#: modules/video_filter/adjust.c:71
 msgid "Set the image gamma, between 0.01 and 10. Defaults to 1"
-msgstr ""
+msgstr "画像ガンマ設定。0.01〜10の間でデフォルトは 1 です。"
 
-#: modules/video_filter/adjust.c:73
+#: modules/video_filter/adjust.c:75
 msgid "Image properties filter"
 msgstr "ビデオプロパティフィルター"
 
-#: modules/video_filter/adjust.c:74
+#: modules/video_filter/adjust.c:76
 msgid "Image adjust"
-msgstr ""
+msgstr "画像調整"
 
 #: modules/video_filter/blend.c:67
-#, fuzzy
 msgid "Video pictures blending"
-msgstr "ビデオフィルター設定"
+msgstr "ビデオピクチャーブレンディング"
 
 #: modules/video_filter/clone.c:55
 msgid "Number of clones"
@@ -13995,7 +14746,6 @@ msgid ""
 msgstr ""
 
 #: modules/video_filter/crop.c:57
-#, fuzzy
 msgid "Automatic cropping"
 msgstr "自動縁取り"
 
@@ -14010,38 +14760,70 @@ msgid "Crop video filter"
 msgstr "ビデオ・フィルター・モジュール"
 
 #: modules/video_filter/deinterlace.c:102
+#: modules/video_filter/deinterlace.c:105
 msgid "Deinterlace mode"
 msgstr "ノンインタレース化モード"
 
 #: modules/video_filter/deinterlace.c:103
-msgid "You can choose the default deinterlace mode"
+#, fuzzy
+msgid "Default 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:112
+#: modules/video_filter/deinterlace.c:115
 #, fuzzy
 msgid "Deinterlacing video filter"
 msgstr "ビデオ逆転モジュール"
 
-#: modules/video_filter/distort.c:59
+#: modules/video_filter/distort.c:64
 #, fuzzy
 msgid "Distort mode"
 msgstr "湾曲モード"
 
-#: modules/video_filter/distort.c:60
-msgid "Distort mode, one of \"wave\" and \"ripple\""
+#: modules/video_filter/distort.c:65
+#, fuzzy
+msgid "Distort mode, one of \"wave\", \"ripple\", \"gradient\" and \"edge\""
 msgstr "湾曲モード(\"wave\", \"ripple\")"
 
-#: modules/video_filter/distort.c:63
+#: modules/video_filter/distort.c:67
+msgid "Gradient image type"
+msgstr ""
+
+#: modules/video_filter/distort.c:68
+msgid "Gradient image type (0 or 1)"
+msgstr ""
+
+#: modules/video_filter/distort.c:70
 #, fuzzy
+msgid "Apply cartoon effect"
+msgstr "次のチャプターを選択"
+
+#: modules/video_filter/distort.c:71
+msgid "Apply cartoon effect. Used by \"gradient\" and \"edge\"."
+msgstr ""
+
+#: modules/video_filter/distort.c:74
 msgid "Wave"
-msgstr "保存"
+msgstr "波形"
 
-#: modules/video_filter/distort.c:63
+#: modules/video_filter/distort.c:74
 #, fuzzy
 msgid "Ripple"
 msgstr "ファイル"
 
-#: modules/video_filter/distort.c:66
+#: modules/video_filter/distort.c:74
+msgid "gradient"
+msgstr ""
+
+#: modules/video_filter/distort.c:74
+#, fuzzy
+msgid "Edge"
+msgstr "ブライトネス"
+
+#: modules/video_filter/distort.c:77
 #, fuzzy
 msgid "Distort video filter"
 msgstr "ビデオ逆転モジュール"
@@ -14054,11 +14836,11 @@ msgstr "ビデオ逆転モジュール"
 #: modules/video_filter/invert.c:53
 #, fuzzy
 msgid "Color inversion"
-msgstr "サイズ"
+msgstr "変換元 "
 
 #: modules/video_filter/logo.c:68
 msgid "Logo filename"
-msgstr "ログファイル名"
+msgstr "ロゴファイル名"
 
 #: modules/video_filter/logo.c:69
 #, fuzzy
@@ -14079,7 +14861,7 @@ msgstr ""
 
 #: modules/video_filter/logo.c:74
 msgid "Transparency of the logo"
-msgstr ""
+msgstr "ロゴの透過"
 
 #: modules/video_filter/logo.c:75
 msgid ""
@@ -14088,9 +14870,8 @@ msgid ""
 msgstr ""
 
 #: modules/video_filter/logo.c:77
-#, fuzzy
 msgid "Logo position"
-msgstr "垂直方向位置"
+msgstr "ロゴの位置"
 
 #: modules/video_filter/logo.c:79
 msgid ""
@@ -14103,14 +14884,17 @@ msgid "Logo video filter"
 msgstr "ロゴビデオフィルター"
 
 #: modules/video_filter/logo.c:91
-#, fuzzy
 msgid "Logo overlay"
-msgstr "ログフォーマット"
+msgstr "ロゴオーバーレイ"
 
 #: modules/video_filter/logo.c:109
-#, fuzzy
 msgid "Logo sub filter"
-msgstr "ロゴビデオフィルター"
+msgstr "ロゴサブフィルター"
+
+#: modules/video_filter/magnify.c:59
+#, fuzzy
+msgid "Magnify/Zoom interactive video filter"
+msgstr "ビデオ逆転モジュール"
 
 #: modules/video_filter/marq.c:76
 msgid "Marquee text"
@@ -14120,19 +14904,23 @@ msgstr ""
 msgid "Marquee text to display"
 msgstr ""
 
-#: modules/video_filter/marq.c:78 modules/video_filter/time.c:73
+#: modules/video_filter/marq.c:78 modules/video_filter/rss.c:120
+#: modules/video_filter/time.c:73
 msgid "X offset, from left"
-msgstr ""
+msgstr "左からの X 座標オフセット"
 
-#: modules/video_filter/marq.c:79 modules/video_filter/time.c:74
+#: 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:80 modules/video_filter/time.c:75
+#: modules/video_filter/marq.c:80 modules/video_filter/rss.c:122
+#: modules/video_filter/time.c:75
 msgid "Y offset, from the top"
-msgstr ""
+msgstr "上からの Y 座標オフセット"
 
-#: modules/video_filter/marq.c:81 modules/video_filter/time.c:76
+#: 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 ""
 
@@ -14146,61 +14934,57 @@ msgid ""
 "value is 0 (remain forever)."
 msgstr ""
 
-#: modules/video_filter/marq.c:86
+#: modules/video_filter/marq.c:86 modules/video_filter/rss.c:124
+#: modules/video_filter/time.c:77
 msgid "Opacity"
 msgstr ""
 
-#: modules/video_filter/marq.c:89 modules/video_filter/time.c:80
-#, fuzzy
+#: modules/video_filter/marq.c:89 modules/video_filter/rss.c:127
+#: modules/video_filter/time.c:80
 msgid "Font size, pixels"
-msgstr "ピクセル中のフォントサイズ"
+msgstr "ピクセル指定のフォントサイズ"
 
-#: modules/video_filter/marq.c:90 modules/video_filter/time.c:81
+#: 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"
 msgstr ""
 
-#: modules/video_filter/marq.c:98
+#: modules/video_filter/marq.c:98 modules/video_filter/rss.c:136
 #, fuzzy
 msgid "Marquee position"
 msgstr "垂直方向位置"
 
-#: modules/video_filter/marq.c:100
+#: modules/video_filter/marq.c:100 modules/video_filter/rss.c:138
 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)."
 msgstr ""
 
-#: modules/video_filter/marq.c:114
-msgid "Marquee"
-msgstr ""
-
-#: modules/video_filter/marq.c:134
+#: modules/video_filter/marq.c:136 modules/video_filter/rss.c:173
 #, fuzzy
 msgid "Misc"
 msgstr "ディスク"
 
-#: modules/video_filter/marq.c:138
+#: modules/video_filter/marq.c:140
 msgid "Marquee display sub filter"
 msgstr ""
 
 #: modules/video_filter/mosaic.c:87
 msgid "Alpha blending"
-msgstr ""
+msgstr "αブレンディング"
 
 #: modules/video_filter/mosaic.c:88
 msgid "Alpha blending (0 -> 255). Default is 255"
-msgstr ""
+msgstr "αブレンディング (0 から 255) です。デフォルトは 255 です。"
 
 #: modules/video_filter/mosaic.c:90
-#, fuzzy
 msgid "Height in pixels"
-msgstr "ピクセル中のフォントサイズ"
+msgstr "ピクセル指定の高さ"
 
 #: modules/video_filter/mosaic.c:91
-#, fuzzy
 msgid "Width in pixels"
-msgstr "ピクセル中のフォントサイズ"
+msgstr "ピクセル指定の幅"
 
 #: modules/video_filter/mosaic.c:92
 #, fuzzy
@@ -14214,21 +14998,19 @@ msgstr "ビデオ y コーディネート"
 
 #: modules/video_filter/mosaic.c:94
 msgid "Vertical border width in pixels"
-msgstr ""
+msgstr "ピクセル指定の垂直境界線幅"
 
 #: modules/video_filter/mosaic.c:95
 msgid "Horizontal border width in pixels"
-msgstr ""
+msgstr "ピクセル指定の水平境界線幅"
 
 #: modules/video_filter/mosaic.c:96
-#, fuzzy
 msgid "Mosaic alignment"
-msgstr "設定"
+msgstr "モザイクの位置"
 
 #: modules/video_filter/mosaic.c:98
-#, fuzzy
 msgid "Positioning method"
-msgstr "ストリームの停止"
+msgstr "位置決定方法"
 
 #: modules/video_filter/mosaic.c:99
 msgid ""
@@ -14246,11 +15028,11 @@ msgstr "列数"
 
 #: modules/video_filter/mosaic.c:104
 msgid "Keep aspect ratio when resizing"
-msgstr ""
+msgstr "サイズ変更時にアスペクト比を維持する"
 
 #: modules/video_filter/mosaic.c:105
 msgid "Keep original size"
-msgstr ""
+msgstr "元サイズを維持する"
 
 #: modules/video_filter/mosaic.c:107
 msgid "Order as a comma separated list of picture-id(s)"
@@ -14269,14 +15051,12 @@ msgid "fixed"
 msgstr "ファイル"
 
 #: modules/video_filter/mosaic.c:125
-#, fuzzy
 msgid "Mosaic video sub filter"
-msgstr "ビデオ・フィルター・モジュール"
+msgstr "モザイクビデオサブフィルター"
 
 #: modules/video_filter/mosaic.c:126
-#, fuzzy
 msgid "Mosaic"
-msgstr "ミュージカル"
+msgstr "モザイク"
 
 #: modules/video_filter/motionblur.c:54
 #, fuzzy
@@ -14290,13 +15070,17 @@ msgstr "かすませる割合い(1から127)"
 
 #: modules/video_filter/motionblur.c:58
 #, fuzzy
+msgid "Motion blur"
+msgstr "モーションをかすませるフィルタ"
+
+#: modules/video_filter/motionblur.c:59
+#, fuzzy
 msgid "Motion blur filter"
 msgstr "モーションをかすませるフィルタ"
 
 #: modules/video_filter/motiondetect.c:54
-#, fuzzy
 msgid "Description file"
-msgstr "説明"
+msgstr "説明ファイル"
 
 #: modules/video_filter/motiondetect.c:55
 msgid "Description file, file containing simple playlist"
@@ -14304,7 +15088,7 @@ msgstr ""
 
 #: modules/video_filter/motiondetect.c:56
 msgid "History parameter"
-msgstr ""
+msgstr "履歴パラメーター"
 
 #: modules/video_filter/motiondetect.c:57
 msgid "History parameter, number of frames used for detection"
@@ -14316,19 +15100,121 @@ msgid "Motion detect video filter"
 msgstr "イメージ・クローン・ビデオ・モジュール"
 
 #: modules/video_filter/motiondetect.c:61
-#, fuzzy
 msgid "Motion detect"
-msgstr "モジュレーションタイプ"
+msgstr "モーション検知"
+
+#: modules/video_filter/osdmenu.c:42
+msgid "OSD menu configuration file"
+msgstr "OSD メニュー設定ファイル"
+
+#: modules/video_filter/osdmenu.c:44
+msgid "An OSD menu configuration file that menu actions with button images"
+msgstr ""
+
+#: modules/video_filter/osdmenu.c:46
+msgid "Path to OSD menu images"
+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"
+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"
+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)."
+msgstr ""
+
+#: modules/video_filter/osdmenu.c:63
+msgid "Timeout of OSD menu"
+msgstr "OSD メニューのタイムアウト"
+
+#: modules/video_filter/osdmenu.c:65
+msgid ""
+"OSD menu pictures get a default timeout of 15 seconds added to their "
+"remaining time. This will ensure that they are at least the specified time "
+"visible."
+msgstr ""
+
+#: modules/video_filter/osdmenu.c:69
+msgid "Update speed of OSD menu"
+msgstr "OSD メニューの更新速度"
+
+#: 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."
+msgstr ""
+
+#: modules/video_filter/osdmenu.c:117
+msgid "On Screen Display menu subfilter"
+msgstr ""
+
+#: modules/video_filter/rss.c:110
+msgid "RSS feed URLs"
+msgstr "RSS フィード URL"
+
+#: modules/video_filter/rss.c:111
+msgid "RSS feed '|' (pipe) seperated URLs"
+msgstr "RSS フィードは「|(パイプ)」で分けられた URL です"
+
+#: modules/video_filter/rss.c:112
+msgid "RSS feed speed"
+msgstr "RSS フィード速度"
+
+#: modules/video_filter/rss.c:113
+msgid "RSS feed speed (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:116
+msgid "Number of seconds between each forced refresh of the feeds"
+msgstr ""
+
+#: modules/video_filter/rss.c:117
+msgid ""
+"Number of seconds between each forced refresh of the feeds. If 0, the feeds "
+"will never be updated."
+msgstr ""
+
+#: modules/video_filter/rss.c:180
+msgid "RSS feed display"
+msgstr "RSS フィード表示"
+
+#: modules/video_filter/rv32.c:52
+msgid "RV32 conversion filter"
+msgstr "RV32 変換フィルター"
 
 #: modules/video_filter/scale.c:53 modules/video_filter/swscale/filter.c:74
-#, fuzzy
 msgid "Video scaling filter"
-msgstr "設定"
+msgstr "ビデオスケーリングフィルター"
 
 #: modules/video_filter/swscale/filter.c:63
-#, fuzzy
 msgid "Scaling mode"
-msgstr "湾曲モード"
+msgstr "スケーリングモード"
 
 #: modules/video_filter/swscale/filter.c:64
 msgid "You can choose the default scaling mode."
@@ -14350,25 +15236,23 @@ msgstr ""
 
 #: modules/video_filter/swscale/filter.c:69
 msgid "Experimental"
-msgstr ""
+msgstr "実験的"
 
 #: modules/video_filter/swscale/filter.c:69
 msgid "Nearest neighbour (bad quality)"
 msgstr ""
 
 #: modules/video_filter/swscale/filter.c:70
-#, fuzzy
 msgid "Area"
-msgstr "垂直"
+msgstr "範囲"
 
 #: modules/video_filter/swscale/filter.c:70
 msgid "Luma bicubic / chroma bilinear"
 msgstr ""
 
 #: modules/video_filter/swscale/filter.c:70
-#, fuzzy
 msgid "Gauss"
-msgstr "バス"
+msgstr "ガウス"
 
 #: modules/video_filter/swscale/filter.c:71
 msgid "SincR"
@@ -14393,9 +15277,8 @@ msgid ""
 msgstr ""
 
 #: modules/video_filter/time.c:88
-#, fuzzy
 msgid "Time position"
-msgstr "垂直方向位置"
+msgstr "時間の位置"
 
 #: modules/video_filter/time.c:90
 msgid ""
@@ -14405,18 +15288,16 @@ msgid ""
 msgstr ""
 
 #: modules/video_filter/time.c:104
-#, fuzzy
 msgid "Time overlay"
-msgstr "垂直オフセット"
+msgstr "時間のオーバーレイ"
 
-#: modules/video_filter/time.c:119
+#: modules/video_filter/time.c:121
 msgid "Time display sub filter"
 msgstr ""
 
 #: modules/video_filter/transform.c:57
-#, fuzzy
 msgid "Transform type"
-msgstr "変換タイプ"
+msgstr "変換の種類"
 
 #: modules/video_filter/transform.c:58
 msgid "One of '90', '180', '270', 'hflip' and 'vflip'"
@@ -14424,15 +15305,15 @@ msgstr "'90', '180', '270', 'hflip', 'vflip'の中から一つ選択する。"
 
 #: modules/video_filter/transform.c:61
 msgid "Rotate by 90 degrees"
-msgstr ""
+msgstr "90 度回転"
 
 #: modules/video_filter/transform.c:62
 msgid "Rotate by 180 degrees"
-msgstr ""
+msgstr "180 度回転"
 
 #: modules/video_filter/transform.c:62
 msgid "Rotate by 270 degrees"
-msgstr ""
+msgstr "270 度回転"
 
 #: modules/video_filter/transform.c:63
 #, fuzzy
@@ -14503,12 +15384,15 @@ msgstr "ASCIIアート・ビデオ出力モジュール"
 msgid "Color ASCII art video output"
 msgstr "ASCIIアート・ビデオ出力モジュール"
 
-#: modules/video_output/directx/directx.c:111
-#, fuzzy
-msgid "Use hardware YUV->RGB conversions"
-msgstr "ハードウェアによる YUV->RGB変換を使用"
+#: modules/video_output/directfb.c:69
+msgid "DirectFB video output http://www.directfb.org/"
+msgstr ""
+
+#: modules/video_output/directx/directx.c:112
+msgid "Use hardware YUV->RGB conversions"
+msgstr "ハードウェアによる YUV->RGB 変換を使用する"
 
-#: modules/video_output/directx/directx.c:113
+#: modules/video_output/directx/directx.c:114
 msgid ""
 "Try to use hardware acceleration for YUV->RGB conversions. This option "
 "doesn't have any effect when using overlays."
@@ -14516,12 +15400,11 @@ msgstr ""
 "YUV->RGBのハードウェア・アクセラレーションの使用を試みます。オーバレイを使用"
 "する場合には何の効果もありません。"
 
-#: modules/video_output/directx/directx.c:116
-#, fuzzy
+#: modules/video_output/directx/directx.c:117
 msgid "Use video buffers in system memory"
 msgstr "システムメモリ中のビデオバッファを使用する"
 
-#: modules/video_output/directx/directx.c:118
+#: modules/video_output/directx/directx.c:119
 msgid ""
 "Create video buffers in system memory instead of video memory. This isn't "
 "recommended as usually using video memory allows to benefit from more "
@@ -14533,57 +15416,54 @@ msgstr ""
 "オプションは推奨しません。(リスケーリングやYUV->RGB変換)オーバレイを使用する"
 "場合には何の効果もありません。"
 
-#: modules/video_output/directx/directx.c:123
+#: modules/video_output/directx/directx.c:124
 msgid "Use triple buffering for overlays"
-msgstr ""
+msgstr "オーバーレイのトリプルバッファを使用する"
 
-#: modules/video_output/directx/directx.c:125
+#: modules/video_output/directx/directx.c:126
 msgid ""
 "Try to use triple buffering when using YUV overlays. That results in much "
 "better video quality (no flickering)."
 msgstr ""
 
-#: modules/video_output/directx/directx.c:128
+#: modules/video_output/directx/directx.c:129
 msgid "Name of desired display device"
 msgstr ""
 
-#: modules/video_output/directx/directx.c:129
+#: modules/video_output/directx/directx.c:130
 msgid ""
 "In a multiple monitor configuration, you can specify the Windows device name "
 "of the display that you want the video window to open on. For example, \"\\"
 "\\.\\DISPLAY1\" or \"\\\\.\\DISPLAY2\"."
 msgstr ""
 
-#: modules/video_output/directx/directx.c:134
+#: modules/video_output/directx/directx.c:135
 msgid "Enable wallpaper mode "
-msgstr ""
+msgstr "壁紙モードを有効にする"
 
-#: modules/video_output/directx/directx.c:136
+#: modules/video_output/directx/directx.c:137
 msgid ""
 "The wallpaper mode allows you to display the video as the desktop "
 "background. Note that this feature only works in overlay mode and the "
 "desktop must not already have a wallpaper."
 msgstr ""
 
-#: modules/video_output/directx/directx.c:162
-#, fuzzy
+#: modules/video_output/directx/directx.c:163
 msgid "DirectX video output"
-msgstr "DirectXビデオ・モジュール"
+msgstr "DirectX ビデオ出力"
 
-#: modules/video_output/directx/directx.c:301
-#, fuzzy
+#: modules/video_output/directx/directx.c:303
 msgid "Wallpaper"
-msgstr "とても小さい"
+msgstr "壁紙"
 
-#: modules/video_output/directx/glwin32.c:65 modules/video_output/opengl.c:119
+#: modules/video_output/directx/glwin32.c:65 modules/video_output/opengl.c:135
 #: modules/video_output/x11/glx.c:115
-#, fuzzy
 msgid "OpenGL video output"
-msgstr "オーバーレイビデオ出力"
+msgstr "OpenGL ビデオ出力"
 
 #: modules/video_output/fb.c:67
 msgid "Framebuffer device"
-msgstr "フレームバッファデバイス"
+msgstr "フレームバッファーデバイス"
 
 #: modules/video_output/fb.c:69
 msgid ""
@@ -14592,9 +15472,8 @@ msgid ""
 msgstr ""
 
 #: modules/video_output/fb.c:78
-#, fuzzy
 msgid "GNU/Linux console framebuffer video output"
-msgstr "Linuxコンソール・フレーム・バッファ・モジュール"
+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
@@ -14616,18 +15495,16 @@ msgid "3dfx Glide video output"
 msgstr "フルスクリーン出力"
 
 #: modules/video_output/hd1000v.cpp:57
-#, fuzzy
 msgid "HD1000 video output"
-msgstr "HD1000 オーディオ出力"
+msgstr "HD1000 ビデオ出力"
 
 #: modules/video_output/image.c:48
-#, fuzzy
 msgid "Image format"
-msgstr "ログフォーマット"
+msgstr "画像の形式"
 
 #: modules/video_output/image.c:49
 msgid "Set the format of the output image."
-msgstr ""
+msgstr "出力画像の形式を設定します"
 
 #: modules/video_output/image.c:51
 msgid "Recording ratio"
@@ -14640,9 +15517,8 @@ msgid ""
 msgstr ""
 
 #: modules/video_output/image.c:55
-#, fuzzy
 msgid "Filename prefix"
-msgstr "ファイル名"
+msgstr "ファイル名の接頭語"
 
 #: modules/video_output/image.c:56
 msgid ""
@@ -14651,38 +15527,36 @@ msgid ""
 msgstr ""
 
 #: modules/video_output/image.c:64
-#, fuzzy
 msgid "Image video output"
-msgstr "X11 ビデオ出力"
+msgstr "画像ビデオ出力"
 
 #: modules/video_output/mga.c:59
 #, fuzzy
 msgid "Matrox Graphic Array video output"
 msgstr "Matroxグラフィック・アレイ・ビデオ・モジュール"
 
-#: modules/video_output/opengl.c:98 modules/video_output/opengl.c:102
+#: modules/video_output/opengl.c:114 modules/video_output/opengl.c:118
 msgid "OpenGL cube rotation speed"
 msgstr ""
 
-#: modules/video_output/opengl.c:103
+#: modules/video_output/opengl.c:119
 msgid "If the OpenGL cube effect is enabled, this controls its rotation speed."
 msgstr ""
 
-#: modules/video_output/opengl.c:106
-#, fuzzy
+#: modules/video_output/opengl.c:122
 msgid "Select effect"
-msgstr "次のチャプターを選択"
+msgstr "エフェクトの選択"
 
-#: modules/video_output/opengl.c:108
+#: modules/video_output/opengl.c:124
 #, fuzzy
 msgid "Allows you to select different visual effects."
 msgstr "VLCが選択するパケッタライザーの順序を選択します。"
 
-#: modules/video_output/opengl.c:113
+#: modules/video_output/opengl.c:129
 msgid "Cube"
 msgstr "キューブ"
 
-#: modules/video_output/opengl.c:113
+#: modules/video_output/opengl.c:129
 msgid "Transparent Cube"
 msgstr ""
 
@@ -14703,14 +15577,14 @@ msgstr ""
 msgid "QT Embedded video output"
 msgstr "QT埋め込みモジュール"
 
-#: modules/video_output/sdl.c:107
+#: modules/video_output/sdl.c:108
 #, fuzzy
 msgid "Simple DirectMedia Layer video output"
 msgstr "シンプル DirectMedia レイヤ・モジュール"
 
 #: modules/video_output/snapshot.c:60
 msgid "snapshot width"
-msgstr ""
+msgstr "スナップショット幅"
 
 #: modules/video_output/snapshot.c:61
 msgid "Set the width of the snapshot image."
@@ -14726,7 +15600,7 @@ msgstr ""
 
 #: modules/video_output/snapshot.c:66
 msgid "chroma"
-msgstr ""
+msgstr "クロマ"
 
 #: modules/video_output/snapshot.c:67
 msgid "Set the desired chroma for the snapshot image (a 4 character string)."
@@ -14734,41 +15608,27 @@ msgstr ""
 
 #: modules/video_output/snapshot.c:69
 msgid "cache size (number of images)"
-msgstr ""
+msgstr "キャッシュサイズ (画像の数)"
 
 #: modules/video_output/snapshot.c:70
 msgid "Set the cache size (number of images to keep)."
-msgstr ""
+msgstr "キャッシュサイズの設定(画像を維持する数)です。"
 
 #: modules/video_output/snapshot.c:74
-#, fuzzy
 msgid "snapshot module"
-msgstr "アクセスモジュール"
+msgstr "スナップショットモジュール"
 
 #: modules/video_output/svgalib.c:56
-#, fuzzy
 msgid "SVGAlib video output"
-msgstr "オーバーレイ"
-
-#: modules/video_output/wingdi.c:216
-#, fuzzy
-msgid "Windows GAPI"
-msgstr "ウィンドウ"
-
-#: modules/video_output/wingdi.c:217
-#, fuzzy
-msgid "Windows GAPI video output"
-msgstr "ビデオ出力モジュール"
+msgstr "SVGAlib ビデオ出力"
 
 #: modules/video_output/wingdi.c:220
-#, fuzzy
-msgid "Windows GDI"
-msgstr "ウィンドウ"
+msgid "Windows GAPI video output"
+msgstr "Windows GAPI ビデオ出力"
 
-#: modules/video_output/wingdi.c:221
-#, fuzzy
+#: modules/video_output/wingdi.c:224
 msgid "Windows GDI video output"
-msgstr "ビデオ出力モジュール"
+msgstr "Windows GDI ビデオ出力"
 
 #: modules/video_output/x11/glx.c:87 modules/video_output/x11/xvideo.c:44
 msgid "XVideo adaptor number"
@@ -14784,9 +15644,8 @@ msgstr ""
 
 #: modules/video_output/x11/glx.c:92 modules/video_output/x11/x11.c:43
 #: modules/video_output/x11/xvideo.c:49
-#, fuzzy
 msgid "Alternate fullscreen method"
-msgstr "代替えフルスクリーン"
+msgstr "代替えフルスクリーン方法"
 
 #: modules/video_output/x11/glx.c:94 modules/video_output/x11/x11.c:45
 #: modules/video_output/x11/xvideo.c:51
@@ -14806,215 +15665,1121 @@ msgstr ""
 "2) 完全にウィンドウ・マネージャーをバイパスするフルスクリーン・モード\n"
 "   ビデオの上に何も表示されません。"
 
-#: modules/video_output/x11/glx.c:103 modules/video_output/x11/x11.c:54
-#: modules/video_output/x11/xvideo.c:60
-msgid ""
-"Specify the X11 hardware display you want to use. By default VLC will use "
-"the value of the DISPLAY environment variable."
-msgstr ""
-"使用したいX11のハードウェア・ディスプレイを指定します。\n"
-"デフォルトではVLCは、DISPLAY環境変数に設定されているものを使用します。"
+#: modules/video_output/x11/glx.c:103 modules/video_output/x11/x11.c:54
+#: modules/video_output/x11/xvideo.c:60
+msgid ""
+"Specify the X11 hardware display you want to use. By default VLC will use "
+"the value of the DISPLAY environment variable."
+msgstr ""
+"使用したいX11のハードウェア・ディスプレイを指定します。\n"
+"デフォルトではVLCは、DISPLAY環境変数に設定されているものを使用します。"
+
+#: modules/video_output/x11/glx.c:106 modules/video_output/x11/xvideo.c:72
+#, fuzzy
+msgid "Screen to be used 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."
+msgstr ""
+
+#: modules/video_output/x11/x11.c:57 modules/video_output/x11/xvideo.c:68
+msgid "Use shared memory"
+msgstr "共有メモリの使用"
+
+#: modules/video_output/x11/x11.c:59 modules/video_output/x11/xvideo.c:70
+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:63
+msgid "XVimage chroma format"
+msgstr "XVimage色彩フォーマット"
+
+#: modules/video_output/x11/xvideo.c:65
+msgid ""
+"Force the XVideo renderer to use a specific chroma format instead of trying "
+"to improve performances by using the most efficient one."
+msgstr ""
+"最も効果的なものを使ってパフォーマンスを改善するかわりに、特定の色彩フォー"
+"マットを使用するためのXVideoレンダラを強制的に指定します。"
+
+#: modules/video_output/x11/xvideo.c:92
+#, fuzzy
+msgid "XVideo extension video output"
+msgstr "XVideoエクステンション・モジュール"
+
+#: modules/visualization/galaktos/plugin.c:48
+msgid "GaLaktos visualization plugin"
+msgstr ""
+
+#: modules/visualization/goom.c:58
+msgid "Goom display width"
+msgstr "Goom 表示の幅"
+
+#: modules/visualization/goom.c:59
+msgid "Goom display height"
+msgstr "Goom 表示の高さ"
+
+#: modules/visualization/goom.c:60
+msgid ""
+"Allows you to change the resolution of the Goom display (bigger resolution "
+"will be prettier but more CPU intensive)."
+msgstr ""
+
+#: modules/visualization/goom.c:63
+msgid "Goom animation speed"
+msgstr "Goom アニメーションの速度"
+
+#: modules/visualization/goom.c:64
+msgid "Allows you to reduce the speed of the animation (default 6, max 10)."
+msgstr ""
+
+#: 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/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 "Defines whether to draw peaks."
+msgstr ""
+
+#: modules/visualization/visual/visual.c:69
+msgid "Enable original graphic spectrum"
+msgstr ""
+
+#: modules/visualization/visual/visual.c:71
+msgid "Defines whether to draw the original spectrum graphic routine."
+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 ""
+
+#: 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 "This is the 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 "Defines the 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
+msgid "Display xosd output on 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 in pixels of the displayed text"
+msgstr "表示されている文字列の垂直方向のオフセット"
+
+#: modules/visualization/xosd.c:70
+msgid "Shadow offset"
+msgstr "陰のオフセット"
+
+#: modules/visualization/xosd.c:71
+msgid "Offset in pixels of the shadow"
+msgstr "陰のオフセット(ピクセル)"
+
+#: modules/visualization/xosd.c:74
+msgid "Font used to display text in the xosd output"
+msgstr "xods出力でテキスト出力のために使用されるフォント"
+
+#: modules/visualization/xosd.c:82
+#, fuzzy
+msgid "XOSD interface"
+msgstr "XOSD インターフェース"
+
+#, fuzzy
+#~ msgid "Netsync"
+#~ msgstr "ネット"
+
+#, fuzzy
+#~ msgid "Interface showing control interface"
+#~ msgstr "赤外線リモート・コントロール・モジュール"
+
+#~ msgid "Item Info"
+#~ msgstr "項目情報"
+
+#~ msgid "type : "
+#~ msgstr "種類 : "
+
+#~ msgid "URL : "
+#~ msgstr "URL : "
+
+#~ msgid "file size : "
+#~ msgstr "ファイルサイズ : "
+
+#, fuzzy
+#~ msgid "Choose a mirror"
+#~ msgstr "ミラーの選択"
+
+#~ msgid "Downloading..."
+#~ msgstr "ダウンロード中..."
+
+#~ msgid "Time To Live"
+#~ msgstr "生存時間"
+
+#, fuzzy
+#~ msgid "VC-1 decoder module"
+#~ msgstr "字幕・デコーダ・モジュール"
+
+#~ msgid "Force options for separate subtitle files."
+#~ msgstr "分離された字幕ファイルをの強制オプション"
+
+#~ msgid ""
+#~ "VLC is an open-source and cross-platform multimedia player for various "
+#~ "audio and video formats (MPEG-1, MPEG-2, MPEG-4, DivX, mp3, Ogg, etc.) as "
+#~ "well as DVDs, VCDs, CD audio, and various streaming protocols.\n"
+#~ "\n"
+#~ "VLC is also a streaming server with transcoding capabilities (UDP unicast "
+#~ "and multicast, HTTP, etc.) mainly designed for high-bandwidth networks.\n"
+#~ "\n"
+#~ "For more information, have a look at the web site."
+#~ msgstr ""
+#~ "VLC はオープンソースでクロスプラットフォームなマルチメディアプレイヤーで、"
+#~ "様々なオーディオとビデオフォーマット(MPEG-1, MPEG-2, MPEG-4, DivX, mp3, "
+#~ "Ogg, ...)とDVD・VCD・CD オーディオと様々なストリーミングプロトコルに対応し"
+#~ "ます。\n"
+#~ "\n"
+#~ "さらに、VLC は、高帯域ネットワーク用に主として設計された、転送能力(UDP ユ"
+#~ "ニキャストおよびマルチキャスト(HTTP)...)を備えたストリーミングサーバで"
+#~ "す。\n"
+#~ "より詳細は、ウェブを見てください。"
+
+#~ msgid "Jump 3 seconds backwards"
+#~ msgstr "3 秒前に戻る"
+
+#~ msgid "Jump 10 seconds backwards"
+#~ msgstr "10 秒前に戻る"
+
+#~ msgid "Select the hotkey to jump 10 seconds backwards."
+#~ msgstr "10 秒前に戻るホットキーを選択する"
+
+#~ msgid "Jump 1 minute backwards"
+#~ msgstr "1 分前に戻る"
+
+#~ msgid "Jump 5 minutes backwards"
+#~ msgstr "5 分前に戻る"
+
+#~ msgid "Jump 3 seconds forward"
+#~ msgstr "3 秒先に進む"
+
+#~ msgid "Jump 10 seconds forward"
+#~ msgstr "10 秒先に進む"
+
+#~ msgid "Select the hotkey to jump 10 seconds forward."
+#~ msgstr "10 秒進むホットキーを選択する"
+
+#~ msgid "Jump 1 minute forward"
+#~ msgstr "1 分先に進む"
+
+#~ msgid "Jump 5 minutes forward"
+#~ msgstr "5 分先に進む"
+
+#~ msgid "Select the hotkey to jump 5 minutes forward."
+#~ msgstr "5 分先に進むホットキーを選択する"
+
+#, fuzzy
+#~ msgid "audio filter using CoreAudio for resampling"
+#~ msgstr "荒れた再サンプリングのためのオーディオ・フィルター"
+
+#~ msgid "CoreAudio output"
+#~ msgstr "コアオーディオ出力"
+
+#~ msgid "SLP announce"
+#~ msgstr "SLP アナウンス"
+
+#, fuzzy
+#~ msgid "SLP announcing"
+#~ msgstr "ストリーム出力"
+
+#, fuzzy
+#~ msgid "Shout"
+#~ msgstr "VideoLANについて"
+
+#, fuzzy
+#~ msgid "Entry "
+#~ msgstr "エントリ"
+
+#, fuzzy
+#~ msgid "Segment "
+#~ msgstr "分割"
+
+#~ msgid "Track "
+#~ msgstr "トラック "
+
+#, fuzzy
+#~ msgid "Stretch Aspect Ratio"
+#~ msgstr "ソースのアスペクト・レシオ"
+
+#, fuzzy
+#~ msgid "Windows GAPI"
+#~ msgstr "ウィンドウ"
+
+#, fuzzy
+#~ msgid "Windows GDI"
+#~ msgstr "ウィンドウ"
+
+#, fuzzy
+#~ msgid "Open MRL"
+#~ msgstr "ストリームの出力MRL"
+
+#~ msgid "Audio output volume"
+#~ msgstr "オーディオ出力ボリューム"
+
+#~ msgid "Network interface address"
+#~ msgstr "ネットワークインタフェースアドレス"
+
+#~ msgid ""
+#~ "If you have several interfaces on your machine and use the multicast "
+#~ "solution, you will probably have to indicate the IP address of your "
+#~ "multicasting interface here."
+#~ msgstr ""
+#~ "Linuxマシン上に複数のネットワーク・インタフェースがあり、マルチキャスト・"
+#~ "ソリューションを使用する場合には、おそらく、IPアドレスかマルチキャストを"
+#~ "行っているインタフェースを指定しなければなりません。"
+
+#~ msgid "Choose program (SID)"
+#~ msgstr "プログラムの選択 (SID)"
+
+#~ msgid "Choose programs"
+#~ msgstr "プログラムの選択"
+
+#, fuzzy
+#~ msgid "Choose audio track"
+#~ msgstr "オーディオの選択"
+
+#, fuzzy
+#~ msgid "Choose subtitles track"
+#~ msgstr "字幕トラックの選択"
+
+#, fuzzy
+#~ msgid "This is a legacy entry to let you configure access modules."
+#~ msgstr "アクセス・モジュールを選択するレガシー・エントリです。"
+
+#, fuzzy
+#~ msgid "Select maximum bitrate stream"
+#~ msgstr "ネットワークストリームを選択する"
+
+#, fuzzy
+#~ msgid "Old playlist open"
+#~ msgstr "再生一覧の最後でループ"
+
+#, fuzzy
+#~ msgid "Current version"
+#~ msgstr "サイズ"
+
+#, fuzzy
+#~ msgid "Released on"
+#~ msgstr "ファイルの選択"
+
+#, fuzzy
+#~ msgid "Your version"
+#~ msgstr "サイズ"
+
+#, fuzzy
+#~ msgid "Mirror"
+#~ msgstr "エラー"
+
+#, fuzzy
+#~ msgid "SAP announces"
+#~ msgstr "SAP アナウンス"
+
+#, fuzzy
+#~ msgid "Streamming"
+#~ msgstr "ストリームの停止"
+
+#~ msgid "Channel mixer"
+#~ msgstr "チャンネルミキサー"
+
+#, fuzzy
+#~ msgid "About VLC media player..."
+#~ msgstr "VLC メディア・プレイヤーについて"
+
+#, fuzzy
+#~ msgid "Wizard..."
+#~ msgstr "新規ウィザード..."
+
+#~ msgid "Controls"
+#~ msgstr "コントロール"
+
+#, fuzzy
+#~ msgid "Random effect"
+#~ msgstr "ランダムオフ"
+
+#~ msgid "SLP attribute identifiers"
+#~ msgstr "SLP 属性識別子"
+
+#~ msgid "SLP scopes list"
+#~ msgstr "SLP スコープ一覧"
+
+#~ msgid "SLP LDAP filter"
+#~ msgstr "SLP LDAP フィルター"
+
+#~ msgid "SLP input"
+#~ msgstr "SLP 入力"
+
+#, fuzzy
+#~ msgid "Repeat time (ms)"
+#~ msgstr "ファイルの選択"
+
+#, fuzzy
+#~ msgid "Wait time (ms)"
+#~ msgstr "ファイルの選択"
+
+#, fuzzy
+#~ msgid "Action mapping"
+#~ msgstr "自動縁取り"
+
+#, fuzzy
+#~ msgid "Joystick control interface"
+#~ msgstr "リモート・コントロール・インタフェース・モジュール"
+
+#~ msgid "Show tooltips"
+#~ msgstr "ツールチップを表示"
+
+#~ 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 "コンフィグレーション・ウィンドウの高さの最大値"
+
+#~ msgid ""
+#~ "You can set the maximum height that the configuration windows in the "
+#~ "preferences menu will occupy."
+#~ msgstr ""
+#~ "設定メニューのコンフィグレーション・ウィンドウが占める高さの最大値を設定で"
+#~ "きます。"
+
+#~ msgid "Interface default search path"
+#~ msgstr "インタフェースの既定の検索パス"
+
+#~ msgid ""
+#~ "This option allows you to set the default path that the interface will "
+#~ "open when looking for a file."
+#~ msgstr ""
+#~ "ファイルを見つけるときにオープンされるインタフェースの既定のパスを設定しま"
+#~ "す。"
+
+#, fuzzy
+#~ msgid "GNOME interface"
+#~ msgstr "GNOMEインタフェース・モジュール"
+
+#~ msgid "_Open File..."
+#~ msgstr "ファイルを開く(_O)..."
+
+#, fuzzy
+#~ msgid "Open a file"
+#~ msgstr "ファイルを開く"
+
+#~ msgid "Open _Disc..."
+#~ msgstr "ディスクを開く(_D)..."
+
+#~ msgid "Open Disc Media"
+#~ msgstr "ディスクメディアを開く"
+
+#~ msgid "_Network stream..."
+#~ msgstr "ネットワークストリーム(_N)..."
+
+#~ msgid "Select a network stream"
+#~ msgstr "ネットワークストリームを選択する"
+
+#~ msgid "_Eject Disc"
+#~ msgstr "ディスクの取出し(_E)"
+
+#~ msgid "Eject disc"
+#~ msgstr "ディスクの取出し"
+
+#~ msgid "_Hide interface"
+#~ msgstr "インタフェースを隠す(_H)"
+
+#~ msgid "Progr_am"
+#~ msgstr "プログラム(_a)"
+
+#~ msgid "Choose the program"
+#~ msgstr "プログラムの選択"
+
+#~ msgid "_Title"
+#~ msgstr "タイトル(_T)"
+
+#~ msgid "Choose title"
+#~ msgstr "タイトルの選択"
+
+#~ msgid "_Chapter"
+#~ msgstr "チャプター(_C)"
+
+#~ msgid "Choose chapter"
+#~ msgstr "チャプターの選択"
+
+#~ msgid "_Playlist..."
+#~ msgstr "再生一覧(_P)..."
+
+#~ msgid "Open the playlist window"
+#~ msgstr "再生一覧を開く"
+
+#~ msgid "_Modules..."
+#~ msgstr "モジュール(_M)..."
+
+#~ msgid "Open the module manager"
+#~ msgstr "モジュール・マネージャー"
+
+#~ msgid "Messages..."
+#~ msgstr "メッセージ..."
+
+#~ msgid "Open the messages window"
+#~ msgstr "メッセージウィンドウを表示"
+
+#, fuzzy
+#~ msgid "_Language"
+#~ msgstr "言語"
+
+#~ msgid "Select audio channel"
+#~ msgstr "オーディオ・チャンネルの選択"
+
+#~ msgid "_Subtitles"
+#~ msgstr "字幕(_S)"
+
+#~ msgid "Select subtitles channel"
+#~ msgstr "字幕の選択"
+
+#~ msgid "_Fullscreen"
+#~ msgstr "全画面化(_F)"
+
+#~ msgid "_Audio"
+#~ msgstr "オーディオ(_A)"
+
+#~ msgid "_Video"
+#~ msgstr "ビデオ"
+
+#~ msgid "Open disc"
+#~ msgstr "ディスクを開く"
+
+#~ msgid "Net"
+#~ msgstr "ネット"
+
+#~ msgid "Sat"
+#~ msgstr "衛星"
+
+#~ msgid "Open a satellite card"
+#~ msgstr "衛星カードを開く"
+
+#~ msgid "Stop stream"
+#~ msgstr "ストリームの停止"
+
+#~ msgid "Eject"
+#~ msgstr "取出し"
+
+#~ msgid "Play stream"
+#~ msgstr "ストリームの再生"
+
+#~ msgid "Pause stream"
+#~ msgstr "ストリームの一時停止"
+
+#~ msgid "Slow"
+#~ msgstr "スロー"
+
+#~ msgid "Fast"
+#~ msgstr "早送り"
+
+#~ msgid "Prev"
+#~ msgstr "前"
+
+#~ msgid "Previous file"
+#~ msgstr "前のファイル"
+
+#~ msgid "Next file"
+#~ msgstr "次のファイル"
+
+#~ msgid "Title:"
+#~ msgstr "タイトル:"
+
+#~ msgid "Select previous title"
+#~ msgstr "前のタイトルを選択"
+
+#~ msgid "Chapter:"
+#~ msgstr "チャプター:"
+
+#~ msgid "Select previous chapter"
+#~ msgstr "前のチャプターを選択"
+
+#~ msgid "No server"
+#~ msgstr "サーバーなし"
+
+#~ msgid "Toggle fullscreen mode"
+#~ msgstr "全画面表示の切替え"
+
+#~ msgid "_Network Stream..."
+#~ msgstr "ネットワークストリーム(_N)..."
+
+#~ msgid "_Jump..."
+#~ msgstr "ジャンプ(_J)..."
+
+#~ msgid "Got directly so specified point"
+#~ msgstr "特定位置を直接指定"
+
+#~ msgid "Switch program"
+#~ msgstr "プログラムの切替え"
+
+#~ msgid "_Navigation"
+#~ msgstr "ナビゲーション(_N)"
+
+#~ msgid "Navigate through titles and chapters"
+#~ msgstr "タイトルとチャプターからナビゲート"
+
+#~ msgid "Toggle _Interface"
+#~ msgstr "メインウィンドウの表示/非表示(_I)"
+
+#~ msgid "Playlist..."
+#~ msgstr "再生一覧..."
+
+#~ msgid "(c) 1996-2004 the VideoLAN team"
+#~ msgstr "(c) 1996-2004 the VideoLAN チーム"
+
+#, fuzzy
+#~ msgid ""
+#~ "This is the VLC media player, a DVD, MPEG and DivX player. It can play "
+#~ "MPEG and MPEG2 files from a file or from a network source."
+#~ msgstr ""
+#~ "このソフトウェアはDVDおよび、MPEGを再生するVideoLANクライアントです。\n"
+#~ "ファイルまたは、ネットワークからMPEGとMPEG 2データを再生することができま"
+#~ "す。"
+
+#~ msgid "Open Stream"
+#~ msgstr "ストリームを開く"
+
+#~ msgid "Open Target:"
+#~ msgstr "ターゲットを開く:"
+
+#~ msgid "Symbol Rate"
+#~ msgstr "シンボル・レート"
+
+#~ msgid "Polarization"
+#~ msgstr "極性"
+
+#~ msgid "Vertical"
+#~ msgstr "垂直"
+
+#~ msgid "Horizontal"
+#~ msgstr "æ°´å¹³"
+
+#~ msgid "Satellite"
+#~ msgstr "衛星"
+
+#~ msgid "stream output"
+#~ msgstr "ストリーム出力"
+
+#~ msgid "Modules"
+#~ msgstr "モジュール"
+
+#~ msgid ""
+#~ "Sorry, the module manager isn't functional yet. Please retry in a later "
+#~ "version."
+#~ msgstr ""
+#~ "すみませんが、このモジュール・マネージャーはまだ機能しません。新しいバー"
+#~ "ジョンで試してみてください。"
+
+#~ msgid "Item"
+#~ msgstr "項目"
+
+#~ msgid "Invert"
+#~ msgstr "逆転"
+
+#~ msgid "Jump to: "
+#~ msgstr "指定時間へジャンプ: "
+
+#~ msgid "stream output (MRL)"
+#~ msgstr "ストリームの出力 (MRL)"
+
+#, fuzzy
+#~ msgid "Destination Target: "
+#~ msgstr "送信先のアスペクト・レシオ"
+
+#, fuzzy
+#~ msgid "Path:"
+#~ msgstr "ポート番号"
+
+#~ msgid "Couldn't create pixmap from file: %s"
+#~ msgstr "ファイル %s からピックスマップを生成できません"
+
+#~ msgid "Gtk+ interface"
+#~ msgstr "Gtk+ インタフェース"
+
+#~ msgid "_File"
+#~ msgstr "ファイル(_F)"
+
+#~ msgid "_Close"
+#~ msgstr "閉じる(_C)"
+
+#~ msgid "Close the window"
+#~ msgstr "ウィンドウを閉じる"
+
+#~ msgid "E_xit"
+#~ msgstr "終了(_x)"
+
+#~ msgid "Exit the program"
+#~ msgstr "プログラムの終了"
+
+#~ msgid "_View"
+#~ msgstr "表示(_V)"
+
+#~ msgid "Hide the main interface window"
+#~ msgstr "インタフェースウィンドウを隠す"
+
+#~ msgid "Navigate through the stream"
+#~ msgstr "ストリームをナビゲートする"
+
+#~ msgid "_Settings"
+#~ msgstr "設定(_S)"
+
+#~ msgid "_Preferences..."
+#~ msgstr "設定(_P)..."
+
+#~ msgid "Configure the application"
+#~ msgstr "アプリケーションの設定"
+
+#~ msgid "_Help"
+#~ msgstr "ヘルプ(_H)"
+
+#~ msgid "_About..."
+#~ msgstr "VideoLAN について(_A)..."
+
+#~ msgid "About this application"
+#~ msgstr "このアプリケーションについて"
+
+#~ msgid "Open a Satellite Card"
+#~ msgstr "衛星カードを開く"
+
+#~ msgid "Go Backward"
+#~ msgstr "逆転再生"
+
+#~ msgid "Stop Stream"
+#~ msgstr "ストリームの停止"
+
+#~ msgid "Play Stream"
+#~ msgstr "ストリームの再生"
+
+#~ msgid "Pause Stream"
+#~ msgstr "ストリームの一時停止"
+
+#~ msgid "Play Slower"
+#~ msgstr "スロー再生"
+
+#~ msgid "Play Faster"
+#~ msgstr "早送り再生"
+
+#~ msgid "Open Playlist"
+#~ msgstr "再生一覧を開く"
+
+#~ msgid "Previous File"
+#~ msgstr "前のファイル"
+
+#~ msgid "Next File"
+#~ msgstr "次のファイル"
+
+#~ msgid "_Play"
+#~ msgstr "再生(_P)"
+
+#~ msgid "Authors"
+#~ msgstr "作成者"
+
+#~ msgid "Open Target"
+#~ msgstr "ファイルを開く"
+
+#, fuzzy
+#~ msgid "Select a subtitles file"
+#~ msgstr "字幕の選択"
+
+#~ msgid "Set the delay (in seconds)"
+#~ msgstr "ディレイの設定 (秒)"
+
+#, fuzzy
+#~ msgid "Use stream output"
+#~ msgstr "ストリームの出力先の選択"
+
+#~ msgid "Stream output configuration "
+#~ msgstr "ストリーム出力の設定"
+
+#~ msgid "Select File"
+#~ msgstr "ファイルの選択"
+
+#~ msgid "Jump"
+#~ msgstr "ジャンプ"
+
+#~ msgid "s."
+#~ msgstr "秒"
+
+#~ msgid "m:"
+#~ msgstr "分:"
+
+#~ msgid "h:"
+#~ msgstr "時:"
+
+#~ msgid "Selected"
+#~ msgstr "選択済み"
+
+#~ msgid "_Crop"
+#~ msgstr "縁取り(_C)"
+
+#~ msgid "_Invert"
+#~ msgstr "逆転(_I)"
+
+#~ msgid "_Select"
+#~ msgstr "選択(_S)"
+
+#, fuzzy
+#~ msgid "Stream output (MRL)"
+#~ msgstr "ストリームの出力MRL"
+
+#~ msgid "Error loading pixmap file: %s"
+#~ msgstr "ピックスマップ・ファイル %s のロードでエラーが発生しました。"
+
+#~ msgid "Title %d (%d)"
+#~ msgstr "タイトル %d (%d)"
+
+#~ msgid "Chapter %d"
+#~ msgstr "チャプター %d"
+
+#~ msgid "Selected:"
+#~ msgstr "選択済み:"
+
+#, fuzzy
+#~ msgid "Disk type"
+#~ msgstr "ディスク・タイプ"
+
+#, fuzzy
+#~ msgid "Starting position"
+#~ msgstr "垂直方向位置"
+
+#~ msgid "Title "
+#~ msgstr "タイトル "
+
+#~ msgid "Chapter "
+#~ msgstr "チャプター "
+
+#~ msgid "Device name "
+#~ msgstr "デバイス名"
+
+#~ msgid "Languages"
+#~ msgstr "言語"
+
+#~ msgid "language"
+#~ msgstr "言語"
+
+#~ msgid "Open &Disk"
+#~ msgstr "ディスクを開く(&D)"
 
-#: modules/video_output/x11/glx.c:106 modules/video_output/x11/xvideo.c:72
 #, fuzzy
-msgid "Screen to be used for fullscreen mode."
-msgstr "全画面表示の切替え"
+#~ msgid "Open &Stream"
+#~ msgstr "ストリームを開く(&S)"
 
-#: 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."
-msgstr ""
+#~ msgid "&Backward"
+#~ msgstr "逆転再生(&B)"
 
-#: modules/video_output/x11/x11.c:57 modules/video_output/x11/xvideo.c:68
-#, fuzzy
-msgid "Use shared memory"
-msgstr "共有メモリの使用"
+#~ msgid "&Stop"
+#~ msgstr "停止(&S)"
 
-#: modules/video_output/x11/x11.c:59 modules/video_output/x11/xvideo.c:70
-msgid "Use shared memory to communicate between VLC and the X server."
-msgstr "共有メモリをVLCとXサーバの通信のために使用します。"
+#~ msgid "&Play"
+#~ msgstr "再生(&P)"
 
-#: modules/video_output/x11/x11.c:61
-msgid "choose the screen to be used for fullscreen mode."
-msgstr ""
+#~ msgid "P&ause"
+#~ msgstr "一時停止(&A)"
 
-#: modules/video_output/x11/x11.c:78
-#, fuzzy
-msgid "X11 video output"
-msgstr "X11 ビデオ出力"
+#~ msgid "&Slow"
+#~ msgstr "スロー(&S)"
 
-#: modules/video_output/x11/xvideo.c:63
-msgid "XVimage chroma format"
-msgstr "XVimage色彩フォーマット"
+#~ msgid "Fas&t"
+#~ msgstr "早送り(&T)"
 
-#: modules/video_output/x11/xvideo.c:65
-msgid ""
-"Force the XVideo renderer to use a specific chroma format instead of trying "
-"to improve performances by using the most efficient one."
-msgstr ""
-"最も効果的なものを使ってパフォーマンスを改善するかわりに、特定の色彩フォー"
-"マットを使用するためのXVideoレンダラを強制的に指定します。"
+#~ msgid "Stream info..."
+#~ msgstr "ストリームの情報..."
+
+#~ msgid "Opens an existing document"
+#~ msgstr "既存のウィンドウを開く"
 
-#: modules/video_output/x11/xvideo.c:92
 #, fuzzy
-msgid "XVideo extension video output"
-msgstr "XVideoエクステンション・モジュール"
+#~ msgid "Opens a recently used file"
+#~ msgstr "ファイルを開く"
 
-#: modules/visualization/galaktos/plugin.c:48
-msgid "GaLaktos visualization plugin"
-msgstr ""
+#, fuzzy
+#~ msgid "Quits the application"
+#~ msgstr "このアプリケーションについて"
 
-#: modules/visualization/goom.c:58
-msgid "Goom display width"
-msgstr ""
+#~ msgid "Enables/disables the toolbar"
+#~ msgstr "ツールバーの有効/無効"
 
-#: modules/visualization/goom.c:59
-msgid "Goom display height"
-msgstr ""
+#~ msgid "Enables/disables the status bar"
+#~ msgstr "ステータスバーの有効/無効"
 
-#: modules/visualization/goom.c:60
-msgid ""
-"Allows you to change the resolution of the Goom display (bigger resolution "
-"will be prettier but more CPU intensive)."
-msgstr ""
+#~ msgid "Opens a disk"
+#~ msgstr "ディスクを開く"
 
-#: modules/visualization/goom.c:63
-msgid "Goom animation speed"
-msgstr ""
+#, fuzzy
+#~ msgid "Opens a network stream"
+#~ msgstr "ネットワークストリームを選択する"
 
-#: modules/visualization/goom.c:64
-msgid "Allows you to reduce the speed of the animation (default 6, max 10)."
-msgstr ""
+#~ msgid "Starts playback"
+#~ msgstr "再生開始"
 
-#: modules/visualization/goom.c:70
 #, fuzzy
-msgid "Goom"
-msgstr "ズーム"
+#~ msgid "Ready."
+#~ msgstr "メッセージ..."
 
-#: modules/visualization/goom.c:71
-#, fuzzy
-msgid "Goom effect"
-msgstr "スコープ効果"
+#~ msgid "Opening file..."
+#~ msgstr "ファイルを開く..."
 
-#: modules/visualization/visual/visual.c:38
-msgid "Effects list"
-msgstr "エフェクト一覧"
+#~ msgid "Exiting..."
+#~ msgstr "終了..."
 
-#: modules/visualization/visual/visual.c:40
-msgid ""
-"A list of visual effect, separated by commas.\n"
-"Current effects include: dummy, random, scope, spectrum"
-msgstr ""
+#~ msgid "KDE interface"
+#~ msgstr "KDE インタフェース"
 
-#: modules/visualization/visual/visual.c:45
-msgid "The width of the effects video window, in pixels."
-msgstr ""
+#~ msgid "path to ui.rc file"
+#~ msgstr "ui.rc ファイルのパス"
 
-#: modules/visualization/visual/visual.c:49
-msgid "The height of the effects video window, in pixels."
-msgstr ""
+#~ msgid "Messages:"
+#~ msgstr "メッセージ:"
 
-#: modules/visualization/visual/visual.c:51
-msgid "Number of bands"
-msgstr "バンド数"
+#~ msgid "Protocol"
+#~ msgstr "プロトコル"
 
-#: modules/visualization/visual/visual.c:53
-msgid "Number of bands used by spectrum analyzer, should be 20 or 80."
-msgstr ""
+#, fuzzy
+#~ msgid "Address "
+#~ msgstr "ホスト名/アドレス"
 
-#: modules/visualization/visual/visual.c:55
-msgid "Band separator"
-msgstr "バンドセパレータ"
+#~ msgid "Port "
+#~ msgstr "ポート "
 
-#: modules/visualization/visual/visual.c:57
-msgid "Number of blank pixels between bands."
-msgstr ""
+#~ msgid "&Save"
+#~ msgstr "保存(&S)"
 
-#: modules/visualization/visual/visual.c:59
 #, fuzzy
-msgid "Amplification"
-msgstr "このアプリケーションについて"
+#~ msgid "Qt interface"
+#~ msgstr "Qtインタフェース・モジュール"
 
-#: modules/visualization/visual/visual.c:61
-msgid "This is a coefficient that modifies the height of the bands."
-msgstr ""
+#, fuzzy
+#~ msgid "Video Filters"
+#~ msgstr "ビデオタイトル"
 
-#: modules/visualization/visual/visual.c:63
-msgid "Enable peaks"
-msgstr "ピークを有効にする"
+#, fuzzy
+#~ msgid "Satellite default transponder frequency (kHz)"
+#~ msgstr "衛星 既定転送周波数"
 
-#: modules/visualization/visual/visual.c:65
-msgid "Defines whether to draw peaks."
-msgstr ""
+#, fuzzy
+#~ msgid "Satellite default transponder polarization"
+#~ msgstr "衛星 既定転送極"
 
-#: modules/visualization/visual/visual.c:67
-msgid "Number of stars"
-msgstr "星の数"
+#, fuzzy
+#~ msgid "Satellite default transponder FEC"
+#~ msgstr "衛星 既定転送FEC"
 
-#: modules/visualization/visual/visual.c:69
-msgid "Defines the number of stars to draw with random effect."
-msgstr ""
+#, fuzzy
+#~ msgid "Satellite default transponder symbol rate (kHz)"
+#~ msgstr "衛星 既定転送シンボル・レート"
 
-#: modules/visualization/visual/visual.c:75
 #, fuzzy
-msgid "Visualizer"
-msgstr "ビジュアル化フィルター"
+#~ msgid "Use diseqc with antenna"
+#~ msgstr "アンテナとdiseqcを使用"
 
-#: modules/visualization/visual/visual.c:78
 #, fuzzy
-msgid "Visualizer filter"
-msgstr "ビジュアル化フィルター"
+#~ msgid "Satellite input"
+#~ msgstr "衛星入力モジュール"
 
-#: modules/visualization/visual/visual.c:86
 #, fuzzy
-msgid "Spectrum analyser"
-msgstr "スペクトラム"
+#~ msgid "< Back"
+#~ msgstr "逆転"
 
-#: modules/visualization/visual/visual.c:95
 #, fuzzy
-msgid "Random effect"
-msgstr "ランダムオフ"
+#~ msgid "Next >"
+#~ msgstr "次"
 
-#: modules/visualization/xosd.c:63
 #, fuzzy
-msgid "Flip vertical position"
-msgstr "垂直方向位置"
+#~ msgid "Choose here your input stream"
+#~ msgstr "ストリームの一時停止"
 
-#: modules/visualization/xosd.c:64
-msgid "Display xosd output on the bottom of the screen instead of the top"
-msgstr "xosd出力をスクリーンの最上端ではなく、最下端に表示する"
+#, fuzzy
+#~ msgid "MPEG-1 Video codec"
+#~ msgstr "ビデオコーデック"
 
-#: modules/visualization/xosd.c:67
-msgid "Vertical offset"
-msgstr "垂直オフセット"
+#, fuzzy
+#~ msgid "MPEG-2 Video codec"
+#~ msgstr "ビデオコーデック"
 
-#: modules/visualization/xosd.c:68
-msgid "Vertical offset in pixels of the displayed text"
-msgstr "表示されている文字列の垂直方向のオフセット"
+#, fuzzy
+#~ msgid "MPEG-4 Video codec"
+#~ msgstr "ビデオコーデック"
 
-#: modules/visualization/xosd.c:70
 #, fuzzy
-msgid "Shadow offset"
-msgstr "陰のオフセット"
+#~ msgid "DivX second version"
+#~ msgstr "MMX 変換元 "
 
-#: modules/visualization/xosd.c:71
-msgid "Offset in pixels of the shadow"
-msgstr "陰のオフセット(ピクセル)"
+#, fuzzy
+#~ msgid "MPEG Audio Layer 3"
+#~ msgstr "MPEG オーディオデコーダー"
 
-#: modules/visualization/xosd.c:74
-msgid "Font used to display text in the xosd output"
-msgstr "xods出力でテキスト出力のために使用されるフォント"
+#, fuzzy
+#~ msgid "DVD audio format"
+#~ msgstr "VCD フォーマット"
 
-#: modules/visualization/xosd.c:82
 #, fuzzy
-msgid "XOSD interface"
-msgstr "ネットワーク・インタフェース"
+#~ msgid "MPEG4"
+#~ msgstr "MPEG1"
+
+#, fuzzy
+#~ msgid "WAV"
+#~ msgstr "AVI"
 
 #, fuzzy
 #~ msgid "Pashto"
-#~ msgstr "作成者"
+#~ msgstr "パシュト語"
 
 #~ msgid "Brazilian"
 #~ msgstr "ブラジル語"
@@ -15023,19 +16788,12 @@ msgstr "ネットワーク・インタフェース"
 #~ 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が選択するパケッタライザーの順序を選択します。"
 
-#, fuzzy
-#~ msgid "HTTP password"
-#~ msgstr "HTTP パスワード"
-
 #, fuzzy
 #~ msgid "Late delay (ms)"
 #~ msgstr "ファイルの選択"
@@ -15077,7 +16835,7 @@ msgstr "ネットワーク・インタフェース"
 
 #, fuzzy
 #~ msgid "Telnet"
-#~ msgstr "選択"
+#~ msgstr "削除"
 
 #, fuzzy
 #~ msgid "MPEG-TS"
@@ -15143,10 +16901,10 @@ msgstr "ネットワーク・インタフェース"
 #~ msgstr "出力ストリームがない場合、空にする"
 
 #~ msgid "Loop playlist on end"
-#~ msgstr "プレイリストの最後でループ"
+#~ msgstr "再生一覧の最後でループ"
 
 #~ msgid "print detailed help (can be combined with --advanced)"
-#~ msgstr "詳細なヘルプを表示する (--advanced と併用出来ます)"
+#~ msgstr "詳細なヘルプを表示する (--advanced と併用できます)"
 
 #~ msgid "Vol %%%d"
 #~ msgstr "音量 %%%d"
@@ -15185,9 +16943,6 @@ msgstr "ネットワーク・インタフェース"
 #~ msgid "vlc preferences"
 #~ msgstr "VLC 設定..."
 
-#~ msgid "Loop"
-#~ msgstr "ループ"
-
 #, fuzzy
 #~ msgid "Repeat"
 #~ msgstr "ファイルの選択"
@@ -15195,10 +16950,6 @@ msgstr "ネットワーク・インタフェース"
 #~ msgid "SAP interface"
 #~ msgstr "SAP インタフェース"
 
-#, fuzzy
-#~ msgid "Image"
-#~ msgstr "サイズ"
-
 #~ msgid "Server port"
 #~ msgstr "サーバーポート"
 
@@ -15248,9 +16999,6 @@ msgstr "ネットワーク・インタフェース"
 #~ msgid "Video output modules settings"
 #~ msgstr "ビデオ出力モジュール設定"
 
-#~ msgid "Choose audio"
-#~ msgstr "オーディオの選択"
-
 #, fuzzy
 #~ msgid ""
 #~ "Give the default type of audio you want to use in a DVD. (Developers only)"
@@ -15264,10 +17012,6 @@ msgstr "ネットワーク・インタフェース"
 #~ msgid "Subtitle aspect-ratio correction"
 #~ msgstr "字幕"
 
-#, fuzzy
-#~ msgid "Error: %s\n"
-#~ msgstr "エラー"
-
 #, fuzzy
 #~ msgid "Xvid video decoder"
 #~ msgstr "DVビデオ・デコーダ"
@@ -15314,13 +17058,8 @@ msgstr "ネットワーク・インタフェース"
 #~ msgid "&Groups"
 #~ msgstr "グループ(&G)"
 
-#, fuzzy
 #~ msgid "Enter a name for the new group:"
-#~ msgstr "区画から縁取りまでのジオメトリを指定"
-
-#, fuzzy
-#~ msgid "Effect"
-#~ msgstr "取出し"
+#~ msgstr "新規グループ名前を入力:"
 
 #, fuzzy
 #~ msgid "no input\n"
@@ -15329,16 +17068,10 @@ msgstr "ネットワーク・インタフェース"
 #~ msgid "| no entries\n"
 #~ msgstr "| エントリがありません。\n"
 
-#~ msgid "+----[ end of %s ]\n"
-#~ msgstr "+---[ %s の終り ]\n"
-
 #, fuzzy
 #~ msgid "Demuxers settings (new generation)"
 #~ msgstr "設定"
 
-#~ msgid "Stream "
-#~ msgstr "ストリーム "
-
 #~ msgid "Year"
 #~ msgstr "å¹´"
 
@@ -15351,10 +17084,6 @@ msgstr "ネットワーク・インタフェース"
 #~ msgid "Track Title"
 #~ msgstr "トラックタイトル"
 
-#, fuzzy
-#~ msgid "Program to decode"
-#~ msgstr "デコードのプログラム"
-
 #, fuzzy
 #~ msgid "DVD input (uses libdvdcss if installed)"
 #~ msgstr "DVD入力モジュール, libdvdcssがある場合には使用"
@@ -15522,10 +17251,6 @@ msgstr "ネットワーク・インタフェース"
 #~ msgid "slowest"
 #~ msgstr "スロー"
 
-#, fuzzy
-#~ msgid "slow"
-#~ msgstr "スロー"
-
 #, fuzzy
 #~ msgid "fastest"
 #~ msgstr "ペースト"
@@ -15647,10 +17372,6 @@ msgstr "ネットワーク・インタフェース"
 #~ msgid "Codec download"
 #~ msgstr "デバイス名"
 
-#, fuzzy
-#~ msgid "No"
-#~ msgstr "なし"
-
 #, fuzzy
 #~ msgid "ftp://"
 #~ msgstr "ファイル"
@@ -15681,7 +17402,7 @@ msgstr "ネットワーク・インタフェース"
 
 #, fuzzy
 #~ msgid "Open the playlist"
-#~ msgstr "プレイリストを開く"
+#~ msgstr "再生一覧を開く"
 
 #, fuzzy
 #~ msgid "Show the program logs"
@@ -15771,10 +17492,6 @@ msgstr "ネットワーク・インタフェース"
 #~ msgid "antenna lnb_slof (kHz)"
 #~ msgstr "アンテナ lnb_slof (kHz)"
 
-#, fuzzy
-#~ msgid "dvd"
-#~ msgstr "追加"
-
 #, fuzzy
 #~ msgid "udp stream output"
 #~ msgstr "ストリームの出力先の選択"
@@ -15786,10 +17503,6 @@ msgstr "ネットワーク・インタフェース"
 #~ msgid "HTTP remote control"
 #~ msgstr "リモート・コントロール"
 
-#, fuzzy
-#~ msgid "Dump file name"
-#~ msgstr "ログ・ファイル名"
-
 #, fuzzy
 #~ msgid "mka/mkv stream demuxer"
 #~ msgstr "MPEG 1/2レイヤ1/2オーディオ・デコーダ"
@@ -15812,7 +17525,7 @@ msgstr "ネットワーク・インタフェース"
 
 #, fuzzy
 #~ msgid "Repeat Playlist"
-#~ msgstr "プレイリストを開く"
+#~ msgstr "再生一覧を開く"
 
 #, fuzzy
 #~ msgid "VLC Media Player"
@@ -15832,7 +17545,7 @@ msgstr "ネットワーク・インタフェース"
 
 #, fuzzy
 #~ msgid "Stop current playlist item"
-#~ msgstr "プレイリストを開く"
+#~ msgstr "再生一覧を開く"
 
 #, fuzzy
 #~ msgid "Quick"
@@ -15848,20 +17561,12 @@ msgstr "ネットワーク・インタフェース"
 
 #, fuzzy
 #~ msgid "&Randomize Playlist"
-#~ msgstr "プレイリストを開く"
+#~ msgstr "再生一覧を開く"
 
 #, fuzzy
 #~ msgid "&Delete"
 #~ msgstr "削除"
 
-#, fuzzy
-#~ msgid "Repeat one"
-#~ msgstr "ファイルの選択"
-
-#, fuzzy
-#~ msgid "Open subtitles file"
-#~ msgstr "字幕の選択"
-
 #, fuzzy
 #~ msgid "Fonts"
 #~ msgstr "フォント"
@@ -15872,18 +17577,10 @@ msgstr "ネットワーク・インタフェース"
 #~ msgid "Using the logger interface plugin..."
 #~ msgstr "ロギング・インタフェース・プラグインを使用します。"
 
-#, fuzzy
-#~ msgid "ES stream"
-#~ msgstr "ストリームの停止"
-
 #, fuzzy
 #~ msgid "Gather stream"
 #~ msgstr "ストリームの一時停止"
 
-#, fuzzy
-#~ msgid "discard"
-#~ msgstr "ディスク"
-
 #, fuzzy
 #~ msgid "video deinterlacing filter"
 #~ msgstr "ノンインタレース化モジュール"
@@ -15892,9 +17589,6 @@ msgstr "ネットワーク・インタフェース"
 #~ msgid "miscellaneous distort video effects filter"
 #~ msgstr "その他のビデオ効果モジュール"
 
-#~ msgid "XOSD module"
-#~ msgstr "XOSDモジュール"
-
 #, fuzzy
 #~ msgid "xosd interface"
 #~ msgstr "xosdインタフェース・モジュール"
@@ -15935,10 +17629,6 @@ msgstr "ネットワーク・インタフェース"
 #~ msgid "Video Device Advanced Options"
 #~ msgstr "ALSAオーディオ・モジュール"
 
-#, fuzzy
-#~ msgid "Logo File"
-#~ msgstr "ファイル"
-
 #, fuzzy
 #~ msgid "CD-ROM device name"
 #~ msgstr "デバイス名"
@@ -15965,10 +17655,6 @@ msgstr "ネットワーク・インタフェース"
 #~ 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."
@@ -16047,7 +17733,7 @@ msgstr "ネットワーク・インタフェース"
 
 #, fuzzy
 #~ msgid "Only enqueue in playlist, do not play"
-#~ msgstr "デフォルトでプレイリストに追加"
+#~ msgstr "デフォルトで再生一覧に追加"
 
 #, fuzzy
 #~ msgid "Stream:"
@@ -16183,17 +17869,13 @@ msgstr "ネットワーク・インタフェース"
 #~ "If you want VLC to add items to the playlist as you open them, then "
 #~ "enable this option."
 #~ msgstr ""
-#~ "プレイリストにオープンしている項目を追加したい場合には、このオプションを選"
-#~ "択します。"
+#~ "再生一覧にオープンしている項目を追加したい場合には、このオプションを選択し"
+#~ "ます。"
 
 #, fuzzy
 #~ msgid "Audio encoding codec"
 #~ msgstr "MPEG 1/2ビデオ・デコーダ・モジュール"
 
-#, fuzzy
-#~ msgid "Encoders"
-#~ msgstr "エンコーダ"
-
 #, fuzzy
 #~ msgid "XviD video encoder (MPEG-4)"
 #~ msgstr "DVビデオ・デコーダ"
@@ -16275,13 +17957,12 @@ msgstr "ネットワーク・インタフェース"
 
 #, fuzzy
 #~ msgid "Launch playlist on startup"
-#~ msgstr "起動時にプレイリストを開く"
+#~ msgstr "起動時に再生一覧を開く"
 
 #~ msgid ""
 #~ "If you want VLC to start playing on startup, then enable this option."
 #~ msgstr ""
-#~ "VLCの起動時にプレイリストを起動したい場合には、このオプションを選択しま"
-#~ "す。"
+#~ "VLCの起動時に再生一覧を起動したい場合には、このオプションを選択します。"
 
 #, fuzzy
 #~ msgid "Device &name:"
@@ -16383,10 +18064,6 @@ msgstr "ネットワーク・インタフェース"
 #~ msgid "About..."
 #~ msgstr "VideoLANについて(_A)..."
 
-#, fuzzy
-#~ msgid "Select next title"
-#~ msgstr "ファイルの選択"
-
 #, fuzzy
 #~ msgid "Volume &Up"
 #~ msgstr "ボリュームを上げる"
@@ -16468,10 +18145,6 @@ msgstr "ネットワーク・インタフェース"
 #~ msgid "Native Windows interface"
 #~ msgstr "ネイティブWindowsインタフェース"
 
-#, fuzzy
-#~ msgid "audio device"
-#~ msgstr "DVDデバイス"
-
 #~ msgid "font"
 #~ msgstr "フォント"
 
@@ -16545,10 +18218,6 @@ msgstr "ネットワーク・インタフェース"
 #~ msgid "Linux OSS /dev/dsp module"
 #~ msgstr "Linux OSS /dev/dspモジュール"
 
-#, fuzzy
-#~ msgid "flac decoder module"
-#~ msgstr "字幕・デコーダ・モジュール"
-
 #, fuzzy
 #~ msgid "libmpeg2 decoder module"
 #~ msgstr "字幕・デコーダ・モジュール"
@@ -16611,9 +18280,6 @@ msgstr "ネットワーク・インタフェース"
 #~ msgid "Slowmotion"
 #~ msgstr "選択"
 
-#~ msgid "Session Announcement Protocol support"
-#~ msgstr "セッション・アナウンスメント・プロトコルをサポートする"
-
 #, fuzzy
 #~ msgid "Open disc..."
 #~ msgstr "ディスクを開く(_D)..."
@@ -16622,10 +18288,6 @@ msgstr "ネットワーク・インタフェース"
 #~ msgid "Select program"
 #~ msgstr "プログラムの切替え"
 
-#, fuzzy
-#~ msgid "Select audio language"
-#~ msgstr "オーディオ・チャンネルの選択"
-
 #, fuzzy
 #~ msgid "Toggle fullscreen"
 #~ msgstr "全画面表示の切替え"
@@ -16640,3 +18302,24 @@ msgstr "ネットワーク・インタフェース"
 #, fuzzy
 #~ msgid "Jump to next chapter"
 #~ msgstr "次のチャプターを選択"
+
+#~ msgid "British"
+#~ msgstr "イギリス英語"
+
+#~ msgid "Disc ID (CDDB)"
+#~ msgstr "ディスク ID (CDDB)"
+
+#, fuzzy
+#~ msgid "Volume is %d\n"
+#~ msgstr "ボリュームは %d です。\n"
+
+#, fuzzy
+#~ msgid "The average bitrate of the stream"
+#~ msgstr "ストリームをナビゲートする"
+
+#~ msgid "XOSD module"
+#~ msgstr "XOSDモジュール"
+
+#, fuzzy
+#~ msgid "Input Type"
+#~ msgstr "入力"