ogt.c cvd.c, subtitle.h: move common debug string help into subtitle.h

[vlc] / po / ja.po

diff --git a/po/ja.po b/po/ja.po
index efc820c60ae27c1de6f1897ee7368ea210034778..e2483fc6b5464fdcc09ddefe02696157cbd93f06 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,37 +4,37 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vlc\n"
-"POT-Creation-Date: 2003-11-23 19:29+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-01-03 12:56+0100\n"
 "PO-Revision-Date: 2003-01-09 02:37+0900\n"
 "Last-Translator: Fumio Nakayama <endymion@ca2.so-net.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=euc-jp\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: include/vlc_help.h:32
 #, fuzzy
-msgid "VLC Preferences"
+msgid "VLC preferences"
 msgstr "ÀßÄê..."
 
 #: include/vlc_help.h:34
 msgid ""
 "Configure some global options in General Settings and configure each VLC "
 "plugin in the Plugins section.\n"
-"Click on 'Advanced Options' to see every options."
+"Click on \"Advanced Options\" to see all options."
 msgstr ""
 
 #: include/vlc_help.h:38
 #, fuzzy
-msgid "VLC Plugins Preferences"
+msgid "VLC plugins preferences"
 msgstr "ÀßÄê..."
 
 #: include/vlc_help.h:40
 msgid ""
 "In this tree, you can set options for every plugin used by VLC.\n"
 "Plugins are sorted by type.\n"
-"Have fun tuning VLC !"
+"Have fun tuning VLC!"
 msgstr ""
 
 #: include/vlc_help.h:47
@@ -45,7 +45,7 @@ msgstr "
 #: include/vlc_help.h:49
 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."
+"Common settings you may want to alter are HTTP proxy or caching settings."
 msgstr ""
 
 #: include/vlc_help.h:53
@@ -80,9 +80,8 @@ msgstr ""
 msgid "Chroma modules settings"
 msgstr "ÀßÄê(_S)"
 
-#: include/vlc_help.h:65 include/vlc_help.h:73 src/libvlc.h:258
-#: src/libvlc.h:508
-msgid " "
+#: include/vlc_help.h:65
+msgid "These settings affect chroma transformation modules."
 msgstr ""
 
 #: include/vlc_help.h:67
@@ -92,8 +91,8 @@ msgstr "
 
 #: include/vlc_help.h:69
 msgid ""
-"In the Subsdec section you may want to set your preferred subtitles text "
-"encoding."
+"In the Subsdec section you may want to set the text encoding of your "
+"preferred subtitles."
 msgstr ""
 
 #: include/vlc_help.h:72
@@ -101,6 +100,10 @@ msgstr ""
 msgid "Demuxers settings"
 msgstr "ÀßÄê(_S)"
 
+#: include/vlc_help.h:73
+msgid "These settings affect demuxer modules."
+msgstr ""
+
 #: include/vlc_help.h:75
 #, fuzzy
 msgid "Interface plugins settings"
@@ -130,7 +133,7 @@ msgstr "
 
 #: include/vlc_help.h:87
 msgid ""
-"In this section you can force the behaviour of the subtitle demuxer, for "
+"In this section you can force the behavior of the subtitle demuxer, for "
 "example by setting the subtitles type or file name."
 msgstr ""
 
@@ -200,41 +203,37 @@ msgid ""
 "For more information, have a look at the web site."
 msgstr ""
 
-#: src/audio_output/input.c:81 modules/gui/macosx/intf.m:499
-#: modules/gui/macosx/intf.m:500
+#: src/audio_output/input.c:103 modules/gui/macosx/intf.m:510
+#: modules/gui/macosx/intf.m:511
 #, fuzzy
 msgid "Visualizations"
 msgstr "¶ËÀ­"
 
-#: src/audio_output/input.c:83 src/input/input_programs.c:679
-#: src/video_output/video_output.c:426
+#: src/audio_output/input.c:105 src/input/input_programs.c:683
+#: src/video_output/video_output.c:426 modules/codec/ffmpeg/postprocess.c:90
 msgid "Disable"
 msgstr ""
 
-#: src/audio_output/input.c:85 modules/gui/wxwindows/playlist.cpp:224
+#: src/audio_output/input.c:107 modules/gui/wxwindows/playlist.cpp:224
 msgid "Random"
 msgstr ""
 
-#: src/audio_output/input.c:87
+#: src/audio_output/input.c:109
 #, fuzzy
 msgid "Scope"
 msgstr "Ää»ß"
 
-#: src/audio_output/input.c:89
+#: src/audio_output/input.c:111
 msgid "Spectrum"
 msgstr ""
 
-#: src/audio_output/input.c:91
-msgid "Goom"
-msgstr ""
-
-#: src/audio_output/input.c:105 src/libvlc.h:156
+#: src/audio_output/input.c:127 src/libvlc.h:156
 #, fuzzy
 msgid "Audio filters"
 msgstr "¥ª¡¼¥Ç¥£¥ª"
 
 #: src/audio_output/output.c:104 src/audio_output/output.c:131
-#: modules/gui/macosx/intf.m:495 modules/gui/macosx/intf.m:496
+#: modules/gui/macosx/intf.m:506 modules/gui/macosx/intf.m:507
 #, fuzzy
 msgid "Audio channels"
 msgstr "¥ª¡¼¥Ç¥£¥ª¡¦¥Á¥ã¥ó¥Í¥ë¤ÎÁªÂò"
@@ -319,164 +318,185 @@ msgstr ""
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr ""
 
-#: src/input/input.c:248
-msgid "General"
-msgstr ""
-
-#: src/input/input.c:249
-#, fuzzy
-msgid "Playlist Item"
-msgstr "¥ê¥¹¥È"
-
-#: src/input/input.c:1155 modules/demux/asf/asf.c:323
+#: src/input/es_out.c:338
 #, fuzzy, c-format
 msgid "Stream %d"
 msgstr "¥¹¥È¥ê¡¼¥à¤ÎÄä»ß"
 
-#: src/input/input.c:1162 src/input/input.c:1187 src/input/input.c:1204
-#: modules/gui/macosx/output.m:143 modules/gui/pda/interface.c:372
+#: src/input/es_out.c:347 src/input/es_out.c:382 modules/demux/asf/asf.c:308
+#: modules/gui/gtk/preferences.c:325 modules/gui/kde/pluginsbox.cpp:46
+msgid "Description"
+msgstr "ÀâÌÀ"
+
+#: src/input/es_out.c:350 src/input/es_out.c:386 src/input/es_out.c:403
+#, fuzzy
+msgid "Codec"
+msgstr "ÊĤ¸¤ë"
+
+#: src/input/es_out.c:352 src/input/es_out.c:385 src/input/es_out.c:402
+#: modules/gui/macosx/output.m:143
 msgid "Type"
 msgstr "¥¿¥¤¥×"
 
-#: src/input/input.c:1162 src/libvlc.h:615 modules/access/dvdplay/access.c:213
+#: src/input/es_out.c:352 src/libvlc.h:675 modules/access/dvdplay/access.c:213
 #: modules/audio_output/coreaudio.c:227 modules/audio_output/file.c:108
 #: modules/gui/beos/InterfaceWindow.cpp:259
 #: modules/gui/gtk/gnome_interface.c:1092 modules/gui/gtk/gtk_interface.c:1219
-#: modules/gui/macosx/intf.m:489 modules/gui/macosx/output.m:156
+#: modules/gui/macosx/intf.m:500 modules/gui/macosx/output.m:156
 msgid "Audio"
 msgstr "¥ª¡¼¥Ç¥£¥ª"
 
-#: src/input/input.c:1163 src/input/input.c:1188 src/input/input.c:1205
-#, fuzzy
-msgid "Codec"
-msgstr "ÊĤ¸¤ë"
-
-#: src/input/input.c:1167 modules/gui/gtk/gnome_interface.c:148
+#: src/input/es_out.c:355 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:162
-#: modules/gui/wxwindows/streamout.cpp:703
+#: modules/gui/wxwindows/streamout.cpp:746
 msgid "Channels"
 msgstr "¥Á¥ã¥ó¥Í¥ë"
 
-#: src/input/input.c:1172
+#: src/input/es_out.c:360 src/libvlc.h:72 modules/demux/mkv.cpp:2214
+#: modules/gui/beos/InterfaceWindow.cpp:255
+msgid "Language"
+msgstr "¸À¸ì"
+
+#: src/input/es_out.c:365
 #, fuzzy
-msgid "Sample Rate"
+msgid "Sample rate"
 msgstr "¥·¥ó¥Ü¥ë¡¦¥ì¡¼¥È"
 
-#: src/input/input.c:1177 modules/gui/wxwindows/v4l.cpp:396
+#: src/input/es_out.c:365
+#, c-format
+msgid "%d Hz"
+msgstr ""
+
+#: src/input/es_out.c:370 modules/gui/wxwindows/v4l.cpp:401
 #, fuzzy
 msgid "Bitrate"
 msgstr "¥ª¡¼¥Ç¥£¥ª"
 
-#: src/input/input.c:1182
-msgid "Bits Per Sample"
+#: src/input/es_out.c:370
+#, c-format
+msgid "%d bps"
+msgstr ""
+
+#: src/input/es_out.c:375
+msgid "Bits per sample"
 msgstr ""
 
-#: src/input/input.c:1187 src/libvlc.h:640
+#: src/input/es_out.c:385 src/libvlc.h:699
 #: modules/gui/gtk/gnome_interface.c:1099 modules/gui/gtk/gtk_interface.c:1296
-#: modules/gui/macosx/intf.m:502 modules/gui/macosx/macosx.m:68
-#: modules/gui/macosx/output.m:150 modules/misc/dummy/dummy.c:85
-#: modules/video_output/directx/directx.c:114
+#: modules/gui/macosx/intf.m:513 modules/gui/macosx/macosx.m:64
+#: modules/gui/macosx/output.m:150 modules/misc/dummy/dummy.c:91
+#: modules/video_output/directx/directx.c:119
 msgid "Video"
 msgstr "¥Ó¥Ç¥ª"
 
-#: src/input/input.c:1192
+#: src/input/es_out.c:390
 #, fuzzy
 msgid "Resolution"
 msgstr "ÁªÂò"
 
-#: src/input/input.c:1198
+#: src/input/es_out.c:396
 #, fuzzy
-msgid "Display Resolution"
+msgid "Display resolution"
 msgstr "ÁªÂò"
 
-#: src/input/input.c:1204 modules/access/dvdplay/access.c:211
-#: modules/gui/gtk/gnome_interface.c:1963 modules/gui/gtk/gtk_interface.c:2278
+#: src/input/es_out.c:402 modules/access/dvdplay/access.c:211
+#: modules/gui/gtk/gnome_interface.c:1972 modules/gui/gtk/gtk_interface.c:2287
 #, fuzzy
 msgid "Subtitle"
 msgstr "»úËë(_S)"
 
-#: src/input/input_programs.c:96 modules/gui/gtk/gnome_interface.c:1078
+#: src/input/input.c:251
+msgid "General"
+msgstr ""
+
+#: src/input/input.c:252
+#, fuzzy
+msgid "Playlist Item"
+msgstr "¥ê¥¹¥È"
+
+#: src/input/input_programs.c:97 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:482 modules/gui/macosx/intf.m:483
+#: modules/gui/macosx/intf.m:493 modules/gui/macosx/intf.m:494
 msgid "Program"
 msgstr "¥×¥í¥°¥é¥à"
 
-#: src/input/input_programs.c:100 modules/access/dvdplay/access.c:207
-#: modules/demux/asf/asf.c:302 modules/demux/mkv.cpp:2188
-#: modules/gui/beos/MediaControlView.cpp:1256
-#: modules/gui/gtk/gnome_interface.c:1650 modules/gui/gtk/gtk_interface.c:1956
+#: src/input/input_programs.c:101 modules/access/dvdplay/access.c:207
+#: modules/demux/asf/asf.c:302 modules/demux/mkv.cpp:2181
+#: modules/gui/beos/MediaControlView.cpp:1264
+#: modules/gui/gtk/gnome_interface.c:1659 modules/gui/gtk/gtk_interface.c:1965
 #: modules/gui/gtk/menu.c:1403 modules/gui/gtk/menu.c:1424
-#: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:484
-#: modules/gui/macosx/intf.m:485 modules/gui/macosx/open.m:149
-#: modules/gui/wxwindows/open.cpp:485
+#: modules/gui/gtk/open.c:236 modules/gui/kde/interface.cpp:144
+#: modules/gui/macosx/intf.m:495 modules/gui/macosx/intf.m:496
+#: modules/gui/macosx/open.m:149 modules/gui/wxwindows/open.cpp:494
 msgid "Title"
 msgstr "¥¿¥¤¥È¥ë"
 
-#: src/input/input_programs.c:104 modules/access/dvdplay/access.c:209
-#: modules/gui/beos/MediaControlView.cpp:1257
-#: modules/gui/gtk/gnome_interface.c:1640 modules/gui/gtk/gtk_interface.c:1946
+#: src/input/input_programs.c:105 modules/access/dvdplay/access.c:209
+#: modules/gui/beos/MediaControlView.cpp:1265
+#: modules/gui/gtk/gnome_interface.c:1649 modules/gui/gtk/gtk_interface.c:1955
 #: modules/gui/gtk/menu.c:1020 modules/gui/gtk/menu.c:1433
-#: modules/gui/kde/interface.cpp:146 modules/gui/macosx/intf.m:486
-#: modules/gui/macosx/intf.m:487 modules/gui/macosx/open.m:150
-#: modules/gui/wxwindows/open.cpp:491
+#: modules/gui/kde/interface.cpp:146 modules/gui/macosx/intf.m:497
+#: modules/gui/macosx/intf.m:498 modules/gui/macosx/open.m:150
+#: modules/gui/wxwindows/open.cpp:500
 msgid "Chapter"
 msgstr "¥Á¥ã¥×¥¿¡¼"
 
-#: src/input/input_programs.c:108 modules/gui/beos/InterfaceWindow.cpp:271
+#: src/input/input_programs.c:109 modules/access/vcdx/access.c:1111
+#: modules/access/vcdx/access.c:1112 modules/gui/beos/InterfaceWindow.cpp:271
 #, fuzzy
 msgid "Navigation"
 msgstr "¥Ê¥Ó¥²¡¼¥·¥ç¥ó(_N)"
 
-#: src/input/input_programs.c:112 modules/gui/macosx/intf.m:509
-#: modules/gui/macosx/intf.m:510
+#: src/input/input_programs.c:113 modules/gui/macosx/intf.m:520
+#: modules/gui/macosx/intf.m:521
 #, fuzzy
 msgid "Video track"
 msgstr "¥Ó¥Ç¥ª"
 
-#: src/input/input_programs.c:115 modules/gui/macosx/intf.m:493
-#: modules/gui/macosx/intf.m:494
+#: src/input/input_programs.c:116 modules/gui/macosx/intf.m:504
+#: modules/gui/macosx/intf.m:505
 #, fuzzy
 msgid "Audio track"
 msgstr "¥ª¡¼¥Ç¥£¥ª"
 
-#: src/input/input_programs.c:118 modules/gui/macosx/intf.m:513
-#: modules/gui/macosx/intf.m:514
+#: src/input/input_programs.c:119 modules/gui/macosx/intf.m:524
+#: modules/gui/macosx/intf.m:525
 #, fuzzy
 msgid "Subtitles track"
 msgstr "»úËë(_S)"
 
-#: src/input/input_programs.c:357 src/input/input_programs.c:359
+#: src/input/input_programs.c:358 src/input/input_programs.c:360
 #, fuzzy, c-format
 msgid "Title %i"
 msgstr "¥¿¥¤¥È¥ë"
 
-#: src/input/input_programs.c:365 src/input/input_programs.c:372
+#: src/input/input_programs.c:366 src/input/input_programs.c:373
 #, fuzzy, c-format
 msgid "Chapter %i"
 msgstr "¥Á¥ã¥×¥¿¡¼ %d"
 
-#: src/input/input_programs.c:387
+#: src/input/input_programs.c:389
 #, fuzzy
 msgid "Next title"
 msgstr "¼¡¤Î¥Õ¥¡¥¤¥ë"
 
-#: src/input/input_programs.c:390
+#: src/input/input_programs.c:392
 #, fuzzy
 msgid "Previous title"
 msgstr "Á°¤Î¥Õ¥¡¥¤¥ë"
 
-#: src/input/input_programs.c:396 modules/gui/beos/InterfaceWindow.cpp:267
+#: src/input/input_programs.c:398 modules/gui/beos/InterfaceWindow.cpp:267
 #, fuzzy
-msgid "Next Chapter"
+msgid "Next chapter"
 msgstr "¥Á¥ã¥×¥¿¡¼"
 
-#: src/input/input_programs.c:399
+#: src/input/input_programs.c:401 modules/gui/beos/InterfaceWindow.cpp:266
 #, fuzzy
-msgid "Previous Chapter"
+msgid "Previous chapter"
 msgstr "¥Á¥ã¥×¥¿¡¼"
 
-#: src/input/input_programs.c:691 src/input/input_programs.c:693
+#: src/input/input_programs.c:695 src/input/input_programs.c:697
 #, c-format
 msgid "Track %i"
 msgstr ""
@@ -495,34 +515,32 @@ msgstr "
 msgid "C"
 msgstr "ja"
 
-#: src/libvlc.c:320 src/libvlc.c:1427
+#: src/libvlc.c:320
 #, c-format
-msgid ""
-"Usage: %s [options] [items]...\n"
-"\n"
+msgid "Usage: %s [options] [items]...\n"
 msgstr ""
 
-#: src/libvlc.c:1259 src/misc/configuration.c:1144
+#: src/libvlc.c:1271 src/misc/configuration.c:1144
 msgid "string"
 msgstr "ʸ»úÎó"
 
-#: src/libvlc.c:1276 src/misc/configuration.c:1114
+#: src/libvlc.c:1289 src/misc/configuration.c:1114
 msgid "integer"
 msgstr "À°¿ô"
 
-#: src/libvlc.c:1279 src/misc/configuration.c:1134
+#: src/libvlc.c:1292 src/misc/configuration.c:1134
 msgid "float"
 msgstr "ÉâÆ°¾®¿ôÅÀ"
 
-#: src/libvlc.c:1285
+#: src/libvlc.c:1298
 msgid " (default enabled)"
 msgstr " (¥Ç¥Õ¥©¥ë¥È¡§Í­¸ú)"
 
-#: src/libvlc.c:1286
+#: src/libvlc.c:1299
 msgid " (default disabled)"
 msgstr " (¥Ç¥Õ¥©¥ë¥È¡§Ìµ¸ú)"
 
-#: src/libvlc.c:1402 src/libvlc.c:1457 src/libvlc.c:1481
+#: src/libvlc.c:1415 src/libvlc.c:1470 src/libvlc.c:1494
 msgid ""
 "\n"
 "Press the RETURN key to continue...\n"
@@ -530,17 +548,24 @@ msgstr ""
 "\n"
 "³¤±¤ë¤Ë¤ÏEnter¥­¡¼¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: src/libvlc.c:1430
+#: src/libvlc.c:1440
+#, c-format
+msgid ""
+"Usage: %s [options] [items]...\n"
+"\n"
+msgstr ""
+
+#: src/libvlc.c:1443
 msgid "[module]              [description]\n"
 msgstr "[¥â¥¸¥å¡¼¥ë]          [ÀâÌÀ]\n"
 
-#: src/libvlc.c:1475
+#: src/libvlc.c:1488
 #, 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 AUTHORS file.\n"
+"Written by the VideoLAN team; see the AUTHORS file.\n"
 msgstr ""
 "ˡΧ¤Ë¤è¤Ã¤Æµö²Ä¤µ¤ì¤ëÈϰϤǤ³¤Î¥×¥í¥°¥é¥à¤Ë¤Ï²¿¤ÎÊݾڤ⤢¤ê¤Þ¤»¤ó¡£\n"
 "¤¢¤Ê¤¿¤Ï¡¢GNU GPL¤Î¾ò¹à¤Ë´ð¤Å¤¤¤ÆºÆÇÛÉÛ¤¹¤ë¤«¤âÃΤì¤Þ¤»¤ó¡£\n"
@@ -553,11 +578,12 @@ msgid "Auto"
 msgstr "ºîÀ®¼Ô"
 
 #: src/libvlc.h:34
-msgid "English US"
-msgstr ""
+#, fuzzy
+msgid "American"
+msgstr "¿âľ"
 
 #: src/libvlc.h:34
-msgid "English GB"
+msgid "British"
 msgstr ""
 
 #: src/libvlc.h:34
@@ -600,8 +626,9 @@ msgid "Polish"
 msgstr ""
 
 #: src/libvlc.h:36
-msgid "Portuguese BR"
-msgstr ""
+#, fuzzy
+msgid "Brazilian"
+msgstr "ʸ»úÎó"
 
 #: src/libvlc.h:36
 #, fuzzy
@@ -673,10 +700,6 @@ msgstr "
 msgid "This options turns off all warning and information messages."
 msgstr "¤¹¤Ù¤Æ¤Î·Ù¹ð¤È¾ðÊó¥á¥Ã¥»¡¼¥¸¤òÍ޻ߤ·¤Þ¤¹¡£"
 
-#: src/libvlc.h:72 modules/gui/beos/InterfaceWindow.cpp:255
-msgid "Language"
-msgstr "¸À¸ì"
-
 #: src/libvlc.h:73
 #, fuzzy
 msgid ""
@@ -738,7 +761,7 @@ msgstr "VLC
 msgid ""
 "These options allow you to tune VLC's audio subsystem, and to add audio "
 "filters which can be used for postprocessing or visual effects (spectrum "
-"analyser,...).\n"
+"analyzer, ...).\n"
 "To tune these filters, have a look at the \"audio filter\" plugin options."
 msgstr ""
 
@@ -836,7 +859,7 @@ msgstr ""
 
 #: src/libvlc.h:145
 #, fuzzy
-msgid "Choose prefered audio output channels mode"
+msgid "Choose preferred audio output channels mode"
 msgstr "½àÈ÷¤µ¤ì¤Æ¤¤¤ë¥³¡¼¥Ç¥Ã¥¯¤Î°ìÍ÷¤ÎÁªÂò"
 
 #: src/libvlc.h:147
@@ -869,25 +892,18 @@ msgstr ""
 
 #: src/libvlc.h:161
 #, fuzzy
-msgid "Headphone virtual spatialization effect"
-msgstr "¥Ø¥Ã¥É¥Û¡¼¥ó¤Î²¾ÁÛŪ¤Ê²»¤Î¹­¤¬¤ê¸ú²Ì"
+msgid "Channel mixer"
+msgstr "¥Á¥ã¥ó¥Í¥ë¡¦¥µ¡¼¥Ð¡¼"
 
 #: src/libvlc.h:163
-#, 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 "
-"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."
+"This allows you to choose a specific audio channel mixer. For instance the "
+"headphone channel mixer will downmix any audio source to a stereo output and "
+"give the feeling that you are standing in a room with a complete 5.1 speaker "
+"set when using only a headphone."
 msgstr ""
-"¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï´°Á´¤Ê5.1¥Á¥ã¥ó¥Í¥ë¡¦¥¹¥Ô¡¼¥«¤¬ÀßÄꤵ¤ì¤¿Éô²°¤Çʹ¤¤¤Æ¤¤¤ë¤«¤Î"
-"¤è¤¦¤Ê¸ú²Ì¤ò¥Ø¥Ã¥É¥Û¡¼¥ó¤Î²»À¼¤ËÍ¿¤¨¤è¤êÎ׾촶¤ò»ý¤¿¤»¤Þ¤¹¡£¤Þ¤¿¡¢Ä¹»þ´Ö¤Î¥ê"
-"¥¹¥Ë¥ó¥°¤Ç¤â°Â¿´¤·¤Æʹ¤¤¤Æ¤¤¤é¤ì¤Þ¤¹¡£\n"
-"¤³¤Îµ¡Ç½¤Ï¡¢¥â¥Î¥é¥ë¤«¤é5.1¥Á¥ã¥ó¥Í¥ë¤Þ¤Ç¤Î¤¹¤Ù¤Æ¤Î¥½¡¼¥¹¡¦¥Õ¥©¡¼¥Þ¥Ã¥È¤ÇÆ°ºî"
-"¤·¤Þ¤¹¡£"
 
-#: src/libvlc.h:171
+#: src/libvlc.h:169
 msgid ""
 "These options allow you to modify options related to the video output "
 "subsystem. You can for example enable video filters, like deinterlacing, "
@@ -896,12 +912,12 @@ msgid ""
 "section."
 msgstr ""
 
-#: src/libvlc.h:178
+#: src/libvlc.h:176
 #, fuzzy
 msgid "Video output module"
 msgstr "¥Ó¥Ç¥ª½ÐÎϥ⥸¥å¡¼¥ë"
 
-#: src/libvlc.h:180
+#: src/libvlc.h:178
 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."
@@ -909,12 +925,12 @@ msgstr ""
 "¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï»ÈÍѤ¹¤ë¥Ó¥Ç¥ª½ÐÎÏÊýË¡¤¬ÁªÂò¤Ç¤­¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¼«Æ°Åª¤ËºÇ"
 "Ŭ¤ÊÊýË¡¤¬ÁªÂò¤µ¤ì¤Þ¤¹¡£"
 
-#: src/libvlc.h:184
+#: src/libvlc.h:182
 #, fuzzy
 msgid "Enable video"
 msgstr "¥Ó¥Ç¥ª¤òÍ­¸ú¤Ë¤¹¤ë"
 
-#: src/libvlc.h:186
+#: src/libvlc.h:184
 #, fuzzy
 msgid ""
 "You can completely disable the video output. In this case the video decoding "
@@ -923,12 +939,12 @@ msgstr ""
 "¥Ó¥Ç¥ª½ÐÎϤò´°Á´¤Ë̵¸ú²½¤·¤Þ¤¹¡£¥Ó¥Ç¥ª¤Ï¥Ç¥³¡¼¥É¤µ¤ì¤Þ¤»¤ó¡£¤³¤ì¤Ë¤è¤ê¡¢¤¤¤¯"
 "¤é¤«¤Î½èÍý¥Ñ¥ï¡¼¤ò¥»¡¼¥Ö¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
 
-#: src/libvlc.h:189 modules/visualization/visual/visual.c:43
+#: src/libvlc.h:187 modules/visualization/visual/visual.c:43
 #, fuzzy
 msgid "Video width"
 msgstr "¥Ó¥Ç¥ª¤ÎÉý"
 
-#: src/libvlc.h:191
+#: src/libvlc.h:189
 #, fuzzy
 msgid ""
 "You can enforce the video width here. By default (-1) VLC will adapt to the "
@@ -937,12 +953,12 @@ msgstr ""
 "¥Ó¥Ç¥ª¤ÎÉý¤ò¶¯À©Åª¤Ë»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£\n"
 "¢¨VLC¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç¥Ó¥Ç¥ª¤ÎÆÃÀ­¤Ë¹ç¤ï¤»¤Þ¤¹¡£"
 
-#: src/libvlc.h:194 modules/visualization/visual/visual.c:47
+#: src/libvlc.h:192 modules/visualization/visual/visual.c:47
 #, fuzzy
 msgid "Video height"
 msgstr "¥Ó¥Ç¥ª¤Î¹â¤µ"
 
-#: src/libvlc.h:196
+#: src/libvlc.h:194
 #, fuzzy
 msgid ""
 "You can enforce the video height here. By default (-1) VLC will adapt to the "
@@ -951,33 +967,33 @@ msgstr ""
 "¥Ó¥Ç¥ª¤Î¹â¤µ¤ò¶¯À©Åª¤Ë»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£\n"
 "¢¨VLC¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç¥Ó¥Ç¥ª¤ÎÆÃÀ­¤Ë¹ç¤ï¤»¤Þ¤¹¡£"
 
-#: src/libvlc.h:199
+#: src/libvlc.h:197
 #, fuzzy
 msgid "Video alignment"
 msgstr "ÀßÄê(_S)"
 
-#: src/libvlc.h:201
+#: src/libvlc.h:199
 msgid ""
 "You can enforce the video alignement 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:205
+#: src/libvlc.h:203
 #, fuzzy
 msgid "Zoom video"
 msgstr "¥Ó¥Ç¥ª¡¦¥º¡¼¥à"
 
-#: src/libvlc.h:207
+#: src/libvlc.h:205
 msgid "You can zoom the video by the specified factor."
 msgstr "Ǥ°Õ¤Ë¥Ó¥Ç¥ª¤ò¥º¡¼¥à¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
 
-#: src/libvlc.h:209
+#: src/libvlc.h:207
 #, fuzzy
 msgid "Grayscale video output"
 msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
 
-#: src/libvlc.h:211
+#: src/libvlc.h:209
 msgid ""
 "When enabled, the color information from the video won't be decoded (this "
 "can also allow you to save some processing power)."
@@ -985,35 +1001,45 @@ msgstr ""
 "¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤È¡¢VLC¤Ï¥«¥é¡¼¾ðÊó¤ò¥Ç¥³¡¼¥É¤·¤Þ¤»¤ó¡£(¤³¤ì¤Ë¤è¤ê¡¢"
 "¤¤¤¯¤é¤«¤Î½èÍý¥Ñ¥ï¡¼¤ò¥»¡¼¥Ö¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£)"
 
-#: src/libvlc.h:214
+#: src/libvlc.h:212
 #, fuzzy
 msgid "Fullscreen video output"
 msgstr "¥Õ¥ë¥¹¥¯¥ê¡¼¥ó½ÐÎÏ"
 
-#: src/libvlc.h:216
+#: src/libvlc.h:214
 msgid ""
 "If this option is enabled, VLC will always start a video in fullscreen mode."
 msgstr ""
 "¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤È¡¢VLC¤Ï¾ï¤Ë¥Ó¥Ç¥ª¤ò¥Õ¥ë¥¹¥¯¥ê¡¼¥ó¡¦¥â¡¼¥É¤Ë¤·¤Þ¤¹¡£"
 
-#: src/libvlc.h:219
+#: src/libvlc.h:217
 #, fuzzy
 msgid "Overlay video output"
 msgstr "¥ª¡¼¥Ð¡¼¥ì¥¤"
 
-#: src/libvlc.h:221
+#: src/libvlc.h:219
 #, fuzzy
 msgid ""
 "If enabled, VLC will try to take advantage of the overlay capabilities of "
 "your graphics card."
 msgstr "VLC¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç¥°¥é¥Õ¥£¥Ã¥¯¥«¡¼¥É¤Î¥ª¡¼¥Ð¥ì¥¤µ¡Ç½¤Î»ÈÍѤò»î¤ß¤Þ¤¹¡£"
 
-#: src/libvlc.h:224
+#: src/libvlc.h:222 modules/video_output/directx/directx.c:242
+#: modules/video_output/x11/xcommon.c:286
+msgid "Always on top"
+msgstr ""
+
+#: src/libvlc.h:223
+#, fuzzy
+msgid "Always place the video window on top of other windows"
+msgstr "¥Ó¥Ç¥ª¤ò¥¯¥í¡¼¥ó¤¹¤ë¤¿¤á¤Ë¥Ó¥Ç¥ª¡¦¥¦¥£¥ó¥É¥¦¿ô¤òÁªÂò¤¹¤ë"
+
+#: src/libvlc.h:226
 #, fuzzy
 msgid "Force SPU position"
 msgstr "¥µ¥Ö¥¿¥¤¥È¥ë¤Î°ÌÃÖ"
 
-#: src/libvlc.h:226
+#: src/libvlc.h:228
 msgid ""
 "You can use this option to place the subtitles under the movie, instead of "
 "over the movie. Try several positions."
@@ -1021,20 +1047,20 @@ msgstr ""
 "¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï±ÇÁüÃæ¤Î¥µ¥Ö¥¿¥¤¥È¥ë¤Î°ÌÃÖ¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£¤¤¤¯¤Ä¤«¤Î°ÌÃÖ¤ò»î"
 "¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: src/libvlc.h:229
+#: src/libvlc.h:231
 msgid "On Screen Display"
 msgstr ""
 
-#: src/libvlc.h:231
+#: src/libvlc.h:233
 msgid "You can disable the messages VLC creates in the video."
 msgstr ""
 
-#: src/libvlc.h:233
+#: src/libvlc.h:235
 #, fuzzy
 msgid "Video filter module"
 msgstr "¥Ó¥Ç¥ª¡¦¥Õ¥£¥ë¥¿¡¼¡¦¥â¥¸¥å¡¼¥ë"
 
-#: src/libvlc.h:235
+#: src/libvlc.h:237
 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."
@@ -1042,12 +1068,12 @@ msgstr ""
 "¥Î¥ó¥¤¥ó¥¿¥ì¡¼¥¹¤Î¥¤¥ó¥¹¥¿¥ó¥¹¤Þ¤¿¤Ï¡¢¥¯¥í¡¼¥ó¡¢ÏѶʲ½¤µ¤ì¤¿¥Ó¥Ç¥ª¡¦¥¦¥£¥ó¥É"
 "¥¦¤Î±ÇÁü¥¯¥©¥ê¥Æ¥£¤Ë¸ú²Ì¤ò²Ã¤¨¤ë¥Õ¥£¥ë¥¿¡¼¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£"
 
-#: src/libvlc.h:239
+#: src/libvlc.h:241
 #, fuzzy
 msgid "Source aspect ratio"
 msgstr "¥½¡¼¥¹¤Î¥¢¥¹¥Ú¥¯¥È¡¦¥ì¥·¥ª"
 
-#: src/libvlc.h:241
+#: src/libvlc.h:243
 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 "
@@ -1061,12 +1087,12 @@ msgstr ""
 "x:y (4:3, 16:9, etc.)¤Î·Á¼°¤Ç¥¢¥¹¥Ú¥¯¥È¤ò»ØÄꤹ¤ë¤«¡¢ÉâÆ°¾®¿ôÅÀÃÍ (1.25, "
 "1.3333, etc.)¤Î·Á¼°¤Ç¥Ô¥¯¥»¥ë¤Î¶ë·Á¤ò»ØÄꤷ¤Þ¤¹¡£"
 
-#: src/libvlc.h:249
+#: src/libvlc.h:251
 #, fuzzy
 msgid "Destination aspect ratio"
 msgstr "Á÷¿®Àè¤Î¥¢¥¹¥Ú¥¯¥È¡¦¥ì¥·¥ª"
 
-#: src/libvlc.h:251
+#: src/libvlc.h:253
 msgid ""
 "This will force the destination pixel size. By default VLC assumes your "
 "pixels are square, unless your hardware has a way to tell it otherwise. This "
@@ -1080,20 +1106,37 @@ msgstr ""
 "¤¹¤ë¤¿¤á¤Ë»ÈÍѤµ¤ì¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£»ØÄê¤Ç¤­¤ë¥Õ¥©¡¼¥Þ¥Ã¥È¤Ï¡¢ÉâÆ°¾®¿ôÅÀÃÍ "
 "(1, 1.25, 1.3333¤Ê¤É)¤Ç¤¹¡£"
 
-#: src/libvlc.h:260
+#: src/libvlc.h:261
+msgid ""
+"These options allow you to modify options related to the input modules, such "
+"as the DVD or VCD device, the network interface settings or the subtitle "
+"channel."
+msgstr ""
+
+#: src/libvlc.h:265
+msgid "Clock reference average counter"
+msgstr ""
+
+#: src/libvlc.h:267
+msgid ""
+"When using the PVR input (or a very irregular source), you should set this "
+"to 10000."
+msgstr ""
+
+#: src/libvlc.h:270
 #, fuzzy
 msgid "Server port"
 msgstr "¥µ¡¼¥Ð¡¼¡¦¥Ý¡¼¥È"
 
-#: src/libvlc.h:262
+#: src/libvlc.h:272
 msgid "This is the port used for UDP streams. By default, we chose 1234."
 msgstr "UDP¥¹¥È¥ê¡¼¥à¤Ç»ÈÍѤµ¤ì¤ë¥Ý¡¼¥È¤ò»ØÄꤷ¤Þ¤¹¡£´ûÄêÃͤÏ1234¤Ç¤¹¡£"
 
-#: src/libvlc.h:264
+#: src/libvlc.h:274
 msgid "MTU of the network interface"
 msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ÎMTU"
 
-#: src/libvlc.h:266
+#: src/libvlc.h:276
 msgid ""
 "This is the typical size of UDP packets that we expect. On Ethernet it is "
 "usually 1500."
@@ -1101,12 +1144,12 @@ msgstr ""
 "´üÂÔ¤¹¤ëŵ·¿Åª¤ÊUDP¥Ñ¥±¥Ã¥È¤Î¥µ¥¤¥º¤Ç¤¹¡£¥¤¡¼¥µ¥Í¥Ã¥È¤Ç¤Ï¡¢¤½¤ÎÃͤϡ¢Ä̾ï1500"
 "¤Ç¤¹¡£"
 
-#: src/libvlc.h:269
+#: src/libvlc.h:279
 #, fuzzy
 msgid "Network interface address"
 msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹"
 
-#: src/libvlc.h:271
+#: src/libvlc.h:281
 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 "
@@ -1116,79 +1159,79 @@ msgstr ""
 "¥ê¥å¡¼¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¾ì¹ç¤Ë¤Ï¡¢¤ª¤½¤é¤¯¡¢IP¥¢¥É¥ì¥¹¤«¥Þ¥ë¥Á¥­¥ã¥¹¥È¤ò¹Ô¤Ã¤Æ"
 "¤¤¤ë¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ò»ØÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£"
 
-#: src/libvlc.h:275
+#: src/libvlc.h:285
 msgid "Time to live"
 msgstr ""
 
-#: src/libvlc.h:277
+#: src/libvlc.h:287
 msgid ""
 "Indicate here the Time To Live of the multicast packets sent by the stream "
 "output."
 msgstr ""
 
-#: src/libvlc.h:280
+#: src/libvlc.h:290
 #, fuzzy
 msgid "Choose program (SID)"
 msgstr "¥×¥í¥°¥é¥à¤ÎÁªÂò (SID)"
 
-#: src/libvlc.h:282
+#: src/libvlc.h:292
 msgid "Choose the program to select by giving its Service ID."
 msgstr "Í¿¤¨¤é¤ì¤¿¥µ¡¼¥Ó¥¹ID¤òÁªÂò¤¹¤ë¤¿¤á¤Î¥×¥í¥°¥é¥à¤ò»ØÄꤷ¤Þ¤¹¡£"
 
-#: src/libvlc.h:284
+#: src/libvlc.h:294
 #, fuzzy
 msgid "Choose audio"
 msgstr "¥ª¡¼¥Ç¥£¥ª¤ÎÁªÂò"
 
-#: src/libvlc.h:286
+#: src/libvlc.h:296
 #, fuzzy
 msgid ""
 "Give the default type of audio you want to use in a DVD. (Developers only)"
 msgstr "DVD¤ÎÃæ¤Ç»ÈÍѤ·¤¿¤¤¥ª¡¼¥Ç¥£¥ª¤Î´ûÄê¤Î¥¿¥¤¥×¤ò»ØÄꤷ¤Þ¤¹¡£"
 
-#: src/libvlc.h:289
+#: src/libvlc.h:299
 #, fuzzy
 msgid "Choose channel"
 msgstr "¥Á¥ã¥ó¥Í¥ë¤ÎÁªÂò"
 
-#: src/libvlc.h:291
+#: src/libvlc.h:301
 msgid ""
 "Give the stream number of the audio channel you want to use in a DVD (from 1 "
 "to n)."
 msgstr ""
 "DVD¤ÎÃæ¤Ç»ÈÍѤ·¤¿¤¤¥ª¡¼¥Ç¥£¥ª¤Î¥Á¥ã¥ó¥Í¥ëÈÖ¹æ¤ò»ØÄꤷ¤Þ¤¹¡£(1¤«¤én¤Þ¤Ç)"
 
-#: src/libvlc.h:294
+#: src/libvlc.h:304
 #, fuzzy
 msgid "Choose subtitles track"
 msgstr "»úËë¤ÎÁªÂò"
 
-#: src/libvlc.h:296
+#: src/libvlc.h:306
 #, fuzzy
 msgid ""
 "Give the stream number of the subtitle channel you want to use (from 1 to n)."
 msgstr "DVD¤ÎÃæ¤Ç»ÈÍѤ·¤¿¤¤»úËë¤Î¥Á¥ã¥ó¥Í¥ëÈÖ¹æ¤ò»ØÄꤷ¤Þ¤¹¡£(1¤«¤én¤Þ¤Ç)"
 
-#: src/libvlc.h:299
+#: src/libvlc.h:309
 #, fuzzy
 msgid "Autodetect subtitle files"
 msgstr "»úËë¤ÎÁªÂò"
 
-#: src/libvlc.h:304
+#: src/libvlc.h:314
 #, fuzzy
 msgid "Subtitle autodection fuzziness"
 msgstr "»úËë"
 
-#: src/libvlc.h:314
+#: src/libvlc.h:324
 #, fuzzy
 msgid "Use subtitle file"
 msgstr "»úËë¤ÎÁªÂò"
 
-#: src/libvlc.h:319
+#: src/libvlc.h:329
 msgid "DVD device"
 msgstr "DVD¥Ç¥Ð¥¤¥¹"
 
-#: src/libvlc.h:322
+#: src/libvlc.h:332
 msgid ""
 "This is the default DVD drive (or file) to use. Don't forget the colon after "
 "the drive letter (eg D:)"
@@ -1196,24 +1239,46 @@ msgstr ""
 "»ÈÍѤ¹¤ë´ûÄê¤ÎDVD¥É¥é¥¤¥Ö(¤Þ¤¿¤Ï¥Õ¥¡¥¤¥ë)¤Ç¤¹¡£¥É¥é¥¤¥Öʸ»ú¤Î¸å¤Ë¥³¥í¥ó¤òÉÕ²Ã"
 "¤¹¤ë¤³¤È¤ò˺¤ì¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£(Îã D:)"
 
-#: src/libvlc.h:326
+#: src/libvlc.h:336
 msgid "This is the default DVD device to use."
 msgstr "DVD¥Ç¥Ð¥¤¥¹¤Î´ûÄêÃͤòÀßÄꤷ¤Þ¤¹¡£"
 
-#: src/libvlc.h:329
+#: src/libvlc.h:339
 msgid "VCD device"
 msgstr "VCD¥Ç¥Ð¥¤¥¹"
 
-#: src/libvlc.h:331
+#: src/libvlc.h:342
+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:346
 msgid "This is the default VCD device to use."
 msgstr "VCD¥Ç¥Ð¥¤¥¹¤Î´ûÄêÃͤò»ØÄꤷ¤Þ¤¹¡£"
 
-#: src/libvlc.h:333
+#: src/libvlc.h:349
+#, fuzzy
+msgid "Audio CD device"
+msgstr "DVD¥Ç¥Ð¥¤¥¹"
+
+#: src/libvlc.h:352
+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:356
+#, fuzzy
+msgid "This is the default Audio CD device to use."
+msgstr "VCD¥Ç¥Ð¥¤¥¹¤Î´ûÄêÃͤò»ØÄꤷ¤Þ¤¹¡£"
+
+#: src/libvlc.h:359 modules/gui/wxwindows/open.cpp:555
 #, fuzzy
 msgid "Force IPv6"
 msgstr "IPv6¤Î»ÈÍÑ"
 
-#: src/libvlc.h:335
+#: src/libvlc.h:361
 msgid ""
 "If you check this box, IPv6 will be used by default for all UDP and HTTP "
 "connections."
@@ -1221,12 +1286,12 @@ msgstr ""
 "¤³¤Î¥Á¥§¥Ã¥¯¥Ü¥Ã¥¯¥¹¤ò¥ª¥ó¤Ë¤¹¤ë¤È¡¢IPv6¤¬¤¹¤Ù¤Æ¤ÎUDP¤ÈHTTP¤ÎÀܳ¤Ç´ûÄêÃͤȤ·"
 "¤Æ»ÈÍѤµ¤ì¤Þ¤¹¡£"
 
-#: src/libvlc.h:338
+#: src/libvlc.h:364
 #, fuzzy
 msgid "Force IPv4"
 msgstr "IPv4¤Î»ÈÍÑ"
 
-#: src/libvlc.h:340
+#: src/libvlc.h:366
 msgid ""
 "If you check this box, IPv4 will be used by default for all UDP and HTTP "
 "connections."
@@ -1234,66 +1299,75 @@ msgstr ""
 "¤³¤Î¥Á¥§¥Ã¥¯¥Ü¥Ã¥¯¥¹¤ò¥ª¥ó¤Ë¤¹¤ë¤È¡¢IPv4¤¬¤¹¤Ù¤Æ¤ÎUDP¤ÈHTTP¤ÎÀܳ¤Ç´ûÄêÃͤȤ·"
 "¤Æ»ÈÍѤµ¤ì¤Þ¤¹¡£"
 
-#: src/libvlc.h:344
+#: src/libvlc.h:370
 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:348
+#: src/libvlc.h:374
 #, fuzzy
 msgid "Choose preferred codecs list"
 msgstr "½àÈ÷¤µ¤ì¤Æ¤¤¤ë¥³¡¼¥Ç¥Ã¥¯¤Î°ìÍ÷¤ÎÁªÂò"
 
-#: src/libvlc.h:350
+#: src/libvlc.h:376
 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:354
+#: src/libvlc.h:380
 #, fuzzy
 msgid "Choose preferred encoders list"
 msgstr "½àÈ÷¤µ¤ì¤Æ¤¤¤ë¥³¡¼¥Ç¥Ã¥¯¤Î°ìÍ÷¤ÎÁªÂò"
 
-#: src/libvlc.h:356
+#: src/libvlc.h:382
 #, fuzzy
 msgid ""
 "This allows you to select a list of encoders that VLC will use in priority"
 msgstr "VLC¤¬ÁªÂò¤¹¤ë¥Ñ¥±¥Ã¥¿¥é¥¤¥¶¡¼¤Î½ç½ø¤òÁªÂò¤·¤Þ¤¹¡£"
 
-#: src/libvlc.h:360
+#: src/libvlc.h:386
 msgid ""
 "These options allow you to set default global options for the stream output "
 "subsystem."
 msgstr ""
 
-#: src/libvlc.h:363
+#: src/libvlc.h:389
 #, fuzzy
 msgid "Choose a stream output"
 msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò"
 
-#: src/libvlc.h:365
+#: src/libvlc.h:391
 msgid "Empty if no stream output."
 msgstr "½ÐÎÏ¥¹¥È¥ê¡¼¥à¤¬¤Ê¤¤¾ì¹ç¡¢¶õ¤Ë¤¹¤ë"
 
-#: src/libvlc.h:367
+#: src/libvlc.h:393
+msgid "Enable streaming of all ES"
+msgstr ""
+
+#: src/libvlc.h:395
+#, fuzzy
+msgid "This allows you to stream all ES (video, audio and subtitles)"
+msgstr "VLC¤¬ÁªÂò¤¹¤ë¥Ñ¥±¥Ã¥¿¥é¥¤¥¶¡¼¤Î½ç½ø¤òÁªÂò¤·¤Þ¤¹¡£"
+
+#: src/libvlc.h:397
 msgid "Display while streaming"
 msgstr ""
 
-#: src/libvlc.h:369
+#: src/libvlc.h:399
 #, fuzzy
 msgid "This allows you to play the stream while streaming it."
 msgstr "VLC¤¬ÁªÂò¤¹¤ë¥Ñ¥±¥Ã¥¿¥é¥¤¥¶¡¼¤Î½ç½ø¤òÁªÂò¤·¤Þ¤¹¡£"
 
-#: src/libvlc.h:371
+#: src/libvlc.h:401
 #, fuzzy
 msgid "Enable video stream output"
 msgstr "¥Ó¥Ç¥ª¡¦¥¹¥È¥ê¡¼¥à¤Î½ÐÎϤòÍ­¸ú¤Ë¤¹¤ë"
 
-#: src/libvlc.h:373 src/libvlc.h:378
+#: src/libvlc.h:403 src/libvlc.h:408
 msgid ""
 "This allows you to choose if the video stream should be redirected to the "
 "stream output facility when this last one is enabled."
@@ -1301,61 +1375,61 @@ msgstr ""
 "¥Ó¥Ç¥ª¡¦¥¹¥È¥ê¡¼¥à½ÐÎϵ¡¹½¤ÎºÇ¸å¤Î¤â¤Î¤¬Í­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤È¥Ó¥Ç¥ª¡¦¥¹¥È¥ê¡¼¥à"
 "¤¬½ÐÎϵ¡¹½¤Ë¥ê¥À¥¤¥ì¥¯¥È¤µ¤ì¤ë¤Ù¤­¾ì¹ç¡¢ÁªÂò²Äǽ¤Ç¤¹¡£"
 
-#: src/libvlc.h:376
+#: src/libvlc.h:406
 #, fuzzy
 msgid "Enable audio stream output"
 msgstr "¥ª¡¼¥Ç¥£¥ª¡¦¥¹¥È¥ê¡¼¥à¤Î½ÐÎϤòÍ­¸ú¤Ë¤¹¤ë"
 
-#: src/libvlc.h:381
+#: src/libvlc.h:411
 msgid "Keep sout open"
 msgstr ""
 
-#: src/libvlc.h:383
+#: src/libvlc.h:413
 msgid ""
 "This allows you to keep an unique sout instance across multiple playlist "
 "item (automatically insert gather stream_out if not specified)"
 msgstr ""
 
-#: src/libvlc.h:387
+#: src/libvlc.h:417
 #, fuzzy
 msgid "Choose preferred packetizer list"
 msgstr "½àÈ÷¤µ¤ì¤Æ¤¤¤ë¥Ñ¥±¥Ã¥¿¥é¥¤¥¶¡¼°ìÍ÷¤ÎÁªÂò"
 
-#: src/libvlc.h:389
+#: src/libvlc.h:419
 msgid ""
 "This allows you to select the order in which VLC will choose its packetizers."
 msgstr "VLC¤¬ÁªÂò¤¹¤ë¥Ñ¥±¥Ã¥¿¥é¥¤¥¶¡¼¤Î½ç½ø¤òÁªÂò¤·¤Þ¤¹¡£"
 
-#: src/libvlc.h:392
+#: src/libvlc.h:422
 #, fuzzy
 msgid "Mux module"
 msgstr "mux¥â¥¸¥å¡¼¥ë"
 
-#: src/libvlc.h:394
+#: src/libvlc.h:424
 msgid "This is a legacy entry to let you configure mux modules"
 msgstr "mux¥â¥¸¥å¡¼¥ë¤òÀßÄꤹ¤ë¥ì¥¬¥·¡¼¡¦¥¨¥ó¥È¥ê¤Ç¤¹¡£"
 
-#: src/libvlc.h:396
+#: src/libvlc.h:426
 #, fuzzy
 msgid "Access output module"
 msgstr "¥ª¡¼¥Ç¥£¥ª½ÐÎϥ⥸¥å¡¼¥ë"
 
-#: src/libvlc.h:398
+#: src/libvlc.h:428
 msgid "This is a legacy entry to let you configure access output modules"
 msgstr "¥¢¥¯¥»¥¹½ÐÎϥ⥸¥å¡¼¥ë¤òÀßÄꤹ¤ë¥ì¥¬¥·¡¼¡¦¥¨¥ó¥È¥ê¤Ç¤¹¡£"
 
-#: src/libvlc.h:401
+#: src/libvlc.h:431
 msgid ""
 "These options allow you to enable special CPU optimizations.\n"
 "You should always leave all these enabled."
 msgstr ""
 
-#: src/libvlc.h:404
+#: src/libvlc.h:434
 #, fuzzy
 msgid "Enable CPU MMX support"
 msgstr "CPU¤ÎMMX¥µ¥Ý¡¼¥È¤ò̵¸ú¤Ë¤¹¤ë"
 
-#: src/libvlc.h:406
+#: src/libvlc.h:436
 msgid ""
 "If your processor supports the MMX instructions set, VLC can take advantage "
 "of them."
@@ -1363,12 +1437,12 @@ msgstr ""
 "¥×¥í¥»¥Ã¥µ¤¬MMX¤Îµ¡Ç½¥»¥Ã¥È¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢VLC¤Ï¤½¤Î¥¢¥É¥Ð¥ó¥Æ¡¼"
 "¥¸¤òÍøÍѤǤ­¤Þ¤¹¡£"
 
-#: src/libvlc.h:409
+#: src/libvlc.h:439
 #, fuzzy
 msgid "Enable CPU 3D Now! support"
 msgstr "CPU¤Î3D Now!¥µ¥Ý¡¼¥È¤ò̵¸ú¤Ë¤¹¤ë"
 
-#: src/libvlc.h:411
+#: src/libvlc.h:441
 msgid ""
 "If your processor supports the 3D Now! instructions set, VLC can take "
 "advantage of them."
@@ -1376,12 +1450,12 @@ msgstr ""
 "¥×¥í¥»¥Ã¥µ¤¬3D Now!µ¡Ç½¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢VLC¤Ï¤½¤Î¥¢¥É¥Ð¥ó¥Æ¡¼¥¸¤ò"
 "ÍøÍѤǤ­¤Þ¤¹¡£"
 
-#: src/libvlc.h:414
+#: src/libvlc.h:444
 #, fuzzy
 msgid "Enable CPU MMX EXT support"
 msgstr "CPU¤ÎMMX³ÈÄ¥µ¡Ç½¥µ¥Ý¡¼¥È¤ò̵¸ú¤Ë¤¹¤ë"
 
-#: src/libvlc.h:416
+#: src/libvlc.h:446
 msgid ""
 "If your processor supports the MMX EXT instructions set, VLC can take "
 "advantage of them."
@@ -1389,12 +1463,12 @@ msgstr ""
 "¥×¥í¥»¥Ã¥µ¤¬MMX¤Î³ÈÄ¥µ¡Ç½¥»¥Ã¥È¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢VLC¤Ï¤½¤Î¥¢¥É¥Ð¥ó"
 "¥Æ¡¼¥¸¤òÍøÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
 
-#: src/libvlc.h:419
+#: src/libvlc.h:449
 #, fuzzy
 msgid "Enable CPU SSE support"
 msgstr "CPU¤ÎSSE¥µ¥Ý¡¼¥È¤ò̵¸ú¤Ë¤¹¤ë"
 
-#: src/libvlc.h:421
+#: src/libvlc.h:451
 msgid ""
 "If your processor supports the SSE instructions set, VLC can take advantage "
 "of them."
@@ -1402,12 +1476,12 @@ msgstr ""
 "¥×¥í¥»¥Ã¥µ¤¬SSE¤Îµ¡Ç½¥»¥Ã¥È¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢VLC¤Ï¤½¤Î¥¢¥É¥Ð¥ó¥Æ¡¼"
 "¥¸¤òÍøÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
 
-#: src/libvlc.h:424
+#: src/libvlc.h:454
 #, fuzzy
 msgid "Enable CPU AltiVec support"
 msgstr "CPU¤ÎAltiVec¥µ¥Ý¡¼¥È¤ò̵¸ú¤Ë¤¹¤ë"
 
-#: src/libvlc.h:426
+#: src/libvlc.h:456
 msgid ""
 "If your processor supports the AltiVec instructions set, VLC can take "
 "advantage of them."
@@ -1415,18 +1489,18 @@ msgstr ""
 "¥×¥í¥»¥Ã¥µ¤¬AltiVec¤Îµ¡Ç½¥»¥Ã¥È¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢¤½¤Î¥¢¥É¥Ð¥ó¥Æ¡¼¥¸"
 "¤òÍøÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
 
-#: src/libvlc.h:430
+#: src/libvlc.h:460
 msgid ""
-"These options define the behaviour of the playlist. Some of them can be "
+"These options define the behavior of the playlist. Some of them can be "
 "overriden in the playlist dialog box."
 msgstr ""
 
-#: src/libvlc.h:433
+#: src/libvlc.h:463
 #, fuzzy
 msgid "Play files randomly forever"
 msgstr "¥Õ¥¡¥¤¥ë¤ò¥é¥ó¥À¥à¤ËºÆÀ¸"
 
-#: src/libvlc.h:435
+#: src/libvlc.h:465
 msgid ""
 "When selected, VLC will randomly play files in the playlist until "
 "interrupted."
@@ -1434,41 +1508,41 @@ msgstr ""
 "¤³¤Î¥ª¥×¥·¥ç¥ó¤¬ÁªÂò¤µ¤ì¤ë¤ÈVLC¤Ï¥×¥ì¥¤¥ê¥¹¥È¤Î¥Õ¥¡¥¤¥ë¤ò¥é¥ó¥À¥à¤ËºÆÀ¸¤·¤Þ"
 "¤¹¡£"
 
-#: src/libvlc.h:438
+#: src/libvlc.h:468
 #, fuzzy
 msgid "Loop playlist on end"
 msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ÎºÇ¸å¤Ç¥ë¡¼¥×"
 
-#: src/libvlc.h:440
+#: src/libvlc.h:470
 msgid ""
 "If you want VLC to keep playing the playlist indefinitely then enable this "
 "option."
 msgstr ""
 "¥×¥ì¥¤¥ê¥¹¥È¤ÎºÆÀ¸¤ò·«¤êÊÖ¤·¤Æ¹Ô¤¤¤¿¤¤¾ì¹ç¤Ë¤Ï¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤òÁªÂò¤·¤Þ¤¹¡£"
 
-#: src/libvlc.h:443
+#: src/libvlc.h:473
 #, fuzzy
 msgid "Repeat the current playlistitem"
 msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
 
-#: src/libvlc.h:445
+#: src/libvlc.h:475
 msgid ""
 "When this is active VLC will keep playing the current playlistitem over and "
 "over again."
 msgstr ""
 
-#: src/libvlc.h:449
+#: src/libvlc.h:479
 msgid ""
 "These options allow you to select default modules. Leave these alone unless "
 "you really know what you are doing."
 msgstr ""
 
-#: src/libvlc.h:452
+#: src/libvlc.h:482
 #, fuzzy
 msgid "Memory copy module"
 msgstr "¥á¥â¥ê¡¼¡¦¥³¥Ô¡¼¡¦¥â¥¸¥å¡¼¥ë"
 
-#: src/libvlc.h:454
+#: src/libvlc.h:484
 msgid ""
 "You can select which memory copy module you want to use. By default VLC will "
 "select the fastest one supported by your hardware."
@@ -1476,29 +1550,29 @@ msgstr ""
 "»ÈÍѤ·¤¿¤¤¥á¥â¥ê¡¼¡¦¥³¥Ô¡¼¡¦¥â¥¸¥å¡¼¥ë¤òÁªÂò¤·¤Þ¤¹¡£VLC¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç¥Ï¡¼¥É"
 "¥¦¥§¥¢¤¬¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ëºÇ¤â®¤¤¤â¤Î¤òÁªÂò¤·¤Þ¤¹¡£"
 
-#: src/libvlc.h:457
+#: src/libvlc.h:487
 #, fuzzy
 msgid "Access module"
 msgstr "¥¢¥¯¥»¥¹¡¦¥â¥¸¥å¡¼¥ë"
 
-#: src/libvlc.h:459
+#: src/libvlc.h:489
 msgid "This is a legacy entry to let you configure access modules"
 msgstr "¥¢¥¯¥»¥¹¡¦¥â¥¸¥å¡¼¥ë¤òÁªÂò¤¹¤ë¥ì¥¬¥·¡¼¡¦¥¨¥ó¥È¥ê¤Ç¤¹¡£"
 
-#: src/libvlc.h:461
+#: src/libvlc.h:491
 #, fuzzy
 msgid "Demux module"
 msgstr "demux¥â¥¸¥å¡¼¥ë"
 
-#: src/libvlc.h:463
+#: src/libvlc.h:493
 msgid "This is a legacy entry to let you configure demux modules"
 msgstr "demux¥â¥¸¥å¡¼¥ë¤òÁªÂò¤¹¤ë¥ì¥¬¥·¡¼¡¦¥¨¥ó¥È¥ê¤Ç¤¹¡£"
 
-#: src/libvlc.h:465
+#: src/libvlc.h:495
 msgid "Allow VLC to run with a real-time priority"
 msgstr ""
 
-#: src/libvlc.h:467
+#: src/libvlc.h:497
 msgid ""
 "Running VLC in real-time priority will allow for much more precise "
 "scheduling and yield better, especially when streaming content. It can "
@@ -1506,11 +1580,15 @@ msgid ""
 "only activate this if you know what you're doing."
 msgstr ""
 
-#: src/libvlc.h:473
+#: src/libvlc.h:503 src/libvlc.h:504
+msgid "Minimize number of threads needed to run VLC"
+msgstr ""
+
+#: src/libvlc.h:506
 msgid "Allow only one running instance of VLC"
 msgstr ""
 
-#: src/libvlc.h:475
+#: src/libvlc.h:508
 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 "
@@ -1519,11 +1597,11 @@ msgid ""
 "running instance or enqueue it."
 msgstr ""
 
-#: src/libvlc.h:481
+#: src/libvlc.h:514
 msgid "Increase the priority of the process"
 msgstr ""
 
-#: src/libvlc.h:483
+#: src/libvlc.h:516
 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 "
@@ -1533,12 +1611,12 @@ msgid ""
 "require a reboot of your machine."
 msgstr ""
 
-#: src/libvlc.h:490
+#: src/libvlc.h:523
 #, fuzzy
 msgid "Fast mutex on NT/2K/XP (developers only)"
 msgstr "¹â®mutex¤Î»ÈÍÑ NT/2K/XP (³«È¯¼Ô¸þ¤±)"
 
-#: src/libvlc.h:492
+#: src/libvlc.h:525
 msgid ""
 "On Windows NT/2K/XP we use a slow mutex implementation but which allows us "
 "to correctely implement condition variables. You can also use the faster "
@@ -1548,301 +1626,424 @@ msgstr ""
 "¤·¡¢¤è¤ê®¤¤mutex¤Î¼ÂÁõ¤ò»ÈÍѤ¹¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡£¤½¤Î¾ì¹ç¡¢ÌäÂ꤬ȯÀ¸¤¹¤ë²Äǽ"
 "À­¤¬¤¢¤ê¤Þ¤¹¡£"
 
-#: src/libvlc.h:497
+#: src/libvlc.h:530
 msgid "Condition variables implementation for Win9x (developers only)"
 msgstr "Win9x¸þ¤±¾ò·ïÃͤμÂÁõ (³«È¯¼Ô¸þ¤±)"
 
-#: src/libvlc.h:500
+#: src/libvlc.h:533
+#, fuzzy
 msgid ""
-"On Windows 9x/Me we use a fast but not correct condition variables "
+"On Windows 9x/Me you can use a fast but incorrect condition variables "
 "implementation (more precisely there is a possibility for a race condition "
-"to happen). However it is possible to use slower alternatives which should "
-"be more robust. Currently you can choose between implementation 0 (which is "
-"the default and the fastest), 1 and 2."
+"to happen). However it is possible to use slower alternatives which are more "
+"robust. Currently you can choose between implementation 0 (which is the "
+"fastest but slightly incorrect), 1 (default) and 2."
 msgstr ""
 "Windows 9x/Me¾å¤Ç¹â®¤Ç¤¹¤¬¡¢Àµ¤·¤¯¤Ê¤¤¾ò·ïÃͤμÂÁõ(¤è¤êÀµ³Î¤Ë¤Ï¶¥¹ç¤¬È¯À¸¤¹"
 "¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹)¤ò»ÈÍѤ·¤Þ¤¹¡£¤·¤«¤·¡¢ÂåÂؤ¨¤È¤Ê¤ëÃÙ¤¯¤Æ¤â°ÂÄꤷ¤¿¼ÂÁõ¤òÁª"
 "Âò¤¹¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡£¸½»þÅÀ¤Ç¤Ï¡¢0(´ûÄêÃͤκÇ®¤Î¤â¤Î), 1, 2¤¬ÁªÂò²Äǽ¤Ç¤¹¡£"
 
-#: src/libvlc.h:510 src/video_output/video_output.c:413
-#: modules/gui/beos/VideoOutput.cpp:1182 modules/gui/macosx/applescript.m:122
-#: modules/gui/macosx/controls.m:702 modules/gui/macosx/intf.m:439
-#: modules/gui/macosx/intf.m:507
+#: src/libvlc.h:541
+msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
+msgstr ""
+
+#: src/libvlc.h:544 src/video_output/video_output.c:413
+#: modules/gui/beos/VideoOutput.cpp:1202 modules/gui/macosx/applescript.m:122
+#: modules/gui/macosx/controls.m:704 modules/gui/macosx/intf.m:450
+#: modules/gui/macosx/intf.m:518
 msgid "Fullscreen"
 msgstr "Á´²èÌ̲½"
 
-#: src/libvlc.h:511
+#: src/libvlc.h:545
 msgid "Select the hotkey to use to swap fullscreen state"
 msgstr ""
 
-#: src/libvlc.h:512
+#: src/libvlc.h:546
 #, fuzzy
 msgid "Play/Pause"
 msgstr "°ì»þÄä»ß"
 
-#: src/libvlc.h:513
+#: src/libvlc.h:547
 msgid "Select the hotkey to use to swap paused state"
 msgstr ""
 
-#: src/libvlc.h:514
+#: src/libvlc.h:548
 #, fuzzy
 msgid "Pause only"
 msgstr "°ì»þÄä»ß"
 
-#: src/libvlc.h:515
+#: src/libvlc.h:549
 msgid "Select the hotkey to use to pause"
 msgstr ""
 
-#: src/libvlc.h:516
+#: src/libvlc.h:550
 #, fuzzy
 msgid "Play only"
 msgstr "¥¹¥í¡¼ºÆÀ¸"
 
-#: src/libvlc.h:517
+#: src/libvlc.h:551
 msgid "Select the hotkey to use to play"
 msgstr ""
 
-#: src/libvlc.h:518 modules/gui/macosx/controls.m:111
-#: modules/gui/macosx/controls.m:623 modules/gui/macosx/intf.m:473
-#: modules/gui/wxwindows/interface.cpp:447
+#: src/libvlc.h:552 modules/gui/macosx/controls.m:111
+#: modules/gui/macosx/controls.m:625 modules/gui/macosx/intf.m:484
+#: modules/gui/wxwindows/interface.cpp:429
 msgid "Faster"
 msgstr "ÁáÁ÷¤ê"
 
-#: src/libvlc.h:519
+#: src/libvlc.h:553
 msgid "Select the hotkey to use for fast forward playback"
 msgstr ""
 
-#: src/libvlc.h:520 modules/gui/macosx/controls.m:126
-#: modules/gui/macosx/controls.m:624 modules/gui/macosx/intf.m:474
-#: modules/gui/wxwindows/interface.cpp:445
+#: src/libvlc.h:554 modules/gui/macosx/controls.m:126
+#: modules/gui/macosx/controls.m:626 modules/gui/macosx/intf.m:485
+#: modules/gui/wxwindows/interface.cpp:427
 msgid "Slower"
 msgstr "¥¹¥í¡¼"
 
-#: src/libvlc.h:521
+#: src/libvlc.h:555
 msgid "Select the hotkey to use for slow motion playback"
 msgstr ""
 
-#: src/libvlc.h:522 modules/gui/gtk/gnome_interface.c:667
+#: src/libvlc.h:556 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/macosx/controls.m:153
-#: modules/gui/macosx/controls.m:645 modules/gui/macosx/intf.m:438
-#: modules/gui/macosx/intf.m:476 modules/gui/macosx/intf.m:538
-#: modules/gui/wxwindows/interface.cpp:443
+#: modules/gui/macosx/controls.m:647 modules/gui/macosx/intf.m:449
+#: modules/gui/macosx/intf.m:487 modules/gui/macosx/intf.m:549
+#: modules/gui/wxwindows/interface.cpp:425
 msgid "Next"
 msgstr "¼¡"
 
-#: src/libvlc.h:523
+#: src/libvlc.h:557
 msgid "Select the hotkey to use to skip to the next item in the playlist"
 msgstr ""
 
-#: src/libvlc.h:524 modules/gui/macosx/controls.m:140
-#: modules/gui/macosx/controls.m:644 modules/gui/macosx/intf.m:433
-#: modules/gui/macosx/intf.m:475 modules/gui/macosx/intf.m:539
+#: src/libvlc.h:558 modules/gui/macosx/controls.m:140
+#: modules/gui/macosx/controls.m:646 modules/gui/macosx/intf.m:444
+#: modules/gui/macosx/intf.m:486 modules/gui/macosx/intf.m:550
 msgid "Previous"
 msgstr "Á°¤Î¥Õ¥¡¥¤¥ë"
 
-#: src/libvlc.h:525
+#: src/libvlc.h:559
 msgid "Select the hotkey to use to skip to the previous item in the playlist"
 msgstr ""
 
-#: src/libvlc.h:526 modules/gui/gtk/gnome_interface.c:566
+#: src/libvlc.h:560 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:95
-#: modules/gui/macosx/controls.m:637 modules/gui/macosx/intf.m:436
-#: modules/gui/macosx/intf.m:472 modules/gui/macosx/intf.m:537
-#: modules/gui/pda/interface.c:205 modules/gui/pda/pda_interface.c:264
-#: modules/gui/pda/pda_interface.c:265 modules/gui/wxwindows/interface.cpp:434
+#: modules/gui/macosx/controls.m:639 modules/gui/macosx/intf.m:447
+#: modules/gui/macosx/intf.m:483 modules/gui/macosx/intf.m:548
+#: modules/gui/pda/pda_interface.c:267 modules/gui/pda/pda_interface.c:268
+#: modules/gui/wxwindows/interface.cpp:415
 msgid "Stop"
 msgstr "Ää»ß"
 
-#: src/libvlc.h:527
+#: src/libvlc.h:561
 msgid "Select the hotkey to stop the playback"
 msgstr ""
 
-#: src/libvlc.h:529
-msgid "Jump backward 10 seconds"
+#: src/libvlc.h:562 modules/gui/macosx/intf.m:452
+#, fuzzy
+msgid "Position"
+msgstr "¶ËÀ­"
+
+#: src/libvlc.h:563
+msgid "Select the hotkey to display the position"
 msgstr ""
 
-#: src/libvlc.h:530
-msgid "Select the hotkey to jump backward by 10 seconds"
+#: src/libvlc.h:565
+msgid "Jump 10 seconds backwards"
 msgstr ""
 
-#: src/libvlc.h:532
-msgid "Jump backward 1 minute"
+#: src/libvlc.h:566
+msgid "Select the hotkey to jump 10 seconds backwards"
 msgstr ""
 
-#: src/libvlc.h:533
-msgid "Select the hotkey to jump backward by 1 minute"
+#: src/libvlc.h:568
+msgid "Jump 1 minute backwards"
+msgstr ""
+
+#: src/libvlc.h:569
+msgid "Select the hotkey to jump 1 minute backwards"
 msgstr ""
 
-#: src/libvlc.h:534
-msgid "Jump backward 5 minutes"
+#: src/libvlc.h:570
+msgid "Jump 5 minutes backwards"
 msgstr ""
 
-#: src/libvlc.h:535
-msgid "Select the hotkey to jump backward by 5 minutes"
+#: src/libvlc.h:571
+msgid "Select the hotkey to jump 5 minutes backwards"
 msgstr ""
 
-#: src/libvlc.h:536
-msgid "Jump forward 10 seconds"
+#: src/libvlc.h:572
+msgid "Jump 10 seconds forward"
 msgstr ""
 
-#: src/libvlc.h:537
-msgid "Select the hotkey to jump forward by 10 seconds"
+#: src/libvlc.h:573
+msgid "Select the hotkey to jump 10 seconds forward"
 msgstr ""
 
-#: src/libvlc.h:539
-msgid "Jump forward 1 minute"
+#: src/libvlc.h:575
+msgid "Jump 1 minute forward"
 msgstr ""
 
-#: src/libvlc.h:540
-msgid "Select the hotkey to jump forward by 1 minute"
+#: src/libvlc.h:576
+msgid "Select the hotkey to jump 1 minute forward"
 msgstr ""
 
-#: src/libvlc.h:542
-msgid "Jump forward 5 minutes"
+#: src/libvlc.h:578
+msgid "Jump 5 minutes forward"
 msgstr ""
 
-#: src/libvlc.h:543
-msgid "Select the hotkey to jump forward by 5 minutes"
+#: src/libvlc.h:579
+msgid "Select the hotkey to jump 5 minutes forward"
 msgstr ""
 
-#: src/libvlc.h:545 modules/control/hotkeys.c:199
+#: src/libvlc.h:581 modules/control/hotkeys.c:235
 #: modules/control/lirc/lirc.c:193 modules/gui/beos/InterfaceWindow.cpp:253
 #, fuzzy
 msgid "Quit"
 msgstr "VLC¤ò½ªÎ»"
 
-#: src/libvlc.h:546
+#: src/libvlc.h:582
 msgid "Select the hotkey to quit the application"
 msgstr ""
 
-#: src/libvlc.h:547
+#: src/libvlc.h:583
 #, fuzzy
 msgid "Navigate up"
 msgstr "¥Ê¥Ó¥²¡¼¥·¥ç¥ó(_N)"
 
-#: src/libvlc.h:548
+#: src/libvlc.h:584
 msgid "Select the key to move the selector up in dvd menus"
 msgstr ""
 
-#: src/libvlc.h:549
+#: src/libvlc.h:585
 #, fuzzy
 msgid "Navigate down"
 msgstr "¥Ê¥Ó¥²¡¼¥·¥ç¥ó(_N)"
 
-#: src/libvlc.h:550
+#: src/libvlc.h:586
 msgid "Select the key to move the selector down in dvd menus"
 msgstr ""
 
-#: src/libvlc.h:551
+#: src/libvlc.h:587
 #, fuzzy
 msgid "Navigate left"
 msgstr "¥Ê¥Ó¥²¡¼¥·¥ç¥ó(_N)"
 
-#: src/libvlc.h:552
+#: src/libvlc.h:588
 msgid "Select the key to move the selector left in dvd menus"
 msgstr ""
 
-#: src/libvlc.h:553
+#: src/libvlc.h:589
 #, fuzzy
 msgid "Navigate right"
 msgstr "¥Ê¥Ó¥²¡¼¥·¥ç¥ó(_N)"
 
-#: src/libvlc.h:554
+#: src/libvlc.h:590
 msgid "Select the key to move the selector right in dvd menus"
 msgstr ""
 
-#: src/libvlc.h:555
+#: src/libvlc.h:591
 msgid "Activate"
 msgstr ""
 
-#: src/libvlc.h:556
+#: src/libvlc.h:592
 msgid "Select the key to activate selected item in dvd menus"
 msgstr ""
 
-#: src/libvlc.h:557
+#: src/libvlc.h:593
 #, fuzzy
 msgid "Volume up"
 msgstr "¥Ü¥ê¥å¡¼¥à¤ò¾å¤²¤ë"
 
-#: src/libvlc.h:558
+#: src/libvlc.h:594
 msgid "Select the key to turn up audio volume"
 msgstr ""
 
-#: src/libvlc.h:559
+#: src/libvlc.h:595
 #, fuzzy
 msgid "Volume down"
 msgstr "¥Ü¥ê¥å¡¼¥à¤ò²¼¤²¤ë"
 
-#: src/libvlc.h:560
+#: src/libvlc.h:596
 msgid "Select the key to turn down audio volume"
 msgstr ""
 
-#: src/libvlc.h:562
-#, fuzzy
-msgid ""
-"\n"
-"Playlist items:\n"
-"  *.mpg, *.vob                   plain MPEG-1/2 files\n"
-"  [dvd:][device][@raw_device][@[title][,[chapter][,angle]]]\n"
-"                                 DVD device\n"
-"  [vcd:][device][@[title][,[chapter]]\n"
-"                                 VCD device\n"
-"  udpstream:[@[<bind address>][:<bind port>]]\n"
-"                                 UDP stream sent by a streaming server\n"
-"  vlc:pause                      pause execution of playlist items\n"
-"  vlc:quit                       quit VLC\n"
+#: src/libvlc.h:597 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:700
+#: modules/gui/macosx/intf.m:503
+msgid "Mute"
+msgstr "¥ß¥å¡¼¥È¤¹¤ë"
+
+#: src/libvlc.h:598
+msgid "Select the key to turn off audio volume"
 msgstr ""
-"\n"
-"¥×¥ì¥¤¥ê¥¹¥È ¹àÌÜ:\n"
-"*.mpg, *.vob                     MPEG-1/2¥Õ¥¡¥¤¥ë\n"
-"  [dvd:][device][@raw_device][@[title][,[chapter][,angle]]]\n"
-"                                 DVD¥Ç¥Ð¥¤¥¹\n"
-"  [vcd:][device][@[title][,[chapter]]\n"
-"                                 VCD¥Ç¥Ð¥¤¥¹\n"
-"  udpstream:[@[<bind address>][:<bind port>]]\n"
-"                                 VLS¤«¤éÁ÷¿®¤µ¤ì¤¿UDP¥¹¥È¥ê¡¼¥à\n"
-"  vlc:pause                      ¥×¥ì¥¤¥ê¥¹¥È¤Î¹àÌܤκÆÀ¸Ää»ß\n"
-"  vlc:quit                       VLC¤ò½ªÎ»\n"
 
-#: src/libvlc.h:592 modules/misc/dummy/dummy.c:58
-msgid "Interface"
-msgstr "¥¤¥ó¥¿¥Õ¥§¡¼¥¹"
+#: src/libvlc.h:599
+msgid "Play playlist bookmark 1"
+msgstr ""
+
+#: src/libvlc.h:600
+msgid "Play playlist bookmark 2"
+msgstr ""
+
+#: src/libvlc.h:601
+msgid "Play playlist bookmark 3"
+msgstr ""
+
+#: src/libvlc.h:602
+msgid "Play playlist bookmark 4"
+msgstr ""
+
+#: src/libvlc.h:603
+msgid "Play playlist bookmark 5"
+msgstr ""
+
+#: src/libvlc.h:604
+msgid "Play playlist bookmark 6"
+msgstr ""
+
+#: src/libvlc.h:605
+msgid "Play playlist bookmark 7"
+msgstr ""
+
+#: src/libvlc.h:606
+msgid "Play playlist bookmark 8"
+msgstr ""
+
+#: src/libvlc.h:607
+msgid "Play playlist bookmark 9"
+msgstr ""
+
+#: src/libvlc.h:608
+msgid "Play playlist bookmark 10"
+msgstr ""
+
+#: src/libvlc.h:609
+msgid "Select the key to play this bookmark"
+msgstr ""
+
+#: src/libvlc.h:610
+#, fuzzy
+msgid "Set playlist bookmark 1"
+msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
+
+#: src/libvlc.h:611
+#, fuzzy
+msgid "Set playlist bookmark 2"
+msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
+
+#: src/libvlc.h:612
+#, fuzzy
+msgid "Set playlist bookmark 3"
+msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
+
+#: src/libvlc.h:613
+#, fuzzy
+msgid "Set playlist bookmark 4"
+msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
+
+#: src/libvlc.h:614
+#, fuzzy
+msgid "Set playlist bookmark 5"
+msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
+
+#: src/libvlc.h:615
+#, fuzzy
+msgid "Set playlist bookmark 6"
+msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
+
+#: src/libvlc.h:616
+#, fuzzy
+msgid "Set playlist bookmark 7"
+msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
+
+#: src/libvlc.h:617
+#, fuzzy
+msgid "Set playlist bookmark 8"
+msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
+
+#: src/libvlc.h:618
+#, fuzzy
+msgid "Set playlist bookmark 9"
+msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
+
+#: src/libvlc.h:619
+#, fuzzy
+msgid "Set playlist bookmark 10"
+msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
+
+#: src/libvlc.h:620
+msgid "Select the key to set this playlist bookmark"
+msgstr ""
+
+#: src/libvlc.h:622
+#, fuzzy
+msgid ""
+"\n"
+"Playlist items:\n"
+"  *.mpg, *.vob                   plain MPEG-1/2 files\n"
+"  [dvd:][device][@raw_device][@[title][,[chapter][,angle]]]\n"
+"                                 DVD device\n"
+"  [vcd:][device][@[title][,[chapter]]\n"
+"                                 VCD device\n"
+"  udpstream:[@[<bind address>][:<bind port>]]\n"
+"                                 UDP stream sent by a streaming server\n"
+"  vlc:pause                      pause execution of playlist items\n"
+"  vlc:quit                       quit VLC\n"
+msgstr ""
+"\n"
+"¥×¥ì¥¤¥ê¥¹¥È ¹àÌÜ:\n"
+"*.mpg, *.vob                     MPEG-1/2¥Õ¥¡¥¤¥ë\n"
+"  [dvd:][device][@raw_device][@[title][,[chapter][,angle]]]\n"
+"                                 DVD¥Ç¥Ð¥¤¥¹\n"
+"  [vcd:][device][@[title][,[chapter]]\n"
+"                                 VCD¥Ç¥Ð¥¤¥¹\n"
+"  udpstream:[@[<bind address>][:<bind port>]]\n"
+"                                 VLS¤«¤éÁ÷¿®¤µ¤ì¤¿UDP¥¹¥È¥ê¡¼¥à\n"
+"  vlc:pause                      ¥×¥ì¥¤¥ê¥¹¥È¤Î¹àÌܤκÆÀ¸Ää»ß\n"
+"  vlc:quit                       VLC¤ò½ªÎ»\n"
+
+#: src/libvlc.h:652 modules/misc/dummy/dummy.c:63
+msgid "Interface"
+msgstr "¥¤¥ó¥¿¥Õ¥§¡¼¥¹"
 
-#: src/libvlc.h:667 modules/access/dvb/qpsk.c:103
+#: src/libvlc.h:728 modules/access/dvb/qpsk.c:103
 #: modules/access/satellite/satellite.c:72
 msgid "Input"
 msgstr "ÆþÎÏ"
 
-#: src/libvlc.h:698
+#: src/libvlc.h:762
 msgid "Decoders"
 msgstr "¥Ç¥³¡¼¥À"
 
-#: src/libvlc.h:704 modules/gui/gtk/gnome_interface.c:2042
-#: modules/gui/gtk/gtk_interface.c:2361 modules/gui/gtk/gtk_interface.c:3034
-#: modules/gui/wxwindows/open.cpp:279 modules/gui/wxwindows/streamout.cpp:145
+#: src/libvlc.h:768 modules/gui/gtk/gnome_interface.c:2051
+#: modules/gui/gtk/gtk_interface.c:2370 modules/gui/gtk/gtk_interface.c:3046
+#: modules/gui/wxwindows/open.cpp:287 modules/gui/wxwindows/streamout.cpp:151
 msgid "Stream output"
 msgstr "¥¹¥È¥ê¡¼¥à½ÐÎÏ"
 
-#: src/libvlc.h:726
+#: src/libvlc.h:791
 msgid "CPU"
 msgstr ""
 
-#: src/libvlc.h:738 modules/gui/beos/InterfaceWindow.cpp:206
+#: src/libvlc.h:803 modules/gui/beos/InterfaceWindow.cpp:206
 #: modules/gui/gtk/gnome_interface.c:643
-#: modules/gui/gtk/gnome_interface.c:2384
-#: modules/gui/gtk/gnome_interface.c:2409 modules/gui/gtk/gtk_interface.c:747
-#: modules/gui/gtk/gtk_interface.c:2697 modules/gui/macosx/intf.m:432
-#: modules/gui/macosx/intf.m:522 modules/gui/macosx/playlist.m:137
-#: modules/gui/pda/interface.c:612 modules/gui/pda/pda_interface.c:1168
-#: modules/gui/wxwindows/interface.cpp:439
-#: modules/gui/wxwindows/playlist.cpp:146
+#: 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:533
+#: modules/gui/macosx/playlist.m:141 modules/gui/macosx/playlist.m:152
+#: modules/gui/pda/pda_interface.c:1210
+#: modules/gui/wxwindows/interface.cpp:421
+#: modules/gui/wxwindows/playlist.cpp:144
 msgid "Playlist"
 msgstr "¥ê¥¹¥È"
 
-#: src/libvlc.h:747 modules/audio_filter/converter/a52tofloat32.c:85
+#: src/libvlc.h:812 modules/audio_filter/converter/a52tofloat32.c:85
 #: modules/audio_filter/converter/mpgatofixed32.c:60
 #: modules/demux/demuxstream.c:143 modules/demux/mpeg/ts.c:142
 #: modules/gui/pda/pda.c:66 modules/misc/logger/logger.c:91
@@ -1851,44 +2052,44 @@ msgstr "
 msgid "Miscellaneous"
 msgstr "¤½¤Î¾"
 
-#: src/libvlc.h:764
+#: src/libvlc.h:831
 #, fuzzy
 msgid "Hot keys"
 msgstr "¥Û¥¹¥È̾/¥¢¥É¥ì¥¹"
 
-#: src/libvlc.h:818
+#: src/libvlc.h:929
 msgid "main program"
 msgstr "¥á¥¤¥ó¡¦¥×¥í¥°¥é¥à"
 
-#: src/libvlc.h:825
+#: src/libvlc.h:936
 msgid "print help (can be combined with --advanced)"
 msgstr ""
 
-#: src/libvlc.h:827
+#: src/libvlc.h:938
 msgid "print detailed help (can be combined with --advanced)"
 msgstr ""
 
-#: src/libvlc.h:829
+#: src/libvlc.h:940
 msgid "print a list of available modules"
 msgstr "Í­¸ú¤Ê¥â¥¸¥å¡¼¥ë¤Î¥ê¥¹¥È¤ò°õºþ"
 
-#: src/libvlc.h:831
+#: src/libvlc.h:942
 msgid "print help on module (can be combined with --advanced)"
 msgstr ""
 
-#: src/libvlc.h:833
+#: src/libvlc.h:944
 msgid "save the current command line options in the config"
 msgstr ""
 
-#: src/libvlc.h:835
+#: src/libvlc.h:946
 msgid "reset the current config to the default values"
 msgstr ""
 
-#: src/libvlc.h:837
+#: src/libvlc.h:948
 msgid "use alternate config file"
 msgstr ""
 
-#: src/libvlc.h:839
+#: src/libvlc.h:950
 msgid "print version information"
 msgstr "¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤Î°õºþ"
 
@@ -1902,8 +2103,8 @@ msgstr ""
 
 #: src/video_output/video_output.c:424 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:515
-#: modules/gui/macosx/intf.m:516
+#: modules/gui/gtk/gtk_interface.c:1349 modules/gui/macosx/intf.m:526
+#: modules/gui/macosx/intf.m:527
 #: modules/video_filter/deinterlace/deinterlace.c:83
 msgid "Deinterlace"
 msgstr "¥Î¥ó¥¤¥ó¥¿¥ì¡¼¥¹²½"
@@ -1935,72 +2136,201 @@ msgstr ""
 msgid "Linear"
 msgstr "À°¿ô"
 
-#: src/video_output/video_output.c:446
+#: src/video_output/video_output.c:447
 #, fuzzy
 msgid "Filters"
 msgstr "¥Õ¥¡¥¤¥ë"
 
-#: modules/access/cdda.c:86 modules/access/cddax.c:135
-#: modules/access/dshow/dshow.cpp:73 modules/access/file.c:72
+#: modules/access/cdda.c:44 modules/access/cdda/cdda.c:125
+#: modules/access/dshow/dshow.cpp:105 modules/access/file.c:72
 #: modules/access/ftp.c:85 modules/access/http.c:79
-#: modules/access/mms/mms.c:57 modules/access/v4l/v4l.c:84
+#: modules/access/mms/mms.c:57 modules/access/v4l/v4l.c:75
 #: modules/demux/livedotcom.cpp:54
 #, fuzzy
 msgid "Caching value in ms"
 msgstr "¥­¥ã¥Ã¥·¥ó¥°ÃÍ (ms)"
 
-#: modules/access/cdda.c:88 modules/access/cddax.c:137
+#: modules/access/cdda.c:46
 #, fuzzy
 msgid ""
 "Allows you to modify the default caching value for cdda streams. This value "
-"should be set in miliseconds units."
+"should be set in milliseconds units."
 msgstr ""
 "udp¥¹¥È¥ê¡¼¥à¤Ç»ÈÍѤµ¤ì¤ë´ûÄê¤Î¥­¥ã¥Ã¥·¥ó¥°Ãͤ¬Êѹ¹²Äǽ¤Ç¤¹¡£Ã±°Ì¤Ï¥ß¥êÉäǻØ"
 "Äꤷ¤Þ¤¹¡£"
 
-#: modules/access/cdda.c:92 modules/access/cddax.c:141
+#: modules/access/cdda.c:50
 #, fuzzy
-msgid "CD Audio input"
+msgid "Audio CD input"
 msgstr "VCDÆþÎϥ⥸¥å¡¼¥ë"
 
-#: modules/access/cdda.c:99 modules/access/cddax.c:155
+#: modules/access/cdda.c:57 modules/access/cdda/cdda.c:190
 #, fuzzy
-msgid "CD Audio demux"
+msgid "Audio CD demux"
 msgstr "ÀßÄê(_S)"
 
-#: modules/access/cddax.c:83 modules/access/vcdx/vcd.c:52
-msgid "set debug mask for additional debugging."
+#: modules/access/cdda/access.c:99 modules/access/vcdx/access.c:138
+msgid "The above message had unknown vcdimager log level"
 msgstr ""
 
-#: modules/access/cddax.c:85
+#: modules/access/cdda/access.c:151
+msgid "The above message had unknown cdio log level"
+msgstr ""
+
+#: modules/access/cdda/access.c:341
+msgid "CDDB Disc ID"
+msgstr ""
+
+#: modules/access/cdda/access.c:346
+msgid "CDDB Disc Category"
+msgstr ""
+
+#: modules/access/cdda/access.c:363 modules/demux/mkv.cpp:2175
+#: modules/gui/gtk/gnome_interface.c:2448 modules/gui/gtk/gtk_interface.c:2869
+#: modules/gui/wxwindows/playlist.cpp:265
+msgid "Duration"
+msgstr "»ý³´ü´Ö"
+
+#: modules/access/cdda/cdda.c:61
 msgid ""
 "This integer when viewed in binary is a debugging mask\n"
-"MRL             1\n"
-"external call   2\n"
-"all calls       4\n"
-"LSN             8\n"
-"libcdio  (10)  16\n"
-"seeks    (20)  32\n"
+"meta info        1\n"
+"events           2\n"
+"MRL              4\n"
+"external call    8\n"
+"all calls (10)  16\n"
+"LSN       (20)  32\n"
+"seek      (40)  64\n"
+"libcdio   (80) 128\n"
+"libcddb  (100) 256\n"
 msgstr ""
 
-#: modules/access/cddax.c:93
+#: modules/access/cdda/cdda.c:73
 #, fuzzy
-msgid "CD-ROM device name"
-msgstr "¥Ç¥Ð¥¤¥¹Ì¾"
+msgid ""
+"Allows you to modify the default caching value for CDDA streams. This value "
+"should be set in millisecond units."
+msgstr ""
+"udp¥¹¥È¥ê¡¼¥à¤Ç»ÈÍѤµ¤ì¤ë´ûÄê¤Î¥­¥ã¥Ã¥·¥ó¥°Ãͤ¬Êѹ¹²Äǽ¤Ç¤¹¡£Ã±°Ì¤Ï¥ß¥êÉäǻØ"
+"Äꤷ¤Þ¤¹¡£"
+
+#: modules/access/cdda/cdda.c:77
+msgid ""
+"Format used in the GUI Playlist Title. Similar to the Unix date \n"
+"Format specifiers that start with a percent sign. Specifiers are: \n"
+"   %a : The artist\n"
+"   %A : The album information\n"
+"   %C : Category\n"
+"   %I : CDDB disk ID\n"
+"   %G : Genre\n"
+"   %M : The current MRL\n"
+"   %m : The CD-DA Media Catalog Number (MCN)\n"
+"   %n : The number of tracks on the CD\n"
+"   %p : The artist/performer/composer in the track\n"
+"   %T : The track number\n"
+"   %s : Number of seconds in this track \n"
+"   %t : The title\n"
+"   %Y : The year 19xx or 20xx\n"
+"   %% : a % \n"
+msgstr ""
 
-#: modules/access/cddax.c:95
+#: modules/access/cdda/cdda.c:95
 msgid ""
-"Specify the name of the CD-ROM device that will be used by default. If you "
-"don't specify anything, we'll scan for a suitable CD-ROM device."
+"Format used in the GUI Playlist Title. Similar to the Unix date \n"
+"Format specifiers that start with a percent sign. Specifiers are: \n"
+"   %M : The current MRL\n"
+"   %m : The CD-DA Media Catalog Number (MCN)\n"
+"   %n : The number of tracks on the CD\n"
+"   %T : The track number\n"
+"   %s : Number of seconds in this track \n"
+"   %% : a % \n"
+msgstr ""
+
+#: modules/access/cdda/cdda.c:109
+msgid "cddax://[device-or-file][@[T]num]"
+msgstr ""
+
+#: modules/access/cdda/cdda.c:110
+msgid "Compact Disc Digital Audio (CD-DA) input"
 msgstr ""
 
-#: modules/access/cddax.c:148
+#: modules/access/cdda/cdda.c:117
 msgid "CDX"
 msgstr ""
 
-#: modules/access/cddax.c:203 modules/access/vcdx/access.c:127
-#: modules/access/vcdx/access.c:153
-msgid "The above message had unknown vcdimager log level"
+#: modules/access/cdda/cdda.c:120 modules/access/vcdx/vcd.c:102
+#: modules/codec/ogt/cvd.c:60 modules/codec/ogt/ogt.c:62
+msgid "set debug mask for additional debugging."
+msgstr ""
+
+#: modules/access/cdda/cdda.c:130
+msgid "Format to use in playlist \"author\" field"
+msgstr ""
+
+#: modules/access/cdda/cdda.c:135
+msgid "Format to use in playlist \"title\" field when no CDDB"
+msgstr ""
+
+#: modules/access/cdda/cdda.c:141
+msgid "Format to use in playlist \"title\" field when using CDDB"
+msgstr ""
+
+#: modules/access/cdda/cdda.c:145
+msgid "Do CDDB lookups?"
+msgstr ""
+
+#: modules/access/cdda/cdda.c:146
+msgid "If set, lookup CD-DA track information using the CDDB protocol"
+msgstr ""
+
+#: modules/access/cdda/cdda.c:151
+#, fuzzy
+msgid "CDDB server"
+msgstr "¥µ¡¼¥Ð¡¼¤Ê¤·"
+
+#: modules/access/cdda/cdda.c:152
+msgid "Contact this CDDB server look up CD-DA information"
+msgstr ""
+
+#: modules/access/cdda/cdda.c:156
+#, fuzzy
+msgid "CDDB server port"
+msgstr "¥µ¡¼¥Ð¡¼¡¦¥Ý¡¼¥È"
+
+#: modules/access/cdda/cdda.c:157
+msgid "CDDB server uses this port number to communicate on"
+msgstr ""
+
+#: modules/access/cdda/cdda.c:161 modules/access/cdda/cdda.c:162
+msgid "email address reported to CDDB server"
+msgstr ""
+
+#: modules/access/cdda/cdda.c:166
+msgid "Cache CDDB lookups?"
+msgstr ""
+
+#: modules/access/cdda/cdda.c:167
+msgid "If set cache CDDB information about this CD"
+msgstr ""
+
+#: modules/access/cdda/cdda.c:171
+msgid "Contact CDDB via the HTTP protocol?"
+msgstr ""
+
+#: modules/access/cdda/cdda.c:172
+msgid "If set, the CDDB server gets information via the CDDB HTTP protocol"
+msgstr ""
+
+#: modules/access/cdda/cdda.c:177
+msgid "CDDB server timeout"
+msgstr ""
+
+#: modules/access/cdda/cdda.c:178
+msgid "Time (in seconds) to wait for a response from the CDDB server"
+msgstr ""
+
+#: modules/access/cdda/cdda.c:183 modules/access/cdda/cdda.c:184
+msgid "Directory to cache CDDB requests"
 msgstr ""
 
 #: modules/access/directory.c:82
@@ -2008,83 +2338,91 @@ msgstr ""
 msgid "Standard filesystem directory input"
 msgstr "ɸ½àŪ¤Ê¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥Õ¥¡¥¤¥ë¤òÆɤà"
 
-#: modules/access/dshow/dshow.cpp:69 modules/access/dshow/dshow.cpp:71
+#: modules/access/dshow/dshow.cpp:101 modules/access/dshow/dshow.cpp:103
 #: modules/gui/macosx/prefs.m:443 modules/gui/macosx/prefs_widgets.m:339
 #: modules/gui/wxwindows/preferences_widgets.cpp:313
 #, fuzzy
 msgid "Default"
 msgstr "ºï½ü"
 
-#: modules/access/dshow/dshow.cpp:69 modules/access/dshow/dshow.cpp:71
+#: modules/access/dshow/dshow.cpp:101 modules/access/dshow/dshow.cpp:103
 #: modules/gui/beos/VlcWrapper.cpp:173 modules/gui/gtk/menu.c:734
 msgid "None"
 msgstr "¤Ê¤·"
 
-#: modules/access/dshow/dshow.cpp:75
+#: modules/access/dshow/dshow.cpp:107
 #, fuzzy
 msgid ""
 "Allows you to modify the default caching value for directshow streams. This "
-"value should be set in miliseconds units."
+"value should be set in milliseconds units."
 msgstr "¥Õ¥¡¥¤¥ë¡¦¥¹¥È¥ê¡¼¥à¤Î´ûÄê¤Î¥­¥ã¥Ã¥·¥ó¥°ÃͤòÊѹ¹¤Ç¤­¤Þ¤¹¡£Ã±°Ì¤Ï¥ß¥êÉÃ"
 
-#: modules/access/dshow/dshow.cpp:77 modules/access/v4l/v4l.c:88
-#: modules/access/vcdx/vcd.c:68
+#: modules/access/dshow/dshow.cpp:109 modules/access/v4l/v4l.c:79
 #, fuzzy
 msgid "Video device name"
 msgstr "DVD¥Ç¥Ð¥¤¥¹"
 
-#: modules/access/dshow/dshow.cpp:79
+#: modules/access/dshow/dshow.cpp:111
 msgid ""
 "You can specify the name of the video device that will be used by the "
 "DirectShow plugin. If you don't specify anything, the default device will be "
 "used."
 msgstr ""
 
-#: modules/access/dshow/dshow.cpp:82 modules/access/v4l/v4l.c:92
+#: modules/access/dshow/dshow.cpp:114 modules/access/v4l/v4l.c:83
 #, fuzzy
 msgid "Audio device name"
 msgstr "DVD¥Ç¥Ð¥¤¥¹"
 
-#: modules/access/dshow/dshow.cpp:84
+#: modules/access/dshow/dshow.cpp:116
 msgid ""
 "You can specify the name of the audio device that will be used by the "
 "DirectShow plugin. If you don't specify anything, the default device will be "
 "used."
 msgstr ""
 
-#: modules/access/dshow/dshow.cpp:87
+#: modules/access/dshow/dshow.cpp:119
 #, fuzzy
 msgid "Video size"
 msgstr "DVD¥Ç¥Ð¥¤¥¹"
 
-#: modules/access/dshow/dshow.cpp:89
+#: modules/access/dshow/dshow.cpp:121
 msgid ""
 "You can specify the size of the video that will be displayed by the "
 "DirectShow plugin. If you don't specify anything the default size for your "
 "device will be used."
 msgstr ""
 
-#: modules/access/dshow/dshow.cpp:92
+#: modules/access/dshow/dshow.cpp:124 modules/access/v4l/v4l.c:87
 #, fuzzy
 msgid "Video input chroma format"
 msgstr "XVimage¿§ºÌ¥Õ¥©¡¼¥Þ¥Ã¥È"
 
-#: modules/access/dshow/dshow.cpp:94
+#: modules/access/dshow/dshow.cpp:126
 msgid ""
 "Force the DirectShow video input to use a specific chroma format (eg. I420 "
-"(default), RV24, etc...)"
+"(default), RV24, etc.)"
+msgstr ""
+
+#: modules/access/dshow/dshow.cpp:128
+#, fuzzy
+msgid "Device properties"
+msgstr "¥×¥í¥°¥é¥à¤ÎÁªÂò"
+
+#: modules/access/dshow/dshow.cpp:130
+msgid "Show the properties dialog of the selected device"
 msgstr ""
 
-#: modules/access/dshow/dshow.cpp:98
+#: modules/access/dshow/dshow.cpp:139
 #, fuzzy
 msgid "DirectShow input"
 msgstr "DirectX¥ª¡¼¥Ç¥£¥ª¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/access/dshow/dshow.cpp:99
+#: modules/access/dshow/dshow.cpp:140
 msgid "dshow"
 msgstr ""
 
-#: modules/access/dshow/dshow.cpp:118
+#: modules/access/dshow/dshow.cpp:163
 msgid "DirectShow demuxer"
 msgstr ""
 
@@ -2234,12 +2572,12 @@ msgstr "
 
 #: modules/access/dvd/dvd.c:83 modules/gui/gtk/gnome_interface.c:515
 #: modules/gui/gtk/gnome_interface.c:718
-#: modules/gui/gtk/gnome_interface.c:1690
-#: modules/gui/gtk/gnome_interface.c:2267 modules/gui/gtk/gtk_interface.c:629
-#: modules/gui/gtk/gtk_interface.c:816 modules/gui/gtk/gtk_interface.c:2005
-#: modules/gui/gtk/gtk_interface.c:2726 modules/gui/macosx/open.m:142
-#: modules/gui/macosx/open.m:263 modules/gui/wxwindows/interface.cpp:424
-#: modules/gui/wxwindows/open.cpp:315
+#: 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:142
+#: modules/gui/macosx/open.m:263 modules/gui/wxwindows/interface.cpp:409
+#: modules/gui/wxwindows/open.cpp:323
 msgid "Disc"
 msgstr "¥Ç¥£¥¹¥¯"
 
@@ -2307,7 +2645,7 @@ msgstr "
 msgid "Standard filesystem file input"
 msgstr "ɸ½àŪ¤Ê¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥Õ¥¡¥¤¥ë¤òÆɤà"
 
-#: modules/access/file.c:79
+#: modules/access/file.c:79 modules/gui/pda/pda_interface.c:1091
 msgid "file"
 msgstr "¥Õ¥¡¥¤¥ë"
 
@@ -2330,13 +2668,12 @@ msgid "Specify an HTTP proxy"
 msgstr "HTTP¥×¥í¥­¥·¤ò»ØÄê"
 
 #: modules/access/http.c:75
-#, fuzzy
 msgid ""
 "Specify an HTTP proxy to use. It must be in the form http://myproxy.mydomain:"
-"myport. If none is specified, the HTTP_PROXY environment variable will be "
+"myport/. If none is specified, the HTTP_PROXY environment variable will be "
 "tried."
 msgstr ""
-"»ÈÍѤ¹¤ëHTTP¥×¥í¥­¥·¤ò http://myproxy.mydomain:myport ¤Î·Á¼°¤Ç»ØÄꤷ¤Æ¤¯¤À¤µ"
+"»ÈÍѤ¹¤ëHTTP¥×¥í¥­¥·¤ò http://myproxy.mydomain:myport/ ¤Î·Á¼°¤Ç»ØÄꤷ¤Æ¤¯¤À¤µ"
 "¤¤¡£none ¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¤Ë¤Ï¡¢HTTP_PROXYenvironmentÊÑ¿ô¤¬»î¤ß¤é¤ì¤Þ¤¹¡£"
 
 #: modules/access/http.c:81
@@ -2347,7 +2684,8 @@ msgstr ""
 "http¥¹¥È¥ê¡¼¥à¤Ç»ÈÍѤµ¤ì¤ë´ûÄê¤Î¥­¥ã¥Ã¥·¥ó¥°Ãͤ¬Êѹ¹²Äǽ¤Ç¤¹¡£Ã±°Ì¤Ï¥ß¥êÉäÇ"
 "»ØÄꤷ¤Þ¤¹¡£"
 
-#: modules/access/http.c:85 modules/gui/pda/pda_interface.c:493
+#: modules/access/http.c:85 modules/gui/pda/pda_interface.c:496
+#: modules/gui/pda/pda_interface.c:1092 modules/gui/pda/pda_interface.c:1095
 msgid "http"
 msgstr ""
 
@@ -2434,11 +2772,13 @@ msgstr ""
 msgid "slp"
 msgstr ""
 
-#: modules/access/udp.c:74 modules/access_output/udp.c:75
+#: modules/access/tcp.c:59 modules/access/udp.c:74
+#: modules/access_output/udp.c:75
 msgid "caching value in ms"
 msgstr "¥­¥ã¥Ã¥·¥ó¥°ÃÍ (ms)"
 
-#: modules/access/udp.c:76 modules/access_output/udp.c:77
+#: modules/access/tcp.c:61 modules/access/udp.c:76
+#: modules/access_output/udp.c:77
 msgid ""
 "Allows you to modify the default caching value for udp streams. This value "
 "should be set in miliseconds units."
@@ -2446,45 +2786,62 @@ msgstr ""
 "udp¥¹¥È¥ê¡¼¥à¤Ç»ÈÍѤµ¤ì¤ë´ûÄê¤Î¥­¥ã¥Ã¥·¥ó¥°Ãͤ¬Êѹ¹²Äǽ¤Ç¤¹¡£Ã±°Ì¤Ï¥ß¥êÉäǻØ"
 "Äꤷ¤Þ¤¹¡£"
 
+#: modules/access/tcp.c:68
+#, fuzzy
+msgid "TCP input"
+msgstr "VCDÆþÎϥ⥸¥å¡¼¥ë"
+
+#: modules/access/tcp.c:69
+msgid "TCP"
+msgstr ""
+
 #: modules/access/udp.c:80
 #, fuzzy
 msgid "UDP/RTP input"
 msgstr "UDP¥Þ¥ë¥Á¥­¥ã¥¹¥È"
 
-#: modules/access/udp.c:81 modules/gui/pda/pda_interface.c:488
-#: modules/gui/pda/pda_interface.c:1013
-msgid "udp"
+#: modules/access/udp.c:81 modules/gui/gtk/gnome_interface.c:2869
+#: modules/gui/gtk/gtk_interface.c:3124 modules/gui/macosx/output.m:141
+#: modules/gui/macosx/output.m:268 modules/gui/macosx/output.m:357
+#: modules/gui/wxwindows/streamout.cpp:420
+msgid "UDP"
 msgstr ""
 
-#: modules/access/v4l/v4l.c:86
+#: modules/access/v4l/v4l.c:77
 #, fuzzy
 msgid ""
 "Allows you to modify the default caching value for v4l streams. This value "
 "should be set in miliseconds units."
 msgstr "¥Õ¥¡¥¤¥ë¡¦¥¹¥È¥ê¡¼¥à¤Î´ûÄê¤Î¥­¥ã¥Ã¥·¥ó¥°ÃͤòÊѹ¹¤Ç¤­¤Þ¤¹¡£Ã±°Ì¤Ï¥ß¥êÉÃ"
 
-#: modules/access/v4l/v4l.c:90
+#: modules/access/v4l/v4l.c:81
 msgid ""
 "Specify the name of the video device that will be used. If you don't specify "
 "anything, no video device will be used."
 msgstr ""
 
-#: modules/access/v4l/v4l.c:94
+#: modules/access/v4l/v4l.c:85
 msgid ""
 "Specify the name of the audio device that will be used. If you don't specify "
 "anything, no audio device will be used."
 msgstr ""
 
-#: modules/access/v4l/v4l.c:98
+#: modules/access/v4l/v4l.c:89
+msgid ""
+"Force the Video4Linux video device to use a specific chroma format (eg. I420 "
+"(default), RV24, etc.)"
+msgstr ""
+
+#: modules/access/v4l/v4l.c:93
 #, fuzzy
 msgid "Video4Linux input"
 msgstr "Video4LinuxÆþÎϥ⥸¥å¡¼¥ë"
 
-#: modules/access/v4l/v4l.c:99
+#: modules/access/v4l/v4l.c:94
 msgid "v4l"
 msgstr ""
 
-#: modules/access/v4l/v4l.c:112
+#: modules/access/v4l/v4l.c:109
 #, fuzzy
 msgid "Video4Linux demuxer"
 msgstr "Video4LinuxÆþÎϥ⥸¥å¡¼¥ë"
@@ -2494,7 +2851,33 @@ msgstr "Video4Linux
 msgid "VCD input"
 msgstr "VCDÆþÎϥ⥸¥å¡¼¥ë"
 
-#: modules/access/vcdx/vcd.c:54
+#: modules/access/vcdx/access.c:112
+msgid "The above message had unknown log level"
+msgstr ""
+
+#: modules/access/vcdx/access.c:1095 modules/access/vcdx/access.c:1096
+#: modules/gui/gtk/open.c:287 modules/gui/gtk/open.c:301
+#, fuzzy
+msgid "Track"
+msgstr "¥­¥ã¥ó¥»¥ë"
+
+#: modules/access/vcdx/access.c:1099 modules/access/vcdx/access.c:1100
+#: modules/gui/gtk/open.c:276
+#, fuzzy
+msgid "Entry"
+msgstr "¥³¥ó¥È¥í¡¼¥ë"
+
+#: modules/access/vcdx/access.c:1103 modules/access/vcdx/access.c:1104
+#, fuzzy
+msgid "Segment"
+msgstr "¥¹¥¯¥ê¡¼¥ó"
+
+#: modules/access/vcdx/access.c:1107 modules/access/vcdx/access.c:1108
+#: modules/access/vcdx/access.c:1125
+msgid "List ID"
+msgstr ""
+
+#: modules/access/vcdx/vcd.c:53
 msgid ""
 "This integer when viewed in binary is a debugging mask\n"
 "meta info         1\n"
@@ -2511,22 +2894,56 @@ msgid ""
 "vcdinfo  (800) 2048\n"
 msgstr ""
 
-#: modules/access/vcdx/vcd.c:70
+#: modules/access/vcdx/vcd.c:68
 msgid ""
-"Specify the name of the video device that will be used by default. If you "
-"don't specify anything, we'll scan for a suitable VCD device."
+"Format used in the GUI Playlist Title. Similar to the Unix date \n"
+"Format specifiers that start with a percent sign. Specifiers are: \n"
+"   %A : The album information\n"
+"   %C : The VCD volume count - the number of CDs in the collection\n"
+"   %c : The VCD volume num - the number of the CD in the collection.\n"
+"   %F : The VCD Format, e.g. VCD 1.0, VCD 1.1, VCD 2.0, or SVC\n"
+"   %I : The current entry/segment/playback type, e.g. ENTRY, TRACK, "
+"SEGMENT...\n"
+"   %L : The playlist ID prefixed with \" LID\" if it exists\n"
+"   %N : The current number of the %I - a decimal number\n"
+"   %P : The publisher ID\n"
+"   %p : The preparer I\n"
+"   %S : If we are in a segment (menu), the kind of segment\n"
+"   %T : The track number\n"
+"   %V : The volume set I\n"
+"   %v : The volume I\n"
+"       A number between 1 and the volume count.\n"
+"   %% : a % \n"
+msgstr ""
+
+#: modules/access/vcdx/vcd.c:91
+msgid "vcdx://[device-or-file][@{P,S,T}num]"
+msgstr ""
+
+#: modules/access/vcdx/vcd.c:92
+msgid "Video CD (VCD 1.0, 1.1, 2.0, SVCD, HQVCD) input"
 msgstr ""
 
-#: modules/access/vcdx/vcd.c:79
-msgid "vcdx:[device-or-file][@{P,S,T}num]"
+#: modules/access/vcdx/vcd.c:99
+msgid "VCDX"
 msgstr ""
 
-#: modules/access/vcdx/vcd.c:80
-msgid "Video CD (VCD 1.0, 1.1, 2.0, SVCD, HQVCD) input"
+#: modules/access/vcdx/vcd.c:106
+msgid "Use playback control?"
 msgstr ""
 
-#: modules/access/vcdx/vcd.c:87
-msgid "VCDX"
+#: modules/access/vcdx/vcd.c:107
+msgid ""
+"If VCD is authored with playback control, use it. Otherwise we play by "
+"tracks."
+msgstr ""
+
+#: modules/access/vcdx/vcd.c:114
+msgid "Format to use in playlist \"author\""
+msgstr ""
+
+#: modules/access/vcdx/vcd.c:120
+msgid "Format to use in playlist \"title\" field"
 msgstr ""
 
 #: modules/access_output/dummy.c:56
@@ -2534,7 +2951,7 @@ msgstr ""
 msgid "Dummy stream ouput"
 msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò"
 
-#: modules/access_output/file.c:66
+#: modules/access_output/file.c:69
 #, fuzzy
 msgid "File stream ouput"
 msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò"
@@ -2554,12 +2971,27 @@ msgstr "
 msgid "udp stream output"
 msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò"
 
-#: modules/audio_filter/channel_mixer/headphone.c:48
+#: 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 "
+"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."
+msgstr ""
+"¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï´°Á´¤Ê5.1¥Á¥ã¥ó¥Í¥ë¡¦¥¹¥Ô¡¼¥«¤¬ÀßÄꤵ¤ì¤¿Éô²°¤Çʹ¤¤¤Æ¤¤¤ë¤«¤Î"
+"¤è¤¦¤Ê¸ú²Ì¤ò¥Ø¥Ã¥É¥Û¡¼¥ó¤Î²»À¼¤ËÍ¿¤¨¤è¤êÎ׾촶¤ò»ý¤¿¤»¤Þ¤¹¡£¤Þ¤¿¡¢Ä¹»þ´Ö¤Î¥ê"
+"¥¹¥Ë¥ó¥°¤Ç¤â°Â¿´¤·¤Æʹ¤¤¤Æ¤¤¤é¤ì¤Þ¤¹¡£\n"
+"¤³¤Îµ¡Ç½¤Ï¡¢¥â¥Î¥é¥ë¤«¤é5.1¥Á¥ã¥ó¥Í¥ë¤Þ¤Ç¤Î¤¹¤Ù¤Æ¤Î¥½¡¼¥¹¡¦¥Õ¥©¡¼¥Þ¥Ã¥È¤ÇÆ°ºî"
+"¤·¤Þ¤¹¡£"
+
+#: modules/audio_filter/channel_mixer/headphone.c:56
 #, fuzzy
 msgid "Characteristic dimension"
 msgstr "¶õ´Ö¤ÎÆÃÀ­"
 
-#: modules/audio_filter/channel_mixer/headphone.c:50
+#: modules/audio_filter/channel_mixer/headphone.c:58
 msgid ""
 "Headphone virtual spatialization effect parameter: distance between front "
 "left speaker and listener in meters."
@@ -2567,11 +2999,11 @@ msgstr ""
 "¥Ø¥Ã¥É¥Û¡¼¥ó¤Î²¾ÁÛŪ¤Ê²»¤Î¹­¤¬¤ê¸ú²Ì¡§¥Õ¥í¥ó¥Èº¸Â¦¥¹¥Ô¡¼¥«¤È¥ê¥¹¥Ê¡¼¤Î´Ö¤Îµ÷"
 "Î¥¤ò¥á¡¼¥È¥ë¤Ç»ØÄꤷ¤Þ¤¹¡£"
 
-#: modules/audio_filter/channel_mixer/headphone.c:54
+#: modules/audio_filter/channel_mixer/headphone.c:62
 msgid "headphone"
 msgstr ""
 
-#: modules/audio_filter/channel_mixer/headphone.c:57
+#: modules/audio_filter/channel_mixer/headphone.c:65
 #, fuzzy
 msgid "headphone channel mixer with virtual spatialization effect"
 msgstr "¥Ø¥Ã¥É¥Û¡¼¥ó¤Î²¾ÁÛŪ¤Ê²»¤Î¹­¤¬¤ê¸ú²Ì"
@@ -2723,7 +3155,8 @@ msgstr "ALSA
 #: modules/audio_output/coreaudio.c:1473 modules/audio_output/directx.c:383
 #: modules/audio_output/oss.c:129 modules/audio_output/sdl.c:176
 #: modules/audio_output/sdl.c:194 modules/audio_output/waveout.c:337
-#: modules/gui/macosx/intf.m:497 modules/gui/macosx/intf.m:498
+#: modules/gui/macosx/intf.m:508 modules/gui/macosx/intf.m:509
+#: modules/gui/wxwindows/v4l.cpp:350 modules/gui/wxwindows/v4l.cpp:355
 #, fuzzy
 msgid "Audio device"
 msgstr "DVD¥Ç¥Ð¥¤¥¹"
@@ -2744,7 +3177,7 @@ msgstr "
 msgid "5.1"
 msgstr ""
 
-#: modules/audio_output/alsa.c:217 modules/audio_output/directx.c:503
+#: modules/audio_output/alsa.c:217 modules/audio_output/directx.c:506
 #: modules/audio_output/oss.c:246 modules/audio_output/waveout.c:415
 msgid "A/52 over S/PDIF"
 msgstr ""
@@ -2896,46 +3329,46 @@ msgstr "
 msgid "DV video decoder"
 msgstr "DV¥Ó¥Ç¥ª¡¦¥Ç¥³¡¼¥À"
 
-#: modules/codec/dvbsub.c:262
+#: modules/codec/dvbsub.c:41
 msgid "subtitles"
 msgstr "»úËë(_S)"
 
-#: modules/codec/dvbsub.c:263
+#: modules/codec/dvbsub.c:42
 #, fuzzy
 msgid "subtitles decoder"
 msgstr "»úË롦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/codec/faad.c:37
+#: modules/codec/faad.c:38
 #, fuzzy
 msgid "AAC audio decoder (using libfaad2)"
 msgstr "AAC¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë (libfaad2)"
 
-#: modules/codec/ffmpeg/ffmpeg.c:78
+#: modules/codec/ffmpeg/ffmpeg.c:79
 msgid "ffmpeg"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:81
+#: modules/codec/ffmpeg/ffmpeg.c:82
 msgid "ffmpeg audio/video decoder((MS)MPEG4,SVQ1,H263,WMV,WMA)"
 msgstr "ffmpeg ¥ª¡¼¥Ç¥£¥ª¡¿¥Ó¥Ç¥ª¡¦¥Ç¥³¡¼¥À((MS)MPEG4,SVQ1,H263,WMV,WMA)"
 
-#: modules/codec/ffmpeg/ffmpeg.c:103
+#: modules/codec/ffmpeg/ffmpeg.c:104
 msgid "ffmpeg chroma conversion"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:107
+#: modules/codec/ffmpeg/ffmpeg.c:108
 #, fuzzy
 msgid "ffmpeg audio/video encoder"
 msgstr "µ¿»÷AC3¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
 
-#: modules/codec/ffmpeg/ffmpeg.h:73
+#: modules/codec/ffmpeg/ffmpeg.h:74
 msgid "Direct rendering"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:75
+#: modules/codec/ffmpeg/ffmpeg.h:76
 msgid "Error resilience"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:77
+#: modules/codec/ffmpeg/ffmpeg.h:78
 msgid ""
 "ffmpeg can make errors resiliences.          \n"
 "Nevertheless, with a buggy encoder (like ISO MPEG-4 encoder from M$) this "
@@ -2943,11 +3376,11 @@ msgid ""
 "Valid range is -1 to 99 (-1 disables all errors resiliences)."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:82
+#: modules/codec/ffmpeg/ffmpeg.h:83
 msgid "Workaround bugs"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:84
+#: modules/codec/ffmpeg/ffmpeg.h:85
 msgid ""
 "Try to fix some bugs\n"
 "1  autodetect\n"
@@ -2959,68 +3392,80 @@ msgid ""
 "64 Qpel chroma"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:93
+#: modules/codec/ffmpeg/ffmpeg.h:94
 msgid "Hurry up"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:95
+#: modules/codec/ffmpeg/ffmpeg.h:96
 msgid ""
 "Allow the decoder to partially decode or skip frame(s) when there is not "
 "enough time. It's useful with low CPU power but it can produce distorted "
 "pictures."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:99
+#: modules/codec/ffmpeg/ffmpeg.h:100
 #, fuzzy
 msgid "Truncated stream"
 msgstr "¥¹¥È¥ê¡¼¥à¤ÎºÆÀ¸"
 
-#: modules/codec/ffmpeg/ffmpeg.h:100
+#: modules/codec/ffmpeg/ffmpeg.h:101
 msgid "truncated stream -1:auto,0:disable,:1:enable"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:102
+#: modules/codec/ffmpeg/ffmpeg.h:103
 #, fuzzy
 msgid "Post processing quality"
 msgstr "¸å½èÍý"
 
-#: modules/codec/ffmpeg/ffmpeg.h:104
+#: modules/codec/ffmpeg/ffmpeg.h:105
 msgid ""
 "Quality of post processing. Valid range is 0 to 6\n"
 "Higher levels require considerable more CPU power, but produce better "
 "looking pictures."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:108
+#: modules/codec/ffmpeg/ffmpeg.h:109
 msgid "Ffmpeg postproc filter chains"
 msgstr ""
 
+#: modules/codec/ffmpeg/postprocess.c:84
+msgid "Post processing"
+msgstr "¸å½èÍý"
+
+#: modules/codec/ffmpeg/postprocess.c:92
+msgid "1 (Lowest)"
+msgstr ""
+
+#: modules/codec/ffmpeg/postprocess.c:102
+msgid "6 (Highest)"
+msgstr ""
+
 #: modules/codec/ffmpeg/postprocessing/postprocessing.c:49
 #, fuzzy
-msgid "C Post Processing"
+msgid "C post processing"
 msgstr "¸å½èÍý"
 
 #: modules/codec/ffmpeg/postprocessing/postprocessing.c:53
 #, fuzzy
-msgid "MMX Post Processing"
+msgid "MMX post processing"
 msgstr "MMX¸å½èÍý¥â¥¸¥å¡¼¥ë"
 
 #: modules/codec/ffmpeg/postprocessing/postprocessing.c:58
 #, fuzzy
-msgid "MMXEXT Post Processing"
+msgid "MMXEXT post processing"
 msgstr "MMX¥¨¥¯¥¹¥Æ¥ó¥·¥ç¥ó¸å½èÍý¥â¥¸¥å¡¼¥ë"
 
-#: modules/codec/flac.c:148
+#: modules/codec/flac.c:145
 #, fuzzy
 msgid "Flac audio decoder"
 msgstr "µ¿»÷AC3¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
 
-#: modules/codec/flac.c:153
+#: modules/codec/flac.c:150
 #, fuzzy
 msgid "Flac audio packetizer"
 msgstr "»úË롦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/codec/flac.c:158
+#: modules/codec/flac.c:155
 #, fuzzy
 msgid "Flac audio encoder"
 msgstr "µ¿»÷AC3¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
@@ -3049,18 +3494,61 @@ msgstr ""
 msgid "MPEG audio layer I/II/III packetizer"
 msgstr "MPEG 1/2¥ì¥¤¥ä1/2¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
 
+#: modules/codec/ogt/cvd.c:40
+msgid ""
+"This integer when viewed in binary is a debugging mask\n"
+"external call          1\n"
+"all calls              2\n"
+"packet assembly info   4\n"
+"image bitmaps          8\n"
+"image transformations 16\n"
+"misc info             32\n"
+msgstr ""
+
+#: modules/codec/ogt/cvd.c:55
+#, fuzzy
+msgid "CVD subtitle decoder"
+msgstr "»úË롦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
+
+#: modules/codec/ogt/cvd.c:64
+#, fuzzy
+msgid "Chaoji VCD subtitle packetizer"
+msgstr "»úË롦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
+
+#: modules/codec/ogt/ogt.c:40
+msgid ""
+"This integer when viewed in binary is a debugging mask\n"
+"external call          1\n"
+"all calls              2\n"
+"packet assembly info   4\n"
+"image bitmaps          8\n"
+"image transformations 16\n"
+"rendering information 32\n"
+"misc info             64\n"
+msgstr ""
+
+#: modules/codec/ogt/ogt.c:57
+#, fuzzy
+msgid "Philips OGT (SVCD subtitle) decoder"
+msgstr "»úË롦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
+
+#: modules/codec/ogt/ogt.c:66
+#, fuzzy
+msgid "Philips OGT (SVCD subtitle) packetizer"
+msgstr "»úË롦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
+
 #: modules/codec/quicktime.c:59
 msgid "QuickTime library decoder"
 msgstr ""
 
 #: modules/codec/rawvideo.c:66
 #, fuzzy
-msgid "Pseudo Raw Video decoder"
+msgid "Pseudo raw video decoder"
 msgstr "µ¿»÷AC3¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
 
 #: modules/codec/rawvideo.c:71
 #, fuzzy
-msgid "Pseudo Raw Video packetizer"
+msgid "Pseudo raw video packetizer"
 msgstr "µ¿»÷AC3¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
 
 #: modules/codec/speex.c:101
@@ -3078,11 +3566,12 @@ msgstr "
 msgid "Speex audio encoder"
 msgstr "µ¿»÷AC3¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
 
-#: modules/codec/speex.c:458
-msgid "Speex Comment"
-msgstr ""
+#: modules/codec/speex.c:463
+#, fuzzy
+msgid "Speex comment"
+msgstr "¥¹¥¯¥ê¡¼¥ó"
 
-#: modules/codec/speex.c:465
+#: modules/codec/speex.c:470
 #, fuzzy
 msgid "Mode"
 msgstr "¥â¥¸¥å¡¼¥ë"
@@ -3137,42 +3626,42 @@ msgstr "
 msgid "Tarkin decoder module"
 msgstr "MPEG 1/2¥Ó¥Ç¥ª¡¦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/codec/theora.c:84
+#: modules/codec/theora.c:85
 #, fuzzy
 msgid "Theora video decoder"
 msgstr "DV¥Ó¥Ç¥ª¡¦¥Ç¥³¡¼¥À"
 
-#: modules/codec/theora.c:90
+#: modules/codec/theora.c:91
 #, fuzzy
 msgid "Theora video packetizer"
 msgstr "DV¥Ó¥Ç¥ª¡¦¥Ç¥³¡¼¥À"
 
-#: modules/codec/theora.c:96
+#: modules/codec/theora.c:97
 #, fuzzy
 msgid "Theora video encoder"
 msgstr "DV¥Ó¥Ç¥ª¡¦¥Ç¥³¡¼¥À"
 
-#: modules/codec/theora.c:338
-msgid "Theora Comment"
+#: modules/codec/theora.c:339
+msgid "Theora comment"
 msgstr ""
 
-#: modules/codec/vorbis.c:124
+#: modules/codec/vorbis.c:127
 #, fuzzy
 msgid "Vorbis audio decoder"
 msgstr "»úË롦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/codec/vorbis.c:133
+#: modules/codec/vorbis.c:136
 #, fuzzy
 msgid "Vorbis audio packetizer"
 msgstr "»úË롦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/codec/vorbis.c:139
+#: modules/codec/vorbis.c:142
 #, fuzzy
 msgid "Vorbis audio encoder"
 msgstr "»úË롦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/codec/vorbis.c:452
-msgid "Vorbis Comment"
+#: modules/codec/vorbis.c:455
+msgid "Vorbis comment"
 msgstr ""
 
 #: modules/codec/xvid.c:45
@@ -3220,57 +3709,111 @@ msgstr ""
 msgid "mouse gestures control interface"
 msgstr "ÀÖ³°Àþ¥ê¥â¡¼¥È¡¦¥³¥ó¥È¥í¡¼¥ë¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/control/hotkeys.c:71
+#: modules/control/hotkeys.c:72
 #, fuzzy
-msgid "hotkey interface"
-msgstr "Gtk+¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
+msgid "Playlist bookmark 1"
+msgstr "¥ê¥¹¥È"
 
-#: modules/control/hotkeys.c:249 modules/control/hotkeys.c:274
-#: modules/control/lirc/lirc.c:297 modules/control/lirc/lirc.c:323
-#: 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/controls.m:59
-#: modules/gui/macosx/intf.m:974 modules/gui/macosx/intf.m:975
-#: modules/gui/macosx/intf.m:976 modules/gui/pda/interface.c:179
-#: modules/gui/pda/pda_interface.c:240 modules/gui/pda/pda_interface.c:241
-#: modules/gui/wxwindows/interface.cpp:1286
-msgid "Pause"
-msgstr "°ì»þÄä»ß"
+#: modules/control/hotkeys.c:73
+#, fuzzy
+msgid "Playlist bookmark 2"
+msgstr "¥ê¥¹¥È"
 
-#: modules/control/hotkeys.c:263 modules/control/lirc/lirc.c:310
-#: modules/gui/gtk/gnome_interface.c:590
-#: modules/gui/gtk/gnome_interface.c:1013 modules/gui/gtk/gtk_interface.c:698
-#: modules/gui/macosx/controls.m:73 modules/gui/macosx/intf.m:435
-#: modules/gui/macosx/intf.m:471 modules/gui/macosx/intf.m:536
-#: modules/gui/macosx/intf.m:982 modules/gui/macosx/intf.m:983
-#: modules/gui/macosx/intf.m:984 modules/gui/macosx/playlist.m:139
-#: modules/gui/pda/interface.c:192 modules/gui/pda/pda_interface.c:252
-#: modules/gui/pda/pda_interface.c:253 modules/gui/wxwindows/interface.cpp:436
-#: modules/gui/wxwindows/interface.cpp:1292
-msgid "Play"
-msgstr "ºÆÀ¸"
+#: modules/control/hotkeys.c:74
+#, fuzzy
+msgid "Playlist bookmark 3"
+msgstr "¥ê¥¹¥È"
 
-#: modules/control/hotkeys.c:280
-msgid "Jump -10 seconds"
-msgstr ""
+#: modules/control/hotkeys.c:75
+#, fuzzy
+msgid "Playlist bookmark 4"
+msgstr "¥ê¥¹¥È"
 
-#: modules/control/hotkeys.c:286
-msgid "Jump +10 seconds"
+#: modules/control/hotkeys.c:76
+#, fuzzy
+msgid "Playlist bookmark 5"
+msgstr "¥ê¥¹¥È"
+
+#: modules/control/hotkeys.c:77
+#, fuzzy
+msgid "Playlist bookmark 6"
+msgstr "¥ê¥¹¥È"
+
+#: modules/control/hotkeys.c:78
+#, fuzzy
+msgid "Playlist bookmark 7"
+msgstr "¥ê¥¹¥È"
+
+#: modules/control/hotkeys.c:79
+#, fuzzy
+msgid "Playlist bookmark 8"
+msgstr "¥ê¥¹¥È"
+
+#: modules/control/hotkeys.c:80
+#, fuzzy
+msgid "Playlist bookmark 9"
+msgstr "¥ê¥¹¥È"
+
+#: modules/control/hotkeys.c:81
+#, fuzzy
+msgid "Playlist bookmark 10"
+msgstr "¥ê¥¹¥È"
+
+#: modules/control/hotkeys.c:83
+msgid "This option allows you to define playlist bookmarks"
+msgstr ""
+
+#: modules/control/hotkeys.c:86
+#, fuzzy
+msgid "hotkey interface"
+msgstr "Gtk+¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
+
+#: modules/control/hotkeys.c:300 modules/control/hotkeys.c:325
+#: modules/control/lirc/lirc.c:297 modules/control/lirc/lirc.c:323
+#: 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/controls.m:59
+#: modules/gui/macosx/intf.m:1022 modules/gui/macosx/intf.m:1023
+#: modules/gui/macosx/intf.m:1024 modules/gui/pda/pda_interface.c:243
+#: modules/gui/pda/pda_interface.c:244
+#: modules/gui/wxwindows/interface.cpp:1275
+msgid "Pause"
+msgstr "°ì»þÄä»ß"
+
+#: modules/control/hotkeys.c:314 modules/control/lirc/lirc.c:310
+#: modules/gui/gtk/gnome_interface.c:590
+#: modules/gui/gtk/gnome_interface.c:1013 modules/gui/gtk/gtk_interface.c:698
+#: modules/gui/macosx/controls.m:73 modules/gui/macosx/intf.m:446
+#: modules/gui/macosx/intf.m:482 modules/gui/macosx/intf.m:547
+#: modules/gui/macosx/intf.m:1030 modules/gui/macosx/intf.m:1031
+#: modules/gui/macosx/intf.m:1032 modules/gui/macosx/playlist.m:143
+#: modules/gui/pda/pda_interface.c:255 modules/gui/pda/pda_interface.c:256
+#: modules/gui/wxwindows/interface.cpp:417
+#: modules/gui/wxwindows/interface.cpp:1281
+msgid "Play"
+msgstr "ºÆÀ¸"
+
+#: modules/control/hotkeys.c:331
+msgid "Jump -10 seconds"
+msgstr ""
+
+#: modules/control/hotkeys.c:337
+msgid "Jump +10 seconds"
 msgstr ""
 
-#: modules/control/hotkeys.c:292
+#: modules/control/hotkeys.c:343
 msgid "Jump -1 minute"
 msgstr ""
 
-#: modules/control/hotkeys.c:298
+#: modules/control/hotkeys.c:349
 msgid "Jump +1 minute"
 msgstr ""
 
-#: modules/control/hotkeys.c:304
+#: modules/control/hotkeys.c:355
 msgid "Jump -5 minutes"
 msgstr ""
 
-#: modules/control/hotkeys.c:310
+#: modules/control/hotkeys.c:361
 msgid "Jump +5 minutes"
 msgstr ""
 
@@ -3319,7 +3862,7 @@ msgstr "
 
 #: modules/control/joystick.c:149
 msgid ""
-"The time waited before the action is repeated if it is still trigered, in "
+"The time waited before the action is repeated if it is still triggered, in "
 "milliseconds"
 msgstr ""
 
@@ -3329,7 +3872,7 @@ msgid "Wait time"
 msgstr "¥Õ¥¡¥¤¥ë¤ÎÁªÂò"
 
 #: modules/control/joystick.c:154
-msgid "The time waited before the repeat starts, in milliseconds "
+msgid "The time waited before the repeat starts, in milliseconds."
 msgstr ""
 
 #: modules/control/joystick.c:156
@@ -3398,7 +3941,7 @@ msgid ""
 "This option allows you to select additional interfaces spawned by the "
 "service. It should be specified at install time so the service is properly "
 "configured. Use a comma separated list of interface modules. (common values "
-"are: logger,sap,rc,http)"
+"are: logger, sap, rc, http)"
 msgstr ""
 "»ÈÍѤ¹¤ë¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤¬ÁªÂò²Äǽ¤Ç¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¼«Æ°Åª¤ËºÇŬ¤Ê¥â¥¸¥å¡¼¥ë¤¬"
 "ÁªÂò¤µ¤ì¤Þ¤¹¡£"
@@ -3441,8 +3984,9 @@ msgid "remote control interface"
 msgstr "¥ê¥â¡¼¥È¡¦¥³¥ó¥È¥í¡¼¥ë¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
 
 #: modules/demux/a52sys.c:39
-msgid "A52 demuxer"
-msgstr ""
+#, fuzzy
+msgid "A/52 demuxer"
+msgstr "MPEG 1/2¥ì¥¤¥ä1/2¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
 
 #: modules/demux/aac.c:39
 #, fuzzy
@@ -3458,14 +4002,15 @@ msgstr "MPEG 1/2
 msgid "Length"
 msgstr ""
 
-#: modules/demux/asf/asf.c:296 modules/demux/mkv.cpp:2206
+#: modules/demux/asf/asf.c:296 modules/demux/avi/avi.c:229
+#: modules/demux/mkv.cpp:2199
 #, fuzzy
 msgid "Number of streams"
 msgstr "¹Ô¿ô"
 
-#: modules/demux/asf/asf.c:304 modules/gui/macosx/playlist.m:143
+#: modules/demux/asf/asf.c:304 modules/gui/macosx/playlist.m:147
 #: modules/gui/wxwindows/iteminfo.cpp:188
-#: modules/gui/wxwindows/playlist.cpp:266
+#: modules/gui/wxwindows/playlist.cpp:263
 #, fuzzy
 msgid "Author"
 msgstr "ºîÀ®¼Ô"
@@ -3475,27 +4020,24 @@ msgstr "
 msgid "Copyright"
 msgstr "¥³¥Ô¡¼"
 
-#: modules/demux/asf/asf.c:308 modules/gui/gtk/preferences.c:325
-#: modules/gui/kde/pluginsbox.cpp:46
-msgid "Description"
-msgstr "ÀâÌÀ"
-
 #: modules/demux/asf/asf.c:310
 #, fuzzy
 msgid "Rating"
 msgstr "ʸ»úÎó"
 
-#: modules/demux/asf/asf.c:322
+#: modules/demux/asf/asf.c:322 modules/demux/asf/asf.c:323
+#: modules/gui/macosx/output.m:133 modules/gui/macosx/output.m:229
+#: modules/gui/macosx/output.m:345 modules/gui/wxwindows/streamwizard.cpp:76
 #, fuzzy
-msgid "Stream "
+msgid "Stream"
 msgstr "¥¹¥È¥ê¡¼¥à¤ÎÄä»ß"
 
-#: modules/demux/asf/asf.c:328
+#: modules/demux/asf/asf.c:329 modules/demux/mkv.cpp:2218
 #, fuzzy
 msgid "Codec name"
 msgstr "¥Ç¥Ð¥¤¥¹Ì¾"
 
-#: modules/demux/asf/asf.c:330
+#: modules/demux/asf/asf.c:331
 #, fuzzy
 msgid "Codec description"
 msgstr "ÀâÌÀ"
@@ -3504,8 +4046,8 @@ msgstr "
 msgid "AU demuxer"
 msgstr ""
 
-#: modules/demux/avi/avi.c:42
-msgid "avi-demuxer"
+#: modules/demux/avi/avi.c:42 modules/demux/avi/avi.c:50
+msgid "AVI demuxer"
 msgstr ""
 
 #: modules/demux/avi/avi.c:44 modules/demux/avi/avi.c:45
@@ -3518,19 +4060,12 @@ msgstr "
 msgid "force index creation"
 msgstr "¥½¡¼¥¹¤Î¥¢¥¹¥Ú¥¯¥È¡¦¥ì¥·¥ª"
 
-#: modules/demux/avi/avi.c:50
-msgid "AVI demuxer"
-msgstr ""
-
-#: modules/demux/avi/avi.c:228
-msgid "Avi"
+#: modules/demux/avi/avi.c:228 modules/gui/gtk/gnome_interface.c:2984
+#: modules/gui/gtk/gtk_interface.c:3229 modules/gui/macosx/output.m:319
+#: modules/gui/macosx/output.m:405
+msgid "AVI"
 msgstr ""
 
-#: modules/demux/avi/avi.c:229
-#, fuzzy
-msgid "Number of Streams"
-msgstr "¹Ô¿ô"
-
 #: modules/demux/avi/avi.c:230
 #, fuzzy
 msgid "Flags"
@@ -3589,6 +4124,11 @@ msgstr "ISO 13818-1 MPEGž
 msgid "ISO 13818-1 MPEG Transport Stream demuxstream (libdvbpsi)"
 msgstr "ISO 13818-1 MPEGžÁ÷¥¹¥È¥ê¡¼¥àÆþÎÏ(libdvdpsi)"
 
+#: modules/demux/dts.c:53
+#, fuzzy
+msgid "Raw DTS demuxer"
+msgstr "MPEG 1/2¥ì¥¤¥ä1/2¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
+
 #: modules/demux/flac.c:54
 msgid "flac demuxer"
 msgstr ""
@@ -3610,7 +4150,7 @@ msgstr ""
 msgid "RTSP/RTP describe"
 msgstr ""
 
-#: modules/demux/livedotcom.cpp:71
+#: modules/demux/livedotcom.cpp:71 modules/gui/wxwindows/open.cpp:525
 msgid "RTSP"
 msgstr ""
 
@@ -3620,8 +4160,9 @@ msgid "playlist metademux"
 msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
 
 #: modules/demux/mkv.cpp:94
-msgid "mkv-demuxer"
-msgstr ""
+#, fuzzy
+msgid "mkv demuxer"
+msgstr "MPEG 1/2¥ì¥¤¥ä1/2¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
 
 #: modules/demux/mkv.cpp:96 modules/demux/mkv.cpp:97
 msgid "Seek based on percent not time"
@@ -3632,88 +4173,64 @@ msgstr ""
 msgid "mka/mkv stream demuxer"
 msgstr "MPEG 1/2¥ì¥¤¥ä1/2¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
 
-#: modules/demux/mkv.cpp:2183 modules/gui/gtk/gnome_interface.c:2436
-#: modules/gui/gtk/gtk_interface.c:2857 modules/gui/wxwindows/playlist.cpp:264
-msgid "Duration"
-msgstr "»ý³´ü´Ö"
-
-#: modules/demux/mkv.cpp:2192
-msgid "Date UTC"
+#: modules/demux/mkv.cpp:2185
+msgid "UTC date"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2196
+#: modules/demux/mkv.cpp:2189
 #, fuzzy
-msgid "Segment Filename"
+msgid "Segment filename"
 msgstr "¥í¥°¡¦¥Õ¥¡¥¤¥ë̾"
 
-#: modules/demux/mkv.cpp:2200
+#: modules/demux/mkv.cpp:2193
 #, fuzzy
-msgid "Muxing Application"
+msgid "Muxing application"
 msgstr "¤³¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ë¤Ä¤¤¤Æ"
 
-#: modules/demux/mkv.cpp:2204
+#: modules/demux/mkv.cpp:2197
 #, fuzzy
-msgid "Writing Application"
+msgid "Writing application"
 msgstr "¿âľÊý¸þ°ÌÃÖ"
 
-#: modules/demux/mkv.cpp:2217 modules/gui/beos/PlayListWindow.cpp:144
+#: modules/demux/mkv.cpp:2210 modules/gui/beos/PlayListWindow.cpp:144
 #: modules/gui/gtk/preferences.c:325 modules/gui/kde/pluginsbox.cpp:45
-#: modules/gui/macosx/playlist.m:142 modules/gui/pda/interface.c:364
-#: modules/gui/wxwindows/iteminfo.cpp:173
+#: modules/gui/macosx/playlist.m:146 modules/gui/wxwindows/iteminfo.cpp:173
 #: modules/gui/wxwindows/playlist.cpp:262
 msgid "Name"
 msgstr "̾Á°"
 
-#: modules/demux/mkv.cpp:2221
-#, fuzzy
-msgid "Codec Name"
-msgstr "¥Ç¥Ð¥¤¥¹Ì¾"
-
-#: modules/demux/mkv.cpp:2225
+#: modules/demux/mkv.cpp:2222
 #, fuzzy
-msgid "Codec Setting"
+msgid "Codec setting"
 msgstr "ÀßÄê(_S)"
 
-#: modules/demux/mkv.cpp:2229
+#: modules/demux/mkv.cpp:2226
 #, fuzzy
-msgid "Codec Info"
+msgid "Codec info"
 msgstr "¥Ç¥Ð¥¤¥¹Ì¾"
 
-#: modules/demux/mkv.cpp:2233
+#: modules/demux/mkv.cpp:2230
 #, fuzzy
-msgid "Codec Download"
+msgid "Codec download"
 msgstr "¥Ç¥Ð¥¤¥¹Ì¾"
 
 #: modules/demux/mp4/mp4.c:42
 msgid "MP4 demuxer"
 msgstr ""
 
-#: modules/demux/mpeg/m4v.c:42
+#: modules/demux/mpeg/m4v.c:40
 #, fuzzy
-msgid "MPEG-4 video elementary stream demuxer"
+msgid "MPEG-4 video demuxer"
 msgstr "MPEG 1/2¥ì¥¤¥ä1/2¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
 
-#: modules/demux/mpeg/m4v.c:149
-msgid "mpeg"
-msgstr ""
-
-#: modules/demux/mpeg/m4v.c:150
-#, fuzzy
-msgid "Input Type"
-msgstr "ÆþÎÏ"
-
-#: modules/demux/mpeg/m4v.c:150
-msgid "Video MPEG-4 (raw ES)"
-msgstr ""
-
 #: modules/demux/mpeg/mpga.c:39
 #, fuzzy
-msgid "MPEG-I/II Audio demuxer"
+msgid "MPEG-I/II audio demuxer"
 msgstr "MPEG 1/2¥ì¥¤¥ä1/2¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
 
 #: modules/demux/mpeg/mpgv.c:40
 #, fuzzy
-msgid "MPEG-I/II Video demuxer"
+msgid "MPEG-I/II video demuxer"
 msgstr "MPEG 1/2¥ì¥¤¥ä1/2¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
 
 #: modules/demux/mpeg/ps.c:59
@@ -3732,12 +4249,12 @@ msgstr "ISO 13818-1 MPEGž
 msgid "ISO 13818-1 MPEG Transport Stream input (libdvbpsi)"
 msgstr "ISO 13818-1 MPEGžÁ÷¥¹¥È¥ê¡¼¥àÆþÎÏ(libdvdpsi)"
 
-#: modules/demux/ogg.c:154
+#: modules/demux/ogg.c:153
 #, fuzzy
 msgid "ogg stream demuxer"
 msgstr "MPEG 1/2¥ì¥¤¥ä1/2¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
 
-#: modules/demux/rawdv.c:109
+#: modules/demux/rawdv.c:39
 msgid "raw dv demuxer"
 msgstr ""
 
@@ -3745,346 +4262,348 @@ msgstr ""
 msgid "Simple id3 tag skipper"
 msgstr "¥·¥ó¥×¥ë¤Êid3¥¿¥°¡¦¥¹¥­¥Ã¥Ñ"
 
-#: modules/demux/util/id3genres.h:8
+#: modules/demux/util/id3genres.h:28
 msgid "Blues"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:9
-msgid "Classic Rock"
+#: modules/demux/util/id3genres.h:29
+msgid "Classic rock"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:10
+#: modules/demux/util/id3genres.h:30
 #, fuzzy
 msgid "Country"
 msgstr "¥³¥ó¥È¥í¡¼¥ë"
 
-#: modules/demux/util/id3genres.h:11
+#: modules/demux/util/id3genres.h:31
 #, fuzzy
 msgid "Dance"
 msgstr "¥­¥ã¥ó¥»¥ë"
 
-#: modules/demux/util/id3genres.h:12
+#: modules/demux/util/id3genres.h:32
 #, fuzzy
 msgid "Disco"
 msgstr "¥Ç¥£¥¹¥¯"
 
-#: modules/demux/util/id3genres.h:13
+#: modules/demux/util/id3genres.h:33
 msgid "Funk"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:14
+#: modules/demux/util/id3genres.h:34
 msgid "Grunge"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:15
+#: modules/demux/util/id3genres.h:35
 msgid "Hip-Hop"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:16
+#: modules/demux/util/id3genres.h:36
 msgid "Jazz"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:17
+#: modules/demux/util/id3genres.h:37
 #, fuzzy
 msgid "Metal"
 msgstr "¿âľ"
 
-#: modules/demux/util/id3genres.h:18
+#: modules/demux/util/id3genres.h:38
 msgid "New Age"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:19
+#: modules/demux/util/id3genres.h:39
 msgid "Oldies"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:20
+#: modules/demux/util/id3genres.h:40
 #, fuzzy
 msgid "Other"
 msgstr "¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ò±£¤¹"
 
-#: modules/demux/util/id3genres.h:21
+#: modules/demux/util/id3genres.h:41
 msgid "Pop"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:22
+#: modules/demux/util/id3genres.h:42
 msgid "R&B"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:23
+#: modules/demux/util/id3genres.h:43
 msgid "Rap"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:24
+#: modules/demux/util/id3genres.h:44
 msgid "Reggae"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:25
+#: modules/demux/util/id3genres.h:45
 msgid "Rock"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:26
+#: modules/demux/util/id3genres.h:46
 msgid "Techno"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:27
+#: modules/demux/util/id3genres.h:47
 msgid "Industrial"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:28
+#: modules/demux/util/id3genres.h:48
 msgid "Alternative"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:29
+#: modules/demux/util/id3genres.h:49
 #, fuzzy
 msgid "Ska"
 msgstr "±ÒÀ±"
 
-#: modules/demux/util/id3genres.h:30
-msgid "Death Metal"
+#: modules/demux/util/id3genres.h:50
+msgid "Death metal"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:31
+#: modules/demux/util/id3genres.h:51
 #, fuzzy
 msgid "Pranks"
 msgstr "ºÆÀ¸"
 
-#: modules/demux/util/id3genres.h:32
+#: modules/demux/util/id3genres.h:52
 #, fuzzy
 msgid "Soundtrack"
 msgstr "¥ª¡¼¥Ç¥£¥ª"
 
-#: modules/demux/util/id3genres.h:33
+#: modules/demux/util/id3genres.h:53
 msgid "Euro-Techno"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:34
+#: modules/demux/util/id3genres.h:54
 msgid "Ambient"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:35
+#: modules/demux/util/id3genres.h:55
 msgid "Trip-Hop"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:36
+#: modules/demux/util/id3genres.h:56
 #, fuzzy
 msgid "Vocal"
 msgstr "¿âľ"
 
-#: modules/demux/util/id3genres.h:37
+#: modules/demux/util/id3genres.h:57
 msgid "Jazz+Funk"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:38
+#: modules/demux/util/id3genres.h:58
 #, fuzzy
 msgid "Fusion"
 msgstr "¥Õ¥©¥ó¥È"
 
-#: modules/demux/util/id3genres.h:39
+#: modules/demux/util/id3genres.h:59
 #, fuzzy
 msgid "Trance"
 msgstr "¥­¥ã¥ó¥»¥ë"
 
-#: modules/demux/util/id3genres.h:40
+#: modules/demux/util/id3genres.h:60
 msgid "Classical"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:41
+#: modules/demux/util/id3genres.h:61
 msgid "Instrumental"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:42
+#: modules/demux/util/id3genres.h:62
 msgid "Acid"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:43
+#: modules/demux/util/id3genres.h:63
 #, fuzzy
 msgid "House"
 msgstr "ÊĤ¸¤ë"
 
-#: modules/demux/util/id3genres.h:44
+#: modules/demux/util/id3genres.h:64
 #, fuzzy
 msgid "Game"
 msgstr "̾Á°"
 
-#: modules/demux/util/id3genres.h:45
-msgid "Sound Clip"
-msgstr ""
+#: modules/demux/util/id3genres.h:65
+#, fuzzy
+msgid "Sound clip"
+msgstr "¥ª¡¼¥Ç¥£¥ª"
 
-#: modules/demux/util/id3genres.h:46
+#: modules/demux/util/id3genres.h:66
 msgid "Gospel"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:47
+#: modules/demux/util/id3genres.h:67
 #, fuzzy
 msgid "Noise"
 msgstr "¤Ê¤·"
 
-#: modules/demux/util/id3genres.h:48
-msgid "AlternRock"
+#: modules/demux/util/id3genres.h:68
+msgid "Alternrock"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:49
+#: modules/demux/util/id3genres.h:69
 msgid "Bass"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:50
+#: modules/demux/util/id3genres.h:70
 msgid "Soul"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:51
+#: modules/demux/util/id3genres.h:71
 msgid "Punk"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:52
+#: modules/demux/util/id3genres.h:72
 #, fuzzy
 msgid "Space"
 msgstr "Êݸ"
 
-#: modules/demux/util/id3genres.h:53
+#: modules/demux/util/id3genres.h:73
 #, fuzzy
 msgid "Meditative"
 msgstr "¥á¥Ç¥£¥¢"
 
-#: modules/demux/util/id3genres.h:54
-msgid "Instrumental Pop"
+#: modules/demux/util/id3genres.h:74
+msgid "Instrumental pop"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:55
-msgid "Instrumental Rock"
+#: modules/demux/util/id3genres.h:75
+msgid "Instrumental rock"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:56
+#: modules/demux/util/id3genres.h:76
 msgid "Ethnic"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:57
+#: modules/demux/util/id3genres.h:77
 msgid "Gothic"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:58
+#: modules/demux/util/id3genres.h:78
 msgid "Darkwave"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:59
+#: modules/demux/util/id3genres.h:79
 msgid "Techno-Industrial"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:60
+#: modules/demux/util/id3genres.h:80
 #, fuzzy
 msgid "Electronic"
 msgstr "ÁªÂò"
 
-#: modules/demux/util/id3genres.h:61
+#: modules/demux/util/id3genres.h:81
 msgid "Pop-Folk"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:62
+#: modules/demux/util/id3genres.h:82
 msgid "Eurodance"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:63
+#: modules/demux/util/id3genres.h:83
 msgid "Dream"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:64
-msgid "Southern Rock"
-msgstr ""
+#: modules/demux/util/id3genres.h:84
+#, fuzzy
+msgid "Southern rock"
+msgstr "¥ª¡¼¥Ç¥£¥ª"
 
-#: modules/demux/util/id3genres.h:65
+#: modules/demux/util/id3genres.h:85
 #, fuzzy
 msgid "Comedy"
 msgstr "¥³¥Ô¡¼"
 
-#: modules/demux/util/id3genres.h:66
+#: modules/demux/util/id3genres.h:86
 #, fuzzy
 msgid "Cult"
 msgstr "¥«¥Ã¥È"
 
-#: modules/demux/util/id3genres.h:67
+#: modules/demux/util/id3genres.h:87
 msgid "Gangsta"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:68
+#: modules/demux/util/id3genres.h:88
 msgid "Top 40"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:69
-msgid "Christian Rap"
+#: modules/demux/util/id3genres.h:89
+msgid "Christian rap"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:70
-msgid "Pop/Funk"
+#: modules/demux/util/id3genres.h:90
+msgid "Pop/funk"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:71
+#: modules/demux/util/id3genres.h:91
 msgid "Jungle"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:72
+#: modules/demux/util/id3genres.h:92
 msgid "Native American"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:73
+#: modules/demux/util/id3genres.h:93
 msgid "Cabaret"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:74
-msgid "New Wave"
+#: modules/demux/util/id3genres.h:94
+msgid "New wave"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:75
+#: modules/demux/util/id3genres.h:95
 msgid "Psychadelic"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:76
+#: modules/demux/util/id3genres.h:96
 #, fuzzy
 msgid "Rave"
 msgstr "Êݸ"
 
-#: modules/demux/util/id3genres.h:77
+#: modules/demux/util/id3genres.h:97
 msgid "Showtunes"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:78
+#: modules/demux/util/id3genres.h:98
 #, fuzzy
 msgid "Trailer"
 msgstr "¥¿¥¤¥È¥ë"
 
-#: modules/demux/util/id3genres.h:79
+#: modules/demux/util/id3genres.h:99
 msgid "Lo-Fi"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:80
+#: modules/demux/util/id3genres.h:100
 msgid "Tribal"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:81
-msgid "Acid Punk"
+#: modules/demux/util/id3genres.h:101
+msgid "Acid punk"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:82
-msgid "Acid Jazz"
+#: modules/demux/util/id3genres.h:102
+msgid "Acid jazz"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:83
+#: modules/demux/util/id3genres.h:103
 #, fuzzy
 msgid "Polka"
 msgstr "ºÆÀ¸"
 
-#: modules/demux/util/id3genres.h:84
+#: modules/demux/util/id3genres.h:104
 msgid "Retro"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:85
+#: modules/demux/util/id3genres.h:105
 msgid "Musical"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:86
-msgid "Rock & Roll"
+#: modules/demux/util/id3genres.h:106
+msgid "Rock & roll"
 msgstr ""
 
-#: modules/demux/util/id3genres.h:87
-msgid "Hard Rock"
+#: modules/demux/util/id3genres.h:107
+msgid "Hard rock"
 msgstr ""
 
 #: modules/demux/util/id3tag.c:50
@@ -4120,41 +4639,39 @@ msgstr ""
 
 #: modules/gui/beos/InterfaceWindow.cpp:201
 #: modules/gui/beos/InterfaceWindow.cpp:308 modules/gui/macosx/prefs.m:78
-#: modules/gui/pda/interface.c:151 modules/gui/pda/interface.c:152
-#: modules/gui/wxwindows/preferences.cpp:175
+#: modules/gui/wxwindows/preferences.cpp:177
 msgid "Preferences"
 msgstr "ÀßÄê..."
 
 #: modules/gui/beos/InterfaceWindow.cpp:211
 #: modules/gui/beos/InterfaceWindow.cpp:306
-#: modules/gui/gtk/gnome_interface.c:2692 modules/gui/gtk/gtk_interface.c:2947
-#: modules/gui/kde/info.cpp:9 modules/gui/kde/messages.cpp:8
-#: modules/gui/macosx/intf.m:444 modules/gui/macosx/intf.m:524
+#: 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:455 modules/gui/macosx/intf.m:535
 #: modules/gui/wxwindows/messages.cpp:65
 msgid "Messages"
 msgstr "¥á¥Ã¥»¡¼¥¸"
 
 #: modules/gui/beos/InterfaceWindow.cpp:238
-#: modules/gui/beos/MediaControlView.cpp:1255
+#: modules/gui/beos/MediaControlView.cpp:1263
 #: modules/gui/beos/PlayListWindow.cpp:82
 #: modules/gui/gtk/gnome_interface.c:503
-#: modules/gui/gtk/gnome_interface.c:1569
-#: modules/gui/gtk/gnome_interface.c:2274
-#: modules/gui/gtk/gnome_interface.c:2847 modules/gui/gtk/gtk_interface.c:618
-#: modules/gui/gtk/gtk_interface.c:1884 modules/gui/gtk/gtk_interface.c:2733
-#: modules/gui/gtk/gtk_interface.c:2850 modules/gui/gtk/gtk_interface.c:3102
+#: 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:141 modules/gui/macosx/open.m:259
 #: modules/gui/macosx/output.m:132 modules/gui/macosx/output.m:209
-#: modules/gui/macosx/output.m:328 modules/gui/pda/interface.c:380
-#: modules/gui/pda/pda_interface.c:355 modules/gui/wxwindows/interface.cpp:422
-#: modules/gui/wxwindows/open.cpp:313 modules/gui/wxwindows/streamout.cpp:398
+#: modules/gui/macosx/output.m:328 modules/gui/pda/pda_interface.c:360
+#: modules/gui/wxwindows/interface.cpp:407 modules/gui/wxwindows/open.cpp:321
+#: modules/gui/wxwindows/streamout.cpp:417
 msgid "File"
 msgstr "¥Õ¥¡¥¤¥ë"
 
 #: modules/gui/beos/InterfaceWindow.cpp:240
 #: modules/gui/beos/PlayListWindow.cpp:84
-#: modules/gui/gtk/gnome_interface.c:2179
-#: modules/gui/gtk2/gnome2_interface.c:113 modules/gui/macosx/open.m:327
+#: modules/gui/gtk/gnome_interface.c:2191 modules/gui/macosx/open.m:327
 #: modules/gui/macosx/open.m:626 modules/gui/macosx/open.m:672
 msgid "Open File"
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯"
@@ -4171,10 +4688,8 @@ msgid "Open Subtitles"
 msgstr "»úËë"
 
 #: modules/gui/beos/InterfaceWindow.cpp:249
-#: modules/gui/gtk/gtk_interface.c:1580 modules/gui/pda/interface.c:233
-#: modules/gui/pda/interface.c:234 modules/gui/pda/interface.c:767
-#: modules/gui/pda/pda_interface.c:290 modules/gui/pda/pda_interface.c:291
-#: modules/gui/pda/pda_interface.c:1266
+#: modules/gui/gtk/gtk_interface.c:1580 modules/gui/pda/pda_interface.c:293
+#: modules/gui/pda/pda_interface.c:294 modules/gui/pda/pda_interface.c:1310
 msgid "About"
 msgstr "VideoLAN¤Ë¤Ä¤¤¤Æ"
 
@@ -4188,11 +4703,6 @@ msgstr "
 msgid "Next Title"
 msgstr "¼¡¤Î¥Õ¥¡¥¤¥ë"
 
-#: modules/gui/beos/InterfaceWindow.cpp:266
-#, fuzzy
-msgid "Prev Chapter"
-msgstr "¥Á¥ã¥×¥¿¡¼"
-
 #: modules/gui/beos/InterfaceWindow.cpp:268
 msgid "Goto Menu"
 msgstr ""
@@ -4212,7 +4722,7 @@ msgstr "
 msgid "Speed"
 msgstr "ÁªÂòºÑ¤ß"
 
-#: modules/gui/beos/InterfaceWindow.cpp:303 modules/gui/macosx/intf.m:518
+#: modules/gui/beos/InterfaceWindow.cpp:303 modules/gui/macosx/intf.m:529
 msgid "Window"
 msgstr "¥¦¥£¥ó¥É¥¦"
 
@@ -4222,29 +4732,29 @@ msgid "Play List"
 msgstr "¥ê¥¹¥È"
 
 #: modules/gui/beos/InterfaceWindow.cpp:364
-#: modules/gui/gtk/gtk_interface.c:1661 modules/gui/gtk/gtk_interface.c:2396
-#: modules/gui/gtk/gtk_interface.c:2638 modules/gui/gtk/gtk_interface.c:2869
-#: modules/gui/gtk/gtk_interface.c:2976 modules/gui/gtk/gtk_interface.c:3250
+#: 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:606 modules/gui/macosx/open.m:138
 #: modules/gui/macosx/open.m:179 modules/gui/macosx/output.m:128
-#: modules/gui/wxwindows/iteminfo.cpp:110 modules/gui/wxwindows/open.cpp:304
-#: modules/gui/wxwindows/playlist.cpp:1031
-#: modules/gui/wxwindows/preferences.cpp:195
-#: modules/gui/wxwindows/streamout.cpp:191
-#: modules/gui/wxwindows/subtitles.cpp:176 modules/gui/wxwindows/v4l.cpp:149
+#: modules/gui/wxwindows/iteminfo.cpp:110 modules/gui/wxwindows/open.cpp:312
+#: modules/gui/wxwindows/playlist.cpp:1025
+#: modules/gui/wxwindows/preferences.cpp:197
+#: modules/gui/wxwindows/streamout.cpp:197
+#: modules/gui/wxwindows/subtitles.cpp:176 modules/gui/wxwindows/v4l.cpp:150
 msgid "OK"
 msgstr ""
 
 #: modules/gui/beos/InterfaceWindow.cpp:372
-msgid "VideoLAN Client: Open Media Files"
+msgid "VLC Media Player: Open Media Files"
 msgstr ""
 
 #: modules/gui/beos/InterfaceWindow.cpp:376
 #, fuzzy
-msgid "VideoLAN Client: Open Subtitle File"
+msgid "VLC Media Player: Open Subtitle File"
 msgstr "»úËë¤ÎÁªÂò"
 
-#: modules/gui/beos/MediaControlView.cpp:64
+#: modules/gui/beos/MediaControlView.cpp:68
 msgid "Drop files to play"
 msgstr ""
 
@@ -4253,12 +4763,12 @@ msgstr ""
 msgid "Close"
 msgstr "ÊĤ¸¤ë"
 
-#: modules/gui/beos/PlayListWindow.cpp:98 modules/gui/macosx/intf.m:463
+#: modules/gui/beos/PlayListWindow.cpp:98 modules/gui/macosx/intf.m:474
 msgid "Edit"
 msgstr "ÊÔ½¸"
 
-#: modules/gui/beos/PlayListWindow.cpp:100 modules/gui/macosx/intf.m:468
-#: modules/gui/macosx/playlist.m:141
+#: modules/gui/beos/PlayListWindow.cpp:100 modules/gui/macosx/intf.m:479
+#: modules/gui/macosx/playlist.m:145
 msgid "Select All"
 msgstr "¤¹¤Ù¤Æ¤òÁªÂò"
 
@@ -4301,63 +4811,63 @@ msgstr "ɽ
 msgid "Path"
 msgstr "¥Ý¡¼¥ÈÈÖ¹æ"
 
-#: modules/gui/beos/PreferencesWindow.cpp:44
 #: modules/gui/beos/PreferencesWindow.cpp:46
-#: modules/gui/beos/PreferencesWindow.cpp:98
-#: modules/gui/gtk/gnome_interface.c:2216 modules/gui/macosx/prefs.m:940
+#: modules/gui/beos/PreferencesWindow.cpp:48
+#: modules/gui/beos/PreferencesWindow.cpp:102
+#: modules/gui/gtk/gnome_interface.c:2228 modules/gui/macosx/prefs.m:940
 #: modules/gui/macosx/prefs.m:948 modules/gui/macosx/prefs.m:1018
 msgid "Modules"
 msgstr "¥â¥¸¥å¡¼¥ë"
 
-#: modules/gui/beos/PreferencesWindow.cpp:219
+#: modules/gui/beos/PreferencesWindow.cpp:233
 #: modules/gui/gtk/preferences.c:610
 msgid "Apply"
 msgstr "ŬÍÑ"
 
-#: modules/gui/beos/PreferencesWindow.cpp:224
+#: modules/gui/beos/PreferencesWindow.cpp:238
 #: modules/gui/gtk/preferences.c:597 modules/gui/gtk/preferences.c:614
-#: modules/gui/macosx/output.m:422 modules/gui/macosx/playlist.m:197
-#: modules/gui/macosx/prefs.m:79 modules/gui/wxwindows/preferences.cpp:199
+#: modules/gui/macosx/output.m:422 modules/gui/macosx/playlist.m:204
+#: modules/gui/macosx/prefs.m:79 modules/gui/wxwindows/preferences.cpp:201
 msgid "Save"
 msgstr "Êݸ"
 
-#: modules/gui/beos/PreferencesWindow.cpp:228
+#: modules/gui/beos/PreferencesWindow.cpp:242
 #, fuzzy
 msgid "Defaults"
 msgstr "ºï½ü"
 
-#: modules/gui/beos/VideoOutput.cpp:1169
+#: modules/gui/beos/VideoOutput.cpp:1189
 #, fuzzy
 msgid "Show Interface"
 msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹"
 
-#: modules/gui/beos/VideoOutput.cpp:1173
+#: modules/gui/beos/VideoOutput.cpp:1193
 msgid "50%"
 msgstr ""
 
-#: modules/gui/beos/VideoOutput.cpp:1176
+#: modules/gui/beos/VideoOutput.cpp:1196
 msgid "100%"
 msgstr ""
 
-#: modules/gui/beos/VideoOutput.cpp:1179
+#: modules/gui/beos/VideoOutput.cpp:1199
 msgid "200%"
 msgstr ""
 
-#: modules/gui/beos/VideoOutput.cpp:1189
+#: modules/gui/beos/VideoOutput.cpp:1209
 #, fuzzy
 msgid "Vertical Sync"
 msgstr "¿âľ"
 
-#: modules/gui/beos/VideoOutput.cpp:1193
+#: modules/gui/beos/VideoOutput.cpp:1213
 #, fuzzy
 msgid "Correct Aspect Ratio"
 msgstr "¥½¡¼¥¹¤Î¥¢¥¹¥Ú¥¯¥È¡¦¥ì¥·¥ª"
 
-#: modules/gui/beos/VideoOutput.cpp:1222
+#: modules/gui/beos/VideoOutput.cpp:1242
 msgid "Stay On Top"
 msgstr ""
 
-#: modules/gui/beos/VideoOutput.cpp:1228
+#: modules/gui/beos/VideoOutput.cpp:1248
 msgid "Take Screen Shot"
 msgstr ""
 
@@ -4413,7 +4923,7 @@ 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/wxwindows/interface.cpp:297
+#: modules/gui/wxwindows/interface.cpp:291
 #, fuzzy
 msgid "Open a file"
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯"
@@ -4426,8 +4936,10 @@ msgstr "
 #: modules/gui/gtk/gnome_interface.c:27 modules/gui/gtk/gnome_interface.c:516
 #: modules/gui/gtk/gnome_interface.c:993 modules/gui/gtk/gtk_interface.c:188
 #: modules/gui/gtk/gtk_interface.c:630 modules/gui/gtk/gtk_interface.c:1411
-msgid "Open a DVD or VCD"
-msgstr "DVD¤Þ¤¿¤ÏVCD¤ò³«¤¯"
+#: modules/gui/wxwindows/interface.cpp:292
+#, fuzzy
+msgid "Open Disc Media"
+msgstr "¥Ç¥£¥¹¥¯¤ò³«¤¯(_D)..."
 
 #: modules/gui/gtk/gnome_interface.c:33 modules/gui/gtk/gnome_interface.c:999
 #: modules/gui/gtk/gtk_interface.c:195 modules/gui/gtk/gtk_interface.c:1415
@@ -4516,22 +5028,16 @@ msgstr "
 
 #: modules/gui/gtk/gnome_interface.c:126 modules/gui/gtk/gnome_interface.c:909
 #: modules/gui/gtk/gtk_interface.c:452 modules/gui/gtk/gtk_interface.c:1253
-#: modules/gui/macosx/intf.m:490
+#: modules/gui/macosx/intf.m:501
 msgid "Volume Up"
 msgstr "¥Ü¥ê¥å¡¼¥à¤ò¾å¤²¤ë"
 
 #: modules/gui/gtk/gnome_interface.c:133 modules/gui/gtk/gnome_interface.c:916
 #: modules/gui/gtk/gtk_interface.c:459 modules/gui/gtk/gtk_interface.c:1260
-#: modules/gui/macosx/intf.m:491
+#: modules/gui/macosx/intf.m:502
 msgid "Volume Down"
 msgstr "¥Ü¥ê¥å¡¼¥à¤ò²¼¤²¤ë"
 
-#: 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:698 modules/gui/macosx/intf.m:492
-msgid "Mute"
-msgstr "¥ß¥å¡¼¥È¤¹¤ë"
-
 #: 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
 msgid "Device"
@@ -4568,19 +5074,17 @@ msgid "_Video"
 msgstr "¥Ó¥Ç¥ª"
 
 #: modules/gui/gtk/gnome_interface.c:274 modules/gui/gtk/gtk_interface.c:121
-#: modules/gui/gtk/gtk_interface.c:1595 modules/gui/pda/interface.c:99
-#: modules/gui/pda/interface.c:734 modules/gui/pda/pda_interface.c:202
-#: modules/gui/pda/pda_interface.c:1259
+#: modules/gui/gtk/gtk_interface.c:1595 modules/gui/pda/pda_interface.c:205
+#: modules/gui/pda/pda_interface.c:1302
 msgid "VLC media player"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:527 modules/gui/gtk/gtk_interface.c:640
-#: modules/gui/wxwindows/interface.cpp:426
+#: modules/gui/wxwindows/interface.cpp:411
 msgid "Net"
 msgstr "Network"
 
 #: modules/gui/gtk/gnome_interface.c:539 modules/gui/gtk/gtk_interface.c:651
-#: modules/gui/wxwindows/interface.cpp:429
 msgid "Sat"
 msgstr "±ÒÀ±"
 
@@ -4642,7 +5146,7 @@ msgstr "
 #: 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/wxwindows/interface.cpp:441
+#: modules/gui/wxwindows/interface.cpp:423
 msgid "Prev"
 msgstr "Á°"
 
@@ -4712,7 +5216,7 @@ msgid "Playlist..."
 msgstr "¥×¥ì¥¤¥ê¥¹¥È..."
 
 #: modules/gui/gtk/gnome_interface.c:1361 modules/gui/gtk/gtk_interface.c:1603
-#: modules/gui/kde/kde.cpp:111 modules/gui/pda/interface.c:713
+#: modules/gui/kde/kde.cpp:111 modules/gui/pda/pda_interface.c:1295
 msgid "(c) 1996-2003 the VideoLAN team"
 msgstr ""
 
@@ -4726,22 +5230,22 @@ msgstr ""
 "¤³¤Î¥½¥Õ¥È¥¦¥§¥¢¤ÏDVD¤ª¤è¤Ó¡¢MPEG¤òºÆÀ¸¤¹¤ëVideoLAN¥¯¥é¥¤¥¢¥ó¥È¤Ç¤¹¡£\n"
 "¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ï¡¢¥Í¥Ã¥È¥ï¡¼¥¯¤«¤éMPEG¤ÈMPEG 2¥Ç¡¼¥¿¤òºÆÀ¸¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
 
-#: modules/gui/gtk/gnome_interface.c:1459
+#: modules/gui/gtk/gnome_interface.c:1460
 msgid "Open Stream"
 msgstr "¥¹¥È¥ê¡¼¥à¤ò³«¤¯"
 
-#: modules/gui/gtk/gnome_interface.c:1476 modules/gui/gtk/gtk_interface.c:1791
-#: modules/gui/macosx/open.m:136 modules/gui/wxwindows/open.cpp:247
+#: modules/gui/gtk/gnome_interface.c:1477 modules/gui/gtk/gtk_interface.c:1792
+#: modules/gui/macosx/open.m:136 modules/gui/wxwindows/open.cpp:255
 msgid "Media Resource Locator (MRL)"
 msgstr "¥á¥Ç¥£¥¢¡¦¥ê¥½¡¼¥¹¡¦¥í¥±¡¼¥¿ (MRL)"
 
-#: modules/gui/gtk/gnome_interface.c:1498 modules/gui/gtk/gtk_interface.c:1813
-#: modules/gui/wxwindows/open.cpp:251
+#: modules/gui/gtk/gnome_interface.c:1499 modules/gui/gtk/gtk_interface.c:1814
+#: modules/gui/wxwindows/open.cpp:259
 msgid "Open Target:"
 msgstr "¥¿¡¼¥²¥Ã¥È¤ò³«¤¯"
 
-#: modules/gui/gtk/gnome_interface.c:1518 modules/gui/gtk/gtk_interface.c:1833
-#: modules/gui/wxwindows/open.cpp:266
+#: modules/gui/gtk/gnome_interface.c:1519 modules/gui/gtk/gtk_interface.c:1834
+#: modules/gui/wxwindows/open.cpp:274
 msgid ""
 "Alternatively, you can build an MRL using one of the following predefined "
 "targets:"
@@ -4749,142 +5253,147 @@ msgstr ""
 "Ê̤ÎÊýË¡¤È¤·¤Æ¡¢¤¢¤é¤«¤¸¤á°Ê²¼¤ËÄêµÁ¤µ¤ì¤¿¥¿¡¼¥²¥Ã¥È¤Î°ì¤Ä¤ò»È¤Ã¤ÆMRL¤ò¹½À®¤Ç"
 "¤­¤Þ¤¹¡£:"
 
-#: modules/gui/gtk/gnome_interface.c:1562
-#: modules/gui/gtk/gnome_interface.c:1998 modules/gui/gtk/gtk_interface.c:1877
-#: modules/gui/gtk/gtk_interface.c:2315 modules/gui/macosx/open.m:145
+#: 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:145
 #: modules/gui/macosx/open.m:151 modules/gui/macosx/open.m:173
 #: modules/gui/macosx/output.m:135 modules/gui/macosx/prefs.m:499
-#: modules/gui/macosx/prefs_widgets.m:588 modules/gui/wxwindows/open.cpp:420
+#: modules/gui/macosx/prefs_widgets.m:588 modules/gui/wxwindows/open.cpp:428
 #: modules/gui/wxwindows/preferences_widgets.cpp:494
-#: modules/gui/wxwindows/streamout.cpp:427
+#: modules/gui/wxwindows/streamout.cpp:446
 #: modules/gui/wxwindows/subtitles.cpp:93
 msgid "Browse..."
 msgstr "¥Ö¥é¥¦¥º..."
 
-#: modules/gui/gtk/gnome_interface.c:1586 modules/gui/gtk/gtk_interface.c:1901
-#: modules/gui/wxwindows/open.cpp:471
+#: modules/gui/gtk/gnome_interface.c:1587 modules/gui/gtk/gtk_interface.c:1902
+#: modules/gui/wxwindows/open.cpp:479
 msgid "Disc type"
 msgstr "¥Ç¥£¥¹¥¯¡¦¥¿¥¤¥×"
 
-#: modules/gui/gtk/gnome_interface.c:1605 modules/gui/gtk/gtk_interface.c:1920
+#: modules/gui/gtk/gnome_interface.c:1606 modules/gui/gtk/gtk_interface.c:1921
 #: modules/gui/macosx/open.m:155 modules/gui/macosx/open.m:483
-#: modules/gui/wxwindows/open.cpp:465
+#: modules/gui/wxwindows/open.cpp:473
 msgid "DVD"
 msgstr ""
 
-#: modules/gui/gtk/gnome_interface.c:1613 modules/gui/gtk/gtk_interface.c:1928
+#: modules/gui/gtk/gnome_interface.c:1614 modules/gui/gtk/gtk_interface.c:1929
 #: modules/gui/macosx/open.m:156 modules/gui/macosx/open.m:377
-#: modules/gui/macosx/open.m:467 modules/gui/wxwindows/open.cpp:466
+#: modules/gui/macosx/open.m:467 modules/gui/wxwindows/open.cpp:474
 msgid "VCD"
 msgstr ""
 
-#: modules/gui/gtk/gnome_interface.c:1621 modules/gui/gtk/gtk_interface.c:1936
-#: modules/gui/macosx/open.m:148 modules/gui/wxwindows/open.cpp:477
+#: modules/gui/gtk/gnome_interface.c:1622 modules/gui/gtk/gtk_interface.c:1937
+#: modules/gui/macosx/open.m:157 modules/gui/macosx/open.m:384
+#: modules/gui/macosx/open.m:475 modules/gui/wxwindows/open.cpp:475
+#, fuzzy
+msgid "Audio CD"
+msgstr "¥ª¡¼¥Ç¥£¥ª"
+
+#: modules/gui/gtk/gnome_interface.c:1630 modules/gui/gtk/gtk_interface.c:1945
+#: modules/gui/macosx/open.m:148 modules/gui/wxwindows/open.cpp:486
 msgid "Device name"
 msgstr "¥Ç¥Ð¥¤¥¹Ì¾"
 
-#: modules/gui/gtk/gnome_interface.c:1660 modules/gui/gtk/gtk_interface.c:1996
+#: modules/gui/gtk/gnome_interface.c:1669 modules/gui/gtk/gtk_interface.c:2005
 #: modules/gui/macosx/open.m:152
 msgid "Use DVD menus"
 msgstr "DVD¥á¥Ë¥å¡¼¤ò»ÈÍÑ"
 
-#: modules/gui/gtk/gnome_interface.c:1707 modules/gui/gtk/gtk_interface.c:2022
+#: modules/gui/gtk/gnome_interface.c:1716 modules/gui/gtk/gtk_interface.c:2031
 #: modules/gui/macosx/open.m:164 modules/gui/macosx/open.m:542
-#: modules/gui/macosx/open.m:580 modules/gui/wxwindows/open.cpp:512
+#: modules/gui/macosx/open.m:580 modules/gui/wxwindows/open.cpp:522
 msgid "UDP/RTP"
 msgstr ""
 
-#: modules/gui/gtk/gnome_interface.c:1717 modules/gui/gtk/gtk_interface.c:2032
+#: modules/gui/gtk/gnome_interface.c:1726 modules/gui/gtk/gtk_interface.c:2041
 #: modules/gui/macosx/open.m:165 modules/gui/macosx/open.m:543
-#: modules/gui/macosx/open.m:592 modules/gui/wxwindows/open.cpp:513
+#: modules/gui/macosx/open.m:592 modules/gui/wxwindows/open.cpp:523
 msgid "UDP/RTP Multicast"
 msgstr "UDP¥Þ¥ë¥Á¥­¥ã¥¹¥È"
 
-#: modules/gui/gtk/gnome_interface.c:1727 modules/gui/gtk/gtk_interface.c:2042
+#: modules/gui/gtk/gnome_interface.c:1736 modules/gui/gtk/gtk_interface.c:2051
 #: modules/gui/macosx/open.m:166 modules/gui/macosx/open.m:544
-#: modules/gui/macosx/open.m:605 modules/gui/wxwindows/open.cpp:514
+#: modules/gui/macosx/open.m:605 modules/gui/wxwindows/open.cpp:524
 msgid "HTTP/FTP/MMS"
 msgstr ""
 
-#: modules/gui/gtk/gnome_interface.c:1737
-#: modules/gui/gtk/gnome_interface.c:1786
-#: modules/gui/gtk/gnome_interface.c:2912 modules/gui/gtk/gtk_interface.c:2052
-#: modules/gui/gtk/gtk_interface.c:2101 modules/gui/gtk/gtk_interface.c:3225
+#: 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:159 modules/gui/macosx/open.m:161
-#: modules/gui/macosx/output.m:137 modules/gui/pda/interface.c:425
-#: modules/gui/wxwindows/open.cpp:533 modules/gui/wxwindows/open.cpp:556
-#: modules/gui/wxwindows/streamout.cpp:457
+#: modules/gui/macosx/output.m:137 modules/gui/wxwindows/open.cpp:544
+#: modules/gui/wxwindows/open.cpp:571 modules/gui/wxwindows/streamout.cpp:476
 msgid "Port"
 msgstr "¥Ý¡¼¥ÈÈÖ¹æ"
 
-#: modules/gui/gtk/gnome_interface.c:1747 modules/gui/gtk/gtk_interface.c:2062
+#: modules/gui/gtk/gnome_interface.c:1756 modules/gui/gtk/gtk_interface.c:2071
 #: modules/gui/macosx/open.m:160 modules/gui/macosx/output.m:136
-#: modules/gui/pda/interface.c:414 modules/gui/wxwindows/open.cpp:548
-#: modules/gui/wxwindows/streamout.cpp:446
+#: modules/gui/wxwindows/open.cpp:563 modules/gui/wxwindows/streamout.cpp:465
 msgid "Address"
 msgstr "¥Û¥¹¥È̾/¥¢¥É¥ì¥¹"
 
-#: modules/gui/gtk/gnome_interface.c:1759 modules/gui/gtk/gtk_interface.c:2074
-#: modules/gui/macosx/open.m:162 modules/gui/wxwindows/open.cpp:571
+#: modules/gui/gtk/gnome_interface.c:1768 modules/gui/gtk/gtk_interface.c:2083
+#: modules/gui/macosx/open.m:162 modules/gui/wxwindows/open.cpp:588
 msgid "URL"
 msgstr ""
 
-#: modules/gui/gtk/gnome_interface.c:1830
-#: modules/gui/gtk/gnome_interface.c:2281 modules/gui/gtk/gtk_interface.c:2145
-#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:143
-#: modules/gui/macosx/open.m:267 modules/gui/pda/interface.c:518
-#: modules/gui/pda/pda_interface.c:522 modules/gui/wxwindows/open.cpp:317
+#: 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:143
+#: modules/gui/macosx/open.m:267 modules/gui/pda/pda_interface.c:524
+#: modules/gui/wxwindows/open.cpp:325
 msgid "Network"
 msgstr "¥Í¥Ã¥È¥ï¡¼¥¯"
 
-#: modules/gui/gtk/gnome_interface.c:1847 modules/gui/gtk/gtk_interface.c:2162
+#: modules/gui/gtk/gnome_interface.c:1856 modules/gui/gtk/gtk_interface.c:2171
 msgid "Symbol Rate"
 msgstr "¥·¥ó¥Ü¥ë¡¦¥ì¡¼¥È"
 
-#: modules/gui/gtk/gnome_interface.c:1857 modules/gui/gtk/gtk_interface.c:2172
-#: modules/gui/wxwindows/v4l.cpp:304
+#: modules/gui/gtk/gnome_interface.c:1866 modules/gui/gtk/gtk_interface.c:2181
+#: modules/gui/wxwindows/v4l.cpp:305
 msgid "Frequency"
 msgstr "¼þÇÈ¿ô"
 
-#: modules/gui/gtk/gnome_interface.c:1867 modules/gui/gtk/gtk_interface.c:2182
+#: modules/gui/gtk/gnome_interface.c:1876 modules/gui/gtk/gtk_interface.c:2191
 msgid "Polarization"
 msgstr "¶ËÀ­"
 
-#: modules/gui/gtk/gnome_interface.c:1887 modules/gui/gtk/gtk_interface.c:2202
+#: modules/gui/gtk/gnome_interface.c:1896 modules/gui/gtk/gtk_interface.c:2211
 msgid "FEC"
 msgstr ""
 
-#: modules/gui/gtk/gnome_interface.c:1906 modules/gui/gtk/gtk_interface.c:2221
+#: modules/gui/gtk/gnome_interface.c:1915 modules/gui/gtk/gtk_interface.c:2230
 msgid "Vertical"
 msgstr "¿âľ"
 
-#: modules/gui/gtk/gnome_interface.c:1914 modules/gui/gtk/gtk_interface.c:2229
+#: modules/gui/gtk/gnome_interface.c:1923 modules/gui/gtk/gtk_interface.c:2238
 msgid "Horizontal"
 msgstr "¿åÊ¿"
 
-#: modules/gui/gtk/gnome_interface.c:1956 modules/gui/gtk/gtk_interface.c:2271
+#: modules/gui/gtk/gnome_interface.c:1965 modules/gui/gtk/gtk_interface.c:2280
 msgid "Satellite"
 msgstr "±ÒÀ±"
 
-#: modules/gui/gtk/gnome_interface.c:2005 modules/gui/gtk/gtk_interface.c:2322
+#: modules/gui/gtk/gnome_interface.c:2014 modules/gui/gtk/gtk_interface.c:2331
 #: modules/gui/macosx/open.m:175
 #, fuzzy
 msgid "delay"
 msgstr "ºÆÀ¸"
 
-#: modules/gui/gtk/gnome_interface.c:2020 modules/gui/gtk/gtk_interface.c:2338
+#: modules/gui/gtk/gnome_interface.c:2029 modules/gui/gtk/gtk_interface.c:2347
 #: modules/gui/macosx/open.m:177
 msgid "fps"
 msgstr ""
 
-#: modules/gui/gtk/gnome_interface.c:2049 modules/gui/gtk/gtk_interface.c:2369
+#: modules/gui/gtk/gnome_interface.c:2058 modules/gui/gtk/gtk_interface.c:2378
 #: modules/gui/macosx/open.m:172 modules/gui/macosx/output.m:127
-#: modules/gui/wxwindows/open.cpp:284 modules/gui/wxwindows/open.cpp:433
+#: modules/gui/wxwindows/open.cpp:292 modules/gui/wxwindows/open.cpp:441
 #, fuzzy
 msgid "Settings..."
 msgstr "ÀßÄê(_S)"
 
-#: modules/gui/gtk/gnome_interface.c:2224
+#: modules/gui/gtk/gnome_interface.c:2236
 msgid ""
 "Sorry, the module manager isn't functional yet. Please retry in a later "
 "version."
@@ -4892,114 +5401,100 @@ msgstr ""
 "¤¹¤ß¤Þ¤»¤ó¤¬¡¢¤³¤Î¥â¥¸¥å¡¼¥ë¡¦¥Þ¥Í¡¼¥¸¥ã¡¼¤Ï¤Þ¤Àµ¡Ç½¤·¤Þ¤»¤ó¡£¿·¤·¤¤¥Ð¡¼¥¸¥ç"
 "¥ó¤Ç»î¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: modules/gui/gtk/gnome_interface.c:2288
-#: modules/gui/gtk/gnome_interface.c:2429 modules/gui/gtk/gtk_interface.c:2747
+#: modules/gui/gtk/gnome_interface.c:2300
+#: modules/gui/gtk/gnome_interface.c:2441 modules/gui/gtk/gtk_interface.c:2759
 msgid "Url"
 msgstr ""
 
-#: modules/gui/gtk/gnome_interface.c:2300 modules/gui/gtk/gtk_interface.c:2768
+#: modules/gui/gtk/gnome_interface.c:2312 modules/gui/gtk/gtk_interface.c:2780
 msgid "All"
 msgstr "¤¹¤Ù¤Æ"
 
-#: modules/gui/gtk/gnome_interface.c:2307
+#: modules/gui/gtk/gnome_interface.c:2319
 msgid "Item"
 msgstr "¹àÌÜ"
 
-#: modules/gui/gtk/gnome_interface.c:2319 modules/video_filter/crop.c:61
+#: modules/gui/gtk/gnome_interface.c:2331 modules/video_filter/crop.c:61
 msgid "Crop"
 msgstr "±ï¼è¤ê"
 
-#: modules/gui/gtk/gnome_interface.c:2326
+#: modules/gui/gtk/gnome_interface.c:2338
 msgid "Invert"
 msgstr "µÕž"
 
-#: modules/gui/gtk/gnome_interface.c:2333 modules/gui/gtk/preferences.c:382
+#: modules/gui/gtk/gnome_interface.c:2345 modules/gui/gtk/preferences.c:382
 #: modules/gui/kde/pluginsbox.cpp:48 modules/gui/macosx/prefs.m:234
 #: modules/gui/macosx/prefs_widgets.m:626
 msgid "Select"
 msgstr "ÁªÂò"
 
-#: modules/gui/gtk/gnome_interface.c:2345 modules/gui/gtk/gtk_interface.c:2712
-#: modules/gui/pda/interface.c:287
+#: modules/gui/gtk/gnome_interface.c:2357 modules/gui/gtk/gtk_interface.c:2724
 msgid "Add"
 msgstr "ÄɲÃ"
 
-#: modules/gui/gtk/gnome_interface.c:2352 modules/gui/gtk/gtk_interface.c:2754
-#: modules/gui/macosx/playlist.m:140 modules/gui/pda/pda_interface.c:1158
+#: modules/gui/gtk/gnome_interface.c:2364 modules/gui/gtk/gtk_interface.c:2766
+#: modules/gui/macosx/playlist.m:144 modules/gui/pda/pda_interface.c:1200
 msgid "Delete"
 msgstr "ºï½ü"
 
-#: modules/gui/gtk/gnome_interface.c:2359 modules/gui/gtk/gtk_interface.c:2782
+#: modules/gui/gtk/gnome_interface.c:2371 modules/gui/gtk/gtk_interface.c:2794
 msgid "Selection"
 msgstr "ÁªÂò"
 
-#: modules/gui/gtk/gnome_interface.c:2588
+#: modules/gui/gtk/gnome_interface.c:2600
 msgid "Jump to: "
 msgstr "»ØÄê»þ´Ö¤Ø¥¸¥ã¥ó¥×: "
 
-#: modules/gui/gtk/gnome_interface.c:2605 modules/gui/gtk/gtk_interface.c:2588
+#: modules/gui/gtk/gnome_interface.c:2617 modules/gui/gtk/gtk_interface.c:2600
 msgid "s."
 msgstr "ÉÃ"
 
-#: modules/gui/gtk/gnome_interface.c:2620 modules/gui/gtk/gtk_interface.c:2603
+#: modules/gui/gtk/gnome_interface.c:2632 modules/gui/gtk/gtk_interface.c:2615
 msgid "m:"
 msgstr "ʬ"
 
-#: modules/gui/gtk/gnome_interface.c:2635 modules/gui/gtk/gtk_interface.c:2618
+#: modules/gui/gtk/gnome_interface.c:2647 modules/gui/gtk/gtk_interface.c:2630
 msgid "h:"
 msgstr "»þ"
 
-#: modules/gui/gtk/gnome_interface.c:2796 modules/gui/gtk/gtk_interface.c:3051
+#: modules/gui/gtk/gnome_interface.c:2808 modules/gui/gtk/gtk_interface.c:3063
 #, fuzzy
 msgid "Stream output (MRL)"
 msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏMRL"
 
-#: modules/gui/gtk/gnome_interface.c:2811 modules/gui/gtk/gtk_interface.c:3066
+#: modules/gui/gtk/gnome_interface.c:2823 modules/gui/gtk/gtk_interface.c:3078
 #, fuzzy
 msgid "Destination Target: "
 msgstr "Á÷¿®Àè¤Î¥¢¥¹¥Ú¥¯¥È¡¦¥ì¥·¥ª"
 
-#: modules/gui/gtk/gnome_interface.c:2857 modules/gui/gtk/gtk_interface.c:3112
-#: modules/gui/macosx/output.m:141 modules/gui/macosx/output.m:268
-#: modules/gui/macosx/output.m:357 modules/gui/wxwindows/streamout.cpp:401
-msgid "UDP"
-msgstr ""
-
-#: modules/gui/gtk/gnome_interface.c:2867 modules/gui/gtk/gtk_interface.c:3122
+#: modules/gui/gtk/gnome_interface.c:2879 modules/gui/gtk/gtk_interface.c:3134
 #: modules/gui/macosx/output.m:142 modules/gui/macosx/output.m:284
-#: modules/gui/macosx/output.m:376 modules/gui/wxwindows/streamout.cpp:402
+#: modules/gui/macosx/output.m:376 modules/gui/wxwindows/streamout.cpp:421
 msgid "RTP"
 msgstr ""
 
-#: modules/gui/gtk/gnome_interface.c:2877 modules/gui/gtk/gtk_interface.c:3132
+#: modules/gui/gtk/gnome_interface.c:2889 modules/gui/gtk/gtk_interface.c:3144
 #, fuzzy
 msgid "Path:"
 msgstr "¥Ý¡¼¥ÈÈÖ¹æ"
 
-#: modules/gui/gtk/gnome_interface.c:2887 modules/gui/gtk/gtk_interface.c:3157
-#: modules/gui/pda/pda_interface.c:422
+#: modules/gui/gtk/gnome_interface.c:2899 modules/gui/gtk/gtk_interface.c:3169
+#: modules/gui/pda/pda_interface.c:427
 #, fuzzy
 msgid "Address:"
 msgstr "¥Û¥¹¥È̾/¥¢¥É¥ì¥¹"
 
-#: modules/gui/gtk/gnome_interface.c:2956 modules/gui/gtk/gtk_interface.c:3201
+#: modules/gui/gtk/gnome_interface.c:2968 modules/gui/gtk/gtk_interface.c:3213
 msgid "TS"
 msgstr ""
 
-#: modules/gui/gtk/gnome_interface.c:2964 modules/gui/gtk/gtk_interface.c:3209
+#: modules/gui/gtk/gnome_interface.c:2976 modules/gui/gtk/gtk_interface.c:3221
 msgid "PS"
 msgstr ""
 
-#: modules/gui/gtk/gnome_interface.c:2972 modules/gui/gtk/gtk_interface.c:3217
-#: modules/gui/macosx/output.m:319 modules/gui/macosx/output.m:405
-msgid "AVI"
-msgstr ""
-
 #: modules/gui/gtk/gnome_support.c:100 modules/gui/gtk/gnome_support.c:138
-#: modules/gui/gtk/gtk_support.c:121 modules/gui/gtk2/gnome2_support.c:60
-#: modules/gui/gtk2/gnome2_support.c:85 modules/gui/gtk2/gtk2_support.c:90
-#: modules/gui/gtk2/gtk2_support.c:114 modules/gui/pda/pda_support.c:90
-#: modules/gui/pda/pda_support.c:114 modules/gui/pda/support.c:121
+#: 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 ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£"
@@ -5019,7 +5514,6 @@ msgid "Gtk+ interface"
 msgstr "Gtk+¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
 
 #: modules/gui/gtk/gtk_interface.c:147 modules/gui/gtk/gtk_interface.c:1373
-#: modules/gui/gtk2/gtk2_interface.c:77
 msgid "_File"
 msgstr "¥Õ¥¡¥¤¥ë(_F)"
 
@@ -5039,7 +5533,7 @@ msgstr "
 msgid "Exit the program"
 msgstr "¥×¥í¥°¥é¥à¤Î½ªÎ»"
 
-#: modules/gui/gtk/gtk_interface.c:268 modules/gui/gtk2/gtk2_interface.c:132
+#: modules/gui/gtk/gtk_interface.c:268
 msgid "_View"
 msgstr "ɽ¼¨(_V)"
 
@@ -5063,7 +5557,7 @@ msgstr "
 msgid "Configure the application"
 msgstr "¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ÎÀßÄê"
 
-#: modules/gui/gtk/gtk_interface.c:569 modules/gui/gtk2/gtk2_interface.c:139
+#: modules/gui/gtk/gtk_interface.c:569
 msgid "_Help"
 msgstr "¥Ø¥ë¥×(_H)"
 
@@ -5087,80 +5581,80 @@ msgstr "
 msgid "the VideoLAN team <videolan@videolan.org>"
 msgstr ""
 
-#: modules/gui/gtk/gtk_interface.c:1777 modules/gui/wxwindows/open.cpp:217
-#: modules/gui/wxwindows/open.cpp:225
+#: modules/gui/gtk/gtk_interface.c:1778 modules/gui/wxwindows/open.cpp:222
+#: modules/gui/wxwindows/open.cpp:230
 msgid "Open Target"
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯"
 
-#: modules/gui/gtk/gtk_interface.c:2284
+#: modules/gui/gtk/gtk_interface.c:2293
 #, fuzzy
 msgid "Use a subtitles file"
 msgstr "»úËë¤ÎÁªÂò"
 
-#: modules/gui/gtk/gtk_interface.c:2306
+#: modules/gui/gtk/gtk_interface.c:2315
 #, fuzzy
 msgid "Select a subtitles file"
 msgstr "»úËë¤ÎÁªÂò"
 
-#: modules/gui/gtk/gtk_interface.c:2336
+#: modules/gui/gtk/gtk_interface.c:2345
 msgid "Set the delay (in seconds)"
 msgstr ""
 
-#: modules/gui/gtk/gtk_interface.c:2352
+#: modules/gui/gtk/gtk_interface.c:2361
 msgid "Set the number of Frames Per Second"
 msgstr ""
 
-#: modules/gui/gtk/gtk_interface.c:2367
+#: modules/gui/gtk/gtk_interface.c:2376
 #, fuzzy
 msgid "Use stream output"
 msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò"
 
-#: modules/gui/gtk/gtk_interface.c:2375
+#: modules/gui/gtk/gtk_interface.c:2384
 #, fuzzy
 msgid "Stream output configuration "
 msgstr "¥¹¥È¥ê¡¼¥à½ÐÎÏ"
 
-#: modules/gui/gtk/gtk_interface.c:2403 modules/gui/gtk/gtk_interface.c:2645
-#: modules/gui/gtk/gtk_interface.c:2876 modules/gui/gtk/gtk_interface.c:3257
+#: 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:618 modules/gui/macosx/open.m:139
 #: modules/gui/macosx/prefs.m:80 modules/gui/macosx/prefs.m:205
-#: modules/gui/wxwindows/iteminfo.cpp:113 modules/gui/wxwindows/open.cpp:307
-#: modules/gui/wxwindows/playlist.cpp:1034
-#: modules/gui/wxwindows/preferences.cpp:198
-#: modules/gui/wxwindows/streamout.cpp:194
-#: modules/gui/wxwindows/subtitles.cpp:179 modules/gui/wxwindows/v4l.cpp:152
+#: modules/gui/wxwindows/iteminfo.cpp:113 modules/gui/wxwindows/open.cpp:315
+#: modules/gui/wxwindows/playlist.cpp:1028
+#: modules/gui/wxwindows/preferences.cpp:200
+#: modules/gui/wxwindows/streamout.cpp:200
+#: modules/gui/wxwindows/subtitles.cpp:179 modules/gui/wxwindows/v4l.cpp:153
 msgid "Cancel"
 msgstr "¥­¥ã¥ó¥»¥ë"
 
-#: modules/gui/gtk/gtk_interface.c:2518
+#: modules/gui/gtk/gtk_interface.c:2530
 msgid "Select File"
 msgstr "¥Õ¥¡¥¤¥ë¤ÎÁªÂò"
 
-#: modules/gui/gtk/gtk_interface.c:2565
+#: modules/gui/gtk/gtk_interface.c:2577
 msgid "Jump"
 msgstr "¥¸¥ã¥ó¥×"
 
-#: modules/gui/gtk/gtk_interface.c:2572
+#: modules/gui/gtk/gtk_interface.c:2584
 msgid "Go to:"
 msgstr ""
 
-#: modules/gui/gtk/gtk_interface.c:2775
+#: modules/gui/gtk/gtk_interface.c:2787
 msgid "Selected"
 msgstr "ÁªÂòºÑ¤ß"
 
-#: modules/gui/gtk/gtk_interface.c:2798
+#: modules/gui/gtk/gtk_interface.c:2810
 msgid "_Crop"
 msgstr "±ï¼è¤ê(_C)"
 
-#: modules/gui/gtk/gtk_interface.c:2809
+#: modules/gui/gtk/gtk_interface.c:2821
 msgid "_Invert"
 msgstr "µÕž"
 
-#: modules/gui/gtk/gtk_interface.c:2820
+#: modules/gui/gtk/gtk_interface.c:2832
 msgid "_Select"
 msgstr "ÁªÂò(_S)"
 
-#: modules/gui/gtk/gtk_support.c:130 modules/gui/pda/support.c:130
+#: modules/gui/gtk/gtk_support.c:130
 #, c-format
 msgid "Error loading pixmap file: %s"
 msgstr "¥Ô¥Ã¥¯¥¹¥Þ¥Ã¥×¡¦¥Õ¥¡¥¤¥ë %s ¤Î¥í¡¼¥É¤Ç¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£"
@@ -5175,6 +5669,10 @@ msgstr "
 msgid "Chapter %d"
 msgstr "¥Á¥ã¥×¥¿¡¼ %d"
 
+#: modules/gui/gtk/open.c:276
+msgid "PBC LID"
+msgstr ""
+
 #: modules/gui/gtk/preferences.c:371
 msgid "Configure"
 msgstr "ÀßÄê"
@@ -5183,56 +5681,6 @@ msgstr "
 msgid "Selected:"
 msgstr "ÁªÂòºÑ¤ß:"
 
-#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55
-#, fuzzy
-msgid "Gtk2 interface"
-msgstr "Gtk+¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
-
-#: modules/gui/gtk2/gnome2_interface.c:31
-#, fuzzy
-msgid "_New"
-msgstr "ɽ¼¨(_V)"
-
-#: modules/gui/gtk2/gnome2_interface.c:87
-msgid "gnome2"
-msgstr ""
-
-#: modules/gui/gtk2/gnome2_interface.c:112
-msgid "button4"
-msgstr ""
-
-#: modules/gui/gtk2/gnome2_interface.c:122
-#: modules/gui/gtk2/gtk2_interface.c:183
-msgid "button3"
-msgstr ""
-
-#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:421
-msgid "Save File"
-msgstr "¥Õ¥¡¥¤¥ë¤ÎÊݸ"
-
-#: modules/gui/gtk2/gtk2_interface.c:67
-#, fuzzy
-msgid "window1"
-msgstr "¥¦¥£¥ó¥É¥¦"
-
-#: modules/gui/gtk2/gtk2_interface.c:109
-#, fuzzy
-msgid "_Edit"
-msgstr "ÊÔ½¸"
-
-#: modules/gui/gtk2/gtk2_interface.c:146
-#, fuzzy
-msgid "_About"
-msgstr "VideoLAN¤Ë¤Ä¤¤¤Æ"
-
-#: modules/gui/gtk2/gtk2_interface.c:163
-msgid "button1"
-msgstr ""
-
-#: modules/gui/gtk2/gtk2_interface.c:173
-msgid "button2"
-msgstr ""
-
 #: modules/gui/kde/interface.cpp:88
 msgid "Languages"
 msgstr "¸À¸ì"
@@ -5255,7 +5703,7 @@ msgstr "ui.rc
 msgid "KDE interface"
 msgstr "KDE¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/gui/kde/messages.cpp:29
+#: modules/gui/kde/messages.cpp:52
 msgid "Messages:"
 msgstr "¥á¥Ã¥»¡¼¥¸:"
 
@@ -5264,7 +5712,7 @@ msgstr "
 msgid "Plugins"
 msgstr ""
 
-#: modules/gui/macosx/about.m:73 modules/gui/macosx/intf.m:448
+#: modules/gui/macosx/about.m:73 modules/gui/macosx/intf.m:459
 #, fuzzy
 msgid "About VLC media player"
 msgstr "VLC¥á¥Ç¥£¥¢¡¦¥×¥ì¥¤¥ä¡¼¤Ë¤Ä¤¤¤Æ"
@@ -5297,245 +5745,246 @@ msgstr "
 msgid "Loop Off"
 msgstr "¥ë¡¼¥×"
 
-#: modules/gui/macosx/controls.m:345 modules/gui/macosx/controls.m:703
-#: modules/gui/macosx/intf.m:503
+#: modules/gui/macosx/controls.m:345 modules/gui/macosx/controls.m:705
+#: modules/gui/macosx/intf.m:514
 #, fuzzy
 msgid "Half Size"
 msgstr "¥µ¥¤¥º"
 
-#: modules/gui/macosx/controls.m:347 modules/gui/macosx/controls.m:704
-#: modules/gui/macosx/intf.m:504
+#: modules/gui/macosx/controls.m:347 modules/gui/macosx/controls.m:706
+#: modules/gui/macosx/intf.m:515
 msgid "Normal Size"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:349 modules/gui/macosx/controls.m:705
-#: modules/gui/macosx/intf.m:505
+#: modules/gui/macosx/controls.m:349 modules/gui/macosx/controls.m:707
+#: modules/gui/macosx/intf.m:516
 msgid "Double Size"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:351 modules/gui/macosx/controls.m:707
-#: modules/gui/macosx/controls.m:714 modules/gui/macosx/intf.m:508
+#: modules/gui/macosx/controls.m:351 modules/gui/macosx/controls.m:709
+#: modules/gui/macosx/controls.m:716 modules/gui/macosx/intf.m:519
 msgid "Float On Top"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:353 modules/gui/macosx/controls.m:706
-#: modules/gui/macosx/intf.m:506
+#: modules/gui/macosx/controls.m:353 modules/gui/macosx/controls.m:708
+#: modules/gui/macosx/intf.m:517
 #, fuzzy
 msgid "Fit To Screen"
 msgstr "¥¹¥¯¥ê¡¼¥ó"
 
-#: modules/gui/macosx/controls.m:663 modules/gui/macosx/intf.m:477
-#: modules/gui/macosx/playlist.m:144
+#: modules/gui/macosx/controls.m:665 modules/gui/macosx/intf.m:488
+#: modules/gui/macosx/playlist.m:148
 msgid "Shuffle"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:670 modules/gui/macosx/intf.m:478
-#: modules/gui/macosx/playlist.m:146
+#: modules/gui/macosx/controls.m:672 modules/gui/macosx/intf.m:489
+#: modules/gui/macosx/playlist.m:150
 #, fuzzy
 msgid "Repeat Item"
 msgstr "¥Õ¥¡¥¤¥ë¤ÎÁªÂò"
 
-#: modules/gui/macosx/controls.m:677 modules/gui/macosx/intf.m:479
-#: modules/gui/macosx/playlist.m:145
+#: modules/gui/macosx/controls.m:679 modules/gui/macosx/intf.m:490
+#: modules/gui/macosx/playlist.m:149
 #, fuzzy
 msgid "Repeat Playlist"
 msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
 
-#: modules/gui/macosx/controls.m:684 modules/gui/macosx/intf.m:480
+#: modules/gui/macosx/controls.m:686 modules/gui/macosx/intf.m:491
 #, fuzzy
 msgid "Step Forward"
 msgstr "žÁ÷"
 
-#: modules/gui/macosx/controls.m:685 modules/gui/macosx/intf.m:481
+#: modules/gui/macosx/controls.m:687 modules/gui/macosx/intf.m:492
 #, fuzzy
 msgid "Step Backward"
 msgstr "µÕžºÆÀ¸"
 
-#: modules/gui/macosx/info.m:157 modules/gui/macosx/intf.m:523
-#: modules/gui/macosx/intf.m:548
+#: modules/gui/macosx/info.m:157 modules/gui/macosx/intf.m:534
+#: modules/gui/macosx/intf.m:559
 msgid "Info"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:429
+#: modules/gui/macosx/intf.m:440
 #, fuzzy
 msgid "VLC - Controller"
 msgstr "¥³¥ó¥È¥í¡¼¥ë"
 
-#: modules/gui/macosx/intf.m:434 modules/gui/pda/interface.c:166
-#: modules/gui/pda/pda_interface.c:228 modules/gui/pda/pda_interface.c:229
+#: modules/gui/macosx/intf.m:441
+#, fuzzy
+msgid "VLC Media Player"
+msgstr "VLC¥á¥Ç¥£¥¢¡¦¥×¥ì¥¤¥ä¡¼¤Ë¤Ä¤¤¤Æ"
+
+#: modules/gui/macosx/intf.m:445 modules/gui/pda/pda_interface.c:231
+#: modules/gui/pda/pda_interface.c:232
 msgid "Rewind"
 msgstr "´¬¤­Ì᤹"
 
-#: modules/gui/macosx/intf.m:437
+#: modules/gui/macosx/intf.m:448
 #, fuzzy
 msgid "Fast Forward"
 msgstr "žÁ÷"
 
-#: modules/gui/macosx/intf.m:440 modules/gui/wxwindows/interface.cpp:1359
+#: modules/gui/macosx/intf.m:451 modules/gui/wxwindows/interface.cpp:1348
 #: modules/gui/wxwindows/timer.cpp:128
 #, fuzzy
 msgid "Volume"
 msgstr "¥Ü¥ê¥å¡¼¥à¤ò¾å¤²¤ë"
 
-#: modules/gui/macosx/intf.m:441
-#, fuzzy
-msgid "Position"
-msgstr "¶ËÀ­"
-
-#: modules/gui/macosx/intf.m:445
+#: modules/gui/macosx/intf.m:456
 msgid "Open CrashLog"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:449
+#: modules/gui/macosx/intf.m:460
 #, fuzzy
 msgid "Preferences..."
 msgstr "ÀßÄê(_P)..."
 
-#: modules/gui/macosx/intf.m:450
+#: modules/gui/macosx/intf.m:461
 msgid "Hide VLC"
 msgstr "VLC¤ò±£¤¹"
 
-#: modules/gui/macosx/intf.m:451
+#: modules/gui/macosx/intf.m:462
 msgid "Hide Others"
 msgstr "¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ò±£¤¹"
 
-#: modules/gui/macosx/intf.m:452
+#: modules/gui/macosx/intf.m:463
 msgid "Show All"
 msgstr "¤¹¤Ù¤Æ¤òɽ¼¨"
 
-#: modules/gui/macosx/intf.m:453
+#: modules/gui/macosx/intf.m:464
 msgid "Quit VLC"
 msgstr "VLC¤ò½ªÎ»"
 
-#: modules/gui/macosx/intf.m:455
+#: modules/gui/macosx/intf.m:466
 msgid "1:File"
 msgstr "1:¥Õ¥¡¥¤¥ë"
 
-#: modules/gui/macosx/intf.m:456
+#: modules/gui/macosx/intf.m:467
 msgid "Open File..."
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯..."
 
-#: modules/gui/macosx/intf.m:457
+#: modules/gui/macosx/intf.m:468
 #, fuzzy
 msgid "Quick Open File..."
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯..."
 
-#: modules/gui/macosx/intf.m:458
+#: modules/gui/macosx/intf.m:469
 msgid "Open Disc..."
 msgstr "¥Ç¥£¥¹¥¯¤ò³«¤¯..."
 
-#: modules/gui/macosx/intf.m:459
+#: modules/gui/macosx/intf.m:470
 msgid "Open Network..."
 msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¤ò³«¤¯"
 
-#: modules/gui/macosx/intf.m:460
+#: modules/gui/macosx/intf.m:471
 msgid "Open Recent"
 msgstr "ºÇ¶á»È¤Ã¤¿¹àÌܤò³«¤¯"
 
-#: modules/gui/macosx/intf.m:461 modules/gui/macosx/intf.m:1265
+#: modules/gui/macosx/intf.m:472 modules/gui/macosx/intf.m:1313
 msgid "Clear Menu"
 msgstr "¥á¥Ë¥å¡¼¤ò¥¯¥ê¥¢¤¹¤ë"
 
-#: modules/gui/macosx/intf.m:464
+#: modules/gui/macosx/intf.m:475
 msgid "Cut"
 msgstr "¥«¥Ã¥È"
 
-#: modules/gui/macosx/intf.m:465
+#: modules/gui/macosx/intf.m:476
 msgid "Copy"
 msgstr "¥³¥Ô¡¼"
 
-#: modules/gui/macosx/intf.m:466
+#: modules/gui/macosx/intf.m:477
 msgid "Paste"
 msgstr "¥Ú¡¼¥¹¥È"
 
-#: modules/gui/macosx/intf.m:467 modules/gui/wxwindows/messages.cpp:95
+#: modules/gui/macosx/intf.m:478 modules/gui/wxwindows/messages.cpp:95
 msgid "Clear"
 msgstr "¥¯¥ê¥¢"
 
-#: modules/gui/macosx/intf.m:470
+#: modules/gui/macosx/intf.m:481
 msgid "Controls"
 msgstr "¥³¥ó¥È¥í¡¼¥ë"
 
-#: modules/gui/macosx/intf.m:511 modules/gui/macosx/intf.m:512
+#: modules/gui/macosx/intf.m:522 modules/gui/macosx/intf.m:523
 #: modules/gui/macosx/macosx.m:47 modules/gui/macosx/vout.m:190
+#: modules/gui/wxwindows/open.cpp:642
 #, fuzzy
 msgid "Video device"
 msgstr "DVD¥Ç¥Ð¥¤¥¹"
 
-#: modules/gui/macosx/intf.m:519
+#: modules/gui/macosx/intf.m:530
 msgid "Minimize Window"
 msgstr "¥¦¥£¥ó¥É¥¦¤òºÇ¾®²½"
 
-#: modules/gui/macosx/intf.m:520
+#: modules/gui/macosx/intf.m:531
 msgid "Close Window"
 msgstr "¥¦¥£¥ó¥É¥¦¤òÊĤ¸¤ë"
 
-#: modules/gui/macosx/intf.m:521
+#: modules/gui/macosx/intf.m:532
 #, fuzzy
 msgid "Controller"
 msgstr "¥³¥ó¥È¥í¡¼¥ë"
 
-#: modules/gui/macosx/intf.m:526
+#: modules/gui/macosx/intf.m:537
 msgid "Bring All to Front"
 msgstr "¤¹¤Ù¤Æ¤òÁ°¤Ë"
 
-#: modules/gui/macosx/intf.m:528
+#: modules/gui/macosx/intf.m:539
 #, fuzzy
 msgid "Help"
 msgstr "¥Ø¥ë¥×"
 
-#: modules/gui/macosx/intf.m:529
+#: modules/gui/macosx/intf.m:540
 #, fuzzy
 msgid "ReadMe..."
 msgstr "¥á¥Ã¥»¡¼¥¸..."
 
-#: modules/gui/macosx/intf.m:530
+#: modules/gui/macosx/intf.m:541
 #, fuzzy
 msgid "Online Documentation"
 msgstr "¥â¡¼¥·¥ç¥óÊäÀµ¥â¥¸¥å¡¼¥ë"
 
-#: modules/gui/macosx/intf.m:531
+#: modules/gui/macosx/intf.m:542
 msgid "Report a Bug"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:532
+#: modules/gui/macosx/intf.m:543
 #, fuzzy
 msgid "VideoLAN Website"
 msgstr "VideoLAN¥¯¥é¥¤¥¢¥ó¥È"
 
-#: modules/gui/macosx/intf.m:533 modules/gui/macosx/intf.m:1258
+#: modules/gui/macosx/intf.m:544 modules/gui/macosx/intf.m:1306
 msgid "License"
 msgstr "¥é¥¤¥»¥ó¥¹"
 
-#: modules/gui/macosx/intf.m:542
+#: modules/gui/macosx/intf.m:553
 msgid "Error"
 msgstr "¥¨¥é¡¼"
 
-#: modules/gui/macosx/intf.m:543
+#: modules/gui/macosx/intf.m:554
 #, fuzzy
 msgid ""
 "An error has occurred which probably prevented the execution of your request:"
 msgstr "Í׵ᤵ¤ì¤¿½èÍý¤Î¼Â¹Ô¤Ç¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ :"
 
-#: modules/gui/macosx/intf.m:544
+#: modules/gui/macosx/intf.m:555
 #, fuzzy
 msgid "If you believe that it is a bug, please follow the instructions at:"
 msgstr "¤â¤·¡¢¥Ð¥°¤Ç¤¢¤ë¤È»×¤ï¤ì¤ë¤Ê¤é¡¢°Ê²¼¤Î¼ê½ç¤Ë¤·¤¿¤¬¤Ã¤Æ¤¯¤À¤µ¤¤ :"
 
-#: modules/gui/macosx/intf.m:545
+#: modules/gui/macosx/intf.m:556
 msgid "Open Messages Window"
 msgstr "¥á¥Ã¥»¡¼¥¸¥¦¥£¥ó¥É¥¦¤òɽ¼¨"
 
-#: modules/gui/macosx/intf.m:546
+#: modules/gui/macosx/intf.m:557
 msgid "Dismiss"
 msgstr "¤ä¤êľ¤·"
 
-#: modules/gui/macosx/intf.m:1222
+#: modules/gui/macosx/intf.m:1270
 #, fuzzy
 msgid "No CrashLog found"
 msgstr "%@s ¤Ï¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: modules/gui/macosx/intf.m:1222
+#: modules/gui/macosx/intf.m:1270
 msgid ""
 "Either you are running Mac OS X pre 10.2 or you haven't experienced any "
 "heavy crashes yet."
@@ -5557,16 +6006,7 @@ msgid ""
 "is fully transparent."
 msgstr ""
 
-#: modules/gui/macosx/macosx.m:57
-msgid "Always float on top"
-msgstr ""
-
-#: modules/gui/macosx/macosx.m:59
-#, fuzzy
-msgid "Let the video window float on top of other windows."
-msgstr "¥Ó¥Ç¥ª¤ò¥¯¥í¡¼¥ó¤¹¤ë¤¿¤á¤Ë¥Ó¥Ç¥ª¡¦¥¦¥£¥ó¥É¥¦¿ô¤òÁªÂò¤¹¤ë"
-
-#: modules/gui/macosx/macosx.m:62
+#: modules/gui/macosx/macosx.m:58
 msgid "MacOS X interface, sound and video"
 msgstr ""
 
@@ -5582,12 +6022,6 @@ msgstr "
 msgid "VIDEO_TS folder"
 msgstr "VIDEO_TS¥Õ¥©¥ë¥À"
 
-#: modules/gui/macosx/open.m:157 modules/gui/macosx/open.m:384
-#: modules/gui/macosx/open.m:475
-#, fuzzy
-msgid "Audio CD"
-msgstr "¥ª¡¼¥Ç¥£¥ª"
-
 #: modules/gui/macosx/open.m:171
 #, fuzzy
 msgid "Load subtitles file:"
@@ -5620,13 +6054,7 @@ msgstr "ALSA
 msgid "Output Options"
 msgstr ""
 
-#: modules/gui/macosx/output.m:133 modules/gui/macosx/output.m:229
-#: modules/gui/macosx/output.m:345 modules/gui/wxwindows/streamwizard.cpp:76
-#, fuzzy
-msgid "Stream"
-msgstr "¥¹¥È¥ê¡¼¥à¤ÎÄä»ß"
-
-#: modules/gui/macosx/output.m:134 modules/gui/wxwindows/streamout.cpp:436
+#: modules/gui/macosx/output.m:134 modules/gui/wxwindows/streamout.cpp:455
 #, fuzzy
 msgid "Dump raw input"
 msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò"
@@ -5636,17 +6064,16 @@ msgid "TTL"
 msgstr ""
 
 #: modules/gui/macosx/output.m:139 modules/gui/macosx/output.m:241
-#: modules/gui/macosx/output.m:350 modules/gui/pda/interface.c:480
-#: modules/gui/wxwindows/streamout.cpp:399
+#: modules/gui/macosx/output.m:350 modules/gui/wxwindows/streamout.cpp:418
 msgid "HTTP"
 msgstr ""
 
 #: modules/gui/macosx/output.m:140 modules/gui/macosx/output.m:254
-#: modules/gui/macosx/output.m:352 modules/gui/wxwindows/streamout.cpp:400
+#: modules/gui/macosx/output.m:352 modules/gui/wxwindows/streamout.cpp:419
 msgid "MMSH"
 msgstr ""
 
-#: modules/gui/macosx/output.m:145 modules/gui/wxwindows/streamout.cpp:554
+#: modules/gui/macosx/output.m:145 modules/gui/wxwindows/streamout.cpp:573
 msgid "Encapsulation Method"
 msgstr ""
 
@@ -5656,8 +6083,8 @@ msgid "Transcode options"
 msgstr "¥¹¥È¥ê¡¼¥à¤Î°ì»þÄä»ß"
 
 #: modules/gui/macosx/output.m:153 modules/gui/macosx/output.m:159
-#: modules/gui/wxwindows/streamout.cpp:642
-#: modules/gui/wxwindows/streamout.cpp:697
+#: modules/gui/wxwindows/streamout.cpp:673
+#: modules/gui/wxwindows/streamout.cpp:740
 msgid "Bitrate (kb/s)"
 msgstr ""
 
@@ -5666,15 +6093,15 @@ msgstr ""
 msgid "Stream Announcing"
 msgstr "¥¹¥È¥ê¡¼¥à½ÐÎÏ"
 
-#: modules/gui/macosx/output.m:167
+#: modules/gui/macosx/output.m:167 modules/gui/wxwindows/streamout.cpp:532
 msgid "SAP announce"
 msgstr ""
 
-#: modules/gui/macosx/output.m:168
+#: modules/gui/macosx/output.m:168 modules/gui/wxwindows/streamout.cpp:534
 msgid "SLP announce"
 msgstr ""
 
-#: modules/gui/macosx/output.m:169 modules/gui/wxwindows/streamout.cpp:518
+#: modules/gui/macosx/output.m:169
 #, fuzzy
 msgid "Channel Name"
 msgstr "¥Á¥ã¥ó¥Í¥ë¡¦¥µ¡¼¥Ð¡¼"
@@ -5705,31 +6132,35 @@ msgstr "VLC
 msgid "ASF"
 msgstr ""
 
-#: modules/gui/macosx/playlist.m:138
+#: modules/gui/macosx/output.m:421
+msgid "Save File"
+msgstr "¥Õ¥¡¥¤¥ë¤ÎÊݸ"
+
+#: modules/gui/macosx/playlist.m:142
 #, fuzzy
 msgid "Save Playlist..."
 msgstr "¥×¥ì¥¤¥ê¥¹¥È..."
 
-#: modules/gui/macosx/playlist.m:147 modules/gui/wxwindows/playlist.cpp:251
+#: modules/gui/macosx/playlist.m:151 modules/gui/wxwindows/playlist.cpp:251
 msgid "Search"
 msgstr ""
 
-#: modules/gui/macosx/playlist.m:195
+#: modules/gui/macosx/playlist.m:202
 #, fuzzy
 msgid "Untitled"
 msgstr "»úËë(_S)"
 
-#: modules/gui/macosx/playlist.m:196
+#: modules/gui/macosx/playlist.m:203
 #, fuzzy
 msgid "Save Playlist"
 msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
 
-#: modules/gui/macosx/playlist.m:469
+#: modules/gui/macosx/playlist.m:479
 #, fuzzy, c-format
 msgid "%i items in playlist"
 msgstr "¥Ç¥Õ¥©¥ë¥È¤Ç¥×¥ì¥¤¥ê¥¹¥È¤ËÄɲÃ"
 
-#: modules/gui/macosx/prefs.m:81 modules/gui/wxwindows/preferences.cpp:201
+#: modules/gui/macosx/prefs.m:81 modules/gui/wxwindows/preferences.cpp:203
 #, fuzzy
 msgid "Reset All"
 msgstr "¤¹¤Ù¤Æ¤òÁªÂò"
@@ -5775,7 +6206,7 @@ msgstr "
 msgid "Continue"
 msgstr "ÀßÄê"
 
-#: modules/gui/macosx/prefs.m:207 modules/gui/wxwindows/preferences.cpp:274
+#: modules/gui/macosx/prefs.m:207 modules/gui/wxwindows/preferences.cpp:276
 msgid ""
 "Beware this will reset your VLC Media Player config file.\n"
 "Are you sure you want to continue?"
@@ -5790,120 +6221,11 @@ msgstr ""
 msgid "Select a file or directory"
 msgstr "¥½¡¼¥¹¤Î¥¢¥¹¥Ú¥¯¥È¡¦¥ì¥·¥ª"
 
-#: modules/gui/ncurses/ncurses.c:66
+#: modules/gui/ncurses/ncurses.c:78
 #, fuzzy
 msgid "ncurses interface"
 msgstr "ncurses¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/gui/pda/interface.c:126 modules/gui/wxwindows/dialogs.cpp:279
-#: modules/gui/wxwindows/open.cpp:901 modules/gui/wxwindows/subtitles.cpp:220
-msgid "Open file"
-msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯"
-
-#: modules/gui/pda/interface.c:167
-msgid "Rewind stream"
-msgstr "¥¹¥È¥ê¡¼¥à¤ò³«¤¯"
-
-#: modules/gui/pda/interface.c:180
-msgid "Pause stream"
-msgstr "¥¹¥È¥ê¡¼¥à¤Î°ì»þÄä»ß"
-
-#: modules/gui/pda/interface.c:193
-msgid "Play stream"
-msgstr "¥¹¥È¥ê¡¼¥à¤ÎºÆÀ¸"
-
-#: modules/gui/pda/interface.c:206
-msgid "Stop stream"
-msgstr "¥¹¥È¥ê¡¼¥à¤ÎÄä»ß"
-
-#: modules/gui/pda/interface.c:218 modules/gui/pda/pda_interface.c:276
-#: modules/gui/pda/pda_interface.c:277
-msgid "Forward"
-msgstr "žÁ÷"
-
-#: modules/gui/pda/interface.c:219
-msgid "Forward stream"
-msgstr "¥¹¥È¥ê¡¼¥à¤ÎžÁ÷"
-
-#: modules/gui/pda/interface.c:295 modules/gui/pda/pda_interface.c:373
-msgid "MRL :"
-msgstr ""
-
-#: modules/gui/pda/interface.c:396
-#, fuzzy
-msgid "UDP/RTP (Adress when Multicast)"
-msgstr "UDP¥Þ¥ë¥Á¥­¥ã¥¹¥È"
-
-#: modules/gui/pda/interface.c:490
-msgid "FTP"
-msgstr ""
-
-#: modules/gui/pda/interface.c:500
-msgid "MMS"
-msgstr ""
-
-#: modules/gui/pda/interface.c:526
-msgid "Media"
-msgstr "¥á¥Ç¥£¥¢"
-
-#: modules/gui/pda/interface.c:562
-msgid "MRL"
-msgstr ""
-
-#: modules/gui/pda/interface.c:571 modules/gui/pda/pda.c:289
-#, fuzzy
-msgid "Time"
-msgstr "¥¿¥¤¥È¥ë"
-
-#: modules/gui/pda/interface.c:588 modules/gui/pda/pda_interface.c:1153
-msgid "Update"
-msgstr ""
-
-#: modules/gui/pda/interface.c:596
-msgid " Del "
-msgstr ""
-
-#: modules/gui/pda/interface.c:604 modules/gui/pda/pda_interface.c:1163
-#, fuzzy
-msgid " Clear "
-msgstr "¥¯¥ê¥¢"
-
-#: modules/gui/pda/interface.c:628
-#, fuzzy
-msgid "Automatically play file"
-msgstr "¥Õ¥¡¥¤¥ë¤Î¼«Æ°ºÆÀ¸"
-
-#: modules/gui/pda/interface.c:645 modules/gui/pda/pda_interface.c:1194
-#, fuzzy
-msgid " Save "
-msgstr "Êݸ"
-
-#: modules/gui/pda/interface.c:653 modules/gui/pda/pda_interface.c:1199
-#, fuzzy
-msgid " Apply "
-msgstr "ŬÍÑ"
-
-#: modules/gui/pda/interface.c:661 modules/gui/pda/pda_interface.c:1204
-#, fuzzy
-msgid " Cancel "
-msgstr "¥­¥ã¥ó¥»¥ë"
-
-#: modules/gui/pda/interface.c:669 modules/gui/pda/pda_interface.c:1209
-msgid "Preference"
-msgstr "ÀßÄê(_P)..."
-
-#: modules/gui/pda/interface.c:723
-msgid "Authors: The VideoLAN Team, http://www.videolan.org"
-msgstr ""
-
-#: modules/gui/pda/interface.c:755
-msgid ""
-"The VideoLAN Client is a MPEG, MPEG 2, MP3, DivX player, that accepts input "
-"from local or network sources."
-msgstr ""
-"VideoLAN Client¤Ï¡¢MPEG, MPEG 2, MP3 DivX¤ò¥í¡¼¥«¥ë¤ª¤è¤Ó¡¢¥Í¥Ã¥È¥ï¡¼¥¯¾å¤Î"
-"¥½¡¼¥¹¤«¤éºÆÀ¸¤Ç¤­¤ë¥×¥ì¥¤¥ä¡¼¤Ç¤¹¡£"
-
 #: modules/gui/pda/pda.c:58
 #, fuzzy
 msgid "Autoplay selected file"
@@ -5919,132 +6241,121 @@ msgstr "
 msgid "PDA Linux Gtk2+ interface"
 msgstr "Gtk+¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/gui/pda/pda.c:225 modules/gui/pda/pda.c:283
-#: modules/gui/wxwindows/streamout.cpp:423
+#: modules/gui/pda/pda.c:218 modules/gui/pda/pda.c:273
+#: modules/gui/wxwindows/streamout.cpp:442
 #, fuzzy
 msgid "Filename"
 msgstr "¥í¥°¡¦¥Õ¥¡¥¤¥ë̾"
 
-#: modules/gui/pda/pda.c:231
+#: modules/gui/pda/pda.c:224
 msgid "Permissions"
 msgstr ""
 
-#: modules/gui/pda/pda.c:237 modules/gui/wxwindows/v4l.cpp:269
+#: modules/gui/pda/pda.c:230 modules/gui/wxwindows/v4l.cpp:270
 msgid "Size"
 msgstr "¥µ¥¤¥º"
 
-#: modules/gui/pda/pda.c:243
+#: modules/gui/pda/pda.c:236
 #, fuzzy
 msgid "Owner"
 msgstr "¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ò±£¤¹"
 
-#: modules/gui/pda/pda.c:249 modules/gui/wxwindows/iteminfo.cpp:230
-#: modules/gui/wxwindows/playlist.cpp:267
+#: modules/gui/pda/pda.c:242 modules/gui/wxwindows/iteminfo.cpp:230
+#: modules/gui/wxwindows/playlist.cpp:264
 msgid "Group"
 msgstr "¥°¥ë¡¼¥×"
 
-#: modules/gui/pda/pda_interface.c:298
-msgid "00:00:00"
-msgstr ""
-
-#: modules/gui/pda/pda_interface.c:350 modules/gui/pda/pda_interface.c:517
-#: modules/gui/pda/pda_interface.c:827 modules/gui/pda/pda_interface.c:1120
+#: modules/gui/pda/pda.c:279
 #, fuzzy
-msgid "Add to Playlist"
-msgstr "¥ê¥¹¥È"
-
-#: modules/gui/pda/pda_interface.c:385
-msgid "udp://@:1234"
-msgstr ""
-
-#: modules/gui/pda/pda_interface.c:386
-msgid "udp6://@:1234"
-msgstr ""
-
-#: modules/gui/pda/pda_interface.c:387
-msgid "rtp://"
-msgstr ""
+msgid "Time"
+msgstr "¥¿¥¤¥È¥ë"
 
-#: modules/gui/pda/pda_interface.c:388
-msgid "rtp6://"
+#: modules/gui/pda/pda.c:286
+msgid "Index"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:389
-msgid "ftp://"
-msgstr ""
+#: modules/gui/pda/pda_interface.c:279 modules/gui/pda/pda_interface.c:280
+msgid "Forward"
+msgstr "žÁ÷"
 
-#: modules/gui/pda/pda_interface.c:390
-msgid "http://"
+#: modules/gui/pda/pda_interface.c:301
+msgid "00:00:00"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:391
-msgid "mms://"
-msgstr ""
+#: modules/gui/pda/pda_interface.c:355 modules/gui/pda/pda_interface.c:519
+#: modules/gui/pda/pda_interface.c:818 modules/gui/pda/pda_interface.c:1161
+#, fuzzy
+msgid "Add to Playlist"
+msgstr "¥ê¥¹¥È"
 
-#: modules/gui/pda/pda_interface.c:399
-msgid "udp://:1234"
+#: modules/gui/pda/pda_interface.c:379
+msgid "MRL :"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:413
+#: modules/gui/pda/pda_interface.c:419
 #, fuzzy
 msgid "Port:"
 msgstr "¥Ý¡¼¥ÈÈÖ¹æ"
 
-#: modules/gui/pda/pda_interface.c:461
+#: modules/gui/pda/pda_interface.c:465
 #, fuzzy
 msgid "unicast"
 msgstr "UDP¥Þ¥ë¥Á¥­¥ã¥¹¥È"
 
-#: modules/gui/pda/pda_interface.c:462
+#: modules/gui/pda/pda_interface.c:466
 #, fuzzy
 msgid "multicast"
 msgstr "UDP¥Þ¥ë¥Á¥­¥ã¥¹¥È"
 
-#: modules/gui/pda/pda_interface.c:471
+#: modules/gui/pda/pda_interface.c:475
 #, fuzzy
 msgid "Network: "
 msgstr "¥Í¥Ã¥È¥ï¡¼¥¯"
 
-#: modules/gui/pda/pda_interface.c:489
+#: modules/gui/pda/pda_interface.c:491 modules/gui/pda/pda_interface.c:1089
+msgid "udp"
+msgstr ""
+
+#: modules/gui/pda/pda_interface.c:492
 msgid "udp6"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:490 modules/gui/pda/pda_interface.c:1031
+#: modules/gui/pda/pda_interface.c:493 modules/gui/pda/pda_interface.c:1094
 msgid "rtp"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:491
+#: modules/gui/pda/pda_interface.c:494
 msgid "rtp4"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:492
+#: modules/gui/pda/pda_interface.c:495 modules/gui/pda/pda_interface.c:1096
 msgid "ftp"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:494
+#: modules/gui/pda/pda_interface.c:497
 #, fuzzy
 msgid "sout"
 msgstr "VideoLAN¤Ë¤Ä¤¤¤Æ"
 
-#: modules/gui/pda/pda_interface.c:495
+#: modules/gui/pda/pda_interface.c:498
 msgid "mms"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:503
+#: modules/gui/pda/pda_interface.c:506
 msgid "Protocol:"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:549
+#: modules/gui/pda/pda_interface.c:552
 #, fuzzy
 msgid "Video:"
 msgstr "¥Ó¥Ç¥ª"
 
-#: modules/gui/pda/pda_interface.c:558
+#: modules/gui/pda/pda_interface.c:560
 #, fuzzy
 msgid "Audio:"
 msgstr "¥ª¡¼¥Ç¥£¥ª"
 
-#: modules/gui/pda/pda_interface.c:567
+#: modules/gui/pda/pda_interface.c:568
 msgid "Channel:"
 msgstr "¥Á¥ã¥ó¥Í¥ë:"
 
@@ -6053,311 +6364,352 @@ msgstr "
 msgid "Norm:"
 msgstr "¤Ê¤·"
 
-#: modules/gui/pda/pda_interface.c:585
+#: modules/gui/pda/pda_interface.c:584
 #, fuzzy
 msgid "Size:"
 msgstr "¥µ¥¤¥º"
 
-#: modules/gui/pda/pda_interface.c:594
+#: modules/gui/pda/pda_interface.c:592
 #, fuzzy
 msgid "Frequency:"
 msgstr "¼þÇÈ¿ô"
 
-#: modules/gui/pda/pda_interface.c:603
+#: modules/gui/pda/pda_interface.c:600
 #, fuzzy
 msgid "Samplerate:"
 msgstr "¥·¥ó¥Ü¥ë¡¦¥ì¡¼¥È"
 
-#: modules/gui/pda/pda_interface.c:612
+#: modules/gui/pda/pda_interface.c:608
 #, fuzzy
 msgid "Quality:"
 msgstr "VLC¤ò½ªÎ»"
 
-#: modules/gui/pda/pda_interface.c:621
+#: modules/gui/pda/pda_interface.c:616
 msgid "Tuner:"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:630
+#: modules/gui/pda/pda_interface.c:624
 #, fuzzy
 msgid "Sound:"
 msgstr "¥ª¡¼¥Ç¥£¥ª"
 
-#: modules/gui/pda/pda_interface.c:639
+#: modules/gui/pda/pda_interface.c:632
 msgid "MJPEG:"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:648
+#: modules/gui/pda/pda_interface.c:640
 #, fuzzy
 msgid "Decimation:"
 msgstr "ÀâÌÀ"
 
-#: modules/gui/pda/pda_interface.c:666
-msgid "/dev/video"
-msgstr ""
-
-#: modules/gui/pda/pda_interface.c:667
-msgid "/dev/video0"
-msgstr ""
-
-#: modules/gui/pda/pda_interface.c:668
-msgid "/dev/video1"
-msgstr ""
-
-#: modules/gui/pda/pda_interface.c:685
-msgid "/dev/dsp"
-msgstr ""
-
-#: modules/gui/pda/pda_interface.c:686
-msgid "/dev/audio"
-msgstr ""
-
-#: modules/gui/pda/pda_interface.c:687
-msgid "/dev/audio0"
-msgstr ""
-
-#: modules/gui/pda/pda_interface.c:688
-msgid "/dev/audio1"
-msgstr ""
-
-#: modules/gui/pda/pda_interface.c:714
+#: modules/gui/pda/pda_interface.c:705
 msgid "pal"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:715
+#: modules/gui/pda/pda_interface.c:706
 #, fuzzy
 msgid "ntsc"
 msgstr "¥Õ¥©¥ó¥È"
 
-#: modules/gui/pda/pda_interface.c:716
+#: modules/gui/pda/pda_interface.c:707
 msgid "secam"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:717
+#: modules/gui/pda/pda_interface.c:708
 #, fuzzy
 msgid "auto"
 msgstr "ºîÀ®¼Ô"
 
-#: modules/gui/pda/pda_interface.c:734
+#: modules/gui/pda/pda_interface.c:725
 msgid "240x192"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:735
+#: modules/gui/pda/pda_interface.c:726
 msgid "320x240"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:736
+#: modules/gui/pda/pda_interface.c:727
 msgid "qsif"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:737
+#: modules/gui/pda/pda_interface.c:728
 msgid "qcif"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:738
+#: modules/gui/pda/pda_interface.c:729
 msgid "sif"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:739
+#: modules/gui/pda/pda_interface.c:730
 msgid "cif"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:740
+#: modules/gui/pda/pda_interface.c:731
 msgid "vga"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:756
+#: modules/gui/pda/pda_interface.c:747
 msgid "kHz"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:766
+#: modules/gui/pda/pda_interface.c:757
 msgid "Hz/s"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:788
+#: modules/gui/pda/pda_interface.c:779
 #, fuzzy
 msgid "mono"
 msgstr "¥â¥Î¥é¥ë"
 
-#: modules/gui/pda/pda_interface.c:789
+#: modules/gui/pda/pda_interface.c:780
 #, fuzzy
 msgid "stereo"
 msgstr "¥¹¥Æ¥ì¥ª"
 
-#: modules/gui/pda/pda_interface.c:807 modules/gui/pda/pda_interface.c:1070
+#: modules/gui/pda/pda_interface.c:798 modules/gui/pda/pda_interface.c:1037
+#: modules/gui/pda/pda_interface.c:1113 modules/gui/pda/pda_interface.c:1120
 #, fuzzy
 msgid "enable"
 msgstr "¥Ó¥Ç¥ª¤òÍ­¸ú¤Ë¤¹¤ë"
 
-#: modules/gui/pda/pda_interface.c:832
+#: modules/gui/pda/pda_interface.c:823
 #, fuzzy
 msgid "Camera"
 msgstr "¥Á¥ã¥×¥¿¡¼"
 
-#: modules/gui/pda/pda_interface.c:859
+#: modules/gui/pda/pda_interface.c:849
 #, fuzzy
 msgid "Video Codec:"
 msgstr "DVD¥Ç¥Ð¥¤¥¹"
 
-#: modules/gui/pda/pda_interface.c:876
+#: modules/gui/pda/pda_interface.c:865
 msgid "huffyuv"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:877
-msgid "mpgv"
-msgstr ""
-
-#: modules/gui/pda/pda_interface.c:878
-msgid "mp4v"
-msgstr ""
-
-#: modules/gui/pda/pda_interface.c:879
-msgid "h263"
-msgstr ""
-
-#: modules/gui/pda/pda_interface.c:880
-msgid "DIV1"
-msgstr ""
-
-#: modules/gui/pda/pda_interface.c:881
-msgid "DIV2"
+#: modules/gui/pda/pda_interface.c:866
+msgid "mp1v"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:882
-msgid "DIV3"
+#: modules/gui/pda/pda_interface.c:867
+msgid "mp2v"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:883
-msgid "I420"
+#: modules/gui/pda/pda_interface.c:868
+msgid "mp4v"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:884
-msgid "I422"
+#: modules/gui/pda/pda_interface.c:869
+msgid "H263"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:885
-msgid "I444"
+#: modules/gui/pda/pda_interface.c:870
+msgid "I263"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:886
-msgid "RV24"
+#: modules/gui/pda/pda_interface.c:871
+msgid "WMV1"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:887
-msgid "YUY2"
+#: modules/gui/pda/pda_interface.c:872
+msgid "WMV2"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:896
+#: modules/gui/pda/pda_interface.c:881
 #, fuzzy
 msgid "Video Bitrate:"
 msgstr "¥ª¡¼¥Ç¥£¥ª"
 
-#: modules/gui/pda/pda_interface.c:905
+#: modules/gui/pda/pda_interface.c:889
 #, fuzzy
 msgid "Bitrate Tolerance:"
 msgstr "¥ª¡¼¥Ç¥£¥ª"
 
-#: modules/gui/pda/pda_interface.c:914
+#: modules/gui/pda/pda_interface.c:897
 msgid "Keyframe Interval:"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:923
+#: modules/gui/pda/pda_interface.c:905
 #, fuzzy
 msgid "Audio Codec:"
 msgstr "DVD¥Ç¥Ð¥¤¥¹"
 
-#: modules/gui/pda/pda_interface.c:932
+#: modules/gui/pda/pda_interface.c:913
 #, fuzzy
 msgid "Deinterlace:"
 msgstr "¥Î¥ó¥¤¥ó¥¿¥ì¡¼¥¹²½"
 
-#: modules/gui/pda/pda_interface.c:941
+#: modules/gui/pda/pda_interface.c:921
 #, fuzzy
 msgid "Access:"
 msgstr "¥Û¥¹¥È̾/¥¢¥É¥ì¥¹"
 
-#: modules/gui/pda/pda_interface.c:950
+#: modules/gui/pda/pda_interface.c:929
 #, fuzzy
 msgid "Muxer:"
 msgstr "¥ß¥å¡¼¥È¤¹¤ë"
 
-#: modules/gui/pda/pda_interface.c:959
+#: modules/gui/pda/pda_interface.c:937
 msgid "URL:"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:968
+#: modules/gui/pda/pda_interface.c:945
 msgid "Time To Live (TTL):"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:993
+#: modules/gui/pda/pda_interface.c:969
 msgid "127.0.0.1"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:994
+#: modules/gui/pda/pda_interface.c:970
 msgid "localhost"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:995
+#: modules/gui/pda/pda_interface.c:971
 msgid "localhost.localdomain"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:996
+#: modules/gui/pda/pda_interface.c:972
 msgid "239.0.0.42"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:1030
+#: modules/gui/pda/pda_interface.c:989
+msgid "ps"
+msgstr ""
+
+#: modules/gui/pda/pda_interface.c:990
 msgid "ts"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:1047 modules/gui/pda/pda_interface.c:1103
+#: modules/gui/pda/pda_interface.c:991
+msgid "mpeg1"
+msgstr ""
+
+#: modules/gui/pda/pda_interface.c:992
+msgid "avi"
+msgstr ""
+
+#: modules/gui/pda/pda_interface.c:993
+msgid "ogg"
+msgstr ""
+
+#: modules/gui/pda/pda_interface.c:994
+msgid "mp4"
+msgstr ""
+
+#: modules/gui/pda/pda_interface.c:995
+msgid "mov"
+msgstr ""
+
+#: modules/gui/pda/pda_interface.c:996
+msgid "asf"
+msgstr ""
+
+#: modules/gui/pda/pda_interface.c:1012 modules/gui/pda/pda_interface.c:1070
 msgid "kbits/s"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:1058
+#: modules/gui/pda/pda_interface.c:1023
 msgid "alaw"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:1059
+#: modules/gui/pda/pda_interface.c:1024
 msgid "ulaw"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:1060
+#: modules/gui/pda/pda_interface.c:1025
 msgid "mpga"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:1061
+#: modules/gui/pda/pda_interface.c:1026
 msgid "mp3"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:1093
+#: modules/gui/pda/pda_interface.c:1027
+msgid "a52"
+msgstr ""
+
+#: modules/gui/pda/pda_interface.c:1028
+msgid "vorb"
+msgstr ""
+
+#: modules/gui/pda/pda_interface.c:1060
 msgid "bits/s"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:1106
+#: modules/gui/pda/pda_interface.c:1073
 #, fuzzy
 msgid "Audio Bitrate :"
 msgstr "¥ª¡¼¥Ç¥£¥ª"
 
-#: modules/gui/pda/pda_interface.c:1125
+#: modules/gui/pda/pda_interface.c:1090
+#, fuzzy
+msgid "display"
+msgstr "ºÆÀ¸"
+
+#: modules/gui/pda/pda_interface.c:1093
+msgid "mmsh"
+msgstr ""
+
+#: modules/gui/pda/pda_interface.c:1105
+#, fuzzy
+msgid "SAP Announce:"
+msgstr "¥¹¥È¥ê¡¼¥à½ÐÎÏ"
+
+#: modules/gui/pda/pda_interface.c:1127
+#, fuzzy
+msgid "SLP Announce:"
+msgstr "¥¹¥È¥ê¡¼¥à½ÐÎÏ"
+
+#: modules/gui/pda/pda_interface.c:1135
+#, fuzzy
+msgid "Announce Channel:"
+msgstr "¥Á¥ã¥ó¥Í¥ë:"
+
+#: modules/gui/pda/pda_interface.c:1166
 #, fuzzy
 msgid "Transcode"
 msgstr "¥­¥ã¥ó¥»¥ë"
 
+#: modules/gui/pda/pda_interface.c:1195
+msgid "Update"
+msgstr ""
+
+#: modules/gui/pda/pda_interface.c:1205
+#, fuzzy
+msgid " Clear "
+msgstr "¥¯¥ê¥¢"
+
 #: modules/gui/pda/pda_interface.c:1237
 #, fuzzy
+msgid " Save "
+msgstr "Êݸ"
+
+#: modules/gui/pda/pda_interface.c:1242
+#, fuzzy
+msgid " Apply "
+msgstr "ŬÍÑ"
+
+#: modules/gui/pda/pda_interface.c:1247
+#, fuzzy
+msgid " Cancel "
+msgstr "¥­¥ã¥ó¥»¥ë"
+
+#: modules/gui/pda/pda_interface.c:1252
+msgid "Preference"
+msgstr "ÀßÄê(_P)..."
+
+#: modules/gui/pda/pda_interface.c:1281
+#, fuzzy
 msgid ""
-"The VideoLAN Client is a MPEG, MPEG 2, MP3, DivX player, that accepts input "
-"from  local or network sources and is licensed under the GPL (http://www.gnu."
+"VLC Media Player is an MPEG, MPEG 2, MP3 and DivX player that accepts input "
+"from local or network sources and is licensed under the GPL (http://www.gnu."
 "org/copyleft/gpl.html)."
 msgstr ""
 "VideoLAN Client¤Ï¡¢MPEG, MPEG 2, MP3 DivX¤ò¥í¡¼¥«¥ë¤ª¤è¤Ó¡¢¥Í¥Ã¥È¥ï¡¼¥¯¾å¤Î"
 "¥½¡¼¥¹¤«¤éºÆÀ¸¤Ç¤­¤ë¥×¥ì¥¤¥ä¡¼¤Ç¤¹¡£"
 
-#: modules/gui/pda/pda_interface.c:1245
-msgid "Authors: The VideoLAN Team, http://www.videolan.org/team/"
-msgstr ""
-
-#: modules/gui/pda/pda_interface.c:1253
-msgid "(C) 1996-2003 the VideoLAN team"
+#: modules/gui/pda/pda_interface.c:1288
+msgid "Authors: the VideoLAN Team, http://www.videolan.org/team/"
 msgstr ""
 
 #: modules/gui/qnx/qnx.c:44
@@ -6375,338 +6727,335 @@ msgstr "Qt
 msgid "Open a skin file"
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯"
 
-#: modules/gui/skins/src/skin_main.cpp:302
-#: modules/gui/skins/src/skin_main.cpp:303
+#: modules/gui/skins/src/skin_main.cpp:307
+#: modules/gui/skins/src/skin_main.cpp:308
 msgid "Last skin actually used"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:304
-#: modules/gui/skins/src/skin_main.cpp:305
+#: modules/gui/skins/src/skin_main.cpp:309
+#: modules/gui/skins/src/skin_main.cpp:310
 msgid "Config of last used skin"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:306
-#: modules/gui/skins/src/skin_main.cpp:307
+#: modules/gui/skins/src/skin_main.cpp:311
+#: modules/gui/skins/src/skin_main.cpp:312
 msgid "Show application in system tray"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:308
-#: modules/gui/skins/src/skin_main.cpp:309
+#: modules/gui/skins/src/skin_main.cpp:313
+#: modules/gui/skins/src/skin_main.cpp:314
 msgid "Show application in taskbar"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:320
+#: modules/gui/skins/src/skin_main.cpp:325
 #, fuzzy
-msgid "Skinnable Interface"
+msgid "Skinnable interface"
 msgstr "¥á¥¤¥ó¥¦¥£¥ó¥É¥¦¤Îɽ¼¨/Èóɽ¼¨(_I)"
 
-#: modules/gui/wxwindows/fileinfo.cpp:61
+#: modules/gui/wxwindows/dialogs.cpp:280 modules/gui/wxwindows/open.cpp:1002
+#: modules/gui/wxwindows/subtitles.cpp:220
+msgid "Open file"
+msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯"
+
+#: modules/gui/wxwindows/fileinfo.cpp:56
 #, fuzzy
-msgid "FileInfo"
-msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯(_O)..."
+msgid "Stream and media info"
+msgstr "¥¹¥È¥ê¡¼¥à¤Î¾ðÊó..."
 
-#: modules/gui/wxwindows/interface.cpp:295
+#: modules/gui/wxwindows/interface.cpp:289
 msgid "Quick file open"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:296
+#: modules/gui/wxwindows/interface.cpp:290
 #, fuzzy
 msgid "Advanced open"
 msgstr "ALSA¥ª¡¼¥Ç¥£¥ª¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/gui/wxwindows/interface.cpp:298
-#, fuzzy
-msgid "Open a DVD or (S)VCD"
-msgstr "DVD¤Þ¤¿¤ÏVCD¤ò³«¤¯"
-
-#: modules/gui/wxwindows/interface.cpp:299
+#: modules/gui/wxwindows/interface.cpp:293
 #, fuzzy
 msgid "Open a network stream"
 msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¥¹¥È¥ê¡¼¥à¤òÁªÂò¤¹¤ë"
 
-#: modules/gui/wxwindows/interface.cpp:300
+#: modules/gui/wxwindows/interface.cpp:294
 #, fuzzy
 msgid "Open a satellite stream"
 msgstr "±ÒÀ±¥«¡¼¥É¤ò³«¤¯"
 
-#: modules/gui/wxwindows/interface.cpp:301
+#: modules/gui/wxwindows/interface.cpp:295
 msgid "Eject the DVD/CD"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:302
+#: modules/gui/wxwindows/interface.cpp:296
 #, fuzzy
 msgid "Exit this program"
 msgstr "¥×¥í¥°¥é¥à¤Î½ªÎ»"
 
-#: modules/gui/wxwindows/interface.cpp:304
+#: modules/gui/wxwindows/interface.cpp:298
 #, fuzzy
 msgid "Open the streaming wizard"
 msgstr "¥Ó¥Ç¥ª¡¦¥¹¥È¥ê¡¼¥à¤Î½ÐÎϤòÍ­¸ú¤Ë¤¹¤ë"
 
-#: modules/gui/wxwindows/interface.cpp:305
+#: modules/gui/wxwindows/interface.cpp:299
 #, fuzzy
 msgid "Open other types of inputs"
 msgstr "¥Ó¥Ç¥ª¡¦¥¹¥È¥ê¡¼¥à¤Î½ÐÎϤòÍ­¸ú¤Ë¤¹¤ë"
 
-#: modules/gui/wxwindows/interface.cpp:307
+#: modules/gui/wxwindows/interface.cpp:301
 #, fuzzy
 msgid "Open the playlist"
 msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
 
-#: modules/gui/wxwindows/interface.cpp:308
+#: modules/gui/wxwindows/interface.cpp:302
 #, fuzzy
 msgid "Show the program logs"
 msgstr "¥×¥í¥°¥é¥à¤ÎÁªÂò"
 
-#: modules/gui/wxwindows/interface.cpp:309
+#: modules/gui/wxwindows/interface.cpp:303
 msgid "Show information about the file being played"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:311
+#: modules/gui/wxwindows/interface.cpp:305
 msgid "Go to the preferences menu"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:312
+#: modules/gui/wxwindows/interface.cpp:306
 msgid "Shows the extended GUI"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:314
+#: modules/gui/wxwindows/interface.cpp:308
 #, fuzzy
 msgid "About this program"
 msgstr "¥×¥í¥°¥é¥à¤Î½ªÎ»"
 
-#: modules/gui/wxwindows/interface.cpp:318
+#: modules/gui/wxwindows/interface.cpp:312
 #, fuzzy
 msgid "Quick &Open ..."
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯..."
 
-#: modules/gui/wxwindows/interface.cpp:322 modules/gui/wxwindows/menus.cpp:94
+#: modules/gui/wxwindows/interface.cpp:316 modules/gui/wxwindows/menus.cpp:94
 #, fuzzy
 msgid "Open &File..."
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯..."
 
-#: modules/gui/wxwindows/interface.cpp:324 modules/gui/wxwindows/menus.cpp:95
+#: modules/gui/wxwindows/interface.cpp:318 modules/gui/wxwindows/menus.cpp:95
 #, fuzzy
 msgid "Open &Disc..."
 msgstr "¥Ç¥£¥¹¥¯¤ò³«¤¯..."
 
-#: modules/gui/wxwindows/interface.cpp:326 modules/gui/wxwindows/menus.cpp:96
+#: modules/gui/wxwindows/interface.cpp:320 modules/gui/wxwindows/menus.cpp:96
 #, fuzzy
 msgid "Open &Network Stream..."
 msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¥¹¥È¥ê¡¼¥à(_N)..."
 
-#: modules/gui/wxwindows/interface.cpp:330
+#: modules/gui/wxwindows/interface.cpp:324
 #, fuzzy
 msgid "Open &Satellite Stream..."
 msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¥¹¥È¥ê¡¼¥à(_N)..."
 
-#: modules/gui/wxwindows/interface.cpp:334
+#: modules/gui/wxwindows/interface.cpp:328
 #, fuzzy
 msgid "Streaming Wizard..."
 msgstr "¥¹¥È¥ê¡¼¥à¤Î¾ðÊó..."
 
-#: modules/gui/wxwindows/interface.cpp:337
+#: modules/gui/wxwindows/interface.cpp:331
 #, fuzzy
 msgid "E&xit"
 msgstr "½ªÎ»(_x)"
 
-#: modules/gui/wxwindows/interface.cpp:341
+#: modules/gui/wxwindows/interface.cpp:335
 #, fuzzy
 msgid "&Playlist..."
 msgstr "¥×¥ì¥¤¥ê¥¹¥È..."
 
-#: modules/gui/wxwindows/interface.cpp:343
+#: modules/gui/wxwindows/interface.cpp:337
 #, fuzzy
 msgid "&Messages..."
 msgstr "¥á¥Ã¥»¡¼¥¸..."
 
-#: modules/gui/wxwindows/interface.cpp:344
-#, fuzzy
-msgid "&File info..."
-msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯(_O)..."
-
-#: modules/gui/wxwindows/interface.cpp:349
+#: modules/gui/wxwindows/interface.cpp:338
 #, fuzzy
-msgid "&Preferences..."
-msgstr "ÀßÄê(_P)..."
-
-#: modules/gui/wxwindows/interface.cpp:351
-msgid "&Extended GUI"
-msgstr ""
+msgid "&Stream and Media info..."
+msgstr "¥¹¥È¥ê¡¼¥à¤Î¾ðÊó..."
 
-#: modules/gui/wxwindows/interface.cpp:372
+#: modules/gui/wxwindows/interface.cpp:359
 #, fuzzy
 msgid "&About..."
 msgstr "VideoLAN¤Ë¤Ä¤¤¤Æ(_A)..."
 
-#: modules/gui/wxwindows/interface.cpp:376
+#: modules/gui/wxwindows/interface.cpp:363
 #, fuzzy
 msgid "&File"
 msgstr "¥Õ¥¡¥¤¥ë"
 
-#: modules/gui/wxwindows/interface.cpp:377
+#: modules/gui/wxwindows/interface.cpp:364
 #, fuzzy
 msgid "&View"
 msgstr "ɽ¼¨(_V)"
 
-#: modules/gui/wxwindows/interface.cpp:378
+#: modules/gui/wxwindows/interface.cpp:365
+#: modules/gui/wxwindows/interface.cpp:751
+#: modules/gui/wxwindows/interface.cpp:824
 #, fuzzy
 msgid "&Settings"
 msgstr "ÀßÄê(_S)"
 
-#: modules/gui/wxwindows/interface.cpp:379
-#: modules/gui/wxwindows/interface.cpp:763
-#: modules/gui/wxwindows/interface.cpp:830
+#: modules/gui/wxwindows/interface.cpp:366
+#: modules/gui/wxwindows/interface.cpp:770
+#: modules/gui/wxwindows/interface.cpp:828
 #, fuzzy
 msgid "&Audio"
 msgstr "¥ª¡¼¥Ç¥£¥ª"
 
-#: modules/gui/wxwindows/interface.cpp:380
-#: modules/gui/wxwindows/interface.cpp:782
-#: modules/gui/wxwindows/interface.cpp:834
+#: modules/gui/wxwindows/interface.cpp:367
+#: modules/gui/wxwindows/interface.cpp:789
+#: modules/gui/wxwindows/interface.cpp:832
 #, fuzzy
 msgid "&Video"
 msgstr "¥Ó¥Ç¥ª"
 
-#: modules/gui/wxwindows/interface.cpp:381
-#: modules/gui/wxwindows/interface.cpp:801
-#: modules/gui/wxwindows/interface.cpp:838
+#: modules/gui/wxwindows/interface.cpp:368
+#: modules/gui/wxwindows/interface.cpp:808
+#: modules/gui/wxwindows/interface.cpp:836
 #, fuzzy
 msgid "&Navigation"
 msgstr "¥Ê¥Ó¥²¡¼¥·¥ç¥ó(_N)"
 
-#: modules/gui/wxwindows/interface.cpp:382
-#: modules/gui/wxwindows/interface.cpp:820
-#: modules/gui/wxwindows/interface.cpp:842
-#, fuzzy
-msgid "&Miscellaneous"
-msgstr "¤½¤Î¾"
-
-#: modules/gui/wxwindows/interface.cpp:383
+#: modules/gui/wxwindows/interface.cpp:369
 #, fuzzy
 msgid "&Help"
 msgstr "¥Ø¥ë¥×(_H)"
 
-#: modules/gui/wxwindows/interface.cpp:399
+#: modules/gui/wxwindows/interface.cpp:385
 #, fuzzy
 msgid "Stop current playlist item"
 msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
 
-#: modules/gui/wxwindows/interface.cpp:401
+#: modules/gui/wxwindows/interface.cpp:387
 msgid "Play current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:402
+#: modules/gui/wxwindows/interface.cpp:388
 msgid "Pause current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:403
-#: modules/gui/wxwindows/playlist.cpp:545
+#: modules/gui/wxwindows/interface.cpp:389
+#: modules/gui/wxwindows/playlist.cpp:544
 #, fuzzy
 msgid "Open playlist"
 msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
 
-#: modules/gui/wxwindows/interface.cpp:404
+#: modules/gui/wxwindows/interface.cpp:390
 #, fuzzy
 msgid "Previous playlist item"
 msgstr "Á°¤Î¥Õ¥¡¥¤¥ë"
 
-#: modules/gui/wxwindows/interface.cpp:405
+#: modules/gui/wxwindows/interface.cpp:391
 #, fuzzy
 msgid "Next playlist item"
 msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
 
-#: modules/gui/wxwindows/interface.cpp:406
+#: modules/gui/wxwindows/interface.cpp:392
 #, fuzzy
 msgid "Play slower"
 msgstr "¥¹¥í¡¼ºÆÀ¸"
 
-#: modules/gui/wxwindows/interface.cpp:407
+#: modules/gui/wxwindows/interface.cpp:393
 #, fuzzy
 msgid "Play faster"
 msgstr "ÁáÁ÷¤êºÆÀ¸"
 
-#: modules/gui/wxwindows/interface.cpp:417
+#: modules/gui/wxwindows/interface.cpp:403
 #, fuzzy
 msgid "Quick"
 msgstr "VLC¤ò½ªÎ»"
 
-#: modules/gui/wxwindows/interface.cpp:518
+#: modules/gui/wxwindows/interface.cpp:498
 msgid "Image adjust"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:529
+#: modules/gui/wxwindows/interface.cpp:509
 #, fuzzy
 msgid "Enable"
 msgstr "¥Ó¥Ç¥ª¤òÍ­¸ú¤Ë¤¹¤ë"
 
-#: modules/gui/wxwindows/interface.cpp:534
+#: modules/gui/wxwindows/interface.cpp:514
 #, fuzzy
 msgid "Hue"
 msgstr "ÊĤ¸¤ë"
 
-#: modules/gui/wxwindows/interface.cpp:544
+#: modules/gui/wxwindows/interface.cpp:524
 #, fuzzy
 msgid "Contrast"
 msgstr "¥³¥ó¥È¥í¡¼¥ë"
 
-#: modules/gui/wxwindows/interface.cpp:553
+#: modules/gui/wxwindows/interface.cpp:533
 msgid "Brightness"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:562
+#: modules/gui/wxwindows/interface.cpp:542
 #, fuzzy
 msgid "Saturation"
 msgstr "»ý³´ü´Ö"
 
-#: modules/gui/wxwindows/interface.cpp:583
+#: modules/gui/wxwindows/interface.cpp:562
 #, fuzzy
 msgid "Video Options"
 msgstr "ÀßÄê(_S)"
 
-#: modules/gui/wxwindows/interface.cpp:597
+#: modules/gui/wxwindows/interface.cpp:576
 #, fuzzy
 msgid "Ratio"
 msgstr "ʸ»úÎó"
 
-#: modules/gui/wxwindows/interface.cpp:614
+#: modules/gui/wxwindows/interface.cpp:594
 #, fuzzy
 msgid "Visualisation"
 msgstr "¥Ê¥Ó¥²¡¼¥·¥ç¥ó(_N)"
 
-#: modules/gui/wxwindows/interface.cpp:620 modules/gui/wxwindows/v4l.cpp:335
+#: modules/gui/wxwindows/interface.cpp:600
 #, fuzzy
 msgid "Audio Options"
 msgstr "ÀßÄê(_S)"
 
-#: modules/gui/wxwindows/interface.cpp:877
+#: modules/gui/wxwindows/interface.cpp:741
+#: modules/gui/wxwindows/interface.cpp:819
+msgid "&Extended GUI"
+msgstr ""
+
+#: modules/gui/wxwindows/interface.cpp:742
+#: modules/gui/wxwindows/interface.cpp:821
+#, fuzzy
+msgid "&Preferences..."
+msgstr "ÀßÄê(_P)..."
+
+#: modules/gui/wxwindows/interface.cpp:872
 #, fuzzy
 msgid ""
 " (wxWindows interface)\n"
 "\n"
 msgstr "¥Í¥¤¥Æ¥£¥ÖWindows¥¤¥ó¥¿¥Õ¥§¡¼¥¹"
 
-#: modules/gui/wxwindows/interface.cpp:878
+#: modules/gui/wxwindows/interface.cpp:873
 msgid ""
-"(C) 1996-2003 - the VideoLAN Team\n"
+"(c) 1996-2003 - the VideoLAN Team\n"
 "\n"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:880
+#: modules/gui/wxwindows/interface.cpp:875
 msgid ""
 "The VideoLAN team <videolan@videolan.org>\n"
 "http://www.videolan.org/\n"
 "\n"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:883
+#: modules/gui/wxwindows/interface.cpp:878
 #, fuzzy, c-format
 msgid "About %s"
 msgstr "VideoLAN¤Ë¤Ä¤¤¤Æ"
 
 #: modules/gui/wxwindows/iteminfo.cpp:87
 #, fuzzy
-msgid "Playlist Item options"
+msgid "Playlist item options"
 msgstr "¥ê¥¹¥È"
 
 #: modules/gui/wxwindows/iteminfo.cpp:147
@@ -6720,7 +7069,7 @@ msgstr ""
 
 #: modules/gui/wxwindows/iteminfo.cpp:218
 #, fuzzy
-msgid "Group Info"
+msgid "Group info"
 msgstr "¥°¥ë¡¼¥×"
 
 #: modules/gui/wxwindows/iteminfo.cpp:225
@@ -6729,7 +7078,7 @@ msgid "Item enabled"
 msgstr " (¥Ç¥Õ¥©¥ë¥È¡§Í­¸ú)"
 
 #: modules/gui/wxwindows/iteminfo.cpp:246
-#: modules/gui/wxwindows/playlist.cpp:1012
+#: modules/gui/wxwindows/playlist.cpp:1006
 #, fuzzy
 msgid "New Group"
 msgstr "¥°¥ë¡¼¥×"
@@ -6749,17 +7098,17 @@ msgstr "
 msgid "Video menu"
 msgstr "ÀßÄê(_S)"
 
-#: modules/gui/wxwindows/menus.cpp:158
+#: modules/gui/wxwindows/menus.cpp:167
 #, fuzzy
 msgid "Input menu"
 msgstr "ÆþÎÏ"
 
-#: modules/gui/wxwindows/menus.cpp:188
+#: modules/gui/wxwindows/menus.cpp:197
 #, fuzzy
 msgid "Interface menu"
 msgstr "¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/gui/wxwindows/menus.cpp:406 modules/gui/wxwindows/menus.cpp:433
+#: modules/gui/wxwindows/menus.cpp:424 modules/gui/wxwindows/menus.cpp:451
 msgid "Empty"
 msgstr ""
 
@@ -6768,132 +7117,138 @@ msgstr ""
 msgid "Save As..."
 msgstr "¥×¥ì¥¤¥ê¥¹¥È..."
 
-#: modules/gui/wxwindows/messages.cpp:204
-msgid "Save Messages As a file..."
-msgstr ""
+#: modules/gui/wxwindows/messages.cpp:209
+#, fuzzy
+msgid "Save Messages As..."
+msgstr "¥á¥Ã¥»¡¼¥¸..."
 
-#: modules/gui/wxwindows/open.cpp:255
+#: modules/gui/wxwindows/open.cpp:263
 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/open.cpp:280
+#: modules/gui/wxwindows/open.cpp:288
 msgid "Use VLC as a stream server"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:320
+#: modules/gui/wxwindows/open.cpp:328
 #, fuzzy
-msgid "Video For Linux"
+msgid "Video for Linux"
 msgstr "ÀßÄê(_S)"
 
-#: modules/gui/wxwindows/open.cpp:427 modules/gui/wxwindows/subtitles.cpp:84
+#: modules/gui/wxwindows/open.cpp:435 modules/gui/wxwindows/subtitles.cpp:84
 #, fuzzy
 msgid "Subtitles file"
 msgstr "»úËë"
 
-#: modules/gui/wxwindows/open.cpp:428
+#: modules/gui/wxwindows/open.cpp:436
 msgid "Load an additional subtitles file. Currently only works with AVI files."
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:464
+#: modules/gui/wxwindows/open.cpp:472
 msgid "DVD (menus support)"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:467
-#, fuzzy
-msgid "CD Audio"
-msgstr "¥ª¡¼¥Ç¥£¥ª"
-
-#: modules/gui/wxwindows/open.cpp:606
-msgid "WebCam"
+#: modules/gui/wxwindows/open.cpp:625
+msgid "Webcam"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:607
-msgid "TV Card"
+#: modules/gui/wxwindows/open.cpp:626
+msgid "TV card"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:608
+#: modules/gui/wxwindows/open.cpp:627
 msgid "PVR"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:609
+#: modules/gui/wxwindows/open.cpp:628
 msgid "Kfir"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:613
+#: modules/gui/wxwindows/open.cpp:632
 #, fuzzy
-msgid "Video Device Type"
+msgid "Video device type"
 msgstr "DVD¥Ç¥Ð¥¤¥¹"
 
-#: modules/gui/wxwindows/open.cpp:623
-#, fuzzy
-msgid "Video Device"
-msgstr "DVD¥Ç¥Ð¥¤¥¹"
+#: modules/gui/wxwindows/open.cpp:646
+msgid "Device corresponding to your acquisition card or your webcam"
+msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:631 modules/gui/wxwindows/v4l.cpp:353
+#: modules/gui/wxwindows/open.cpp:651 modules/gui/wxwindows/v4l.cpp:356
 #, fuzzy
 msgid "Channel"
 msgstr "¥Á¥ã¥ó¥Í¥ë"
 
-#: modules/gui/wxwindows/open.cpp:640
+#: modules/gui/wxwindows/open.cpp:653
+msgid "Usually 0 is for tuner, 1 for composite and 2 for svideo"
+msgstr ""
+
+#: modules/gui/wxwindows/open.cpp:661
 #, fuzzy
-msgid "Advanced Settings..."
+msgid "Advanced settings..."
 msgstr "ALSA¥ª¡¼¥Ç¥£¥ª¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/gui/wxwindows/playlist.cpp:173
+#: modules/gui/wxwindows/playlist.cpp:171
 #, fuzzy
 msgid "&Simple Add..."
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯(_O)..."
 
-#: modules/gui/wxwindows/playlist.cpp:174
+#: modules/gui/wxwindows/playlist.cpp:172
 msgid "&Add MRL..."
 msgstr ""
 
-#: modules/gui/wxwindows/playlist.cpp:176
+#: modules/gui/wxwindows/playlist.cpp:174
 #, fuzzy
 msgid "&Open Playlist..."
 msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
 
-#: modules/gui/wxwindows/playlist.cpp:177
+#: modules/gui/wxwindows/playlist.cpp:175
 #, fuzzy
 msgid "&Save Playlist..."
 msgstr "¥×¥ì¥¤¥ê¥¹¥È..."
 
-#: modules/gui/wxwindows/playlist.cpp:179
+#: modules/gui/wxwindows/playlist.cpp:177
 #, fuzzy
 msgid "&Close"
 msgstr "ÊĤ¸¤ë"
 
-#: modules/gui/wxwindows/playlist.cpp:183
+#: modules/gui/wxwindows/playlist.cpp:181
 #, fuzzy
-msgid "&Sort by title"
+msgid "Sort by &title"
 msgstr "»úËë(_S)"
 
-#: modules/gui/wxwindows/playlist.cpp:184
+#: modules/gui/wxwindows/playlist.cpp:182
 #, fuzzy
 msgid "&Reverse sort by title"
 msgstr "¥µ¡¼¥Ð¡¼¡¦¥Ý¡¼¥È"
 
-#: modules/gui/wxwindows/playlist.cpp:186
-msgid "&Sort by author"
-msgstr ""
+#: modules/gui/wxwindows/playlist.cpp:184
+#, fuzzy
+msgid "Sort by &author"
+msgstr "¥µ¡¼¥Ð¡¼¡¦¥Ý¡¼¥È"
 
-#: modules/gui/wxwindows/playlist.cpp:187
+#: modules/gui/wxwindows/playlist.cpp:185
 #, fuzzy
 msgid "&Reverse sort by author"
 msgstr "¥µ¡¼¥Ð¡¼¡¦¥Ý¡¼¥È"
 
-#: modules/gui/wxwindows/playlist.cpp:189
-msgid "&Sort by group"
-msgstr ""
+#: modules/gui/wxwindows/playlist.cpp:187
+#, fuzzy
+msgid "Sort by &group"
+msgstr "¥µ¡¼¥Ð¡¼¡¦¥Ý¡¼¥È"
 
-#: modules/gui/wxwindows/playlist.cpp:190
+#: modules/gui/wxwindows/playlist.cpp:188
 #, fuzzy
 msgid "&Reverse sort by group"
 msgstr "¥µ¡¼¥Ð¡¼¡¦¥Ý¡¼¥È"
 
+#: modules/gui/wxwindows/playlist.cpp:190
+#, fuzzy
+msgid "&Randomize Playlist"
+msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
+
 #: modules/gui/wxwindows/playlist.cpp:194
 #, fuzzy
 msgid "&Enable"
@@ -6956,45 +7311,41 @@ msgstr "
 msgid "Repeat one"
 msgstr "¥Õ¥¡¥¤¥ë¤ÎÁªÂò"
 
-#: modules/gui/wxwindows/playlist.cpp:274
+#: modules/gui/wxwindows/playlist.cpp:272
 msgid "Up"
 msgstr ""
 
-#: modules/gui/wxwindows/playlist.cpp:277
+#: modules/gui/wxwindows/playlist.cpp:275
 msgid "Down"
 msgstr ""
 
-#: modules/gui/wxwindows/playlist.cpp:281
+#: modules/gui/wxwindows/playlist.cpp:279
 #, fuzzy
-msgid "Item Infos"
+msgid "Item info"
 msgstr "¥Ç¥Ð¥¤¥¹Ì¾"
 
-#: modules/gui/wxwindows/playlist.cpp:406
-msgid "no info"
-msgstr ""
-
-#: modules/gui/wxwindows/playlist.cpp:524
+#: modules/gui/wxwindows/playlist.cpp:523
 #, fuzzy
 msgid "Save playlist"
 msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
 
-#: modules/gui/wxwindows/playlist.cpp:1026
+#: modules/gui/wxwindows/playlist.cpp:1020
 #, fuzzy
-msgid "Enter the name for the new group"
+msgid "Enter a name for the new group"
 msgstr "¶è²è¤«¤é±ï¼è¤ê¤Þ¤Ç¤Î¥¸¥ª¥á¥È¥ê¤ò»ØÄê"
 
-#: modules/gui/wxwindows/preferences.cpp:205
+#: modules/gui/wxwindows/preferences.cpp:207
 #, fuzzy
 msgid "Advanced options"
 msgstr "ALSA¥ª¡¼¥Ç¥£¥ª¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/gui/wxwindows/preferences.cpp:276
+#: modules/gui/wxwindows/preferences.cpp:278
 msgid "Reset config file"
 msgstr ""
 
-#: modules/gui/wxwindows/preferences.cpp:369
+#: modules/gui/wxwindows/preferences.cpp:370
 #, fuzzy
-msgid "General Settings"
+msgid "General settings"
 msgstr "ÀßÄê(_S)"
 
 #: modules/gui/wxwindows/preferences_widgets.cpp:238
@@ -7008,74 +7359,77 @@ msgid "Ctrl"
 msgstr "¥³¥ó¥È¥í¡¼¥ë"
 
 #: modules/gui/wxwindows/preferences_widgets.cpp:404
-#: modules/gui/wxwindows/preferences_widgets.cpp:593
+#: modules/gui/wxwindows/preferences_widgets.cpp:597
 msgid "Refresh"
 msgstr ""
 
 #: modules/gui/wxwindows/preferences_widgets.cpp:509
 #, fuzzy
-msgid "Choose Directory"
+msgid "Choose directory"
 msgstr "¥½¡¼¥¹¤Î¥¢¥¹¥Ú¥¯¥È¡¦¥ì¥·¥ª"
 
 #: modules/gui/wxwindows/preferences_widgets.cpp:518
 #, fuzzy
-msgid "Choose File"
+msgid "Choose file"
 msgstr "¥¿¥¤¥È¥ë¤ÎÁªÂò"
 
-#: modules/gui/wxwindows/streamout.cpp:160
+#: modules/gui/wxwindows/streamout.cpp:166
 msgid "Stream output MRL"
 msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏMRL"
 
-#: modules/gui/wxwindows/streamout.cpp:164 modules/gui/wxwindows/v4l.cpp:125
+#: modules/gui/wxwindows/streamout.cpp:170
 #, fuzzy
 msgid "Destination Target:"
 msgstr "Á÷¿®Àè¤Î¥¢¥¹¥Ú¥¯¥È¡¦¥ì¥·¥ª"
 
-#: modules/gui/wxwindows/streamout.cpp:167 modules/gui/wxwindows/v4l.cpp:128
+#: modules/gui/wxwindows/streamout.cpp:173 modules/gui/wxwindows/v4l.cpp:129
 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/streamout.cpp:390
-msgid "Output Methods"
-msgstr ""
+#: modules/gui/wxwindows/streamout.cpp:409
+#, fuzzy
+msgid "Output methods"
+msgstr "½ÐÎÏ¥Õ¥©¡¼¥Þ¥Ã¥È"
 
-#: modules/gui/wxwindows/streamout.cpp:397
+#: modules/gui/wxwindows/streamout.cpp:416
 #, fuzzy
 msgid "Play locally"
 msgstr "¥¹¥í¡¼ºÆÀ¸"
 
-#: modules/gui/wxwindows/streamout.cpp:504
+#: modules/gui/wxwindows/streamout.cpp:523
 #, fuzzy
-msgid "Miscellaneous Options"
+msgid "Miscellaneous options"
 msgstr "¤½¤Î¾"
 
-#: modules/gui/wxwindows/streamout.cpp:513
-msgid "SAP Announce"
-msgstr ""
-
-#: modules/gui/wxwindows/streamout.cpp:515
-msgid "SLP Announce"
-msgstr ""
+#: modules/gui/wxwindows/streamout.cpp:537
+#, fuzzy
+msgid "Channel name"
+msgstr "¥Á¥ã¥ó¥Í¥ë¡¦¥µ¡¼¥Ð¡¼"
 
-#: modules/gui/wxwindows/streamout.cpp:596
+#: modules/gui/wxwindows/streamout.cpp:616
 #, fuzzy
 msgid "Transcoding options"
 msgstr "»ý³´ü´Ö"
 
-#: modules/gui/wxwindows/streamout.cpp:635
+#: modules/gui/wxwindows/streamout.cpp:666
 #, fuzzy
 msgid "Video codec"
 msgstr "DVD¥Ç¥Ð¥¤¥¹"
 
-#: modules/gui/wxwindows/streamout.cpp:685
+#: modules/gui/wxwindows/streamout.cpp:679
+#, fuzzy
+msgid "Scale"
+msgstr "±ÒÀ±"
+
+#: modules/gui/wxwindows/streamout.cpp:728
 #, fuzzy
 msgid "Audio codec"
 msgstr "DVD¥Ç¥Ð¥¤¥¹"
 
-#: modules/gui/wxwindows/streamout.cpp:831
+#: modules/gui/wxwindows/streamout.cpp:874
 #, fuzzy
 msgid "Save file"
 msgstr "¥Õ¥¡¥¤¥ë¤ÎÊݸ"
@@ -7086,16 +7440,18 @@ msgstr ""
 
 #: modules/gui/wxwindows/streamwizard.cpp:41
 #, fuzzy
-msgid "Step 1 : Select what to stream"
+msgid "Step 1: select what to stream"
 msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¥¹¥È¥ê¡¼¥à¤òÁªÂò¤¹¤ë"
 
 #: modules/gui/wxwindows/streamwizard.cpp:42
-msgid "Step 2 : Define streaming method"
-msgstr ""
+#, fuzzy
+msgid "Step 2: define streaming method"
+msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¥¹¥È¥ê¡¼¥à¤òÁªÂò¤¹¤ë"
 
 #: modules/gui/wxwindows/streamwizard.cpp:43
-msgid "Step 3 : Start streaming"
-msgstr ""
+#, fuzzy
+msgid "Step 3: start streaming"
+msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¥¹¥È¥ê¡¼¥à¤òÁªÂò¤¹¤ë"
 
 #: modules/gui/wxwindows/streamwizard.cpp:105
 msgid "Open..."
@@ -7108,12 +7464,12 @@ msgstr "
 
 #: modules/gui/wxwindows/streamwizard.cpp:111
 #, fuzzy
-msgid "Start !"
+msgid "Start!"
 msgstr "±ÒÀ±"
 
 #: modules/gui/wxwindows/subtitles.cpp:67
 #, fuzzy
-msgid "Open Subtitles File"
+msgid "Open subtitles file"
 msgstr "»úËë¤ÎÁªÂò"
 
 #: modules/gui/wxwindows/subtitles.cpp:107
@@ -7139,42 +7495,61 @@ msgstr ""
 msgid "Override frames per second. It will only work with MicroDVD subtitles."
 msgstr ""
 
-#: modules/gui/wxwindows/v4l.cpp:106
+#: modules/gui/wxwindows/v4l.cpp:107
 #, fuzzy
-msgid "Video Device Advanced Options"
+msgid "Advanced video device options"
 msgstr "ALSA¥ª¡¼¥Ç¥£¥ª¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/gui/wxwindows/v4l.cpp:121
+#: modules/gui/wxwindows/v4l.cpp:122
 #, fuzzy
-msgid "Video Device MRL"
+msgid "Video device MRL"
 msgstr "DVD¥Ç¥Ð¥¤¥¹"
 
-#: modules/gui/wxwindows/v4l.cpp:247
-msgid "Common Options"
-msgstr ""
+#: modules/gui/wxwindows/v4l.cpp:126
+#, fuzzy
+msgid "Destination target:"
+msgstr "Á÷¿®Àè¤Î¥¢¥¹¥Ú¥¯¥È¡¦¥ì¥·¥ª"
+
+#: modules/gui/wxwindows/v4l.cpp:248
+#, fuzzy
+msgid "Common options"
+msgstr "»ý³´ü´Ö"
 
-#: modules/gui/wxwindows/v4l.cpp:290
+#: modules/gui/wxwindows/v4l.cpp:291
 #, fuzzy
 msgid "Norm"
 msgstr "¤Ê¤·"
 
-#: modules/gui/wxwindows/v4l.cpp:306
+#: modules/gui/wxwindows/v4l.cpp:297
+msgid "Standard of the analogic signal"
+msgstr ""
+
+#: modules/gui/wxwindows/v4l.cpp:308
 msgid "The frequency in kHz"
 msgstr ""
 
-#: modules/gui/wxwindows/v4l.cpp:348
+#: modules/gui/wxwindows/v4l.cpp:337
 #, fuzzy
-msgid "Audio Device"
-msgstr "DVD¥Ç¥Ð¥¤¥¹"
+msgid "Audio options"
+msgstr "ÀßÄê(_S)"
 
-#: modules/gui/wxwindows/v4l.cpp:384
+#: modules/gui/wxwindows/v4l.cpp:359
+msgid "Usually 0 is for mono and 1 for stereo"
+msgstr ""
+
+#: modules/gui/wxwindows/v4l.cpp:389
 #, fuzzy
-msgid "Bitrate Options"
+msgid "Bitrate options"
 msgstr "¥¹¥È¥ê¡¼¥à¤Î°ì»þÄä»ß"
 
-#: modules/gui/wxwindows/v4l.cpp:406
+#: modules/gui/wxwindows/v4l.cpp:403
+#, fuzzy
+msgid "The average bitrate of the stream"
+msgstr "¥¹¥È¥ê¡¼¥à¤ò¥Ê¥Ó¥²¡¼¥È¤¹¤ë"
+
+#: modules/gui/wxwindows/v4l.cpp:411
 #, fuzzy
-msgid "Maximum Bitrate"
+msgid "Maximum bitrate"
 msgstr "¥ª¡¼¥Ç¥£¥ª"
 
 #: modules/gui/wxwindows/wxwindows.cpp:85
@@ -7201,53 +7576,66 @@ msgstr ""
 "¥Þ¥Ã¥È¤ò»ÈÍѤ·¤Æ¥¤¥á¡¼¥¸¤òºîÀ®¤¹¤ë¤¿¤á¤Ë¡¢¥À¥ß¡¼¤Î¥Ó¥Ç¥ª½ÐÎϤò¶¯À©Åª¤ËÁªÂò¤·"
 "¤Þ¤¹¡£"
 
-#: modules/misc/dummy/dummy.c:44
-msgid "Don't open a dos command box interface"
+#: modules/misc/dummy/dummy.c:43
+msgid "Save raw codec data"
+msgstr ""
+
+#: modules/misc/dummy/dummy.c:45
+#, fuzzy
+msgid ""
+"This option allows you to save the raw codec data if you have selected/"
+"forced the dummy decoder in the main options."
+msgstr ""
+"¥ª¡¼¥Ç¥£¥ª½ÐÎϤÎÃÙ¤ì¤òÀßÄꤷ¤Þ¤¹¡£¥Ó¥Ç¥ª¤È²»À¼¤Î¥º¥ì¤¬¤¢¤ë¾ì¹ç¤Ë¤Ï¡¢Å¬ÀÚ¤ÊÃÍ"
+"¤òÀßÄê¤Ç¤­¤Þ¤¹¡£"
+
+#: modules/misc/dummy/dummy.c:49
+msgid "Do not open a DOS command box interface"
 msgstr ""
 
-#: modules/misc/dummy/dummy.c:46
+#: modules/misc/dummy/dummy.c:51
 msgid ""
-"By default the dummy interface plugin will start a dos command box. Enabling "
+"By default the dummy 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 opened."
+"annoying when you want to stop VLC and no video window is open."
 msgstr ""
 
-#: modules/misc/dummy/dummy.c:53
+#: modules/misc/dummy/dummy.c:58
 #, fuzzy
 msgid "dummy interface function"
 msgstr "¥À¥ß¡¼¤Îµ¡Ç½¥â¥¸¥å¡¼¥ë"
 
-#: modules/misc/dummy/dummy.c:62
+#: modules/misc/dummy/dummy.c:67
 #, fuzzy
 msgid "dummy access function"
 msgstr "¥À¥ß¡¼¤Îµ¡Ç½¥â¥¸¥å¡¼¥ë"
 
-#: modules/misc/dummy/dummy.c:66
+#: modules/misc/dummy/dummy.c:71
 #, fuzzy
 msgid "dummy demux function"
 msgstr "¥À¥ß¡¼¤Îµ¡Ç½¥â¥¸¥å¡¼¥ë"
 
-#: modules/misc/dummy/dummy.c:70
+#: modules/misc/dummy/dummy.c:75
 #, fuzzy
 msgid "dummy decoder function"
 msgstr "¥À¥ß¡¼¤Îµ¡Ç½¥â¥¸¥å¡¼¥ë"
 
-#: modules/misc/dummy/dummy.c:74
+#: modules/misc/dummy/dummy.c:80
 #, fuzzy
 msgid "dummy encoder function"
 msgstr "¥À¥ß¡¼¤Îµ¡Ç½¥â¥¸¥å¡¼¥ë"
 
-#: modules/misc/dummy/dummy.c:78
+#: modules/misc/dummy/dummy.c:84
 #, fuzzy
 msgid "dummy audio output function"
 msgstr "¥À¥ß¡¼¤Îµ¡Ç½¥â¥¸¥å¡¼¥ë"
 
-#: modules/misc/dummy/dummy.c:82
+#: modules/misc/dummy/dummy.c:88
 #, fuzzy
 msgid "dummy video output function"
 msgstr "¥À¥ß¡¼¤Îµ¡Ç½¥â¥¸¥å¡¼¥ë"
 
-#: modules/misc/dummy/dummy.c:88
+#: modules/misc/dummy/dummy.c:94
 #, fuzzy
 msgid "dummy font renderer function"
 msgstr "¥À¥ß¡¼¤Îµ¡Ç½¥â¥¸¥å¡¼¥ë"
@@ -7256,63 +7644,63 @@ msgstr "
 msgid "Using the dummy interface plugin..."
 msgstr "¥À¥ß¡¼¤Î¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥×¥é¥°¥¤¥ó¤ò»ÈÍѤ·¤Þ¤¹¡£"
 
-#: modules/misc/freetype.c:89 modules/visualization/xosd/xosd.c:71
+#: modules/misc/freetype.c:94 modules/visualization/xosd/xosd.c:71
 #, fuzzy
 msgid "Font"
 msgstr "¥Õ¥©¥ó¥È"
 
-#: modules/misc/freetype.c:90
+#: modules/misc/freetype.c:95
 #, fuzzy
-msgid "Filename of Font"
+msgid "Font filename"
 msgstr "¥í¥°¡¦¥Õ¥¡¥¤¥ë̾"
 
-#: modules/misc/freetype.c:91
+#: modules/misc/freetype.c:96
 msgid "Font size in pixels"
 msgstr ""
 
-#: modules/misc/freetype.c:92
+#: modules/misc/freetype.c:97
 msgid ""
-"The size of the fonts used by the osd module. If  set to something different "
+"The size of the fonts used by the osd module. If set to something different "
 "than 0 this option will override the relative font size "
 msgstr ""
 
-#: modules/misc/freetype.c:94
+#: modules/misc/freetype.c:100
 msgid "Font size"
 msgstr ""
 
-#: modules/misc/freetype.c:95
+#: modules/misc/freetype.c:101
 msgid "The size of the fonts used by the osd module"
 msgstr ""
 
-#: modules/misc/freetype.c:98
+#: modules/misc/freetype.c:104
 #, fuzzy
 msgid "Smaller"
 msgstr "±ÒÀ±"
 
-#: modules/misc/freetype.c:98
+#: modules/misc/freetype.c:104
 msgid "Small"
 msgstr ""
 
-#: modules/misc/freetype.c:98
+#: modules/misc/freetype.c:104
 #, fuzzy
 msgid "Normal"
 msgstr "¤Ê¤·"
 
-#: modules/misc/freetype.c:99
+#: modules/misc/freetype.c:105
 #, fuzzy
 msgid "Large"
 msgstr "¸À¸ì"
 
-#: modules/misc/freetype.c:99
+#: modules/misc/freetype.c:105
 msgid "Larger"
 msgstr ""
 
-#: modules/misc/freetype.c:102
+#: modules/misc/freetype.c:108
 #, fuzzy
 msgid "Fonts"
 msgstr "¥Õ¥©¥ó¥È"
 
-#: modules/misc/freetype.c:108
+#: modules/misc/freetype.c:114
 msgid "freetype2 font renderer"
 msgstr ""
 
@@ -7397,16 +7785,16 @@ msgid "IPv6 network abstraction layer"
 msgstr "IPv6¥Í¥Ã¥È¥ï¡¼¥¯Ãê¾Ý¥ì¥¤¥ä"
 
 #: modules/misc/qte_main.cpp:66
-msgid "Run as standalone Qt/Embedded Gui Server"
+msgid "Run as standalone Qt/Embedded GUI Server"
 msgstr ""
 
 #: modules/misc/qte_main.cpp:67
 msgid ""
-"Use this option to run as standalone Qt/Embedded Gui Server. This option is "
+"Use this option to run as standalone Qt/Embedded GUI Server. This option is "
 "equivalent to the -qws option from normal Qt."
 msgstr ""
 
-#: modules/misc/qte_main.cpp:71
+#: modules/misc/qte_main.cpp:72
 #, fuzzy
 msgid "Qt Embedded GUI helper"
 msgstr "QTËä¤á¹þ¤ß¥â¥¸¥å¡¼¥ë"
@@ -7419,31 +7807,31 @@ msgstr ""
 msgid "IPv4-SAP listening"
 msgstr ""
 
-#: modules/misc/sap.c:90
+#: modules/misc/sap.c:91
 msgid "Set this if you want the SAP module to listen to IPv4 announces"
 msgstr ""
 
-#: modules/misc/sap.c:91
+#: modules/misc/sap.c:92
 msgid "IPv6-SAP listening"
 msgstr ""
 
-#: modules/misc/sap.c:92
+#: modules/misc/sap.c:94
 msgid "Set this if you want the SAP module to listen to IPv6 announces"
 msgstr ""
 
-#: modules/misc/sap.c:93
+#: modules/misc/sap.c:95
 msgid "IPv6 SAP scope"
 msgstr ""
 
-#: modules/misc/sap.c:94
+#: modules/misc/sap.c:97
 msgid "Sets the scope for IPv6 announces (default is 8)"
 msgstr ""
 
-#: modules/misc/sap.c:100
+#: modules/misc/sap.c:103
 msgid "SAP"
 msgstr ""
 
-#: modules/misc/sap.c:113
+#: modules/misc/sap.c:116
 #, fuzzy
 msgid "SAP interface"
 msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹"
@@ -7463,12 +7851,13 @@ msgstr "
 
 #: modules/mux/asf.c:42
 #, fuzzy
-msgid "Asf muxer"
+msgid "ASF muxer"
 msgstr "MPEG 1/2¥ì¥¤¥ä1/2¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
 
 #: modules/mux/avi.c:44
-msgid "Avi muxer"
-msgstr ""
+#, fuzzy
+msgid "AVI muxer"
+msgstr "MPEG 1/2¥ì¥¤¥ä1/2¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
 
 #: modules/mux/dummy.c:43
 msgid "Dummy/Raw muxer"
@@ -7499,14 +7888,16 @@ msgid "Copy packetizer"
 msgstr ""
 
 #: modules/packetizer/mpeg4audio.c:116
-msgid "MPEG4 Audio packetizer"
-msgstr ""
+#, fuzzy
+msgid "MPEG4 audio packetizer"
+msgstr "»úË롦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
 
 #: modules/packetizer/mpeg4video.c:44
-msgid "MPEG4 Video packetizer"
-msgstr ""
+#, fuzzy
+msgid "MPEG4 video packetizer"
+msgstr "MPEG 1/2¥Ó¥Ç¥ª¡¦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/packetizer/mpegvideo.c:55
+#: modules/packetizer/mpegvideo.c:58
 #, fuzzy
 msgid "MPEG-I/II video packetizer"
 msgstr "MPEG 1/2¥Ó¥Ç¥ª¡¦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
@@ -7728,15 +8119,15 @@ msgstr "
 
 #: modules/video_filter/logo.c:58
 #, fuzzy
-msgid "Logo File"
-msgstr "¥Õ¥¡¥¤¥ë"
+msgid "Logo filename"
+msgstr "¥í¥°¡¦¥Õ¥¡¥¤¥ë̾"
 
 #: modules/video_filter/logo.c:59
-msgid "The file must in PNG RGBA 8bits format (for now)"
+msgid "The file must be in PNG RGBA 8bits format (for now)"
 msgstr ""
 
 #: modules/video_filter/logo.c:60
-msgid "x postion of the logo"
+msgid "X coordinate of the logo"
 msgstr ""
 
 #: modules/video_filter/logo.c:61 modules/video_filter/logo.c:63
@@ -7744,7 +8135,7 @@ msgid "You can move the logo by left-clicking on it"
 msgstr ""
 
 #: modules/video_filter/logo.c:62
-msgid "y position of the logo"
+msgid "Y coordinate of the logo"
 msgstr ""
 
 #: modules/video_filter/logo.c:64
@@ -7861,44 +8252,42 @@ msgstr "
 msgid "Choose the libcaca dithering mode"
 msgstr ""
 
-#: modules/video_output/caca.c:57
+#: modules/video_output/caca.c:61
 msgid "No dithering"
 msgstr ""
 
-#: modules/video_output/caca.c:57
-msgid "Ordered dithering"
+#: modules/video_output/caca.c:62
+msgid "2x2 ordered dithering"
+msgstr ""
+
+#: modules/video_output/caca.c:63
+msgid "4x4 ordered dithering"
+msgstr ""
+
+#: modules/video_output/caca.c:64
+msgid "8x8 ordered dithering"
 msgstr ""
 
-#: modules/video_output/caca.c:58
+#: modules/video_output/caca.c:65
 msgid "Random dithering"
 msgstr ""
 
-#: modules/video_output/caca.c:61
+#: modules/video_output/caca.c:68
 #, fuzzy
 msgid "Dithering"
 msgstr "ʸ»úÎó"
 
-#: modules/video_output/caca.c:65
+#: modules/video_output/caca.c:72
 #, fuzzy
 msgid "colour ASCII art video output"
 msgstr "ASCII¥¢¡¼¥È¡¦¥Ó¥Ç¥ª½ÐÎϥ⥸¥å¡¼¥ë"
 
-#: modules/video_output/directx/directx.c:96
-#: modules/video_output/directx/directx.c:225
-msgid "Always on top"
-msgstr ""
-
-#: modules/video_output/directx/directx.c:97
-#, fuzzy
-msgid "Place the directx window on top of other windows"
-msgstr "¥Ó¥Ç¥ª¤ò¥¯¥í¡¼¥ó¤¹¤ë¤¿¤á¤Ë¥Ó¥Ç¥ª¡¦¥¦¥£¥ó¥É¥¦¿ô¤òÁªÂò¤¹¤ë"
-
-#: modules/video_output/directx/directx.c:98
+#: modules/video_output/directx/directx.c:103
 #, fuzzy
 msgid "Use hardware YUV->RGB conversions"
 msgstr "¥Ï¡¼¥É¥¦¥§¥¢¤Ë¤è¤ë YUV->RGBÊÑ´¹¤ò»ÈÍÑ"
 
-#: modules/video_output/directx/directx.c:100
+#: modules/video_output/directx/directx.c:105
 msgid ""
 "Try to use hardware acceleration for YUV->RGB conversions. This option "
 "doesn't have any effect when using overlays."
@@ -7906,12 +8295,12 @@ msgstr ""
 "YUV->RGB¤Î¥Ï¡¼¥É¥¦¥§¥¢¡¦¥¢¥¯¥»¥é¥ì¡¼¥·¥ç¥ó¤Î»ÈÍѤò»î¤ß¤Þ¤¹¡£¥ª¡¼¥Ð¥ì¥¤¤ò»ÈÍÑ"
 "¤¹¤ë¾ì¹ç¤Ë¤Ï²¿¤Î¸ú²Ì¤â¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: modules/video_output/directx/directx.c:102
+#: modules/video_output/directx/directx.c:107
 #, fuzzy
 msgid "Use video buffers in system memory"
 msgstr "¥·¥¹¥Æ¥à¥á¥â¥êÃæ¤Î¥Ó¥Ç¥ª¥Ð¥Ã¥Õ¥¡¤ò»ÈÍѤ¹¤ë"
 
-#: modules/video_output/directx/directx.c:104
+#: modules/video_output/directx/directx.c:109
 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 "
@@ -7923,17 +8312,17 @@ msgstr ""
 "¥ª¥×¥·¥ç¥ó¤Ï¿ä¾©¤·¤Þ¤»¤ó¡£(¥ê¥¹¥±¡¼¥ê¥ó¥°¤äYUV->RGBÊÑ´¹)¥ª¡¼¥Ð¥ì¥¤¤ò»ÈÍѤ¹¤ë"
 "¾ì¹ç¤Ë¤Ï²¿¤Î¸ú²Ì¤â¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: modules/video_output/directx/directx.c:108
+#: modules/video_output/directx/directx.c:113
 msgid "Use triple buffering for overlays"
 msgstr ""
 
-#: modules/video_output/directx/directx.c:110
+#: modules/video_output/directx/directx.c:115
 msgid ""
 "Try to use triple bufferring when using YUV overlays. That results in much "
 "better video quality (no flickering)."
 msgstr ""
 
-#: modules/video_output/directx/directx.c:119
+#: modules/video_output/directx/directx.c:123
 #, fuzzy
 msgid "DirectX video output"
 msgstr "DirectX¥Ó¥Ç¥ª¡¦¥â¥¸¥å¡¼¥ë"
@@ -8130,7 +8519,7 @@ msgid "Number of bands"
 msgstr "¥¯¥í¡¼¥ó¿ô"
 
 #: modules/visualization/visual/visual.c:53
-msgid "Number of bands used by spectrum analizer, should be 20 or 80"
+msgid "Number of bands used by spectrum analyzer, should be 20 or 80"
 msgstr ""
 
 #: modules/visualization/visual/visual.c:55
@@ -8217,6 +8606,150 @@ msgstr "XOSD
 msgid "xosd interface"
 msgstr "xosd¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
 
+#, fuzzy
+#~ msgid "CD Audio demux"
+#~ msgstr "ÀßÄê(_S)"
+
+#, fuzzy
+#~ msgid "CD Audio device"
+#~ msgstr "DVD¥Ç¥Ð¥¤¥¹"
+
+#, fuzzy
+#~ msgid "Sample Rate"
+#~ msgstr "¥·¥ó¥Ü¥ë¡¦¥ì¡¼¥È"
+
+#, fuzzy
+#~ msgid "Stream "
+#~ msgstr "¥¹¥È¥ê¡¼¥à¤ÎÄä»ß"
+
+#, fuzzy
+#~ msgid "Number of Streams"
+#~ msgstr "¹Ô¿ô"
+
+#, fuzzy
+#~ msgid "Codec Name"
+#~ msgstr "¥Ç¥Ð¥¤¥¹Ì¾"
+
+#, fuzzy
+#~ msgid "Prev Chapter"
+#~ msgstr "¥Á¥ã¥×¥¿¡¼"
+
+#, fuzzy
+#~ msgid "Gtk2 interface"
+#~ msgstr "Gtk+¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
+
+#, fuzzy
+#~ msgid "_New"
+#~ msgstr "ɽ¼¨(_V)"
+
+#, fuzzy
+#~ msgid "window1"
+#~ msgstr "¥¦¥£¥ó¥É¥¦"
+
+#, fuzzy
+#~ msgid "_Edit"
+#~ msgstr "ÊÔ½¸"
+
+#, fuzzy
+#~ msgid "_About"
+#~ msgstr "VideoLAN¤Ë¤Ä¤¤¤Æ"
+
+#, fuzzy
+#~ msgid "CD Audio"
+#~ msgstr "¥ª¡¼¥Ç¥£¥ª"
+
+#, fuzzy
+#~ msgid "Video Device"
+#~ msgstr "DVD¥Ç¥Ð¥¤¥¹"
+
+#, fuzzy
+#~ msgid "Video Device Advanced Options"
+#~ msgstr "ALSA¥ª¡¼¥Ç¥£¥ª¡¦¥â¥¸¥å¡¼¥ë"
+
+#, fuzzy
+#~ msgid "Filename of Font"
+#~ msgstr "¥í¥°¡¦¥Õ¥¡¥¤¥ë̾"
+
+#, fuzzy
+#~ msgid "Logo File"
+#~ msgstr "¥Õ¥¡¥¤¥ë"
+
+#, fuzzy
+#~ msgid "Headphone virtual spatialization effect"
+#~ msgstr "¥Ø¥Ã¥É¥Û¡¼¥ó¤Î²¾ÁÛŪ¤Ê²»¤Î¹­¤¬¤ê¸ú²Ì"
+
+#, fuzzy
+#~ msgid "CD-ROM device name"
+#~ msgstr "¥Ç¥Ð¥¤¥¹Ì¾"
+
+#, fuzzy
+#~ msgid "VCD device name"
+#~ msgstr "¥Ç¥Ð¥¤¥¹Ì¾"
+
+#~ msgid "Open a DVD or VCD"
+#~ msgstr "DVD¤Þ¤¿¤ÏVCD¤ò³«¤¯"
+
+#, fuzzy
+#~ msgid "Let the video window float on top of other windows."
+#~ msgstr "¥Ó¥Ç¥ª¤ò¥¯¥í¡¼¥ó¤¹¤ë¤¿¤á¤Ë¥Ó¥Ç¥ª¡¦¥¦¥£¥ó¥É¥¦¿ô¤òÁªÂò¤¹¤ë"
+
+#, fuzzy
+#~ msgid "Open a DVD or (S)VCD"
+#~ msgstr "DVD¤Þ¤¿¤ÏVCD¤ò³«¤¯"
+
+#~ msgid "Rewind stream"
+#~ msgstr "¥¹¥È¥ê¡¼¥à¤ò³«¤¯"
+
+#~ msgid "Pause stream"
+#~ msgstr "¥¹¥È¥ê¡¼¥à¤Î°ì»þÄä»ß"
+
+#~ msgid "Play stream"
+#~ msgstr "¥¹¥È¥ê¡¼¥à¤ÎºÆÀ¸"
+
+#~ msgid "Stop stream"
+#~ msgstr "¥¹¥È¥ê¡¼¥à¤ÎÄä»ß"
+
+#~ msgid "Forward stream"
+#~ msgstr "¥¹¥È¥ê¡¼¥à¤ÎžÁ÷"
+
+#, fuzzy
+#~ msgid "UDP/RTP (Adress when Multicast)"
+#~ msgstr "UDP¥Þ¥ë¥Á¥­¥ã¥¹¥È"
+
+#~ msgid "Media"
+#~ msgstr "¥á¥Ç¥£¥¢"
+
+#, 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."
+#~ msgstr ""
+#~ "VideoLAN Client¤Ï¡¢MPEG, MPEG 2, MP3 DivX¤ò¥í¡¼¥«¥ë¤ª¤è¤Ó¡¢¥Í¥Ã¥È¥ï¡¼¥¯¾å"
+#~ "¤Î¥½¡¼¥¹¤«¤éºÆÀ¸¤Ç¤­¤ë¥×¥ì¥¤¥ä¡¼¤Ç¤¹¡£"
+
+#, fuzzy
+#~ msgid "FileInfo"
+#~ msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯(_O)..."
+
+#, fuzzy
+#~ msgid "&File info..."
+#~ msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯(_O)..."
+
+#, fuzzy
+#~ msgid "&Miscellaneous"
+#~ msgstr "¤½¤Î¾"
+
+#, fuzzy
+#~ msgid "MPEG-4 video elementary stream demuxer"
+#~ msgstr "MPEG 1/2¥ì¥¤¥ä1/2¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
+
+#, fuzzy
+#~ msgid "Input Type"
+#~ msgstr "ÆþÎÏ"
+
 #~ msgid "ISO 13818-1 MPEG Elementary Stream input"
 #~ msgstr "ISO 13818-1 MPEG´ðËÜ¥¹¥È¥ê¡¼¥àÆþÎÏ"
 
@@ -8278,9 +8811,6 @@ msgstr "xosd
 #~ msgid "Antenna lnb_slof (KHz)"
 #~ msgstr "¥¢¥ó¥Æ¥Ê lnb_slof (kHz)"
 
-#~ msgid "Post processing"
-#~ msgstr "¸å½èÍý"
-
 #, fuzzy
 #~ msgid "Planes"
 #~ msgstr "ºÆÀ¸"
@@ -8301,10 +8831,6 @@ msgstr "xosd
 #~ msgid "Stream:"
 #~ msgstr "¥¹¥È¥ê¡¼¥à¤ÎÄä»ß"
 
-#, fuzzy
-#~ msgid "server"
-#~ msgstr "¥µ¡¼¥Ð¡¼¤Ê¤·"
-
 #, fuzzy
 #~ msgid "Device :"
 #~ msgstr "DVD¥Ç¥Ð¥¤¥¹"
@@ -8511,10 +9037,6 @@ msgstr "xosd
 #~ msgid "UDP/RTP (Address when Multicast)"
 #~ msgstr "UDP¥Þ¥ë¥Á¥­¥ã¥¹¥È"
 
-#, fuzzy
-#~ msgid "Advanced open options"
-#~ msgstr "ALSA¥ª¡¼¥Ç¥£¥ª¡¦¥â¥¸¥å¡¼¥ë"
-
 #, fuzzy
 #~ msgid "Font used by the text subtitler"
 #~ msgstr "ʸ»ú»úËë¤Ç»ÈÍѤµ¤ì¤ë¥Õ¥©¥ó¥È"