* po/*: ran "./toolbox --update-po" to get rid of missing files

[vlc] / po / ja.po

diff --git a/po/ja.po b/po/ja.po
index f1eee92ed36a6d8aedca9ceb639138faee71a6b7..f7e5a1c85f98ed0bb19dcdf7d51a72a6b23aaebc 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vlc\n"
-"POT-Creation-Date: 2003-08-11 21:05+0200\n"
+"POT-Creation-Date: 2003-09-18 19:23+0200\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"
@@ -25,6 +25,18 @@ msgstr ""
 "¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Ë°ÜÆ°¤·¡¢\"vlc -I win32\"¤ò¼Â¹Ô¤·¤Æ¤¯¤À"
 "¤µ¤¤¡£\n"
 
+#: include/vlc_interface.h:133
+msgid ""
+"VLC is an open-source and cross-platform multimedia player for various audio "
+"and video formats (MPEG-1, MPEG-2, MPEG-4, DivX, mp3, Ogg, ...) as well as "
+"DVDs, VCDs, CD audio, and various streaming protocols.\n"
+"\n"
+"VLC is also a streaming server with transcoding capabilities (UDP unicast "
+"and multicast, HTTP, ...) mainly designed for high-bandwidth networks.\n"
+"\n"
+"For more information, have a look at the web site."
+msgstr ""
+
 #: src/audio_output/output.c:104 src/audio_output/output.c:131
 #: modules/gui/macosx/intf.m:384 modules/gui/macosx/intf.m:385
 #, fuzzy
@@ -32,7 +44,7 @@ msgid "Audio channels"
 msgstr "¥ª¡¼¥Ç¥£¥ª¡¦¥Á¥ã¥ó¥Í¥ë¤ÎÁªÂò"
 
 #: src/audio_output/output.c:107 src/audio_output/output.c:142
-#: modules/audio_output/alsa.c:177 modules/audio_output/directx.c:423
+#: modules/audio_output/alsa.c:177 modules/audio_output/directx.c:447
 #: modules/audio_output/oss.c:202 modules/audio_output/sdl.c:181
 #: modules/audio_output/sdl.c:198 modules/audio_output/waveout.c:386
 msgid "Stereo"
@@ -109,11 +121,11 @@ msgstr ""
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr ""
 
-#: src/input/input.c:174
+#: src/input/input.c:237
 msgid "General"
 msgstr ""
 
-#: src/input/input.c:175
+#: src/input/input.c:238
 #, fuzzy
 msgid "Playlist Item"
 msgstr "¥ê¥¹¥È"
@@ -124,22 +136,24 @@ msgstr "
 msgid "Program"
 msgstr "¥×¥í¥°¥é¥à"
 
-#: src/input/input_programs.c:98 modules/demux/asf/libasf.c:696
-#: modules/demux/mkv.cpp:2398 modules/gui/beos/MediaControlView.cpp:1258
+#: src/input/input_programs.c:98 modules/access/dvdplay/access.c:207
+#: modules/demux/asf/asf.c:371 modules/demux/mkv.cpp:2327
+#: modules/gui/beos/MediaControlView.cpp:1256
 #: modules/gui/gtk/gnome_interface.c:1650 modules/gui/gtk/gtk_interface.c:1956
 #: modules/gui/gtk/menu.c:1403 modules/gui/gtk/menu.c:1424
 #: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:373
 #: modules/gui/macosx/intf.m:374 modules/gui/macosx/open.m:150
-#: modules/gui/wxwindows/open.cpp:406
+#: modules/gui/wxwindows/open.cpp:436
 msgid "Title"
 msgstr "¥¿¥¤¥È¥ë"
 
-#: src/input/input_programs.c:102 modules/gui/beos/MediaControlView.cpp:1259
+#: src/input/input_programs.c:102 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
 #: modules/gui/gtk/menu.c:1020 modules/gui/gtk/menu.c:1433
 #: modules/gui/kde/interface.cpp:146 modules/gui/macosx/intf.m:375
 #: modules/gui/macosx/intf.m:376 modules/gui/macosx/open.m:151
-#: modules/gui/wxwindows/open.cpp:412
+#: modules/gui/wxwindows/open.cpp:442
 msgid "Chapter"
 msgstr "¥Á¥ã¥×¥¿¡¼"
 
@@ -196,7 +210,7 @@ msgstr "
 msgid "Previous Chapter"
 msgstr "¥Á¥ã¥×¥¿¡¼"
 
-#: src/input/input_programs.c:673 src/video_output/video_output.c:421
+#: src/input/input_programs.c:673 src/video_output/video_output.c:425
 msgid "Disable"
 msgstr ""
 
@@ -209,34 +223,34 @@ msgstr ""
 msgid "C"
 msgstr "ja"
 
-#: src/libvlc.c:305 src/libvlc.c:1368
+#: src/libvlc.c:305 src/libvlc.c:1381
 #, c-format
 msgid ""
 "Usage: %s [options] [items]...\n"
 "\n"
 msgstr ""
 
-#: src/libvlc.c:1200 src/misc/configuration.c:1040
+#: src/libvlc.c:1213 src/misc/configuration.c:1062
 msgid "string"
 msgstr "ʸ»úÎó"
 
-#: src/libvlc.c:1217 src/misc/configuration.c:1021
+#: src/libvlc.c:1230 src/misc/configuration.c:1034
 msgid "integer"
 msgstr "À°¿ô"
 
-#: src/libvlc.c:1220 src/misc/configuration.c:1030
+#: src/libvlc.c:1233 src/misc/configuration.c:1052
 msgid "float"
 msgstr "ÉâÆ°¾®¿ôÅÀ"
 
-#: src/libvlc.c:1226
+#: src/libvlc.c:1239
 msgid " (default enabled)"
 msgstr " (¥Ç¥Õ¥©¥ë¥È¡§Í­¸ú)"
 
-#: src/libvlc.c:1227
+#: src/libvlc.c:1240
 msgid " (default disabled)"
 msgstr " (¥Ç¥Õ¥©¥ë¥È¡§Ìµ¸ú)"
 
-#: src/libvlc.c:1343 src/libvlc.c:1398 src/libvlc.c:1422
+#: src/libvlc.c:1356 src/libvlc.c:1411 src/libvlc.c:1435
 msgid ""
 "\n"
 "Press the RETURN key to continue...\n"
@@ -244,11 +258,11 @@ msgstr ""
 "\n"
 "³¤±¤ë¤Ë¤ÏEnter¥­¡¼¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: src/libvlc.c:1371
+#: src/libvlc.c:1384
 msgid "[module]              [description]\n"
 msgstr "[¥â¥¸¥å¡¼¥ë]          [ÀâÌÀ]\n"
 
-#: src/libvlc.c:1416
+#: src/libvlc.c:1429
 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"
@@ -260,12 +274,12 @@ msgstr ""
 "COPYING¥Õ¥¡¥¤¥ë¤Ë¾ÜºÙ¤¬½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¤Î¤Ç¡¢»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 "Written by the VideoLAN team at Ecole Centrale, Paris.\n"
 
-#: src/libvlc.h:42
+#: src/libvlc.h:38
 #, fuzzy
 msgid "Interface module"
 msgstr "¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
 
-#: src/libvlc.h:44
+#: src/libvlc.h:40
 msgid ""
 "This option allows you to select the interface used by VLC. The default "
 "behavior is to automatically select the best module available."
@@ -273,12 +287,12 @@ msgstr ""
 "»ÈÍѤ¹¤ë¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤¬ÁªÂò²Äǽ¤Ç¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¼«Æ°Åª¤ËºÇŬ¤Ê¥â¥¸¥å¡¼¥ë¤¬"
 "ÁªÂò¤µ¤ì¤Þ¤¹¡£"
 
-#: src/libvlc.h:48
+#: src/libvlc.h:44 modules/control/ntservice.c:48
 #, fuzzy
 msgid "Extra interface modules"
 msgstr "Qt¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
 
-#: src/libvlc.h:50
+#: src/libvlc.h:46
 #, fuzzy
 msgid ""
 "This option allows you to select additional interfaces used by VLC. They "
@@ -289,32 +303,32 @@ msgstr ""
 "»ÈÍѤ¹¤ë¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤¬ÁªÂò²Äǽ¤Ç¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¼«Æ°Åª¤ËºÇŬ¤Ê¥â¥¸¥å¡¼¥ë¤¬"
 "ÁªÂò¤µ¤ì¤Þ¤¹¡£"
 
-#: src/libvlc.h:55
+#: src/libvlc.h:51
 #, fuzzy
 msgid "Verbosity (0,1,2)"
 msgstr "¾éĹ (0,1,2)"
 
-#: src/libvlc.h:57
+#: src/libvlc.h:53
 msgid ""
 "This options sets the verbosity level (0=only errors and standard messages, "
 "1=warnings, 2=debug)."
 msgstr ""
 "¾éĹ¥ì¥Ù¥ë¤ò»ØÄꤷ¤Þ¤¹ (0=¥¨¥é¡¼¤Èɸ½à¥á¥Ã¥»¡¼¥¸¤Î¤ß¡¢1=·Ù¹ð¡¢2=¥Ç¥Ð¥Ã¥°)"
 
-#: src/libvlc.h:60
+#: src/libvlc.h:56
 #, fuzzy
 msgid "Be quiet"
 msgstr "¥¨¥é¡¼¤Î¤ß"
 
-#: src/libvlc.h:62
+#: src/libvlc.h:58
 msgid "This options turns off all warning and information messages."
 msgstr "¤¹¤Ù¤Æ¤Î·Ù¹ð¤È¾ðÊó¥á¥Ã¥»¡¼¥¸¤òÍ޻ߤ·¤Þ¤¹¡£"
 
-#: src/libvlc.h:64 modules/gui/beos/InterfaceWindow.cpp:255
+#: src/libvlc.h:60 modules/gui/beos/InterfaceWindow.cpp:255
 msgid "Language"
 msgstr "¸À¸ì"
 
-#: src/libvlc.h:65
+#: src/libvlc.h:61
 #, fuzzy
 msgid ""
 "This option allows you to set the language of the interface. The system "
@@ -323,12 +337,12 @@ msgstr ""
 "¥Õ¥¡¥¤¥ë¤ò¸«¤Ä¤±¤ë¤È¤­¤Ë¥ª¡¼¥×¥ó¤µ¤ì¤ë¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Î´ûÄê¤Î¥Ñ¥¹¤òÀßÄꤷ¤Þ"
 "¤¹¡£"
 
-#: src/libvlc.h:69
+#: src/libvlc.h:65
 #, fuzzy
 msgid "Color messages"
 msgstr "¥«¥é¡¼¡¦¥á¥Ã¥»¡¼¥¸"
 
-#: src/libvlc.h:71
+#: src/libvlc.h:67
 msgid ""
 "When this option is turned on, the messages sent to the console will be "
 "colorized. Your terminal needs Linux color support for this to work."
@@ -336,22 +350,22 @@ msgstr ""
 "¤³¤Î¥ª¥×¥·¥ç¥ó¤òÀßÄꤹ¤ë¤È¡¢¥³¥ó¥½¡¼¥ë¤ËÁ÷¿®¤µ¤ì¤ë¥á¥Ã¥»¡¼¥¸¤Ï¥«¥é¡¼²½¤µ¤ì¤Þ"
 "¤¹¡£¤³¤ÎÆ°ºî¤ÏüËö¤¬Linux¥«¥é¡¼¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£"
 
-#: src/libvlc.h:74
+#: src/libvlc.h:70
 msgid "Show advanced options"
 msgstr ""
 
-#: src/libvlc.h:76
+#: src/libvlc.h:72
 msgid ""
 "When this option is turned on, the preferences and/or interfaces  will show "
 "all the available options, including those that most users should never touch"
 msgstr ""
 
-#: src/libvlc.h:80
+#: src/libvlc.h:76
 #, fuzzy
 msgid "Interface default search path"
 msgstr "¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Î´ûÄê¤Î¸¡º÷¥Ñ¥¹"
 
-#: src/libvlc.h:82
+#: src/libvlc.h:78
 msgid ""
 "This option allows you to set the default path that the interface will open "
 "when looking for a file."
@@ -359,24 +373,24 @@ msgstr ""
 "¥Õ¥¡¥¤¥ë¤ò¸«¤Ä¤±¤ë¤È¤­¤Ë¥ª¡¼¥×¥ó¤µ¤ì¤ë¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Î´ûÄê¤Î¥Ñ¥¹¤òÀßÄꤷ¤Þ"
 "¤¹¡£"
 
-#: src/libvlc.h:85
+#: src/libvlc.h:81
 #, fuzzy
 msgid "Plugin search path"
 msgstr "¥×¥é¥°¥¤¥ó¤Î¸¡º÷¥Ñ¥¹"
 
-#: src/libvlc.h:87
+#: src/libvlc.h:83
 #, fuzzy
 msgid ""
 "This option allows you to specify an additional path for VLC to look for its "
 "plugins."
 msgstr "VLC¤¬¥×¥é¥°¥¤¥ó¤ò¸«¤Ä¤±¤ë¤È¤­¤Ë¸¡º÷¤µ¤ì¤ëÄɲäΥѥ¹¤òÀßÄꤷ¤Þ¤¹¡£"
 
-#: src/libvlc.h:90
+#: src/libvlc.h:86
 #, fuzzy
 msgid "Audio output module"
 msgstr "¥ª¡¼¥Ç¥£¥ª½ÐÎϥ⥸¥å¡¼¥ë"
 
-#: src/libvlc.h:92
+#: src/libvlc.h:88
 msgid ""
 "This option allows you to select the audio output method used by VLC. The "
 "default behavior is to automatically select the best method available."
@@ -384,12 +398,12 @@ msgstr ""
 "¥ª¡¼¥Ç¥£¥ª½ÐÎÏÊýË¡¤¬ÁªÂò²Äǽ¤Ç¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¼«Æ°Åª¤ËºÇŬ¤ÊÊýË¡¤¬ÁªÂò¤µ¤ì¤Þ"
 "¤¹¡£"
 
-#: src/libvlc.h:96
+#: src/libvlc.h:92
 #, fuzzy
 msgid "Enable audio"
 msgstr "¥ª¡¼¥Ç¥£¥ª¤òÍ­¸ú¤Ë¤¹¤ë"
 
-#: src/libvlc.h:98
+#: src/libvlc.h:94
 #, fuzzy
 msgid ""
 "You can completely disable the audio output. In this case the audio decoding "
@@ -398,40 +412,40 @@ msgstr ""
 "¥ª¡¼¥Ç¥£¥ª½ÐÎϤò´°Á´¤Ë̵¸ú¤Ë¤·¤Þ¤¹¡£¥ª¡¼¥Ç¥£¥ª¤Ï¥Ç¥³¡¼¥É¤µ¤ì¤Þ¤»¤ó¡£¤³¤ì¤Ë¤è"
 "¤ê¡¢¤¤¤¯¤é¤«¤Î½èÍý¥Ñ¥ï¡¼¤ò¥»¡¼¥Ö¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
 
-#: src/libvlc.h:101
+#: src/libvlc.h:97
 #, fuzzy
 msgid "Force mono audio"
 msgstr "¥â¥Î¥é¥ë"
 
-#: src/libvlc.h:102
+#: src/libvlc.h:98
 msgid "This will force a mono audio output"
 msgstr "¥ª¡¼¥Ç¥£¥ª½ÐÎϤò¶¯À©Åª¤Ë¥â¥Î¥é¥ë¤Ë¤·¤Þ¤¹¡£"
 
-#: src/libvlc.h:104
+#: src/libvlc.h:100
 #, fuzzy
 msgid "Audio output volume"
 msgstr "¥ª¡¼¥Ç¥£¥ª¡¦¥Ü¥ê¥å¡¼¥à"
 
-#: src/libvlc.h:106
+#: src/libvlc.h:102
 msgid ""
 "You can set the default audio output volume here, in a range from 0 to 1024."
 msgstr "¥ª¡¼¥Ç¥£¥ª¡¦¥Ü¥ê¥å¡¼¥à¤Î´ûÄêÃͤò0¤«¤é1024¤Î´Ö¤ÇÀßÄê²Äǽ¤Ç¤¹¡£"
 
-#: src/libvlc.h:109
+#: src/libvlc.h:105
 #, fuzzy
 msgid "Audio output saved volume"
 msgstr "¥ª¡¼¥Ç¥£¥ª¡¦¥Ü¥ê¥å¡¼¥à"
 
-#: src/libvlc.h:111
+#: src/libvlc.h:107
 msgid "This saves the audio output volume when you select mute."
 msgstr ""
 
-#: src/libvlc.h:113
+#: src/libvlc.h:109
 #, fuzzy
 msgid "Audio output frequency (Hz)"
 msgstr "¥ª¡¼¥Ç¥£¥ª½ÐÎϼþÇÈ¿ô(Hz)"
 
-#: src/libvlc.h:115
+#: src/libvlc.h:111
 #, fuzzy
 msgid ""
 "You can force the audio output frequency here. Common values are -1 "
@@ -440,22 +454,22 @@ msgstr ""
 "¥ª¡¼¥Ç¥£¥ª½ÐÎϤμþÇÈ¿ô¤ò¶¯À©Åª¤ËÀßÄê²Äǽ¤Ç¤¹¡£\n"
 "°ìÈÌŪ¤ÊÃͤϡ¢48000, 44100, 32000, 22050, 16000, 11025, 8000¤Ç¤¹¡£"
 
-#: src/libvlc.h:119
+#: src/libvlc.h:115
 msgid "High quality audio resampling"
 msgstr ""
 
-#: src/libvlc.h:121
+#: src/libvlc.h:117
 msgid ""
 "High quality audio resampling can be processor intensive so you can disable "
 "it and a cheaper resampling algorithm will be used instead."
 msgstr ""
 
-#: src/libvlc.h:125
+#: src/libvlc.h:121
 #, fuzzy
 msgid "Compensate desynchronization of audio (in ms)"
 msgstr "Êä½þ¤¹¤ë²»À¼¤Î¥º¥ì(»þ´Ö:ms)"
 
-#: src/libvlc.h:127
+#: src/libvlc.h:123
 msgid ""
 "This option allows you to delay the audio output. This can be handy if you "
 "notice a lag between the video and the audio."
@@ -463,12 +477,12 @@ msgstr ""
 "¥ª¡¼¥Ç¥£¥ª½ÐÎϤÎÃÙ¤ì¤òÀßÄꤷ¤Þ¤¹¡£¥Ó¥Ç¥ª¤È²»À¼¤Î¥º¥ì¤¬¤¢¤ë¾ì¹ç¤Ë¤Ï¡¢Å¬ÀÚ¤ÊÃÍ"
 "¤òÀßÄê¤Ç¤­¤Þ¤¹¡£"
 
-#: src/libvlc.h:130
+#: src/libvlc.h:126
 #, fuzzy
 msgid "Choose prefered audio output channels mode"
 msgstr "½àÈ÷¤µ¤ì¤Æ¤¤¤ë¥³¡¼¥Ç¥Ã¥¯¤Î°ìÍ÷¤ÎÁªÂò"
 
-#: src/libvlc.h:132
+#: src/libvlc.h:128
 #, fuzzy
 msgid ""
 "This option allows you to set the audio output channels mode that will be "
@@ -478,11 +492,11 @@ msgstr ""
 "¥ª¡¼¥Ç¥£¥ª½ÐÎÏÊýË¡¤¬ÁªÂò²Äǽ¤Ç¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¼«Æ°Åª¤ËºÇŬ¤ÊÊýË¡¤¬ÁªÂò¤µ¤ì¤Þ"
 "¤¹¡£"
 
-#: src/libvlc.h:136
+#: src/libvlc.h:132
 msgid "Use the S/PDIF audio output when available"
 msgstr ""
 
-#: src/libvlc.h:138
+#: src/libvlc.h:134
 #, fuzzy
 msgid ""
 "This option allows you to use the S/PDIF audio output by default when your "
@@ -491,12 +505,22 @@ msgstr ""
 "¥ª¡¼¥Ç¥£¥ª½ÐÎÏÊýË¡¤¬ÁªÂò²Äǽ¤Ç¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¼«Æ°Åª¤ËºÇŬ¤ÊÊýË¡¤¬ÁªÂò¤µ¤ì¤Þ"
 "¤¹¡£"
 
-#: src/libvlc.h:141
+#: src/libvlc.h:137
+#, fuzzy
+msgid "Audio filters"
+msgstr "¥ª¡¼¥Ç¥£¥ª"
+
+#: src/libvlc.h:139
+msgid ""
+"This allows you to add audio postprocessing filters, to modifythe sound."
+msgstr ""
+
+#: src/libvlc.h:142
 #, fuzzy
 msgid "Headphone virtual spatialization effect"
 msgstr "¥Ø¥Ã¥É¥Û¡¼¥ó¤Î²¾ÁÛŪ¤Ê²»¤Î¹­¤¬¤ê¸ú²Ì"
 
-#: src/libvlc.h:143
+#: src/libvlc.h:144
 #, fuzzy
 msgid ""
 "This effect gives you the feeling that you are standing in a room with a "
@@ -511,12 +535,12 @@ msgstr ""
 "¤³¤Îµ¡Ç½¤Ï¡¢¥â¥Î¥é¥ë¤«¤é5.1¥Á¥ã¥ó¥Í¥ë¤Þ¤Ç¤Î¤¹¤Ù¤Æ¤Î¥½¡¼¥¹¡¦¥Õ¥©¡¼¥Þ¥Ã¥È¤ÇÆ°ºî"
 "¤·¤Þ¤¹¡£"
 
-#: src/libvlc.h:150
+#: src/libvlc.h:152
 #, fuzzy
 msgid "Video output module"
 msgstr "¥Ó¥Ç¥ª½ÐÎϥ⥸¥å¡¼¥ë"
 
-#: src/libvlc.h:152
+#: src/libvlc.h:154
 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."
@@ -524,12 +548,12 @@ msgstr ""
 "¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï»ÈÍѤ¹¤ë¥Ó¥Ç¥ª½ÐÎÏÊýË¡¤¬ÁªÂò¤Ç¤­¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¼«Æ°Åª¤ËºÇ"
 "Ŭ¤ÊÊýË¡¤¬ÁªÂò¤µ¤ì¤Þ¤¹¡£"
 
-#: src/libvlc.h:156
+#: src/libvlc.h:158
 #, fuzzy
 msgid "Enable video"
 msgstr "¥Ó¥Ç¥ª¤òÍ­¸ú¤Ë¤¹¤ë"
 
-#: src/libvlc.h:158
+#: src/libvlc.h:160
 #, fuzzy
 msgid ""
 "You can completely disable the video output. In this case the video decoding "
@@ -538,12 +562,13 @@ msgstr ""
 "¥Ó¥Ç¥ª½ÐÎϤò´°Á´¤Ë̵¸ú²½¤·¤Þ¤¹¡£¥Ó¥Ç¥ª¤Ï¥Ç¥³¡¼¥É¤µ¤ì¤Þ¤»¤ó¡£¤³¤ì¤Ë¤è¤ê¡¢¤¤¤¯"
 "¤é¤«¤Î½èÍý¥Ñ¥ï¡¼¤ò¥»¡¼¥Ö¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
 
-#: src/libvlc.h:161
+#: src/libvlc.h:163 modules/visualization/visual/visual.c:48
+#: modules/visualization/visual/visual.c:52
 #, fuzzy
 msgid "Video width"
 msgstr "¥Ó¥Ç¥ª¤ÎÉý"
 
-#: src/libvlc.h:163
+#: src/libvlc.h:165
 #, fuzzy
 msgid ""
 "You can enforce the video width here. By default (-1) VLC will adapt to the "
@@ -552,12 +577,12 @@ msgstr ""
 "¥Ó¥Ç¥ª¤ÎÉý¤ò¶¯À©Åª¤Ë»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£\n"
 "¢¨VLC¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç¥Ó¥Ç¥ª¤ÎÆÃÀ­¤Ë¹ç¤ï¤»¤Þ¤¹¡£"
 
-#: src/libvlc.h:166
+#: src/libvlc.h:168
 #, fuzzy
 msgid "Video height"
 msgstr "¥Ó¥Ç¥ª¤Î¹â¤µ"
 
-#: src/libvlc.h:168
+#: src/libvlc.h:170
 #, fuzzy
 msgid ""
 "You can enforce the video height here. By default (-1) VLC will adapt to the "
@@ -566,21 +591,33 @@ msgstr ""
 "¥Ó¥Ç¥ª¤Î¹â¤µ¤ò¶¯À©Åª¤Ë»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£\n"
 "¢¨VLC¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç¥Ó¥Ç¥ª¤ÎÆÃÀ­¤Ë¹ç¤ï¤»¤Þ¤¹¡£"
 
-#: src/libvlc.h:171
+#: src/libvlc.h:173
+#, fuzzy
+msgid "Video alignment"
+msgstr "ÀßÄê(_S)"
+
+#: src/libvlc.h:175
+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:179
 #, fuzzy
 msgid "Zoom video"
 msgstr "¥Ó¥Ç¥ª¡¦¥º¡¼¥à"
 
-#: src/libvlc.h:173
+#: src/libvlc.h:181
 msgid "You can zoom the video by the specified factor."
 msgstr "Ǥ°Õ¤Ë¥Ó¥Ç¥ª¤ò¥º¡¼¥à¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
 
-#: src/libvlc.h:175
+#: src/libvlc.h:183
 #, fuzzy
 msgid "Grayscale video output"
 msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
 
-#: src/libvlc.h:177
+#: src/libvlc.h:185
 msgid ""
 "When enabled, the color information from the video won't be decoded (this "
 "can also allow you to save some processing power)."
@@ -588,35 +625,35 @@ msgstr ""
 "¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤È¡¢VLC¤Ï¥«¥é¡¼¾ðÊó¤ò¥Ç¥³¡¼¥É¤·¤Þ¤»¤ó¡£(¤³¤ì¤Ë¤è¤ê¡¢"
 "¤¤¤¯¤é¤«¤Î½èÍý¥Ñ¥ï¡¼¤ò¥»¡¼¥Ö¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£)"
 
-#: src/libvlc.h:180
+#: src/libvlc.h:188
 #, fuzzy
 msgid "Fullscreen video output"
 msgstr "¥Õ¥ë¥¹¥¯¥ê¡¼¥ó½ÐÎÏ"
 
-#: src/libvlc.h:182
+#: src/libvlc.h:190
 msgid ""
 "If this option is enabled, VLC will always start a video in fullscreen mode."
 msgstr ""
 "¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤È¡¢VLC¤Ï¾ï¤Ë¥Ó¥Ç¥ª¤ò¥Õ¥ë¥¹¥¯¥ê¡¼¥ó¡¦¥â¡¼¥É¤Ë¤·¤Þ¤¹¡£"
 
-#: src/libvlc.h:185
+#: src/libvlc.h:193
 #, fuzzy
 msgid "Overlay video output"
 msgstr "¥ª¡¼¥Ð¡¼¥ì¥¤"
 
-#: src/libvlc.h:187
+#: src/libvlc.h:195
 #, fuzzy
 msgid ""
 "If enabled, VLC will try to take advantage of the overlay capabilities of "
 "your graphics card."
 msgstr "VLC¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç¥°¥é¥Õ¥£¥Ã¥¯¥«¡¼¥É¤Î¥ª¡¼¥Ð¥ì¥¤µ¡Ç½¤Î»ÈÍѤò»î¤ß¤Þ¤¹¡£"
 
-#: src/libvlc.h:190
+#: src/libvlc.h:198
 #, fuzzy
 msgid "Force SPU position"
 msgstr "¥µ¥Ö¥¿¥¤¥È¥ë¤Î°ÌÃÖ"
 
-#: src/libvlc.h:192
+#: src/libvlc.h:200
 msgid ""
 "You can use this option to place the subtitles under the movie, instead of "
 "over the movie. Try several positions."
@@ -624,12 +661,12 @@ msgstr ""
 "¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï±ÇÁüÃæ¤Î¥µ¥Ö¥¿¥¤¥È¥ë¤Î°ÌÃÖ¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£¤¤¤¯¤Ä¤«¤Î°ÌÃÖ¤ò»î"
 "¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: src/libvlc.h:195
+#: src/libvlc.h:203
 #, fuzzy
 msgid "Video filter module"
 msgstr "¥Ó¥Ç¥ª¡¦¥Õ¥£¥ë¥¿¡¼¡¦¥â¥¸¥å¡¼¥ë"
 
-#: src/libvlc.h:197
+#: src/libvlc.h:205
 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."
@@ -637,12 +674,12 @@ msgstr ""
 "¥Î¥ó¥¤¥ó¥¿¥ì¡¼¥¹¤Î¥¤¥ó¥¹¥¿¥ó¥¹¤Þ¤¿¤Ï¡¢¥¯¥í¡¼¥ó¡¢ÏѶʲ½¤µ¤ì¤¿¥Ó¥Ç¥ª¡¦¥¦¥£¥ó¥É"
 "¥¦¤Î±ÇÁü¥¯¥©¥ê¥Æ¥£¤Ë¸ú²Ì¤ò²Ã¤¨¤ë¥Õ¥£¥ë¥¿¡¼¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£"
 
-#: src/libvlc.h:201
+#: src/libvlc.h:209
 #, fuzzy
 msgid "Source aspect ratio"
 msgstr "¥½¡¼¥¹¤Î¥¢¥¹¥Ú¥¯¥È¡¦¥ì¥·¥ª"
 
-#: src/libvlc.h:203
+#: src/libvlc.h:211
 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 "
@@ -656,12 +693,12 @@ msgstr ""
 "x:y (4:3, 16:9, etc.)¤Î·Á¼°¤Ç¥¢¥¹¥Ú¥¯¥È¤ò»ØÄꤹ¤ë¤«¡¢ÉâÆ°¾®¿ôÅÀÃÍ (1.25, "
 "1.3333, etc.)¤Î·Á¼°¤Ç¥Ô¥¯¥»¥ë¤Î¶ë·Á¤ò»ØÄꤷ¤Þ¤¹¡£"
 
-#: src/libvlc.h:211
+#: src/libvlc.h:219
 #, fuzzy
 msgid "Destination aspect ratio"
 msgstr "Á÷¿®Àè¤Î¥¢¥¹¥Ú¥¯¥È¡¦¥ì¥·¥ª"
 
-#: src/libvlc.h:213
+#: src/libvlc.h:221
 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 "
@@ -675,20 +712,20 @@ msgstr ""
 "¤¹¤ë¤¿¤á¤Ë»ÈÍѤµ¤ì¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£»ØÄê¤Ç¤­¤ë¥Õ¥©¡¼¥Þ¥Ã¥È¤Ï¡¢ÉâÆ°¾®¿ôÅÀÃÍ "
 "(1, 1.25, 1.3333¤Ê¤É)¤Ç¤¹¡£"
 
-#: src/libvlc.h:220
+#: src/libvlc.h:228
 #, fuzzy
 msgid "Server port"
 msgstr "¥µ¡¼¥Ð¡¼¡¦¥Ý¡¼¥È"
 
-#: src/libvlc.h:222
+#: src/libvlc.h:230
 msgid "This is the port used for UDP streams. By default, we chose 1234."
 msgstr "UDP¥¹¥È¥ê¡¼¥à¤Ç»ÈÍѤµ¤ì¤ë¥Ý¡¼¥È¤ò»ØÄꤷ¤Þ¤¹¡£´ûÄêÃͤÏ1234¤Ç¤¹¡£"
 
-#: src/libvlc.h:224
+#: src/libvlc.h:232
 msgid "MTU of the network interface"
 msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ÎMTU"
 
-#: src/libvlc.h:226
+#: src/libvlc.h:234
 msgid ""
 "This is the typical size of UDP packets that we expect. On Ethernet it is "
 "usually 1500."
@@ -696,12 +733,12 @@ msgstr ""
 "´üÂÔ¤¹¤ëŵ·¿Åª¤ÊUDP¥Ñ¥±¥Ã¥È¤Î¥µ¥¤¥º¤Ç¤¹¡£¥¤¡¼¥µ¥Í¥Ã¥È¤Ç¤Ï¡¢¤½¤ÎÃͤϡ¢Ä̾ï1500"
 "¤Ç¤¹¡£"
 
-#: src/libvlc.h:229
+#: src/libvlc.h:237
 #, fuzzy
 msgid "Network interface address"
 msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹"
 
-#: src/libvlc.h:231
+#: src/libvlc.h:239
 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 "
@@ -711,64 +748,64 @@ msgstr ""
 "¥ê¥å¡¼¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¾ì¹ç¤Ë¤Ï¡¢¤ª¤½¤é¤¯¡¢IP¥¢¥É¥ì¥¹¤«¥Þ¥ë¥Á¥­¥ã¥¹¥È¤ò¹Ô¤Ã¤Æ"
 "¤¤¤ë¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ò»ØÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£"
 
-#: src/libvlc.h:235
+#: src/libvlc.h:243
 msgid "Time to live"
 msgstr ""
 
-#: src/libvlc.h:237
+#: src/libvlc.h:245
 msgid ""
 "Indicate here the Time To Live of the multicast packets sent by the stream "
 "output."
 msgstr ""
 
-#: src/libvlc.h:240
+#: src/libvlc.h:248
 #, fuzzy
 msgid "Choose program (SID)"
 msgstr "¥×¥í¥°¥é¥à¤ÎÁªÂò (SID)"
 
-#: src/libvlc.h:242
+#: src/libvlc.h:250
 msgid "Choose the program to select by giving its Service ID."
 msgstr "Í¿¤¨¤é¤ì¤¿¥µ¡¼¥Ó¥¹ID¤òÁªÂò¤¹¤ë¤¿¤á¤Î¥×¥í¥°¥é¥à¤ò»ØÄꤷ¤Þ¤¹¡£"
 
-#: src/libvlc.h:244
+#: src/libvlc.h:252
 #, fuzzy
 msgid "Choose audio"
 msgstr "¥ª¡¼¥Ç¥£¥ª¤ÎÁªÂò"
 
-#: src/libvlc.h:246
+#: src/libvlc.h:254
 #, fuzzy
 msgid ""
 "Give the default type of audio you want to use in a DVD. (Developers only)"
 msgstr "DVD¤ÎÃæ¤Ç»ÈÍѤ·¤¿¤¤¥ª¡¼¥Ç¥£¥ª¤Î´ûÄê¤Î¥¿¥¤¥×¤ò»ØÄꤷ¤Þ¤¹¡£"
 
-#: src/libvlc.h:249
+#: src/libvlc.h:257
 #, fuzzy
 msgid "Choose channel"
 msgstr "¥Á¥ã¥ó¥Í¥ë¤ÎÁªÂò"
 
-#: src/libvlc.h:251
+#: src/libvlc.h:259
 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:254
+#: src/libvlc.h:262
 #, fuzzy
 msgid "Choose subtitles"
 msgstr "»úËë¤ÎÁªÂò"
 
-#: src/libvlc.h:256
+#: src/libvlc.h:264
 msgid ""
 "Give the stream number of the subtitle channel you want to use in a DVD "
 "(from 1 to n)."
 msgstr "DVD¤ÎÃæ¤Ç»ÈÍѤ·¤¿¤¤»úËë¤Î¥Á¥ã¥ó¥Í¥ëÈÖ¹æ¤ò»ØÄꤷ¤Þ¤¹¡£(1¤«¤én¤Þ¤Ç)"
 
-#: src/libvlc.h:259
+#: src/libvlc.h:267
 msgid "DVD device"
 msgstr "DVD¥Ç¥Ð¥¤¥¹"
 
-#: src/libvlc.h:262
+#: src/libvlc.h:270
 msgid ""
 "This is the default DVD drive (or file) to use. Don't forget the colon after "
 "the drive letter (eg D:)"
@@ -776,24 +813,24 @@ msgstr ""
 "»ÈÍѤ¹¤ë´ûÄê¤ÎDVD¥É¥é¥¤¥Ö(¤Þ¤¿¤Ï¥Õ¥¡¥¤¥ë)¤Ç¤¹¡£¥É¥é¥¤¥Öʸ»ú¤Î¸å¤Ë¥³¥í¥ó¤òÉÕ²Ã"
 "¤¹¤ë¤³¤È¤ò˺¤ì¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£(Îã D:)"
 
-#: src/libvlc.h:266
+#: src/libvlc.h:274
 msgid "This is the default DVD device to use."
 msgstr "DVD¥Ç¥Ð¥¤¥¹¤Î´ûÄêÃͤòÀßÄꤷ¤Þ¤¹¡£"
 
-#: src/libvlc.h:269
+#: src/libvlc.h:277
 msgid "VCD device"
 msgstr "VCD¥Ç¥Ð¥¤¥¹"
 
-#: src/libvlc.h:271
+#: src/libvlc.h:279
 msgid "This is the default VCD device to use."
 msgstr "VCD¥Ç¥Ð¥¤¥¹¤Î´ûÄêÃͤò»ØÄꤷ¤Þ¤¹¡£"
 
-#: src/libvlc.h:273
+#: src/libvlc.h:281
 #, fuzzy
 msgid "Force IPv6"
 msgstr "IPv6¤Î»ÈÍÑ"
 
-#: src/libvlc.h:275
+#: src/libvlc.h:283
 msgid ""
 "If you check this box, IPv6 will be used by default for all UDP and HTTP "
 "connections."
@@ -801,12 +838,12 @@ msgstr ""
 "¤³¤Î¥Á¥§¥Ã¥¯¥Ü¥Ã¥¯¥¹¤ò¥ª¥ó¤Ë¤¹¤ë¤È¡¢IPv6¤¬¤¹¤Ù¤Æ¤ÎUDP¤ÈHTTP¤ÎÀܳ¤Ç´ûÄêÃͤȤ·"
 "¤Æ»ÈÍѤµ¤ì¤Þ¤¹¡£"
 
-#: src/libvlc.h:278
+#: src/libvlc.h:286
 #, fuzzy
 msgid "Force IPv4"
 msgstr "IPv4¤Î»ÈÍÑ"
 
-#: src/libvlc.h:280
+#: src/libvlc.h:288
 msgid ""
 "If you check this box, IPv4 will be used by default for all UDP and HTTP "
 "connections."
@@ -814,12 +851,12 @@ msgstr ""
 "¤³¤Î¥Á¥§¥Ã¥¯¥Ü¥Ã¥¯¥¹¤ò¥ª¥ó¤Ë¤¹¤ë¤È¡¢IPv4¤¬¤¹¤Ù¤Æ¤ÎUDP¤ÈHTTP¤ÎÀܳ¤Ç´ûÄêÃͤȤ·"
 "¤Æ»ÈÍѤµ¤ì¤Þ¤¹¡£"
 
-#: src/libvlc.h:283
+#: src/libvlc.h:291
 #, fuzzy
 msgid "Choose preferred codec list"
 msgstr "½àÈ÷¤µ¤ì¤Æ¤¤¤ë¥³¡¼¥Ç¥Ã¥¯¤Î°ìÍ÷¤ÎÁªÂò"
 
-#: src/libvlc.h:285
+#: src/libvlc.h:293
 msgid ""
 "This allows you to select the order in which VLC will choose its codecs. For "
 "instance, 'a52old,a52,any' will try the old a52 codec before the new one. "
@@ -833,46 +870,46 @@ msgstr ""
 "¥×¤¬»ØÄꤵ¤ì¤Ê¤«¤Ã¤¿¾ì¹ç¤Î¥Õ¥©¡¼¥ë¥Ð¥Ã¥¯¤Î¤¿¤á¤Ë¡¢¥ê¥¹¥È¤ÎºÇ¸å¤Ë¾ï¤Ë'any'¤ò»Ø"
 "Äꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£"
 
-#: src/libvlc.h:292
+#: src/libvlc.h:300
 #, fuzzy
 msgid "Choose preferred video encoder list"
 msgstr "½àÈ÷¤µ¤ì¤Æ¤¤¤ë¥³¡¼¥Ç¥Ã¥¯¤Î°ìÍ÷¤ÎÁªÂò"
 
-#: src/libvlc.h:294 src/libvlc.h:298
+#: src/libvlc.h:302 src/libvlc.h:306
 #, fuzzy
 msgid ""
 "This allows you to select the order in which VLC will choose its codecs. "
 msgstr "VLC¤¬ÁªÂò¤¹¤ë¥Ñ¥±¥Ã¥¿¥é¥¤¥¶¡¼¤Î½ç½ø¤òÁªÂò¤·¤Þ¤¹¡£"
 
-#: src/libvlc.h:296
+#: src/libvlc.h:304
 #, fuzzy
 msgid "Choose preferred audio encoder list"
 msgstr "½àÈ÷¤µ¤ì¤Æ¤¤¤ë¥³¡¼¥Ç¥Ã¥¯¤Î°ìÍ÷¤ÎÁªÂò"
 
-#: src/libvlc.h:301
+#: src/libvlc.h:309
 #, fuzzy
 msgid "Choose a stream output"
 msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò"
 
-#: src/libvlc.h:303
+#: src/libvlc.h:311
 msgid "Empty if no stream output."
 msgstr "½ÐÎÏ¥¹¥È¥ê¡¼¥à¤¬¤Ê¤¤¾ì¹ç¡¢¶õ¤Ë¤¹¤ë"
 
-#: src/libvlc.h:305
+#: src/libvlc.h:313
 msgid "Display while streaming"
 msgstr ""
 
-#: src/libvlc.h:307
+#: src/libvlc.h:315
 #, fuzzy
 msgid "This allows you to play the stream while streaming it."
 msgstr "VLC¤¬ÁªÂò¤¹¤ë¥Ñ¥±¥Ã¥¿¥é¥¤¥¶¡¼¤Î½ç½ø¤òÁªÂò¤·¤Þ¤¹¡£"
 
-#: src/libvlc.h:309
+#: src/libvlc.h:317
 #, fuzzy
 msgid "Enable video stream output"
 msgstr "¥Ó¥Ç¥ª¡¦¥¹¥È¥ê¡¼¥à¤Î½ÐÎϤòÍ­¸ú¤Ë¤¹¤ë"
 
-#: src/libvlc.h:311 src/libvlc.h:324
+#: src/libvlc.h:319 src/libvlc.h:324
 msgid ""
 "This allows you to choose if the video stream should be redirected to the "
 "stream output facility when this last one is enabled."
@@ -880,79 +917,55 @@ msgstr ""
 "¥Ó¥Ç¥ª¡¦¥¹¥È¥ê¡¼¥à½ÐÎϵ¡¹½¤ÎºÇ¸å¤Î¤â¤Î¤¬Í­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤È¥Ó¥Ç¥ª¡¦¥¹¥È¥ê¡¼¥à"
 "¤¬½ÐÎϵ¡¹½¤Ë¥ê¥À¥¤¥ì¥¯¥È¤µ¤ì¤ë¤Ù¤­¾ì¹ç¡¢ÁªÂò²Äǽ¤Ç¤¹¡£"
 
-#: src/libvlc.h:314
-#, fuzzy
-msgid "Video encoding codec"
-msgstr "DV¥Ó¥Ç¥ª¡¦¥Ç¥³¡¼¥À"
-
-#: src/libvlc.h:316
-msgid "This allows you to force video encoding"
-msgstr ""
-
-#: src/libvlc.h:318
-msgid "Video bitrate encoding (kB/s)"
-msgstr ""
-
-#: src/libvlc.h:320
-msgid "This allows you to specify video bitrate in kB/s."
-msgstr ""
-
 #: src/libvlc.h:322
 #, fuzzy
 msgid "Enable audio stream output"
 msgstr "¥ª¡¼¥Ç¥£¥ª¡¦¥¹¥È¥ê¡¼¥à¤Î½ÐÎϤòÍ­¸ú¤Ë¤¹¤ë"
 
 #: src/libvlc.h:327
-#, fuzzy
-msgid "Audio encoding codec"
-msgstr "MPEG 1/2¥Ó¥Ç¥ª¡¦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
-
-#: src/libvlc.h:329
-msgid "This allows you to force audio encoding"
+msgid "Keep sout open"
 msgstr ""
 
-#: src/libvlc.h:331
-msgid "Audio bitrate encoding (kB/s)"
+#: src/libvlc.h:329
+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:333
-msgid "This allows you to specify audio bitrate in kB/s."
-msgstr ""
-
-#: src/libvlc.h:335
 #, fuzzy
 msgid "Choose preferred packetizer list"
 msgstr "½àÈ÷¤µ¤ì¤Æ¤¤¤ë¥Ñ¥±¥Ã¥¿¥é¥¤¥¶¡¼°ìÍ÷¤ÎÁªÂò"
 
-#: src/libvlc.h:337
+#: src/libvlc.h:335
 msgid ""
 "This allows you to select the order in which VLC will choose its packetizers."
 msgstr "VLC¤¬ÁªÂò¤¹¤ë¥Ñ¥±¥Ã¥¿¥é¥¤¥¶¡¼¤Î½ç½ø¤òÁªÂò¤·¤Þ¤¹¡£"
 
-#: src/libvlc.h:340
+#: src/libvlc.h:338
 #, fuzzy
 msgid "Mux module"
 msgstr "mux¥â¥¸¥å¡¼¥ë"
 
-#: src/libvlc.h:342
+#: src/libvlc.h:340
 msgid "This is a legacy entry to let you configure mux modules"
 msgstr "mux¥â¥¸¥å¡¼¥ë¤òÀßÄꤹ¤ë¥ì¥¬¥·¡¼¡¦¥¨¥ó¥È¥ê¤Ç¤¹¡£"
 
-#: src/libvlc.h:344
+#: src/libvlc.h:342
 #, fuzzy
 msgid "Access output module"
 msgstr "¥ª¡¼¥Ç¥£¥ª½ÐÎϥ⥸¥å¡¼¥ë"
 
-#: src/libvlc.h:346
+#: src/libvlc.h:344
 msgid "This is a legacy entry to let you configure access output modules"
 msgstr "¥¢¥¯¥»¥¹½ÐÎϥ⥸¥å¡¼¥ë¤òÀßÄꤹ¤ë¥ì¥¬¥·¡¼¡¦¥¨¥ó¥È¥ê¤Ç¤¹¡£"
 
-#: src/libvlc.h:349
+#: src/libvlc.h:347
 #, fuzzy
 msgid "Enable CPU MMX support"
 msgstr "CPU¤ÎMMX¥µ¥Ý¡¼¥È¤ò̵¸ú¤Ë¤¹¤ë"
 
-#: src/libvlc.h:351
+#: src/libvlc.h:349
 msgid ""
 "If your processor supports the MMX instructions set, VLC can take advantage "
 "of them."
@@ -960,12 +973,12 @@ msgstr ""
 "¥×¥í¥»¥Ã¥µ¤¬MMX¤Îµ¡Ç½¥»¥Ã¥È¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢VLC¤Ï¤½¤Î¥¢¥É¥Ð¥ó¥Æ¡¼"
 "¥¸¤òÍøÍѤǤ­¤Þ¤¹¡£"
 
-#: src/libvlc.h:354
+#: src/libvlc.h:352
 #, fuzzy
 msgid "Enable CPU 3D Now! support"
 msgstr "CPU¤Î3D Now!¥µ¥Ý¡¼¥È¤ò̵¸ú¤Ë¤¹¤ë"
 
-#: src/libvlc.h:356
+#: src/libvlc.h:354
 msgid ""
 "If your processor supports the 3D Now! instructions set, VLC can take "
 "advantage of them."
@@ -973,12 +986,12 @@ msgstr ""
 "¥×¥í¥»¥Ã¥µ¤¬3D Now!µ¡Ç½¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢VLC¤Ï¤½¤Î¥¢¥É¥Ð¥ó¥Æ¡¼¥¸¤ò"
 "ÍøÍѤǤ­¤Þ¤¹¡£"
 
-#: src/libvlc.h:359
+#: src/libvlc.h:357
 #, fuzzy
 msgid "Enable CPU MMX EXT support"
 msgstr "CPU¤ÎMMX³ÈÄ¥µ¡Ç½¥µ¥Ý¡¼¥È¤ò̵¸ú¤Ë¤¹¤ë"
 
-#: src/libvlc.h:361
+#: src/libvlc.h:359
 msgid ""
 "If your processor supports the MMX EXT instructions set, VLC can take "
 "advantage of them."
@@ -986,12 +999,12 @@ msgstr ""
 "¥×¥í¥»¥Ã¥µ¤¬MMX¤Î³ÈÄ¥µ¡Ç½¥»¥Ã¥È¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢VLC¤Ï¤½¤Î¥¢¥É¥Ð¥ó"
 "¥Æ¡¼¥¸¤òÍøÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
 
-#: src/libvlc.h:364
+#: src/libvlc.h:362
 #, fuzzy
 msgid "Enable CPU SSE support"
 msgstr "CPU¤ÎSSE¥µ¥Ý¡¼¥È¤ò̵¸ú¤Ë¤¹¤ë"
 
-#: src/libvlc.h:366
+#: src/libvlc.h:364
 msgid ""
 "If your processor supports the SSE instructions set, VLC can take advantage "
 "of them."
@@ -999,12 +1012,12 @@ msgstr ""
 "¥×¥í¥»¥Ã¥µ¤¬SSE¤Îµ¡Ç½¥»¥Ã¥È¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢VLC¤Ï¤½¤Î¥¢¥É¥Ð¥ó¥Æ¡¼"
 "¥¸¤òÍøÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
 
-#: src/libvlc.h:369
+#: src/libvlc.h:367
 #, fuzzy
 msgid "Enable CPU AltiVec support"
 msgstr "CPU¤ÎAltiVec¥µ¥Ý¡¼¥È¤ò̵¸ú¤Ë¤¹¤ë"
 
-#: src/libvlc.h:371
+#: src/libvlc.h:369
 msgid ""
 "If your processor supports the AltiVec instructions set, VLC can take "
 "advantage of them."
@@ -1012,12 +1025,12 @@ msgstr ""
 "¥×¥í¥»¥Ã¥µ¤¬AltiVec¤Îµ¡Ç½¥»¥Ã¥È¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢¤½¤Î¥¢¥É¥Ð¥ó¥Æ¡¼¥¸"
 "¤òÍøÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
 
-#: src/libvlc.h:374
+#: src/libvlc.h:372
 #, fuzzy
 msgid "Play files randomly forever"
 msgstr "¥Õ¥¡¥¤¥ë¤ò¥é¥ó¥À¥à¤ËºÆÀ¸"
 
-#: src/libvlc.h:376
+#: src/libvlc.h:374
 msgid ""
 "When selected, VLC will randomly play files in the playlist until "
 "interrupted."
@@ -1025,12 +1038,12 @@ msgstr ""
 "¤³¤Î¥ª¥×¥·¥ç¥ó¤¬ÁªÂò¤µ¤ì¤ë¤ÈVLC¤Ï¥×¥ì¥¤¥ê¥¹¥È¤Î¥Õ¥¡¥¤¥ë¤ò¥é¥ó¥À¥à¤ËºÆÀ¸¤·¤Þ"
 "¤¹¡£"
 
-#: src/libvlc.h:379
+#: src/libvlc.h:377
 #, fuzzy
 msgid "Enqueue items in playlist"
 msgstr "¥Ç¥Õ¥©¥ë¥È¤Ç¥×¥ì¥¤¥ê¥¹¥È¤ËÄɲÃ"
 
-#: src/libvlc.h:381
+#: src/libvlc.h:379
 msgid ""
 "If you want VLC to add items to the playlist as you open them, then enable "
 "this option."
@@ -1038,24 +1051,24 @@ msgstr ""
 "¥×¥ì¥¤¥ê¥¹¥È¤Ë¥ª¡¼¥×¥ó¤·¤Æ¤¤¤ë¹àÌܤòÄɲä·¤¿¤¤¾ì¹ç¤Ë¤Ï¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤òÁªÂò"
 "¤·¤Þ¤¹¡£"
 
-#: src/libvlc.h:384
+#: src/libvlc.h:382
 #, fuzzy
 msgid "Loop playlist on end"
 msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ÎºÇ¸å¤Ç¥ë¡¼¥×"
 
-#: src/libvlc.h:386
+#: src/libvlc.h:384
 msgid ""
 "If you want VLC to keep playing the playlist indefinitely then enable this "
 "option."
 msgstr ""
 "¥×¥ì¥¤¥ê¥¹¥È¤ÎºÆÀ¸¤ò·«¤êÊÖ¤·¤Æ¹Ô¤¤¤¿¤¤¾ì¹ç¤Ë¤Ï¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤òÁªÂò¤·¤Þ¤¹¡£"
 
-#: src/libvlc.h:389
+#: src/libvlc.h:387
 #, fuzzy
 msgid "Memory copy module"
 msgstr "¥á¥â¥ê¡¼¡¦¥³¥Ô¡¼¡¦¥â¥¸¥å¡¼¥ë"
 
-#: src/libvlc.h:391
+#: src/libvlc.h:389
 msgid ""
 "You can select which memory copy module you want to use. By default VLC will "
 "select the fastest one supported by your hardware."
@@ -1063,29 +1076,29 @@ msgstr ""
 "»ÈÍѤ·¤¿¤¤¥á¥â¥ê¡¼¡¦¥³¥Ô¡¼¡¦¥â¥¸¥å¡¼¥ë¤òÁªÂò¤·¤Þ¤¹¡£VLC¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç¥Ï¡¼¥É"
 "¥¦¥§¥¢¤¬¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ëºÇ¤â®¤¤¤â¤Î¤òÁªÂò¤·¤Þ¤¹¡£"
 
-#: src/libvlc.h:394
+#: src/libvlc.h:392
 #, fuzzy
 msgid "Access module"
 msgstr "¥¢¥¯¥»¥¹¡¦¥â¥¸¥å¡¼¥ë"
 
-#: src/libvlc.h:396
+#: src/libvlc.h:394
 msgid "This is a legacy entry to let you configure access modules"
 msgstr "¥¢¥¯¥»¥¹¡¦¥â¥¸¥å¡¼¥ë¤òÁªÂò¤¹¤ë¥ì¥¬¥·¡¼¡¦¥¨¥ó¥È¥ê¤Ç¤¹¡£"
 
-#: src/libvlc.h:398
+#: src/libvlc.h:396
 #, fuzzy
 msgid "Demux module"
 msgstr "demux¥â¥¸¥å¡¼¥ë"
 
-#: src/libvlc.h:400
+#: src/libvlc.h:398
 msgid "This is a legacy entry to let you configure demux modules"
 msgstr "demux¥â¥¸¥å¡¼¥ë¤òÁªÂò¤¹¤ë¥ì¥¬¥·¡¼¡¦¥¨¥ó¥È¥ê¤Ç¤¹¡£"
 
-#: src/libvlc.h:402
+#: src/libvlc.h:400
 msgid "Increase the priority of the process"
 msgstr ""
 
-#: src/libvlc.h:404
+#: src/libvlc.h:402
 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 "
@@ -1095,12 +1108,12 @@ msgid ""
 "require a reboot of your machine."
 msgstr ""
 
-#: src/libvlc.h:411
+#: src/libvlc.h:409
 #, fuzzy
 msgid "Fast mutex on NT/2K/XP (developers only)"
 msgstr "¹â®mutex¤Î»ÈÍÑ NT/2K/XP (³«È¯¼Ô¸þ¤±)"
 
-#: src/libvlc.h:413
+#: src/libvlc.h:411
 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 "
@@ -1110,11 +1123,11 @@ msgstr ""
 "¤·¡¢¤è¤ê®¤¤mutex¤Î¼ÂÁõ¤ò»ÈÍѤ¹¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡£¤½¤Î¾ì¹ç¡¢ÌäÂ꤬ȯÀ¸¤¹¤ë²Äǽ"
 "À­¤¬¤¢¤ê¤Þ¤¹¡£"
 
-#: src/libvlc.h:418
+#: src/libvlc.h:416
 msgid "Condition variables implementation for Win9x (developers only)"
 msgstr "Win9x¸þ¤±¾ò·ïÃͤμÂÁõ (³«È¯¼Ô¸þ¤±)"
 
-#: src/libvlc.h:421
+#: src/libvlc.h:419
 msgid ""
 "On Windows 9x/Me we use a fast but not correct condition variables "
 "implementation (more precisely there is a possibility for a race condition "
@@ -1126,7 +1139,178 @@ msgstr ""
 "¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹)¤ò»ÈÍѤ·¤Þ¤¹¡£¤·¤«¤·¡¢ÂåÂؤ¨¤È¤Ê¤ëÃÙ¤¯¤Æ¤â°ÂÄꤷ¤¿¼ÂÁõ¤òÁª"
 "Âò¤¹¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡£¸½»þÅÀ¤Ç¤Ï¡¢0(´ûÄêÃͤκÇ®¤Î¤â¤Î), 1, 2¤¬ÁªÂò²Äǽ¤Ç¤¹¡£"
 
-#: src/libvlc.h:429
+#: src/libvlc.h:427 src/video_output/video_output.c:412
+#: modules/gui/beos/VideoOutput.cpp:1151 modules/gui/macosx/applescript.m:122
+#: modules/gui/macosx/controls.m:348 modules/gui/macosx/controls.m:690
+#: modules/gui/macosx/intf.m:394
+msgid "Fullscreen"
+msgstr "Á´²èÌ̲½"
+
+#: src/libvlc.h:428
+msgid "Select the hotkey to use to swap fullscreen state"
+msgstr ""
+
+#: src/libvlc.h:429 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/intf.m:921
+#: modules/gui/macosx/intf.m:922 modules/gui/macosx/intf.m:923
+#: modules/gui/pda/interface.c:179 modules/gui/wxwindows/interface.cpp:872
+msgid "Pause"
+msgstr "°ì»þÄä»ß"
+
+#: src/libvlc.h:430
+msgid "Select the hotkey to use to swap paused state"
+msgstr ""
+
+#: src/libvlc.h:431
+#, fuzzy
+msgid "Pause only"
+msgstr "°ì»þÄä»ß"
+
+#: src/libvlc.h:432
+msgid "Select the hotkey to use to pause"
+msgstr ""
+
+#: src/libvlc.h:433
+#, fuzzy
+msgid "Play only"
+msgstr "¥¹¥í¡¼ºÆÀ¸"
+
+#: src/libvlc.h:434
+msgid "Select the hotkey to use to play"
+msgstr ""
+
+#: src/libvlc.h:435 modules/gui/macosx/controls.m:625
+#: modules/gui/macosx/intf.m:326 modules/gui/macosx/intf.m:364
+#: modules/gui/wxwindows/interface.cpp:382
+msgid "Faster"
+msgstr "ÁáÁ÷¤ê"
+
+#: src/libvlc.h:436
+msgid "Select the hotkey to use for fast forward playback"
+msgstr ""
+
+#: src/libvlc.h:437 modules/gui/macosx/controls.m:626
+#: modules/gui/macosx/intf.m:323 modules/gui/macosx/intf.m:365
+#: modules/gui/wxwindows/interface.cpp:380
+msgid "Slower"
+msgstr "¥¹¥í¡¼"
+
+#: src/libvlc.h:438
+msgid "Select the hotkey to use for slow motion playback"
+msgstr ""
+
+#: src/libvlc.h:439 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:647
+#: modules/gui/macosx/intf.m:327 modules/gui/macosx/intf.m:367
+#: modules/gui/macosx/intf.m:425 modules/gui/wxwindows/interface.cpp:378
+msgid "Next"
+msgstr "¼¡"
+
+#: src/libvlc.h:440
+msgid "Select the hotkey to use to skip to the next item in the playlist"
+msgstr ""
+
+#: src/libvlc.h:441 modules/gui/macosx/controls.m:646
+#: modules/gui/macosx/intf.m:322 modules/gui/macosx/intf.m:366
+#: modules/gui/macosx/intf.m:426
+msgid "Previous"
+msgstr "Á°¤Î¥Õ¥¡¥¤¥ë"
+
+#: src/libvlc.h:442
+msgid "Select the hotkey to use to skip to the previous item in the playlist"
+msgstr ""
+
+#: src/libvlc.h:443 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:639
+#: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
+#: modules/gui/macosx/intf.m:424 modules/gui/pda/interface.c:205
+#: modules/gui/wxwindows/interface.cpp:369
+msgid "Stop"
+msgstr "Ää»ß"
+
+#: src/libvlc.h:444
+msgid "Select the hotkey to stop the playback"
+msgstr ""
+
+#: src/libvlc.h:445 modules/control/lirc/lirc.c:193
+#: modules/gui/beos/InterfaceWindow.cpp:253
+#, fuzzy
+msgid "Quit"
+msgstr "VLC¤ò½ªÎ»"
+
+#: src/libvlc.h:446
+msgid "Select the hotkey to quit the application"
+msgstr ""
+
+#: src/libvlc.h:447
+#, fuzzy
+msgid "Navigate up"
+msgstr "¥Ê¥Ó¥²¡¼¥·¥ç¥ó(_N)"
+
+#: src/libvlc.h:448
+msgid "Select the key to move the selector up in dvd menus"
+msgstr ""
+
+#: src/libvlc.h:449
+#, fuzzy
+msgid "Navigate down"
+msgstr "¥Ê¥Ó¥²¡¼¥·¥ç¥ó(_N)"
+
+#: src/libvlc.h:450
+msgid "Select the key to move the selector down in dvd menus"
+msgstr ""
+
+#: src/libvlc.h:451
+#, fuzzy
+msgid "Navigate left"
+msgstr "¥Ê¥Ó¥²¡¼¥·¥ç¥ó(_N)"
+
+#: src/libvlc.h:452
+msgid "Select the key to move the selector left in dvd menus"
+msgstr ""
+
+#: src/libvlc.h:453
+#, fuzzy
+msgid "Navigate right"
+msgstr "¥Ê¥Ó¥²¡¼¥·¥ç¥ó(_N)"
+
+#: src/libvlc.h:454
+msgid "Select the key to move the selector right in dvd menus"
+msgstr ""
+
+#: src/libvlc.h:455
+msgid "Activate"
+msgstr ""
+
+#: src/libvlc.h:456
+msgid "Select the key to activate selected item in dvd menus"
+msgstr ""
+
+#: src/libvlc.h:457
+#, fuzzy
+msgid "Volume up"
+msgstr "¥Ü¥ê¥å¡¼¥à¤ò¾å¤²¤ë"
+
+#: src/libvlc.h:458
+msgid "Select the key to turn up audio volume"
+msgstr ""
+
+#: src/libvlc.h:459
+#, fuzzy
+msgid "Volume down"
+msgstr "¥Ü¥ê¥å¡¼¥à¤ò²¼¤²¤ë"
+
+#: src/libvlc.h:460
+msgid "Select the key to turn down audio volume"
+msgstr ""
+
+#: src/libvlc.h:462
+#, fuzzy
 msgid ""
 "\n"
 "Playlist items:\n"
@@ -1136,7 +1320,7 @@ msgid ""
 "  [vcd:][device][@[title][,[chapter]]\n"
 "                                 VCD device\n"
 "  udpstream:[@[<bind address>][:<bind port>]]\n"
-"                                 UDP stream sent by VLS\n"
+"                                 UDP stream sent by a streaming server\n"
 "  vlc:pause                      pause execution of playlist items\n"
 "  vlc:quit                       quit VLC\n"
 msgstr ""
@@ -1152,109 +1336,108 @@ msgstr ""
 "  vlc:pause                      ¥×¥ì¥¤¥ê¥¹¥È¤Î¹àÌܤκÆÀ¸Ää»ß\n"
 "  vlc:quit                       VLC¤ò½ªÎ»\n"
 
-#: src/libvlc.h:459 modules/misc/dummy/dummy.c:58
+#: src/libvlc.h:492 modules/misc/dummy/dummy.c:58
 msgid "Interface"
 msgstr "¥¤¥ó¥¿¥Õ¥§¡¼¥¹"
 
-#: src/libvlc.h:474 modules/audio_output/coreaudio.c:227
-#: modules/audio_output/file.c:108 modules/demux/asf/asf.c:228
-#: modules/demux/mkv.cpp:2449 modules/demux/ogg.c:558 modules/demux/ogg.c:830
-#: modules/demux/ogg.c:1003 modules/gui/beos/InterfaceWindow.cpp:259
+#: src/libvlc.h:507 modules/access/dvdplay/access.c:213
+#: modules/audio_output/coreaudio.c:227 modules/audio_output/file.c:108
+#: modules/demux/asf/asf.c:398 modules/demux/mkv.cpp:2378
+#: modules/demux/ogg.c:542 modules/demux/ogg.c:814 modules/demux/ogg.c:987
+#: 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:378 modules/gui/macosx/output.m:156
+#: modules/gui/macosx/intf.m:378 modules/gui/macosx/output.m:154
 msgid "Audio"
 msgstr "¥ª¡¼¥Ç¥£¥ª"
 
-#: src/libvlc.h:493 modules/demux/asf/asf.c:298 modules/demux/avi/avi.c:1217
-#: modules/demux/mkv.cpp:2465 modules/demux/ogg.c:630 modules/demux/ogg.c:670
-#: modules/demux/ogg.c:735 modules/demux/ogg.c:910
+#: src/libvlc.h:528 modules/demux/asf/asf.c:398 modules/demux/avi/avi.c:363
+#: modules/demux/mkv.cpp:2394 modules/demux/ogg.c:614 modules/demux/ogg.c:654
+#: modules/demux/ogg.c:719 modules/demux/ogg.c:894
 #: modules/gui/gtk/gnome_interface.c:1099 modules/gui/gtk/gtk_interface.c:1296
 #: modules/gui/macosx/intf.m:389 modules/gui/macosx/macosx.m:68
-#: modules/gui/macosx/output.m:150 modules/misc/dummy/dummy.c:81
+#: modules/gui/macosx/output.m:148 modules/misc/dummy/dummy.c:81
 #: modules/video_output/directx/directx.c:112
 msgid "Video"
 msgstr "¥Ó¥Ç¥ª"
 
-#: src/libvlc.h:515 modules/access/dvb/qpsk.c:101
+#: src/libvlc.h:551 modules/access/dvb/qpsk.c:101
 #: modules/access/satellite/satellite.c:66
 msgid "Input"
 msgstr "ÆþÎÏ"
 
-#: src/libvlc.h:537
+#: src/libvlc.h:573
 msgid "Decoders"
 msgstr "¥Ç¥³¡¼¥À"
 
-#: src/libvlc.h:541
-#, fuzzy
-msgid "Encoders"
-msgstr "¥¨¥ó¥³¡¼¥À"
-
-#: src/libvlc.h:547 modules/gui/gtk/gnome_interface.c:2042
+#: src/libvlc.h:578 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:194 modules/gui/wxwindows/streamout.cpp:171
+#: modules/gui/wxwindows/open.cpp:212 modules/gui/wxwindows/streamout.cpp:141
 msgid "Stream output"
 msgstr "¥¹¥È¥ê¡¼¥à½ÐÎÏ"
 
-#: src/libvlc.h:567
+#: src/libvlc.h:595
 msgid "CPU"
 msgstr ""
 
-#: src/libvlc.h:579 modules/gui/beos/InterfaceWindow.cpp:206
+#: src/libvlc.h:607 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:321
 #: modules/gui/macosx/intf.m:409 modules/gui/pda/interface.c:612
-#: modules/gui/wxwindows/interface.cpp:378
-#: modules/gui/wxwindows/playlist.cpp:104
+#: modules/gui/wxwindows/interface.cpp:374
+#: modules/gui/wxwindows/playlist.cpp:106
 msgid "Playlist"
 msgstr "¥ê¥¹¥È"
 
-#: src/libvlc.h:585 modules/audio_filter/converter/a52tofloat32.c:85
+#: src/libvlc.h:613 modules/audio_filter/converter/a52tofloat32.c:85
 #: modules/audio_filter/converter/mpgatofixed32.c:60
 #: modules/codec/a52old/a52old.c:59 modules/codec/mpeg_video/parser.c:84
-#: modules/demux/mpeg/ts.c:118 modules/gui/pda/pda.c:70
+#: modules/demux/mpeg/ts.c:112 modules/gui/pda/pda.c:70
 #: modules/misc/logger/logger.c:89 modules/video_filter/motionblur.c:58
 #: modules/video_filter/transform.c:63 modules/video_filter/wall.c:66
-#: modules/video_output/ggi.c:62 modules/video_output/mga/xmga.c:102
+#: modules/video_output/ggi.c:62
 msgid "Miscellaneous"
 msgstr "¤½¤Î¾"
 
-#: src/libvlc.h:599
+#: src/libvlc.h:625
+#, fuzzy
+msgid "Hot keys"
+msgstr "¥Û¥¹¥È̾/¥¢¥É¥ì¥¹"
+
+#: src/libvlc.h:647
 msgid "main program"
 msgstr "¥á¥¤¥ó¡¦¥×¥í¥°¥é¥à"
 
-#: src/libvlc.h:605
+#: src/libvlc.h:653
 msgid "print help"
 msgstr "¥Ø¥ë¥×¤Î°õºþ"
 
-#: src/libvlc.h:607
+#: src/libvlc.h:655
 msgid "print detailed help"
 msgstr "¾ÜºÙ¤Ê¥Ø¥ë¥×¤Î°õºþ"
 
-#: src/libvlc.h:610
+#: src/libvlc.h:658
 msgid "print a list of available modules"
 msgstr "Í­¸ú¤Ê¥â¥¸¥å¡¼¥ë¤Î¥ê¥¹¥È¤ò°õºþ"
 
-#: src/libvlc.h:612
+#: src/libvlc.h:660
 msgid "print help on module"
 msgstr "¥â¥¸¥å¡¼¥ë¾å¤Î¥Ø¥ë¥×¤ò°õºþ <ʸ»úÎó>"
 
-#: src/libvlc.h:615
+#: src/libvlc.h:663
 msgid "print version information"
 msgstr "¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤Î°õºþ"
 
-#: src/misc/configuration.c:1021
+#: src/misc/configuration.c:1034
 msgid "boolean"
 msgstr "¿¿µ¶ÃÍ"
 
-#: src/video_output/video_output.c:408 modules/gui/beos/VideoOutput.cpp:1151
-#: modules/gui/macosx/applescript.m:122 modules/gui/macosx/controls.m:348
-#: modules/gui/macosx/controls.m:690 modules/gui/macosx/intf.m:394
-msgid "Fullscreen"
-msgstr "Á´²èÌ̲½"
+#: src/misc/configuration.c:1042
+msgid "key"
+msgstr ""
 
-#: src/video_output/video_output.c:419 modules/gui/gtk/gnome_interface.c:183
+#: src/video_output/video_output.c:423 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:402
 #: modules/gui/macosx/intf.m:403
@@ -1262,32 +1445,32 @@ msgstr "
 msgid "Deinterlace"
 msgstr "¥Î¥ó¥¤¥ó¥¿¥ì¡¼¥¹²½"
 
-#: src/video_output/video_output.c:423
+#: src/video_output/video_output.c:427
 #, fuzzy
 msgid "Discard"
 msgstr "¥Ç¥£¥¹¥¯"
 
-#: src/video_output/video_output.c:425
+#: src/video_output/video_output.c:429
 msgid "Blend"
 msgstr ""
 
-#: src/video_output/video_output.c:427
+#: src/video_output/video_output.c:431
 #, fuzzy
 msgid "Mean"
 msgstr "¥á¥Ç¥£¥¢"
 
-#: src/video_output/video_output.c:429
+#: src/video_output/video_output.c:433
 msgid "Bob"
 msgstr ""
 
-#: src/video_output/video_output.c:431
+#: src/video_output/video_output.c:435
 #, fuzzy
 msgid "Linear"
 msgstr "À°¿ô"
 
-#: modules/access/cdda.c:86 modules/access/file.c:72 modules/access/ftp.c:86
-#: modules/access/http.c:80 modules/access/mms/mms.c:57
-#: modules/access/v4l/v4l.c:66
+#: modules/access/cdda.c:86 modules/access/dshow/dshow.cpp:58
+#: 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:65
 #, fuzzy
 msgid "Caching value in ms"
 msgstr "¥­¥ã¥Ã¥·¥ó¥°ÃÍ (ms)"
@@ -1316,6 +1499,26 @@ msgstr "
 msgid "Standard filesystem directory input"
 msgstr "ɸ½àŪ¤Ê¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥Õ¥¡¥¤¥ë¤òÆɤà"
 
+#: modules/access/dshow/dshow.cpp:60
+#, fuzzy
+msgid ""
+"Allows you to modify the default caching value for directshow streams. This "
+"value should be set in miliseconds units."
+msgstr "¥Õ¥¡¥¤¥ë¡¦¥¹¥È¥ê¡¼¥à¤Î´ûÄê¤Î¥­¥ã¥Ã¥·¥ó¥°ÃͤòÊѹ¹¤Ç¤­¤Þ¤¹¡£Ã±°Ì¤Ï¥ß¥êÉÃ"
+
+#: modules/access/dshow/dshow.cpp:64
+#, fuzzy
+msgid "DirectShow input"
+msgstr "DirectX¥ª¡¼¥Ç¥£¥ª¡¦¥â¥¸¥å¡¼¥ë"
+
+#: modules/access/dshow/dshow.cpp:65
+msgid "dshow"
+msgstr ""
+
+#: modules/access/dshow/dshow.cpp:73
+msgid "DirectShow demuxer"
+msgstr ""
+
 #: modules/access/dvb/qpsk.c:44
 msgid "adapter card to tune"
 msgstr ""
@@ -1330,7 +1533,7 @@ msgstr ""
 
 #: modules/access/dvb/qpsk.c:50
 #, fuzzy
-msgid "satellite default transponder frequency"
+msgid "satellite default transponder frequency in Hz"
 msgstr "±ÒÀ± ´ûÄêžÁ÷¼þÇÈ¿ô"
 
 #: modules/access/dvb/qpsk.c:53
@@ -1349,7 +1552,7 @@ msgstr ""
 
 #: modules/access/dvb/qpsk.c:59
 #, fuzzy
-msgid "satellite default transponder symbol rate"
+msgid "satellite default transponder symbol rate in Hz"
 msgstr "±ÒÀ± ´ûÄêžÁ÷¥·¥ó¥Ü¥ë¡¦¥ì¡¼¥È"
 
 #: modules/access/dvb/qpsk.c:62
@@ -1359,17 +1562,17 @@ msgstr "
 
 #: modules/access/dvb/qpsk.c:65
 #, fuzzy
-msgid "antenna lnb_lof1 (kHz)"
+msgid "antenna lnb_lof1 (Hz)"
 msgstr "¥¢¥ó¥Æ¥Ê lnb_lof1 (kHz)"
 
 #: modules/access/dvb/qpsk.c:68
 #, fuzzy
-msgid "antenna lnb_lof2 (kHz)"
+msgid "antenna lnb_lof2 (Hz)"
 msgstr "¥¢¥ó¥Æ¥Ê lnb_lof2 (kHz)"
 
 #: modules/access/dvb/qpsk.c:71
 #, fuzzy
-msgid "antenna lnb_slof (kHz)"
+msgid "antenna lnb_slof (Hz)"
 msgstr "¥¢¥ó¥Æ¥Ê lnb_slof (kHz)"
 
 #: modules/access/dvb/qpsk.c:74
@@ -1416,7 +1619,7 @@ msgstr ""
 msgid "terrestrial hierarchy mode"
 msgstr ""
 
-#: modules/access/dvb/qpsk.c:123
+#: modules/access/dvb/qpsk.c:120
 msgid "DVB input module with v4l2 support"
 msgstr ""
 
@@ -1472,6 +1675,29 @@ msgstr "DVD
 msgid "DVD input (uses libdvdcss)"
 msgstr "DVDÆþÎϥ⥸¥å¡¼¥ë, libdvdcss¤ò»ÈÍÑ"
 
+#: modules/access/dvdplay/access.c:202
+#, fuzzy
+msgid "DVD menus"
+msgstr "DVD¥á¥Ë¥å¡¼¤ò»ÈÍÑ"
+
+#: modules/access/dvdplay/access.c:205
+msgid "Root"
+msgstr ""
+
+#: modules/access/dvdplay/access.c:211 modules/demux/mkv.cpp:2410
+#: modules/gui/gtk/gnome_interface.c:1963 modules/gui/gtk/gtk_interface.c:2278
+#, fuzzy
+msgid "Subtitle"
+msgstr "»úËë(_S)"
+
+#: modules/access/dvdplay/access.c:215
+msgid "Angle"
+msgstr ""
+
+#: modules/access/dvdplay/access.c:217
+msgid "Resume"
+msgstr ""
+
 #: modules/access/dvdplay/dvd.c:51
 msgid "[dvdplay:][device][@[title][,[chapter][,angle]]]"
 msgstr ""
@@ -1500,7 +1726,7 @@ msgstr "ɸ
 msgid "file"
 msgstr "¥Õ¥¡¥¤¥ë"
 
-#: modules/access/ftp.c:88
+#: modules/access/ftp.c:87
 #, fuzzy
 msgid ""
 "Allows you to modify the default caching value for ftp streams. This value "
@@ -1509,16 +1735,16 @@ msgstr ""
 "http¥¹¥È¥ê¡¼¥à¤Ç»ÈÍѤµ¤ì¤ë´ûÄê¤Î¥­¥ã¥Ã¥·¥ó¥°Ãͤ¬Êѹ¹²Äǽ¤Ç¤¹¡£Ã±°Ì¤Ï¥ß¥êÉäÇ"
 "»ØÄꤷ¤Þ¤¹¡£"
 
-#: modules/access/ftp.c:92
+#: modules/access/ftp.c:91
 msgid "FTP input"
 msgstr ""
 
-#: modules/access/http.c:74
+#: modules/access/http.c:73
 #, fuzzy
 msgid "Specify an HTTP proxy"
 msgstr "HTTP¥×¥í¥­¥·¤ò»ØÄê"
 
-#: modules/access/http.c:76
+#: modules/access/http.c:75
 #, fuzzy
 msgid ""
 "Specify an HTTP proxy to use. It must be in the form http://myproxy.mydomain:"
@@ -1528,7 +1754,7 @@ msgstr ""
 "»ÈÍѤ¹¤ëHTTP¥×¥í¥­¥·¤ò http://myproxy.mydomain:myport ¤Î·Á¼°¤Ç»ØÄꤷ¤Æ¤¯¤À¤µ"
 "¤¤¡£none ¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¤Ë¤Ï¡¢HTTP_PROXYenvironmentÊÑ¿ô¤¬»î¤ß¤é¤ì¤Þ¤¹¡£"
 
-#: modules/access/http.c:82
+#: modules/access/http.c:81
 msgid ""
 "Allows you to modify the default caching value for http streams. This value "
 "should be set in miliseconds units."
@@ -1536,11 +1762,11 @@ msgstr ""
 "http¥¹¥È¥ê¡¼¥à¤Ç»ÈÍѤµ¤ì¤ë´ûÄê¤Î¥­¥ã¥Ã¥·¥ó¥°Ãͤ¬Êѹ¹²Äǽ¤Ç¤¹¡£Ã±°Ì¤Ï¥ß¥êÉäÇ"
 "»ØÄꤷ¤Þ¤¹¡£"
 
-#: modules/access/http.c:86
+#: modules/access/http.c:85
 msgid "http"
 msgstr ""
 
-#: modules/access/http.c:91
+#: modules/access/http.c:90
 msgid "HTTP input"
 msgstr ""
 
@@ -1557,14 +1783,10 @@ msgstr ""
 msgid "Microsoft Media Server (MMS) input"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:75
+#: modules/access/pvr/pvr.c:77
 msgid "Hauppauge PVR cards input"
 msgstr ""
 
-#: modules/access/rtsp.c:68
-msgid "RTSP SDP request"
-msgstr ""
-
 #: modules/access/satellite/satellite.c:41
 #, fuzzy
 msgid "Satellite default transponder frequency"
@@ -1639,23 +1861,23 @@ msgstr "UDP
 msgid "udp"
 msgstr ""
 
-#: modules/access/v4l/v4l.c:68
+#: modules/access/v4l/v4l.c:67
 #, 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:72
+#: modules/access/v4l/v4l.c:71
 #, fuzzy
 msgid "Video4Linux input"
 msgstr "Video4LinuxÆþÎϥ⥸¥å¡¼¥ë"
 
-#: modules/access/v4l/v4l.c:73
+#: modules/access/v4l/v4l.c:72
 msgid "v4l"
 msgstr ""
 
-#: modules/access/v4l/v4l.c:81
+#: modules/access/v4l/v4l.c:80
 #, fuzzy
 msgid "Video4Linux demuxer"
 msgstr "Video4LinuxÆþÎϥ⥸¥å¡¼¥ë"
@@ -1856,7 +2078,7 @@ msgid "ALSA audio output"
 msgstr "ALSA¥ª¡¼¥Ç¥£¥ª¡¦¥â¥¸¥å¡¼¥ë"
 
 #: modules/audio_output/alsa.c:117 modules/audio_output/coreaudio.c:218
-#: modules/audio_output/coreaudio.c:1473 modules/audio_output/directx.c:377
+#: 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:386 modules/gui/macosx/intf.m:387
@@ -1864,23 +2086,23 @@ msgstr "ALSA
 msgid "Audio device"
 msgstr "DVD¥Ç¥Ð¥¤¥¹"
 
-#: modules/audio_output/alsa.c:171 modules/audio_output/directx.c:435
+#: modules/audio_output/alsa.c:171 modules/audio_output/directx.c:460
 #: modules/audio_output/oss.c:222 modules/audio_output/sdl.c:182
 #: modules/audio_output/sdl.c:201 modules/audio_output/waveout.c:399
 msgid "Mono"
 msgstr "¥â¥Î¥é¥ë"
 
-#: modules/audio_output/alsa.c:184 modules/audio_output/directx.c:409
+#: modules/audio_output/alsa.c:184 modules/audio_output/directx.c:433
 #: modules/audio_output/oss.c:178 modules/audio_output/waveout.c:371
 msgid "2 Front 2 Rear"
 msgstr "¥Õ¥í¥ó¥È 2, ¥ê¥¢ 2"
 
-#: modules/audio_output/alsa.c:190 modules/audio_output/directx.c:391
+#: modules/audio_output/alsa.c:190 modules/audio_output/directx.c:397
 #: modules/audio_output/oss.c:167 modules/audio_output/waveout.c:352
 msgid "5.1"
 msgstr ""
 
-#: modules/audio_output/alsa.c:217 modules/audio_output/directx.c:478
+#: modules/audio_output/alsa.c:217 modules/audio_output/directx.c:503
 #: modules/audio_output/oss.c:246 modules/audio_output/waveout.c:415
 msgid "A/52 over S/PDIF"
 msgstr ""
@@ -1907,6 +2129,11 @@ msgstr "
 msgid "DirectX audio output"
 msgstr "DirectX¥ª¡¼¥Ç¥£¥ª¡¦¥â¥¸¥å¡¼¥ë"
 
+#: modules/audio_output/directx.c:415
+#, fuzzy
+msgid "3 Front 2 Rear"
+msgstr "¥Õ¥í¥ó¥È 2, ¥ê¥¢ 2"
+
 #: modules/audio_output/esd.c:66
 #, fuzzy
 msgid "EsounD audio output"
@@ -1985,10 +2212,14 @@ msgstr "
 msgid "Win32 waveOut extension output"
 msgstr "Win32 wave½ÐÎÏÍѳÈÄ¥¥â¥¸¥å¡¼¥ë"
 
-#: modules/codec/a52.c:81
+#: modules/codec/a52.c:120
 msgid "A/52 parser"
 msgstr "A/52¥Ñ¡¼¥µ"
 
+#: modules/codec/a52.c:125
+msgid "A/52 audio packetizer"
+msgstr ""
+
 #: modules/codec/a52old/a52old.c:61 modules/codec/a52old/downmix/downmix.c:58
 msgid "A52 downmix module"
 msgstr "AC3¥À¥¦¥ó¥ß¥Ã¥¯¥¹¡¦¥â¥¸¥å¡¼¥ë"
@@ -2032,11 +2263,16 @@ msgstr "
 msgid "Cinepak video decoder"
 msgstr "DV¥Ó¥Ç¥ª¡¦¥Ç¥³¡¼¥À"
 
-#: modules/codec/dts.c:80
+#: modules/codec/dts.c:122
 #, fuzzy
 msgid "DTS parser"
 msgstr "A/52¥Ñ¡¼¥µ"
 
+#: modules/codec/dts.c:127
+#, fuzzy
+msgid "DTS audio packetizer"
+msgstr "»úË롦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
+
 #: modules/codec/dv.c:48
 msgid "DV video decoder"
 msgstr "DV¥Ó¥Ç¥ª¡¦¥Ç¥³¡¼¥À"
@@ -2150,7 +2386,7 @@ msgstr "MMX
 msgid "flac audio decoder"
 msgstr "µ¿»÷AC3¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
 
-#: modules/codec/libmpeg2.c:94
+#: modules/codec/libmpeg2.c:95
 #, fuzzy
 msgid "MPEG I/II video decoder (using libmpeg2)"
 msgstr "MPEG 1/2¥Ó¥Ç¥ª¡¦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
@@ -2291,31 +2527,37 @@ msgstr "
 msgid "DVD subtitles decoder"
 msgstr "»úË롦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/codec/subsdec/subsdec.c:68
+#: modules/codec/subsdec/subsdec.c:51 modules/codec/subsdec/subsdec.c:86
+#: modules/codec/subsdec/subsdec.c:157
+#, fuzzy
+msgid "System Default"
+msgstr "ºï½ü"
+
+#: modules/codec/subsdec/subsdec.c:73
 #, fuzzy
 msgid "Subtitles text encoding"
 msgstr "»úË롦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/codec/subsdec/subsdec.c:69
+#: modules/codec/subsdec/subsdec.c:74
 #, fuzzy
 msgid "Change the encoding used in text subtitles"
 msgstr "ʸ»ú»úËë¤Ç»ÈÍѤµ¤ì¤ë¥Õ¥©¥ó¥È"
 
-#: modules/codec/subsdec/subsdec.c:70
+#: modules/codec/subsdec/subsdec.c:75
 #, fuzzy
 msgid "Subtitles justification"
 msgstr "»úËë"
 
-#: modules/codec/subsdec/subsdec.c:71
+#: modules/codec/subsdec/subsdec.c:76
 msgid "Change the justification of substitles (0=center, 1=left, 2=right)"
 msgstr ""
 
-#: modules/codec/subsdec/subsdec.c:74
+#: modules/codec/subsdec/subsdec.c:79
 #, fuzzy
 msgid "file subtitles decoder"
 msgstr "»úË롦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/codec/subsdec/subsdec.c:77 modules/gui/beos/InterfaceWindow.cpp:256
+#: modules/codec/subsdec/subsdec.c:82 modules/gui/beos/InterfaceWindow.cpp:256
 #: modules/gui/kde/interface.cpp:93
 msgid "Subtitles"
 msgstr "»úËë"
@@ -2325,17 +2567,31 @@ msgstr "
 msgid "Tarkin decoder module"
 msgstr "MPEG 1/2¥Ó¥Ç¥ª¡¦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/codec/theora.c:85
+#: modules/codec/theora.c:100
 #, fuzzy
 msgid "Theora video decoder"
 msgstr "DV¥Ó¥Ç¥ª¡¦¥Ç¥³¡¼¥À"
 
-#: modules/codec/vorbis.c:112
+#: modules/codec/theora.c:106
+#, fuzzy
+msgid "Theora video packetizer"
+msgstr "DV¥Ó¥Ç¥ª¡¦¥Ç¥³¡¼¥À"
+
+#: modules/codec/theora.c:435
+msgid "Theora Comment"
+msgstr ""
+
+#: modules/codec/vorbis.c:128
 #, fuzzy
 msgid "Vorbis audio decoder"
 msgstr "»úË롦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/codec/vorbis.c:189
+#: modules/codec/vorbis.c:137
+#, fuzzy
+msgid "Vorbis audio packetizer"
+msgstr "»úË롦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
+
+#: modules/codec/vorbis.c:498
 msgid "Vorbis Comment"
 msgstr ""
 
@@ -2470,31 +2726,64 @@ msgstr "
 msgid "infrared remote control interface"
 msgstr "ÀÖ³°Àþ¥ê¥â¡¼¥È¡¦¥³¥ó¥È¥í¡¼¥ë¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/control/lirc/lirc.c:193 modules/gui/beos/InterfaceWindow.cpp:253
-#, fuzzy
-msgid "Quit"
-msgstr "VLC¤ò½ªÎ»"
-
-#: 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/intf.m:921
-#: modules/gui/macosx/intf.m:922 modules/gui/macosx/intf.m:923
-#: modules/gui/pda/interface.c:179 modules/gui/wxwindows/interface.cpp:833
-msgid "Pause"
-msgstr "°ì»þÄä»ß"
-
 #: 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/intf.m:324 modules/gui/macosx/intf.m:362
 #: modules/gui/macosx/intf.m:423 modules/gui/macosx/intf.m:928
 #: modules/gui/macosx/intf.m:929 modules/gui/macosx/intf.m:930
 #: modules/gui/macosx/playlist.m:194 modules/gui/pda/interface.c:192
-#: modules/gui/wxwindows/interface.cpp:375
-#: modules/gui/wxwindows/interface.cpp:839
+#: modules/gui/wxwindows/interface.cpp:371
+#: modules/gui/wxwindows/interface.cpp:878
 msgid "Play"
 msgstr "ºÆÀ¸"
 
+#: modules/control/ntservice.c:39
+msgid "Install NT/2K/XP service"
+msgstr ""
+
+#: modules/control/ntservice.c:41
+msgid "If enabled the interface will install the service and exit."
+msgstr ""
+
+#: modules/control/ntservice.c:42
+msgid "Uninstall NT/2K/XP service"
+msgstr ""
+
+#: modules/control/ntservice.c:44
+msgid "If enabled the interface will uninstall the service and exit."
+msgstr ""
+
+#: modules/control/ntservice.c:45
+msgid "Display name of the service"
+msgstr ""
+
+#: modules/control/ntservice.c:47
+#, fuzzy
+msgid "This allows you to change the display name of the service."
+msgstr ""
+"¥Õ¥¡¥¤¥ë¤ò¸«¤Ä¤±¤ë¤È¤­¤Ë¥ª¡¼¥×¥ó¤µ¤ì¤ë¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Î´ûÄê¤Î¥Ñ¥¹¤òÀßÄꤷ¤Þ"
+"¤¹¡£"
+
+#: modules/control/ntservice.c:50
+#, fuzzy
+msgid ""
+"This option allows you to select additional interfaces spawned by the "
+"service. It should be specified at install time so the service is properly "
+"configured. Use a comma separated list of interface modules. (common values "
+"are: logger,sap,rc,http)"
+msgstr ""
+"»ÈÍѤ¹¤ë¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤¬ÁªÂò²Äǽ¤Ç¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¼«Æ°Åª¤ËºÇŬ¤Ê¥â¥¸¥å¡¼¥ë¤¬"
+"ÁªÂò¤µ¤ì¤Þ¤¹¡£"
+
+#: modules/control/ntservice.c:56
+msgid "Windows NT/2K/XP service interface"
+msgstr ""
+
+#: modules/control/ntservice.c:57
+#, fuzzy
+msgid "NT service"
+msgstr "¥µ¡¼¥Ð¡¼¤Ê¤·"
+
 #: modules/control/rc/rc.c:77
 #, fuzzy
 msgid "Show stream position"
@@ -2523,209 +2812,210 @@ msgstr "
 msgid "remote control interface"
 msgstr "¥ê¥â¡¼¥È¡¦¥³¥ó¥È¥í¡¼¥ë¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/demux/a52sys.c:41
+#: modules/demux/a52sys.c:39
 msgid "A52 demuxer"
 msgstr ""
 
-#: modules/demux/a52sys.c:161
+#: modules/demux/a52sys.c:153
 msgid "A52"
 msgstr ""
 
-#: modules/demux/a52sys.c:163 modules/demux/aac.c:175
-#: modules/demux/mpeg/m4v.c:150 modules/demux/mpeg/mpga.c:331
+#: modules/demux/a52sys.c:155 modules/demux/aac.c:167
+#: modules/demux/mpeg/m4v.c:150 modules/demux/mpeg/mpga.c:321
 #, fuzzy
 msgid "Input Type"
 msgstr "ÆþÎÏ"
 
-#: modules/demux/a52sys.c:164 modules/demux/aac.c:177
-#: modules/demux/asf/asf.c:275 modules/demux/avi/avi.c:1178
-#: modules/demux/mkv.cpp:2453 modules/demux/ogg.c:562 modules/demux/ogg.c:838
-#: modules/demux/ogg.c:1011 modules/gui/gtk/gnome_interface.c:148
+#: modules/demux/a52sys.c:156 modules/demux/aac.c:169
+#: modules/demux/asf/asf.c:412 modules/demux/avi/avi.c:324
+#: modules/demux/mkv.cpp:2382 modules/demux/ogg.c:546 modules/demux/ogg.c:822
+#: modules/demux/ogg.c:995 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:668
+#: modules/gui/gtk/gtk_interface.c:1282 modules/gui/macosx/output.m:160
+#: modules/gui/wxwindows/streamout.cpp:672
 msgid "Channels"
 msgstr "¥Á¥ã¥ó¥Í¥ë"
 
-#: modules/demux/a52sys.c:165 modules/demux/aac.c:179
-#: modules/demux/asf/asf.c:277 modules/demux/avi/avi.c:1180
-#: modules/demux/mkv.cpp:2457 modules/demux/mpeg/mpga.c:337
-#: modules/demux/ogg.c:560 modules/demux/ogg.c:672 modules/demux/ogg.c:833
-#: modules/demux/ogg.c:1006
+#: modules/demux/a52sys.c:157 modules/demux/aac.c:171
+#: modules/demux/asf/asf.c:413 modules/demux/avi/avi.c:326
+#: modules/demux/mkv.cpp:2386 modules/demux/mpeg/mpga.c:327
+#: modules/demux/ogg.c:544 modules/demux/ogg.c:656 modules/demux/ogg.c:817
+#: modules/demux/ogg.c:990
 #, fuzzy
 msgid "Sample Rate"
 msgstr "¥·¥ó¥Ü¥ë¡¦¥ì¡¼¥È"
 
-#: modules/demux/aac.c:41
+#: modules/demux/aac.c:39
 #, fuzzy
 msgid "AAC demuxer"
 msgstr "MPEG 1/2¥ì¥¤¥ä1/2¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
 
-#: modules/demux/aac.c:173
+#: modules/demux/aac.c:165
 msgid "Aac"
 msgstr ""
 
-#: modules/demux/asf/asf.c:48
-msgid "ASF v1.0 demuxer (file only)"
+#: modules/demux/asf/asf.c:42
+#, fuzzy
+msgid "ASF v1.0 demuxer"
+msgstr "MPEG 1/2¥ì¥¤¥ä1/2¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
+
+#: modules/demux/asf/asf.c:360
+msgid "Length"
 msgstr ""
 
-#: modules/demux/asf/asf.c:165 modules/demux/mkv.cpp:2416
+#: modules/demux/asf/asf.c:365 modules/demux/mkv.cpp:2345
 #, fuzzy
 msgid "Number of streams"
 msgstr "¹Ô¿ô"
 
-#: modules/demux/asf/asf.c:228 modules/demux/asf/asf.c:298
-#: modules/demux/avi/avi.c:1172 modules/demux/avi/avi.c:1217
-#: modules/demux/avi/avi.c:1250 modules/demux/mkv.cpp:2449
-#: modules/demux/mkv.cpp:2465 modules/demux/mkv.cpp:2481
-#: modules/demux/ogg.c:558 modules/demux/ogg.c:630 modules/demux/ogg.c:670
-#: modules/demux/ogg.c:735 modules/demux/ogg.c:830 modules/demux/ogg.c:910
-#: modules/demux/ogg.c:1003 modules/gui/macosx/output.m:139
-#: modules/gui/pda/interface.c:372
+#: modules/demux/asf/asf.c:373
+#, fuzzy
+msgid "Author"
+msgstr "ºîÀ®¼Ô"
+
+#: modules/demux/asf/asf.c:375
+#, fuzzy
+msgid "Copyright"
+msgstr "¥³¥Ô¡¼"
+
+#: modules/demux/asf/asf.c:377 modules/gui/gtk/preferences.c:325
+#: modules/gui/kde/pluginsbox.cpp:46
+msgid "Description"
+msgstr "ÀâÌÀ"
+
+#: modules/demux/asf/asf.c:379
+#, fuzzy
+msgid "Rating"
+msgstr "ʸ»úÎó"
+
+#: modules/demux/asf/asf.c:388
+#, fuzzy
+msgid "Stream "
+msgstr "¥¹¥È¥ê¡¼¥à¤ÎÄä»ß"
+
+#: modules/demux/asf/asf.c:394 modules/demux/avi/avi.c:316
+#, fuzzy, c-format
+msgid "Stream %d"
+msgstr "¥¹¥È¥ê¡¼¥à¤ÎÄä»ß"
+
+#: modules/demux/asf/asf.c:397 modules/demux/avi/avi.c:318
+#: modules/demux/avi/avi.c:363 modules/demux/avi/avi.c:388
+#: modules/demux/mkv.cpp:2378 modules/demux/mkv.cpp:2394
+#: modules/demux/mkv.cpp:2410 modules/demux/ogg.c:542 modules/demux/ogg.c:614
+#: modules/demux/ogg.c:654 modules/demux/ogg.c:719 modules/demux/ogg.c:814
+#: modules/demux/ogg.c:894 modules/demux/ogg.c:987
+#: modules/gui/macosx/output.m:141 modules/gui/pda/interface.c:372
 msgid "Type"
 msgstr "¥¿¥¤¥×"
 
-#: modules/demux/asf/asf.c:260 modules/demux/asf/asf.c:314
-#: modules/demux/avi/avi.c:1174 modules/demux/avi/avi.c:1218
-#: modules/demux/mkv.cpp:2450 modules/demux/mkv.cpp:2466
-#: modules/demux/mkv.cpp:2482 modules/demux/ogg.c:559 modules/demux/ogg.c:631
-#: modules/demux/ogg.c:671 modules/demux/ogg.c:736 modules/demux/ogg.c:831
-#: modules/demux/ogg.c:911 modules/demux/ogg.c:1004
+#: modules/demux/asf/asf.c:399 modules/demux/avi/avi.c:320
+#: modules/demux/avi/avi.c:364 modules/demux/mkv.cpp:2379
+#: modules/demux/mkv.cpp:2395 modules/demux/mkv.cpp:2411
+#: modules/demux/ogg.c:543 modules/demux/ogg.c:615 modules/demux/ogg.c:655
+#: modules/demux/ogg.c:720 modules/demux/ogg.c:815 modules/demux/ogg.c:895
+#: modules/demux/ogg.c:988
 #, fuzzy
 msgid "Codec"
 msgstr "ÊĤ¸¤ë"
 
-#: modules/demux/asf/asf.c:279
+#: modules/demux/asf/asf.c:403
+#, fuzzy
+msgid "Codec name"
+msgstr "¥Ç¥Ð¥¤¥¹Ì¾"
+
+#: modules/demux/asf/asf.c:405
+#, fuzzy
+msgid "Codec description"
+msgstr "ÀâÌÀ"
+
+#: modules/demux/asf/asf.c:414
 msgid "Avg. byterate"
 msgstr ""
 
-#: modules/demux/asf/asf.c:282 modules/demux/avi/avi.c:1185
-#: modules/demux/mkv.cpp:2461
+#: modules/demux/asf/asf.c:415 modules/demux/avi/avi.c:331
+#: modules/demux/mkv.cpp:2390
 msgid "Bits Per Sample"
 msgstr ""
 
-#: modules/demux/asf/asf.c:328
-msgid "Size"
-msgstr "¥µ¥¤¥º"
-
-#: modules/demux/asf/asf.c:331 modules/demux/avi/avi.c:1222
-#: modules/demux/mkv.cpp:2469
+#: modules/demux/asf/asf.c:421 modules/demux/avi/avi.c:368
+#: modules/demux/mkv.cpp:2398
 #, fuzzy
 msgid "Resolution"
 msgstr "ÁªÂò"
 
-#: modules/demux/asf/asf.c:333
+#: modules/demux/asf/asf.c:423
 #, fuzzy
 msgid "Planes"
 msgstr "ºÆÀ¸"
 
-#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1228
+#: modules/demux/asf/asf.c:424 modules/demux/avi/avi.c:374
 msgid "Bits Per Pixel"
 msgstr ""
 
-#: modules/demux/asf/asf.c:338
+#: modules/demux/asf/asf.c:425
 #, fuzzy
 msgid "Image Size"
 msgstr "¥µ¥¤¥º"
 
-#: modules/demux/asf/asf.c:340
+#: modules/demux/asf/asf.c:426
 msgid "X pixels per meter"
 msgstr ""
 
-#: modules/demux/asf/asf.c:342
+#: modules/demux/asf/asf.c:428
 msgid "Y pixels per meter"
 msgstr ""
 
-#: modules/demux/asf/libasf.c:614
-#, fuzzy
-msgid "Codec name"
-msgstr "¥Ç¥Ð¥¤¥¹Ì¾"
-
-#: modules/demux/asf/libasf.c:615
-#, fuzzy
-msgid "Codec description"
-msgstr "ÀâÌÀ"
-
-#: modules/demux/asf/libasf.c:695
-msgid "Asf"
-msgstr ""
-
-#: modules/demux/asf/libasf.c:697
-#, fuzzy
-msgid "Author"
-msgstr "ºîÀ®¼Ô"
-
-#: modules/demux/asf/libasf.c:698
-#, fuzzy
-msgid "Copyright"
-msgstr "¥³¥Ô¡¼"
-
-#: modules/demux/asf/libasf.c:699 modules/gui/gtk/preferences.c:325
-#: modules/gui/kde/pluginsbox.cpp:46
-msgid "Description"
-msgstr "ÀâÌÀ"
-
-#: modules/demux/asf/libasf.c:700
-#, fuzzy
-msgid "Rating"
-msgstr "ʸ»úÎó"
-
-#: modules/demux/au.c:42
+#: modules/demux/au.c:41
 msgid "AU demuxer"
 msgstr ""
 
-#: modules/demux/avi/avi.c:60
+#: modules/demux/avi/avi.c:42
 msgid "avi-demuxer"
 msgstr ""
 
-#: modules/demux/avi/avi.c:62 modules/demux/avi/avi.c:63
+#: modules/demux/avi/avi.c:44 modules/demux/avi/avi.c:45
 #, fuzzy
 msgid "force interleaved method"
 msgstr "¥Î¥ó¥¤¥ó¥¿¥ì¡¼¥¹²½¥â¡¼¥É"
 
-#: modules/demux/avi/avi.c:65 modules/demux/avi/avi.c:66
+#: modules/demux/avi/avi.c:47 modules/demux/avi/avi.c:48
 #, fuzzy
 msgid "force index creation"
 msgstr "¥½¡¼¥¹¤Î¥¢¥¹¥Ú¥¯¥È¡¦¥ì¥·¥ª"
 
-#: modules/demux/avi/avi.c:68
+#: modules/demux/avi/avi.c:50
 msgid "AVI demuxer"
 msgstr ""
 
-#: modules/demux/avi/avi.c:1101
+#: modules/demux/avi/avi.c:245
 msgid "Avi"
 msgstr ""
 
-#: modules/demux/avi/avi.c:1102
+#: modules/demux/avi/avi.c:246
 #, fuzzy
 msgid "Number of Streams"
 msgstr "¹Ô¿ô"
 
-#: modules/demux/avi/avi.c:1103
+#: modules/demux/avi/avi.c:247
 #, fuzzy
 msgid "Flags"
 msgstr "ÁáÁ÷¤ê"
 
-#: modules/demux/avi/avi.c:1170
-#, fuzzy, c-format
-msgid "Stream %d"
-msgstr "¥¹¥È¥ê¡¼¥à¤ÎÄä»ß"
-
-#: modules/demux/avi/avi.c:1176 modules/demux/avi/avi.c:1220
+#: modules/demux/avi/avi.c:322 modules/demux/avi/avi.c:366
 msgid "FOURCC"
 msgstr ""
 
-#: modules/demux/avi/avi.c:1187
+#: modules/demux/avi/avi.c:333
 #, fuzzy
 msgid "Audio Bitrate"
 msgstr "¥ª¡¼¥Ç¥£¥ª"
 
-#: modules/demux/avi/avi.c:1225 modules/demux/ogg.c:632
-#: modules/demux/ogg.c:738 modules/demux/ogg.c:913
+#: modules/demux/avi/avi.c:371 modules/demux/ogg.c:616 modules/demux/ogg.c:722
+#: modules/demux/ogg.c:897
 msgid "Frame Rate"
 msgstr ""
 
-#: modules/demux/avi/avi.c:1250
+#: modules/demux/avi/avi.c:388
 msgid "Unknown"
 msgstr ""
 
@@ -2764,80 +3054,74 @@ msgstr ""
 msgid "mka/mkv stream demuxer"
 msgstr "MPEG 1/2¥ì¥¤¥ä1/2¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
 
-#: modules/demux/mkv.cpp:2393 modules/gui/gtk/gnome_interface.c:2436
-#: modules/gui/gtk/gtk_interface.c:2857 modules/gui/wxwindows/playlist.cpp:150
+#: modules/demux/mkv.cpp:2322 modules/gui/gtk/gnome_interface.c:2436
+#: modules/gui/gtk/gtk_interface.c:2857 modules/gui/wxwindows/playlist.cpp:154
 msgid "Duration"
 msgstr "»ý³´ü´Ö"
 
-#: modules/demux/mkv.cpp:2402
+#: modules/demux/mkv.cpp:2331
 msgid "Date UTC"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2406
+#: modules/demux/mkv.cpp:2335
 #, fuzzy
 msgid "Segment Filename"
 msgstr "¥í¥°¡¦¥Õ¥¡¥¤¥ë̾"
 
-#: modules/demux/mkv.cpp:2410
+#: modules/demux/mkv.cpp:2339
 #, fuzzy
 msgid "Muxing Application"
 msgstr "¤³¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ë¤Ä¤¤¤Æ"
 
-#: modules/demux/mkv.cpp:2414
+#: modules/demux/mkv.cpp:2343
 #, fuzzy
 msgid "Writing Application"
 msgstr "¿âľÊý¸þ°ÌÃÖ"
 
-#: modules/demux/mkv.cpp:2427 modules/gui/beos/PlayListWindow.cpp:144
+#: modules/demux/mkv.cpp:2356 modules/gui/beos/PlayListWindow.cpp:144
 #: modules/gui/gtk/preferences.c:325 modules/gui/kde/pluginsbox.cpp:45
 #: modules/gui/pda/interface.c:364
 msgid "Name"
 msgstr "̾Á°"
 
-#: modules/demux/mkv.cpp:2431
+#: modules/demux/mkv.cpp:2360
 #, fuzzy
 msgid "Codec Name"
 msgstr "¥Ç¥Ð¥¤¥¹Ì¾"
 
-#: modules/demux/mkv.cpp:2435
+#: modules/demux/mkv.cpp:2364
 #, fuzzy
 msgid "Codec Setting"
 msgstr "ÀßÄê(_S)"
 
-#: modules/demux/mkv.cpp:2439
+#: modules/demux/mkv.cpp:2368
 #, fuzzy
 msgid "Codec Info"
 msgstr "¥Ç¥Ð¥¤¥¹Ì¾"
 
-#: modules/demux/mkv.cpp:2443
+#: modules/demux/mkv.cpp:2372
 #, fuzzy
 msgid "Codec Download"
 msgstr "¥Ç¥Ð¥¤¥¹Ì¾"
 
-#: modules/demux/mkv.cpp:2473
+#: modules/demux/mkv.cpp:2402
 #, fuzzy
 msgid "Display Resolution"
 msgstr "ÁªÂò"
 
-#: modules/demux/mkv.cpp:2477
+#: modules/demux/mkv.cpp:2406
 msgid "Frame Per Second"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2481 modules/gui/gtk/gnome_interface.c:1963
-#: modules/gui/gtk/gtk_interface.c:2278
-#, fuzzy
-msgid "Subtitle"
-msgstr "»úËë(_S)"
-
-#: modules/demux/mp4/mp4.c:59
+#: modules/demux/mp4/mp4.c:42
 msgid "MP4 demuxer"
 msgstr ""
 
-#: modules/demux/mpeg/es.c:49
+#: modules/demux/mpeg/es.c:48
 msgid "ISO 13818-1 MPEG Elementary Stream input"
 msgstr "ISO 13818-1 MPEG´ðËÜ¥¹¥È¥ê¡¼¥àÆþÎÏ"
 
-#: modules/demux/mpeg/m4v.c:43
+#: modules/demux/mpeg/m4v.c:42
 #, fuzzy
 msgid "MPEG-4 video elementary stream demuxer"
 msgstr "MPEG 1/2¥ì¥¤¥ä1/2¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
@@ -2850,42 +3134,42 @@ msgstr ""
 msgid "Video MPEG-4 (raw ES)"
 msgstr ""
 
-#: modules/demux/mpeg/mpga.c:41
+#: modules/demux/mpeg/mpga.c:39
 #, fuzzy
 msgid "MPEG-I/II Audio demuxer"
 msgstr "MPEG 1/2¥ì¥¤¥ä1/2¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
 
-#: modules/demux/mpeg/mpga.c:330
+#: modules/demux/mpeg/mpga.c:320
 msgid "MPEG"
 msgstr ""
 
-#: modules/demux/mpeg/mpga.c:333
+#: modules/demux/mpeg/mpga.c:323
 msgid "Layer"
 msgstr ""
 
-#: modules/demux/mpeg/mpga.c:335
+#: modules/demux/mpeg/mpga.c:325
 #, fuzzy
 msgid "Mode"
 msgstr "¥â¥¸¥å¡¼¥ë"
 
-#: modules/demux/mpeg/mpga.c:339
+#: modules/demux/mpeg/mpga.c:329
 msgid "Average Bitrate"
 msgstr ""
 
-#: modules/demux/mpeg/ps.c:60
+#: modules/demux/mpeg/ps.c:59
 msgid "ISO 13818-1 MPEG Program Stream input"
 msgstr "ISO 13818-1 MPEG¥×¥í¥°¥é¥à¡¦¥¹¥È¥ê¡¼¥àÆþÎÏ"
 
-#: modules/demux/mpeg/system.c:56
+#: modules/demux/mpeg/system.c:55
 msgid "generic ISO 13818-1 MPEG demultiplexing"
 msgstr "°ìÈÌŪ¤ÊISO 13818-1 MPEG¿½ÅÁ÷¿®"
 
-#: modules/demux/mpeg/ts.c:97
+#: modules/demux/mpeg/ts.c:91
 #, fuzzy
 msgid "Compatibility with pre-0.4 VLS"
 msgstr "0.4°ÊÁ°¤ÎVLS¤È¤Î¸ß´¹"
 
-#: modules/demux/mpeg/ts.c:99
+#: modules/demux/mpeg/ts.c:93
 msgid ""
 "The protocol for transmitting A/52 audio streams changed between VLC 0.3.x "
 "and 0.4. By default VLC assumes you have the latest VLS. In case you're "
@@ -2895,69 +3179,73 @@ msgstr ""
 "¤¿¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢VLC¤ÏºÇ¿·¤Îvls¤òÁÛÄꤷ¤Þ¤¹¡£¤â¤·¡¢¸Å¤¤¥Ð¡¼¥¸¥ç¥ó¤Îvls¤ò»È"
 "ÍѤ·¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤òÁªÂò¤·¤Þ¤¹¡£"
 
-#: modules/demux/mpeg/ts.c:103
+#: modules/demux/mpeg/ts.c:97
 msgid "Buggy PSI"
 msgstr ""
 
-#: modules/demux/mpeg/ts.c:105
+#: modules/demux/mpeg/ts.c:99
 msgid ""
 "If you have a stream whose PSI packets do not feature incremented continuity "
 "counters, select this option."
 msgstr ""
 
-#: modules/demux/mpeg/ts.c:110
+#: modules/demux/mpeg/ts.c:104
 msgid "ISO 13818-1 MPEG Transport Stream input"
 msgstr "ISO 13818-1 MPEGžÁ÷¥¹¥È¥ê¡¼¥àÆþÎÏ"
 
-#: modules/demux/mpeg/ts.c:114
+#: modules/demux/mpeg/ts.c:108
 msgid "ISO 13818-1 MPEG Transport Stream input (libdvbpsi)"
 msgstr "ISO 13818-1 MPEGžÁ÷¥¹¥È¥ê¡¼¥àÆþÎÏ(libdvdpsi)"
 
-#: modules/demux/ogg.c:188
+#: modules/demux/ogg.c:172
 #, fuzzy
 msgid "ogg stream demuxer"
 msgstr "MPEG 1/2¥ì¥¤¥ä1/2¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
 
-#: modules/demux/ogg.c:559
+#: modules/demux/ogg.c:543
 msgid "Vorbis"
 msgstr ""
 
-#: modules/demux/ogg.c:564 modules/demux/ogg.c:634 modules/demux/ogg.c:674
-#: modules/demux/ogg.c:835 modules/demux/ogg.c:1008
+#: modules/demux/ogg.c:548 modules/demux/ogg.c:618 modules/demux/ogg.c:658
+#: modules/demux/ogg.c:819 modules/demux/ogg.c:992
 msgid "Bit Rate"
 msgstr ""
 
-#: modules/demux/ogg.c:631
+#: modules/demux/ogg.c:615
 msgid "Theora"
 msgstr ""
 
-#: modules/demux/ogg.c:671
+#: modules/demux/ogg.c:655
 #, fuzzy
 msgid "tarkin"
 msgstr "ʸ»úÎó"
 
-#: modules/demux/ogg.c:740 modules/demux/ogg.c:915
+#: modules/demux/ogg.c:724 modules/demux/ogg.c:899
 msgid "Bit Count"
 msgstr ""
 
-#: modules/demux/ogg.c:742 modules/demux/ogg.c:917
+#: modules/demux/ogg.c:726 modules/demux/ogg.c:901
 msgid "Width"
 msgstr ""
 
-#: modules/demux/ogg.c:744 modules/demux/ogg.c:919
+#: modules/demux/ogg.c:728 modules/demux/ogg.c:903
 msgid "Height"
 msgstr ""
 
-#: modules/demux/ogg.c:840 modules/demux/ogg.c:1013
+#: modules/demux/ogg.c:824 modules/demux/ogg.c:997
 msgid "Bits per Sample"
 msgstr ""
 
-#: modules/demux/rawdv.c:115
+#: modules/demux/rawdv.c:109
 msgid "raw dv demuxer"
 msgstr ""
 
-#: modules/demux/sdp.c:64
-msgid "SDP demuxer + UDP/RTP/RTSP"
+#: modules/demux/sdp.c:46
+msgid "SDP demuxer/reader"
+msgstr ""
+
+#: modules/demux/sdp.c:56
+msgid "RTSP/RTP describe"
 msgstr ""
 
 #: modules/demux/util/id3.c:44
@@ -3310,30 +3598,15 @@ msgstr ""
 msgid "id3 tag parser using libid3tag"
 msgstr "id3¥¿¥°¥Ñ¡¼¥µ¤Çlibid3tag¤ò»ÈÍÑ"
 
-#: modules/demux/util/sub.c:67
+#: modules/demux/util/sub.c:72
 #, fuzzy
 msgid "Text subtitles demux"
 msgstr "»úËë¤ÎÁªÂò"
 
-#: modules/demux/wav.c:43
+#: modules/demux/wav.c:42
 msgid "WAV demuxer"
 msgstr ""
 
-#: modules/encoder/ffmpeg/encoder.c:51
-#, fuzzy
-msgid "ffmpeg video encoder"
-msgstr "DV¥Ó¥Ç¥ª¡¦¥Ç¥³¡¼¥À"
-
-#: modules/encoder/ffmpeg/encoder.c:62
-#, fuzzy
-msgid "ffmpeg audio encoder"
-msgstr "µ¿»÷AC3¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
-
-#: modules/encoder/xvid.c:58
-#, fuzzy
-msgid "XviD video encoder (MPEG-4)"
-msgstr "DV¥Ó¥Ç¥ª¡¦¥Ç¥³¡¼¥À"
-
 #: modules/gui/beos/BeOS.cpp:55
 #, fuzzy
 msgid "BeOS standard API interface"
@@ -3355,7 +3628,7 @@ msgstr ""
 #: modules/gui/beos/InterfaceWindow.cpp:201
 #: modules/gui/beos/InterfaceWindow.cpp:308 modules/gui/macosx/intf.m:328
 #: modules/gui/macosx/prefs.m:77 modules/gui/pda/interface.c:151
-#: modules/gui/pda/interface.c:152 modules/gui/wxwindows/preferences.cpp:233
+#: modules/gui/pda/interface.c:152 modules/gui/wxwindows/preferences.cpp:216
 msgid "Preferences"
 msgstr "ÀßÄê..."
 
@@ -3364,12 +3637,12 @@ msgstr "
 #: 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:334 modules/gui/macosx/intf.m:411
-#: modules/gui/wxwindows/messages.cpp:83
+#: modules/gui/wxwindows/messages.cpp:65
 msgid "Messages"
 msgstr "¥á¥Ã¥»¡¼¥¸"
 
 #: modules/gui/beos/InterfaceWindow.cpp:238
-#: modules/gui/beos/MediaControlView.cpp:1257
+#: modules/gui/beos/MediaControlView.cpp:1255
 #: modules/gui/beos/PlayListWindow.cpp:82
 #: modules/gui/gtk/gnome_interface.c:503
 #: modules/gui/gtk/gnome_interface.c:1569
@@ -3377,19 +3650,19 @@ msgstr "
 #: 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/macosx/open.m:142 modules/gui/macosx/open.m:263
-#: modules/gui/macosx/output.m:130 modules/gui/macosx/output.m:208
-#: modules/gui/macosx/output.m:300 modules/gui/pda/interface.c:380
-#: modules/gui/wxwindows/interface.cpp:362 modules/gui/wxwindows/open.cpp:253
-#: modules/gui/wxwindows/streamout.cpp:385
+#: modules/gui/macosx/open.m:142 modules/gui/macosx/open.m:261
+#: modules/gui/macosx/output.m:132 modules/gui/macosx/output.m:206
+#: modules/gui/macosx/output.m:303 modules/gui/pda/interface.c:380
+#: modules/gui/wxwindows/interface.cpp:358 modules/gui/wxwindows/open.cpp:271
+#: modules/gui/wxwindows/streamout.cpp:381
 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:331
-#: modules/gui/macosx/open.m:630 modules/gui/macosx/open.m:676
+#: modules/gui/gtk2/gnome2_interface.c:113 modules/gui/macosx/open.m:329
+#: modules/gui/macosx/open.m:628 modules/gui/macosx/open.m:674
 msgid "Open File"
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯"
 
@@ -3458,11 +3731,11 @@ msgstr "
 #: 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/preferences.c:606 modules/gui/macosx/open.m:139
-#: modules/gui/macosx/open.m:180 modules/gui/macosx/output.m:126
-#: modules/gui/wxwindows/open.cpp:244
-#: modules/gui/wxwindows/preferences.cpp:253
-#: modules/gui/wxwindows/streamout.cpp:217
-#: modules/gui/wxwindows/subtitles.cpp:190
+#: modules/gui/macosx/open.m:180 modules/gui/macosx/output.m:128
+#: modules/gui/wxwindows/open.cpp:262
+#: modules/gui/wxwindows/preferences.cpp:236
+#: modules/gui/wxwindows/streamout.cpp:187
+#: modules/gui/wxwindows/subtitles.cpp:176 modules/gui/wxwindows/v4l.cpp:149
 msgid "OK"
 msgstr ""
 
@@ -3480,9 +3753,8 @@ msgid "Drop files to play"
 msgstr ""
 
 #: modules/gui/beos/PlayListWindow.cpp:93
-#: modules/gui/wxwindows/fileinfo.cpp:96
-#: modules/gui/wxwindows/messages.cpp:106
-#: modules/gui/wxwindows/playlist.cpp:156
+#: modules/gui/wxwindows/fileinfo.cpp:80 modules/gui/wxwindows/messages.cpp:90
+#: modules/gui/wxwindows/playlist.cpp:160
 msgid "Close"
 msgstr "ÊĤ¸¤ë"
 
@@ -3549,8 +3821,8 @@ msgstr "Ŭ
 
 #: modules/gui/beos/PreferencesWindow.cpp:224
 #: modules/gui/gtk/preferences.c:597 modules/gui/gtk/preferences.c:614
-#: modules/gui/macosx/output.m:365 modules/gui/macosx/prefs.m:78
-#: modules/gui/wxwindows/preferences.cpp:257
+#: modules/gui/macosx/output.m:370 modules/gui/macosx/prefs.m:78
+#: modules/gui/wxwindows/preferences.cpp:240
 msgid "Save"
 msgstr "Êݸ"
 
@@ -3650,7 +3922,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:255
+#: modules/gui/wxwindows/interface.cpp:251
 #, fuzzy
 msgid "Open a file"
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯"
@@ -3791,7 +4063,7 @@ msgstr "
 
 #: modules/gui/gtk/gnome_interface.c:190 modules/gui/gtk/gnome_interface.c:973
 #: modules/gui/gtk/gtk_interface.c:560 modules/gui/gtk/gtk_interface.c:1356
-#: modules/gui/macosx/output.m:129 modules/gui/macosx/vout.m:199
+#: modules/gui/macosx/output.m:131 modules/gui/macosx/vout.m:225
 msgid "Screen"
 msgstr "¥¹¥¯¥ê¡¼¥ó"
 
@@ -3815,18 +4087,18 @@ msgstr ""
 #: 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:143
-#: modules/gui/macosx/open.m:267 modules/gui/wxwindows/interface.cpp:364
-#: modules/gui/wxwindows/open.cpp:255
+#: modules/gui/macosx/open.m:265 modules/gui/wxwindows/interface.cpp:360
+#: modules/gui/wxwindows/open.cpp:273
 msgid "Disc"
 msgstr "¥Ç¥£¥¹¥¯"
 
 #: modules/gui/gtk/gnome_interface.c:527 modules/gui/gtk/gtk_interface.c:640
-#: modules/gui/wxwindows/interface.cpp:366
+#: modules/gui/wxwindows/interface.cpp:362
 msgid "Net"
 msgstr "Network"
 
 #: modules/gui/gtk/gnome_interface.c:539 modules/gui/gtk/gtk_interface.c:651
-#: modules/gui/wxwindows/interface.cpp:369
+#: modules/gui/wxwindows/interface.cpp:365
 msgid "Sat"
 msgstr "±ÒÀ±"
 
@@ -3844,15 +4116,6 @@ msgstr "
 msgid "Go Backward"
 msgstr "µÕžºÆÀ¸"
 
-#: 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:639
-#: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
-#: modules/gui/macosx/intf.m:424 modules/gui/pda/interface.c:205
-#: modules/gui/wxwindows/interface.cpp:373
-msgid "Stop"
-msgstr "Ää»ß"
-
 #: modules/gui/gtk/gnome_interface.c:567 modules/gui/gtk/gtk_interface.c:677
 msgid "Stop Stream"
 msgstr "¥¹¥È¥ê¡¼¥à¤ÎÄä»ß"
@@ -3897,7 +4160,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:380
+#: modules/gui/wxwindows/interface.cpp:376
 msgid "Prev"
 msgstr "Á°"
 
@@ -3906,15 +4169,6 @@ msgstr "
 msgid "Previous file"
 msgstr "Á°¤Î¥Õ¥¡¥¤¥ë"
 
-#: 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:647
-#: modules/gui/macosx/intf.m:327 modules/gui/macosx/intf.m:367
-#: modules/gui/macosx/intf.m:425 modules/gui/wxwindows/interface.cpp:382
-msgid "Next"
-msgstr "¼¡"
-
 #: modules/gui/gtk/gnome_interface.c:668 modules/gui/gtk/gtk_interface.c:770
 msgid "Next File"
 msgstr "¼¡¤Î¥Õ¥¡¥¤¥ë"
@@ -3995,17 +4249,17 @@ 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:169
+#: modules/gui/macosx/open.m:136 modules/gui/wxwindows/open.cpp:187
 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:173
+#: modules/gui/wxwindows/open.cpp:191
 msgid "Open Target:"
 msgstr "¥¿¡¼¥²¥Ã¥È¤ò³«¤¯"
 
 #: modules/gui/gtk/gnome_interface.c:1518 modules/gui/gtk/gtk_interface.c:1833
-#: modules/gui/wxwindows/open.cpp:188
+#: modules/gui/wxwindows/open.cpp:206
 msgid ""
 "Alternatively, you can build an MRL using one of the following predefined "
 "targets:"
@@ -4017,33 +4271,33 @@ msgstr ""
 #: 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:146
 #: modules/gui/macosx/open.m:152 modules/gui/macosx/open.m:174
-#: modules/gui/macosx/output.m:132 modules/gui/macosx/prefs.m:464
-#: modules/gui/wxwindows/open.cpp:223 modules/gui/wxwindows/open.cpp:341
-#: modules/gui/wxwindows/preferences.cpp:832
-#: modules/gui/wxwindows/streamout.cpp:412
-#: modules/gui/wxwindows/subtitles.cpp:109
+#: modules/gui/macosx/output.m:134 modules/gui/macosx/prefs.m:464
+#: modules/gui/wxwindows/open.cpp:241 modules/gui/wxwindows/open.cpp:371
+#: modules/gui/wxwindows/preferences.cpp:815
+#: modules/gui/wxwindows/streamout.cpp:410
+#: 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:392
+#: modules/gui/wxwindows/open.cpp:422
 msgid "Disc type"
 msgstr "¥Ç¥£¥¹¥¯¡¦¥¿¥¤¥×"
 
 #: modules/gui/gtk/gnome_interface.c:1605 modules/gui/gtk/gtk_interface.c:1920
-#: modules/gui/macosx/open.m:156 modules/gui/macosx/open.m:487
-#: modules/gui/wxwindows/open.cpp:386
+#: modules/gui/macosx/open.m:156 modules/gui/macosx/open.m:485
+#: modules/gui/wxwindows/open.cpp:416
 msgid "DVD"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1613 modules/gui/gtk/gtk_interface.c:1928
-#: modules/gui/macosx/open.m:157 modules/gui/macosx/open.m:381
-#: modules/gui/macosx/open.m:471 modules/gui/wxwindows/open.cpp:387
+#: modules/gui/macosx/open.m:157 modules/gui/macosx/open.m:379
+#: modules/gui/macosx/open.m:469 modules/gui/wxwindows/open.cpp:417
 msgid "VCD"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1621 modules/gui/gtk/gtk_interface.c:1936
-#: modules/gui/macosx/open.m:149 modules/gui/wxwindows/open.cpp:398
+#: modules/gui/macosx/open.m:149 modules/gui/wxwindows/open.cpp:428
 msgid "Device name"
 msgstr "¥Ç¥Ð¥¤¥¹Ì¾"
 
@@ -4053,20 +4307,20 @@ msgid "Use DVD menus"
 msgstr "DVD¥á¥Ë¥å¡¼¤ò»ÈÍÑ"
 
 #: modules/gui/gtk/gnome_interface.c:1707 modules/gui/gtk/gtk_interface.c:2022
-#: modules/gui/macosx/open.m:165 modules/gui/macosx/open.m:546
-#: modules/gui/macosx/open.m:584 modules/gui/wxwindows/open.cpp:433
+#: modules/gui/macosx/open.m:165 modules/gui/macosx/open.m:544
+#: modules/gui/macosx/open.m:582 modules/gui/wxwindows/open.cpp:463
 msgid "UDP/RTP"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1717 modules/gui/gtk/gtk_interface.c:2032
-#: modules/gui/macosx/open.m:166 modules/gui/macosx/open.m:547
-#: modules/gui/macosx/open.m:596 modules/gui/wxwindows/open.cpp:434
+#: modules/gui/macosx/open.m:166 modules/gui/macosx/open.m:545
+#: modules/gui/macosx/open.m:594 modules/gui/wxwindows/open.cpp:464
 msgid "UDP/RTP Multicast"
 msgstr "UDP¥Þ¥ë¥Á¥­¥ã¥¹¥È"
 
 #: modules/gui/gtk/gnome_interface.c:1727 modules/gui/gtk/gtk_interface.c:2042
-#: modules/gui/macosx/open.m:167 modules/gui/macosx/open.m:548
-#: modules/gui/macosx/open.m:609 modules/gui/wxwindows/open.cpp:435
+#: modules/gui/macosx/open.m:167 modules/gui/macosx/open.m:546
+#: modules/gui/macosx/open.m:607 modules/gui/wxwindows/open.cpp:465
 msgid "HTTP/FTP/MMS"
 msgstr ""
 
@@ -4075,29 +4329,29 @@ msgstr ""
 #: 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/macosx/open.m:160 modules/gui/macosx/open.m:162
-#: modules/gui/macosx/output.m:134 modules/gui/pda/interface.c:425
-#: modules/gui/wxwindows/open.cpp:454 modules/gui/wxwindows/open.cpp:477
-#: modules/gui/wxwindows/streamout.cpp:436
+#: modules/gui/macosx/output.m:136 modules/gui/pda/interface.c:425
+#: modules/gui/wxwindows/open.cpp:484 modules/gui/wxwindows/open.cpp:507
+#: modules/gui/wxwindows/streamout.cpp:434
 msgid "Port"
 msgstr "¥Ý¡¼¥ÈÈÖ¹æ"
 
 #: modules/gui/gtk/gnome_interface.c:1747 modules/gui/gtk/gtk_interface.c:2062
-#: modules/gui/macosx/open.m:161 modules/gui/macosx/output.m:133
-#: modules/gui/pda/interface.c:414 modules/gui/wxwindows/open.cpp:469
-#: modules/gui/wxwindows/streamout.cpp:425
+#: modules/gui/macosx/open.m:161 modules/gui/macosx/output.m:135
+#: modules/gui/pda/interface.c:414 modules/gui/wxwindows/open.cpp:499
+#: modules/gui/wxwindows/streamout.cpp:423
 msgid "Address"
 msgstr "¥Û¥¹¥È̾/¥¢¥É¥ì¥¹"
 
 #: modules/gui/gtk/gnome_interface.c:1759 modules/gui/gtk/gtk_interface.c:2074
-#: modules/gui/macosx/open.m:163 modules/gui/wxwindows/open.cpp:492
+#: modules/gui/macosx/open.m:163 modules/gui/wxwindows/open.cpp:522
 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:144
-#: modules/gui/macosx/open.m:271 modules/gui/pda/interface.c:518
-#: modules/gui/wxwindows/open.cpp:257
+#: modules/gui/macosx/open.m:269 modules/gui/pda/interface.c:518
+#: modules/gui/wxwindows/open.cpp:275
 msgid "Network"
 msgstr "¥Í¥Ã¥È¥ï¡¼¥¯"
 
@@ -4106,6 +4360,7 @@ msgid "Symbol Rate"
 msgstr "¥·¥ó¥Ü¥ë¡¦¥ì¡¼¥È"
 
 #: modules/gui/gtk/gnome_interface.c:1857 modules/gui/gtk/gtk_interface.c:2172
+#: modules/gui/wxwindows/v4l.cpp:304
 msgid "Frequency"
 msgstr "¼þÇÈ¿ô"
 
@@ -4126,7 +4381,7 @@ msgid "Horizontal"
 msgstr "¿åÊ¿"
 
 #: modules/gui/gtk/gnome_interface.c:1956 modules/gui/gtk/gtk_interface.c:2271
-#: modules/gui/wxwindows/open.cpp:260
+#: modules/gui/wxwindows/open.cpp:278
 msgid "Satellite"
 msgstr "±ÒÀ±"
 
@@ -4142,8 +4397,8 @@ msgid "fps"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2049 modules/gui/gtk/gtk_interface.c:2369
-#: modules/gui/macosx/open.m:173 modules/gui/macosx/output.m:125
-#: modules/gui/wxwindows/open.cpp:199 modules/gui/wxwindows/open.cpp:354
+#: modules/gui/macosx/open.m:173 modules/gui/macosx/output.m:127
+#: modules/gui/wxwindows/open.cpp:217 modules/gui/wxwindows/open.cpp:384
 #, fuzzy
 msgid "Settings..."
 msgstr "ÀßÄê(_S)"
@@ -4158,7 +4413,7 @@ msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2288
 #: modules/gui/gtk/gnome_interface.c:2429 modules/gui/gtk/gtk_interface.c:2747
-#: modules/gui/wxwindows/playlist.cpp:149
+#: modules/gui/wxwindows/playlist.cpp:153
 msgid "Url"
 msgstr ""
 
@@ -4224,14 +4479,14 @@ msgid "Destination Target: "
 msgstr "Á÷¿®Àè¤Î¥¢¥¹¥Ú¥¯¥È¡¦¥ì¥·¥ª"
 
 #: modules/gui/gtk/gnome_interface.c:2857 modules/gui/gtk/gtk_interface.c:3112
-#: modules/gui/macosx/output.m:137 modules/gui/macosx/output.m:247
-#: modules/gui/macosx/output.m:313 modules/gui/wxwindows/streamout.cpp:387
+#: modules/gui/macosx/output.m:139 modules/gui/macosx/output.m:247
+#: modules/gui/macosx/output.m:316 modules/gui/wxwindows/streamout.cpp:384
 msgid "UDP"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2867 modules/gui/gtk/gtk_interface.c:3122
-#: modules/gui/macosx/output.m:138 modules/gui/macosx/output.m:260
-#: modules/gui/macosx/output.m:323 modules/gui/wxwindows/streamout.cpp:388
+#: modules/gui/macosx/output.m:140 modules/gui/macosx/output.m:261
+#: modules/gui/macosx/output.m:326 modules/gui/wxwindows/streamout.cpp:385
 msgid "RTP"
 msgstr ""
 
@@ -4254,8 +4509,7 @@ msgid "PS"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2972 modules/gui/gtk/gtk_interface.c:3217
-#: modules/gui/macosx/output.m:145 modules/gui/macosx/output.m:293
-#: modules/gui/macosx/output.m:352
+#: modules/gui/macosx/output.m:295 modules/gui/macosx/output.m:355
 msgid "AVI"
 msgstr ""
 
@@ -4350,7 +4604,7 @@ msgstr "
 msgid "the VideoLAN team <videolan@videolan.org>"
 msgstr ""
 
-#: modules/gui/gtk/gtk_interface.c:1777 modules/gui/wxwindows/open.cpp:150
+#: modules/gui/gtk/gtk_interface.c:1777 modules/gui/wxwindows/open.cpp:165
 msgid "Open Target"
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯"
 
@@ -4386,10 +4640,10 @@ msgstr "
 #: modules/gui/gtk/gtk_interface.c:2876 modules/gui/gtk/gtk_interface.c:3257
 #: modules/gui/gtk/preferences.c:618 modules/gui/macosx/open.m:140
 #: modules/gui/macosx/prefs.m:79 modules/gui/macosx/prefs.m:170
-#: modules/gui/wxwindows/open.cpp:247
-#: modules/gui/wxwindows/preferences.cpp:256
-#: modules/gui/wxwindows/streamout.cpp:220
-#: modules/gui/wxwindows/subtitles.cpp:193
+#: modules/gui/wxwindows/open.cpp:265
+#: modules/gui/wxwindows/preferences.cpp:239
+#: modules/gui/wxwindows/streamout.cpp:190
+#: modules/gui/wxwindows/subtitles.cpp:179 modules/gui/wxwindows/v4l.cpp:152
 msgid "Cancel"
 msgstr "¥­¥ã¥ó¥»¥ë"
 
@@ -4467,7 +4721,7 @@ msgstr ""
 msgid "button3"
 msgstr ""
 
-#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:364
+#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:369
 msgid "Save File"
 msgstr "¥Õ¥¡¥¤¥ë¤ÎÊݸ"
 
@@ -4521,7 +4775,7 @@ msgid "Messages:"
 msgstr "¥á¥Ã¥»¡¼¥¸:"
 
 #: modules/gui/kde/preferences.cpp:96
-#: modules/gui/wxwindows/preferences.cpp:398
+#: modules/gui/wxwindows/preferences.cpp:381
 msgid "Plugins"
 msgstr ""
 
@@ -4557,22 +4811,8 @@ msgstr ""
 msgid "Fit To Screen"
 msgstr "¥¹¥¯¥ê¡¼¥ó"
 
-#: modules/gui/macosx/controls.m:625 modules/gui/macosx/intf.m:326
-#: modules/gui/macosx/intf.m:364 modules/gui/wxwindows/interface.cpp:386
-msgid "Faster"
-msgstr "ÁáÁ÷¤ê"
-
-#: modules/gui/macosx/controls.m:626 modules/gui/macosx/intf.m:323
-#: modules/gui/macosx/intf.m:365 modules/gui/wxwindows/interface.cpp:384
-msgid "Slower"
-msgstr "¥¹¥í¡¼"
-
-#: modules/gui/macosx/controls.m:646 modules/gui/macosx/intf.m:322
-#: modules/gui/macosx/intf.m:366 modules/gui/macosx/intf.m:426
-msgid "Previous"
-msgstr "Á°¤Î¥Õ¥¡¥¤¥ë"
-
 #: modules/gui/macosx/controls.m:665 modules/gui/macosx/intf.m:368
+#: modules/gui/wxwindows/playlist.cpp:171
 msgid "Loop"
 msgstr "¥ë¡¼¥×"
 
@@ -4596,9 +4836,8 @@ msgstr ""
 msgid "VLC - Controller"
 msgstr "¥³¥ó¥È¥í¡¼¥ë"
 
-#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/control.cpp:160
-#: modules/gui/wxwindows/control.cpp:370
-#: modules/gui/wxwindows/interface.cpp:904 modules/gui/wxwindows/timer.cpp:131
+#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/interface.cpp:943
+#: modules/gui/wxwindows/timer.cpp:119
 #, fuzzy
 msgid "Volume"
 msgstr "¥Ü¥ê¥å¡¼¥à¤ò¾å¤²¤ë"
@@ -4673,7 +4912,7 @@ msgstr "
 msgid "Paste"
 msgstr "¥Ú¡¼¥¹¥È"
 
-#: modules/gui/macosx/intf.m:358 modules/gui/wxwindows/messages.cpp:111
+#: modules/gui/macosx/intf.m:358 modules/gui/wxwindows/messages.cpp:95
 msgid "Clear"
 msgstr "¥¯¥ê¥¢"
 
@@ -4682,7 +4921,7 @@ msgid "Controls"
 msgstr "¥³¥ó¥È¥í¡¼¥ë"
 
 #: modules/gui/macosx/intf.m:398 modules/gui/macosx/intf.m:399
-#: modules/gui/macosx/macosx.m:47 modules/gui/macosx/vout.m:188
+#: modules/gui/macosx/macosx.m:47 modules/gui/macosx/vout.m:214
 #, fuzzy
 msgid "Video device"
 msgstr "DVD¥Ç¥Ð¥¤¥¹"
@@ -4808,12 +5047,12 @@ msgstr "
 msgid "Treat as a pipe rather than as a file"
 msgstr "¥Õ¥¡¥¤¥ë¤È¤·¤Æ¤Ç¤Ï¤Ê¤¯¡¢¥Ñ¥¤¥×¤È¤·¤Æ°·¤¦"
 
-#: modules/gui/macosx/open.m:155 modules/gui/macosx/open.m:370
+#: modules/gui/macosx/open.m:155 modules/gui/macosx/open.m:368
 msgid "VIDEO_TS folder"
 msgstr "VIDEO_TS¥Õ¥©¥ë¥À"
 
-#: modules/gui/macosx/open.m:158 modules/gui/macosx/open.m:388
-#: modules/gui/macosx/open.m:479
+#: modules/gui/macosx/open.m:158 modules/gui/macosx/open.m:386
+#: modules/gui/macosx/open.m:477
 #, fuzzy
 msgid "Audio CD"
 msgstr "¥ª¡¼¥Ç¥£¥ª"
@@ -4827,93 +5066,91 @@ msgstr "
 msgid "Override"
 msgstr ""
 
-#: modules/gui/macosx/open.m:332 modules/gui/macosx/open.m:526
-#: modules/gui/macosx/open.m:631 modules/gui/macosx/open.m:677
+#: modules/gui/macosx/open.m:330 modules/gui/macosx/open.m:524
+#: modules/gui/macosx/open.m:629 modules/gui/macosx/open.m:675
 msgid "Open"
 msgstr "³«¤¯"
 
-#: modules/gui/macosx/open.m:422 modules/gui/macosx/open.m:474
-#: modules/gui/macosx/open.m:482 modules/gui/macosx/open.m:490
+#: modules/gui/macosx/open.m:420 modules/gui/macosx/open.m:472
+#: modules/gui/macosx/open.m:480 modules/gui/macosx/open.m:488
 msgid "No %@s found"
 msgstr "%@s ¤Ï¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: modules/gui/macosx/open.m:525
+#: modules/gui/macosx/open.m:523
 msgid "Open VIDEO_TS Directory"
 msgstr "VIDEO_TS¥Ç¥£¥ì¥¯¥È¥ê¤ò³«¤¯"
 
-#: modules/gui/macosx/output.m:124
+#: modules/gui/macosx/output.m:126
 #, fuzzy
 msgid "Advanced output:"
 msgstr "ALSA¥ª¡¼¥Ç¥£¥ª¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/gui/macosx/output.m:128
+#: modules/gui/macosx/output.m:130
 msgid "Output Options"
 msgstr ""
 
-#: modules/gui/macosx/output.m:131 modules/gui/macosx/output.m:225
-#: modules/gui/macosx/output.m:306
+#: modules/gui/macosx/output.m:133 modules/gui/macosx/output.m:224
+#: modules/gui/macosx/output.m:309
 #, fuzzy
 msgid "Stream"
 msgstr "¥¹¥È¥ê¡¼¥à¤ÎÄä»ß"
 
-#: modules/gui/macosx/output.m:135
+#: modules/gui/macosx/output.m:137
 msgid "TTL"
 msgstr ""
 
-#: modules/gui/macosx/output.m:136 modules/gui/macosx/output.m:236
-#: modules/gui/macosx/output.m:311 modules/gui/pda/interface.c:480
-#: modules/gui/wxwindows/streamout.cpp:386
+#: modules/gui/macosx/output.m:138 modules/gui/macosx/output.m:235
+#: modules/gui/macosx/output.m:314 modules/gui/pda/interface.c:480
+#: modules/gui/wxwindows/streamout.cpp:382
 msgid "HTTP"
 msgstr ""
 
-#: modules/gui/macosx/output.m:141 modules/gui/wxwindows/streamout.cpp:531
+#: modules/gui/macosx/output.m:143 modules/gui/wxwindows/streamout.cpp:531
 msgid "Encapsulation Method"
 msgstr ""
 
-#: modules/gui/macosx/output.m:142
-msgid "MPEG TS"
-msgstr ""
-
-#: modules/gui/macosx/output.m:143 modules/gui/macosx/output.m:295
-#: modules/gui/macosx/output.m:348
-msgid "MPEG PS"
-msgstr ""
-
-#: modules/gui/macosx/output.m:144 modules/gui/macosx/output.m:297
-#: modules/gui/macosx/output.m:350
-msgid "MPEG1"
-msgstr ""
-
-#: modules/gui/macosx/output.m:146 modules/gui/macosx/output.m:294
-#: modules/gui/macosx/output.m:354
-msgid "Ogg"
-msgstr ""
-
-#: modules/gui/macosx/output.m:149
+#: modules/gui/macosx/output.m:147
 #, fuzzy
 msgid "Transcode options"
 msgstr "¥¹¥È¥ê¡¼¥à¤Î°ì»þÄä»ß"
 
-#: modules/gui/macosx/output.m:153 modules/gui/macosx/output.m:159
-#: modules/gui/wxwindows/streamout.cpp:610
-#: modules/gui/wxwindows/streamout.cpp:662
+#: modules/gui/macosx/output.m:151 modules/gui/macosx/output.m:157
+#: modules/gui/wxwindows/streamout.cpp:614
+#: modules/gui/wxwindows/streamout.cpp:666
 msgid "Bitrate (kb/s)"
 msgstr ""
 
-#: modules/gui/macosx/output.m:166 modules/gui/wxwindows/streamout.cpp:484
+#: modules/gui/macosx/output.m:164 modules/gui/wxwindows/streamout.cpp:481
 #, fuzzy
 msgid "Miscellaneous Options"
 msgstr "¤½¤Î¾"
 
-#: modules/gui/macosx/output.m:167
+#: modules/gui/macosx/output.m:165
 msgid "Announce streams via SAP Channel:"
 msgstr ""
 
-#: modules/gui/macosx/output.m:296 modules/gui/macosx/output.m:356
-msgid "mp4"
+#: modules/gui/macosx/output.m:296 modules/gui/macosx/output.m:357
+msgid "Ogg"
 msgstr ""
 
-#: modules/gui/macosx/prefs.m:80 modules/gui/wxwindows/preferences.cpp:259
+#: modules/gui/macosx/output.m:297 modules/gui/macosx/output.m:351
+msgid "MPEG PS"
+msgstr ""
+
+#: modules/gui/macosx/output.m:298 modules/gui/macosx/output.m:359
+msgid "MPEG4"
+msgstr ""
+
+#: modules/gui/macosx/output.m:299 modules/gui/macosx/output.m:353
+msgid "MPEG1"
+msgstr ""
+
+#: modules/gui/macosx/output.m:300 modules/gui/macosx/output.m:361
+#, fuzzy
+msgid "Quicktime"
+msgstr "VLC¤ò½ªÎ»"
+
+#: modules/gui/macosx/prefs.m:80 modules/gui/wxwindows/preferences.cpp:242
 #, fuzzy
 msgid "Reset All"
 msgstr "¤¹¤Ù¤Æ¤òÁªÂò"
@@ -4932,7 +5169,7 @@ msgstr "
 msgid "Continue"
 msgstr "ÀßÄê"
 
-#: modules/gui/macosx/prefs.m:172 modules/gui/wxwindows/preferences.cpp:316
+#: modules/gui/macosx/prefs.m:172 modules/gui/wxwindows/preferences.cpp:299
 msgid ""
 "Beware this will reset your VLC Media Player config file.\n"
 "Are you sure you want to continue?"
@@ -4942,7 +5179,7 @@ msgstr ""
 msgid "Select file or directory"
 msgstr ""
 
-#: modules/gui/macosx/prefs.m:408 modules/gui/wxwindows/preferences.cpp:767
+#: modules/gui/macosx/prefs.m:408 modules/gui/wxwindows/preferences.cpp:750
 #, fuzzy
 msgid "Default"
 msgstr "ºï½ü"
@@ -4952,10 +5189,10 @@ msgstr "
 msgid "ncurses interface"
 msgstr "ncurses¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/gui/pda/interface.c:126 modules/gui/wxwindows/dialogs.cpp:268
-#: modules/gui/wxwindows/open.cpp:709
-#: modules/gui/wxwindows/preferences.cpp:1029
-#: modules/gui/wxwindows/subtitles.cpp:234
+#: modules/gui/pda/interface.c:126 modules/gui/wxwindows/dialogs.cpp:256
+#: modules/gui/wxwindows/open.cpp:821
+#: modules/gui/wxwindows/preferences.cpp:1034
+#: modules/gui/wxwindows/subtitles.cpp:220
 msgid "Open file"
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯"
 
@@ -5091,7 +5328,7 @@ msgstr "
 msgid "Qt interface"
 msgstr "Qt¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/gui/skins/src/dialogs.cpp:136
+#: modules/gui/skins/src/dialogs.cpp:143
 #, fuzzy
 msgid "Open a skin file"
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯"
@@ -5121,472 +5358,587 @@ msgstr ""
 msgid "Skinnable Interface"
 msgstr "¥á¥¤¥ó¥¦¥£¥ó¥É¥¦¤Îɽ¼¨/Èóɽ¼¨(_I)"
 
-#: modules/gui/wxwindows/fileinfo.cpp:77
+#: modules/gui/wxwindows/fileinfo.cpp:61
 #, fuzzy
 msgid "FileInfo"
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯(_O)..."
 
-#: modules/gui/wxwindows/interface.cpp:256
+#: modules/gui/wxwindows/interface.cpp:252
 #, fuzzy
 msgid "Open a DVD or (S)VCD"
 msgstr "DVD¤Þ¤¿¤ÏVCD¤ò³«¤¯"
 
-#: modules/gui/wxwindows/interface.cpp:257
+#: modules/gui/wxwindows/interface.cpp:253
 #, fuzzy
 msgid "Open a network stream"
 msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¥¹¥È¥ê¡¼¥à¤òÁªÂò¤¹¤ë"
 
-#: modules/gui/wxwindows/interface.cpp:258
+#: modules/gui/wxwindows/interface.cpp:254
 #, fuzzy
 msgid "Open a satellite stream"
 msgstr "±ÒÀ±¥«¡¼¥É¤ò³«¤¯"
 
-#: modules/gui/wxwindows/interface.cpp:259
+#: modules/gui/wxwindows/interface.cpp:255
 msgid "Eject the DVD/CD"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:260
+#: modules/gui/wxwindows/interface.cpp:256
 #, fuzzy
 msgid "Exit this program"
 msgstr "¥×¥í¥°¥é¥à¤Î½ªÎ»"
 
-#: modules/gui/wxwindows/interface.cpp:262
+#: modules/gui/wxwindows/interface.cpp:258
 #, fuzzy
 msgid "Open the playlist"
 msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
 
-#: modules/gui/wxwindows/interface.cpp:263
+#: modules/gui/wxwindows/interface.cpp:259
 #, fuzzy
 msgid "Show the program logs"
 msgstr "¥×¥í¥°¥é¥à¤ÎÁªÂò"
 
-#: modules/gui/wxwindows/interface.cpp:264
+#: modules/gui/wxwindows/interface.cpp:260
 msgid "Show information about the file being played"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:266
+#: modules/gui/wxwindows/interface.cpp:262
 msgid "Go to the preferences menu"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:268
+#: modules/gui/wxwindows/interface.cpp:264
 #, fuzzy
 msgid "About this program"
 msgstr "¥×¥í¥°¥é¥à¤Î½ªÎ»"
 
-#: modules/gui/wxwindows/interface.cpp:272 modules/gui/wxwindows/menus.cpp:108
+#: modules/gui/wxwindows/interface.cpp:268 modules/gui/wxwindows/menus.cpp:92
 #, fuzzy
 msgid "Simple &Open ..."
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯..."
 
-#: modules/gui/wxwindows/interface.cpp:274 modules/gui/wxwindows/menus.cpp:109
+#: modules/gui/wxwindows/interface.cpp:270 modules/gui/wxwindows/menus.cpp:93
 #, fuzzy
 msgid "Open &File..."
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯..."
 
-#: modules/gui/wxwindows/interface.cpp:276 modules/gui/wxwindows/menus.cpp:110
+#: modules/gui/wxwindows/interface.cpp:272 modules/gui/wxwindows/menus.cpp:94
 #, fuzzy
 msgid "Open &Disc..."
 msgstr "¥Ç¥£¥¹¥¯¤ò³«¤¯..."
 
-#: modules/gui/wxwindows/interface.cpp:278 modules/gui/wxwindows/menus.cpp:111
+#: modules/gui/wxwindows/interface.cpp:274 modules/gui/wxwindows/menus.cpp:95
 #, fuzzy
 msgid "Open &Network Stream..."
 msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¥¹¥È¥ê¡¼¥à(_N)..."
 
-#: modules/gui/wxwindows/interface.cpp:281
+#: modules/gui/wxwindows/interface.cpp:277
 #, fuzzy
 msgid "Open &Satellite Stream..."
 msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¥¹¥È¥ê¡¼¥à(_N)..."
 
-#: modules/gui/wxwindows/interface.cpp:286
+#: modules/gui/wxwindows/interface.cpp:282
 #, fuzzy
 msgid "&Eject Disc"
 msgstr "¥Ç¥£¥¹¥¯¤Î¼è½Ð¤·(_E)"
 
-#: modules/gui/wxwindows/interface.cpp:290
+#: modules/gui/wxwindows/interface.cpp:286
 #, fuzzy
 msgid "E&xit"
 msgstr "½ªÎ»(_x)"
 
-#: modules/gui/wxwindows/interface.cpp:294
+#: modules/gui/wxwindows/interface.cpp:290
 #, fuzzy
 msgid "&Playlist..."
 msgstr "¥×¥ì¥¤¥ê¥¹¥È..."
 
-#: modules/gui/wxwindows/interface.cpp:296
+#: modules/gui/wxwindows/interface.cpp:292
 #, fuzzy
 msgid "&Messages..."
 msgstr "¥á¥Ã¥»¡¼¥¸..."
 
-#: modules/gui/wxwindows/interface.cpp:297
+#: modules/gui/wxwindows/interface.cpp:293
 #, fuzzy
 msgid "&File info..."
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯(_O)..."
 
-#: modules/gui/wxwindows/interface.cpp:302
+#: modules/gui/wxwindows/interface.cpp:298
 #, fuzzy
 msgid "&Preferences..."
 msgstr "ÀßÄê(_P)..."
 
-#: modules/gui/wxwindows/interface.cpp:319
+#: modules/gui/wxwindows/interface.cpp:315
 #, fuzzy
 msgid "&About..."
 msgstr "VideoLAN¤Ë¤Ä¤¤¤Æ(_A)..."
 
-#: modules/gui/wxwindows/interface.cpp:323
+#: modules/gui/wxwindows/interface.cpp:319
 #, fuzzy
 msgid "&File"
 msgstr "¥Õ¥¡¥¤¥ë"
 
-#: modules/gui/wxwindows/interface.cpp:324
+#: modules/gui/wxwindows/interface.cpp:320
 #, fuzzy
 msgid "&View"
 msgstr "ɽ¼¨(_V)"
 
-#: modules/gui/wxwindows/interface.cpp:325
+#: modules/gui/wxwindows/interface.cpp:321
 #, fuzzy
 msgid "&Settings"
 msgstr "ÀßÄê(_S)"
 
-#: modules/gui/wxwindows/interface.cpp:326
-#: modules/gui/wxwindows/interface.cpp:482
-#: modules/gui/wxwindows/interface.cpp:530
+#: modules/gui/wxwindows/interface.cpp:322
+#: modules/gui/wxwindows/interface.cpp:515
+#: modules/gui/wxwindows/interface.cpp:563
 #, fuzzy
 msgid "&Audio"
 msgstr "¥ª¡¼¥Ç¥£¥ª"
 
-#: modules/gui/wxwindows/interface.cpp:327
-#: modules/gui/wxwindows/interface.cpp:501
+#: modules/gui/wxwindows/interface.cpp:323
 #: modules/gui/wxwindows/interface.cpp:534
+#: modules/gui/wxwindows/interface.cpp:567
 #, fuzzy
 msgid "&Video"
 msgstr "¥Ó¥Ç¥ª"
 
-#: modules/gui/wxwindows/interface.cpp:328
-#: modules/gui/wxwindows/interface.cpp:520
-#: modules/gui/wxwindows/interface.cpp:538
+#: modules/gui/wxwindows/interface.cpp:324
+#: modules/gui/wxwindows/interface.cpp:553
+#: modules/gui/wxwindows/interface.cpp:571
 #, fuzzy
 msgid "&Navigation"
 msgstr "¥Ê¥Ó¥²¡¼¥·¥ç¥ó(_N)"
 
-#: modules/gui/wxwindows/interface.cpp:329
+#: modules/gui/wxwindows/interface.cpp:325
 #, fuzzy
 msgid "&Help"
 msgstr "¥Ø¥ë¥×(_H)"
 
-#: modules/gui/wxwindows/interface.cpp:345
+#: modules/gui/wxwindows/interface.cpp:341
 #, fuzzy
 msgid "Stop current playlist item"
 msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
 
-#: modules/gui/wxwindows/interface.cpp:346
+#: modules/gui/wxwindows/interface.cpp:342
 msgid "Play current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:347
+#: modules/gui/wxwindows/interface.cpp:343
 msgid "Pause current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:348
-#: modules/gui/wxwindows/playlist.cpp:353
+#: modules/gui/wxwindows/interface.cpp:344
+#: modules/gui/wxwindows/playlist.cpp:397
 #, fuzzy
 msgid "Open playlist"
 msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
 
-#: modules/gui/wxwindows/interface.cpp:349
+#: modules/gui/wxwindows/interface.cpp:345
 #, fuzzy
 msgid "Previous playlist item"
 msgstr "Á°¤Î¥Õ¥¡¥¤¥ë"
 
-#: modules/gui/wxwindows/interface.cpp:350
+#: modules/gui/wxwindows/interface.cpp:346
 #, fuzzy
 msgid "Next playlist item"
 msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
 
-#: modules/gui/wxwindows/interface.cpp:351
+#: modules/gui/wxwindows/interface.cpp:347
 #, fuzzy
 msgid "Play slower"
 msgstr "¥¹¥í¡¼ºÆÀ¸"
 
-#: modules/gui/wxwindows/interface.cpp:352
+#: modules/gui/wxwindows/interface.cpp:348
 #, fuzzy
 msgid "Play faster"
 msgstr "ÁáÁ÷¤êºÆÀ¸"
 
-#: modules/gui/wxwindows/interface.cpp:574
+#: modules/gui/wxwindows/interface.cpp:607
 #, fuzzy
 msgid ""
 " (wxWindows interface)\n"
 "\n"
 msgstr "¥Í¥¤¥Æ¥£¥ÖWindows¥¤¥ó¥¿¥Õ¥§¡¼¥¹"
 
-#: modules/gui/wxwindows/interface.cpp:575
+#: modules/gui/wxwindows/interface.cpp:608
 msgid ""
 "(C) 1996-2003 - the VideoLAN Team\n"
 "\n"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:576
+#: modules/gui/wxwindows/interface.cpp:610
 msgid ""
 "The VideoLAN team <videolan@videolan.org>\n"
 "http://www.videolan.org/\n"
 "\n"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:578
-#, fuzzy
-msgid ""
-"This is the VideoLAN Client, a DVD, MPEG and DivX player.\n"
-"It can play MPEG and MPEG2 files from a file or from a network source."
-msgstr ""
-"¤³¤Î¥½¥Õ¥È¥¦¥§¥¢¤ÏDVD¤ª¤è¤Ó¡¢MPEG¤òºÆÀ¸¤¹¤ëVideoLAN¥¯¥é¥¤¥¢¥ó¥È¤Ç¤¹¡£\n"
-"¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ï¡¢¥Í¥Ã¥È¥ï¡¼¥¯¤«¤éMPEG¤ÈMPEG 2¥Ç¡¼¥¿¤òºÆÀ¸¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
-
-#: modules/gui/wxwindows/interface.cpp:582
+#: modules/gui/wxwindows/interface.cpp:613
 #, fuzzy, c-format
 msgid "About %s"
 msgstr "VideoLAN¤Ë¤Ä¤¤¤Æ"
 
-#: modules/gui/wxwindows/menus.cpp:127
+#: modules/gui/wxwindows/menus.cpp:111
 #, fuzzy
 msgid "Audio menu"
 msgstr "ÀßÄê(_S)"
 
-#: modules/gui/wxwindows/menus.cpp:143
+#: modules/gui/wxwindows/menus.cpp:127
 #, fuzzy
 msgid "Video menu"
 msgstr "ÀßÄê(_S)"
 
-#: modules/gui/wxwindows/menus.cpp:161
+#: modules/gui/wxwindows/menus.cpp:145
 #, fuzzy
 msgid "Input menu"
 msgstr "ÆþÎÏ"
 
-#: modules/gui/wxwindows/menus.cpp:197
-#, fuzzy
-msgid "Close Menu"
-msgstr "¥á¥Ë¥å¡¼¤ò¥¯¥ê¥¢¤¹¤ë"
-
-#: modules/gui/wxwindows/menus.cpp:358
+#: modules/gui/wxwindows/menus.cpp:344
 msgid "Empty"
 msgstr ""
 
-#: modules/gui/wxwindows/messages.cpp:116
+#: modules/gui/wxwindows/messages.cpp:100
 #, fuzzy
 msgid "Save As..."
 msgstr "¥×¥ì¥¤¥ê¥¹¥È..."
 
-#: modules/gui/wxwindows/messages.cpp:121
-msgid "Verbose"
-msgstr ""
-
-#: modules/gui/wxwindows/messages.cpp:222
+#: modules/gui/wxwindows/messages.cpp:204
 msgid "Save Messages As a file..."
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:177
+#: modules/gui/wxwindows/open.cpp:195
 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:195
+#: modules/gui/wxwindows/open.cpp:213
 msgid "Use VLC as a stream server"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:216
+#: modules/gui/wxwindows/open.cpp:234
 #, fuzzy
 msgid "Capture input stream"
 msgstr "¥¹¥È¥ê¡¼¥à¤Î°ì»þÄä»ß"
 
-#: modules/gui/wxwindows/open.cpp:218
+#: modules/gui/wxwindows/open.cpp:236
 msgid "Capture the stream you are playing to a file"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:348 modules/gui/wxwindows/subtitles.cpp:100
+#: modules/gui/wxwindows/open.cpp:281
+#, fuzzy
+msgid "Video For Linux"
+msgstr "ÀßÄê(_S)"
+
+#: modules/gui/wxwindows/open.cpp:378 modules/gui/wxwindows/subtitles.cpp:84
 #, fuzzy
 msgid "Subtitles file"
 msgstr "»úËë"
 
-#: modules/gui/wxwindows/open.cpp:349
+#: modules/gui/wxwindows/open.cpp:379
 msgid "Load an additional subtitles file. Currently only works with AVI files."
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:385
+#: modules/gui/wxwindows/open.cpp:415
 msgid "DVD (menus support)"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:388
+#: modules/gui/wxwindows/open.cpp:418
 #, fuzzy
 msgid "CD Audio"
 msgstr "¥ª¡¼¥Ç¥£¥ª"
 
-#: modules/gui/wxwindows/open.cpp:903 modules/gui/wxwindows/streamout.cpp:784
+#: modules/gui/wxwindows/open.cpp:557
+msgid "WebCam"
+msgstr ""
+
+#: modules/gui/wxwindows/open.cpp:558
+msgid "TV Card"
+msgstr ""
+
+#: modules/gui/wxwindows/open.cpp:559
+msgid "PVR"
+msgstr ""
+
+#: modules/gui/wxwindows/open.cpp:560
+msgid "Kfir"
+msgstr ""
+
+#: modules/gui/wxwindows/open.cpp:564
+#, fuzzy
+msgid "Video Device Type"
+msgstr "DVD¥Ç¥Ð¥¤¥¹"
+
+#: modules/gui/wxwindows/open.cpp:574
+#, fuzzy
+msgid "Video Device"
+msgstr "DVD¥Ç¥Ð¥¤¥¹"
+
+#: modules/gui/wxwindows/open.cpp:582 modules/gui/wxwindows/v4l.cpp:353
+#, fuzzy
+msgid "Channel"
+msgstr "¥Á¥ã¥ó¥Í¥ë"
+
+#: modules/gui/wxwindows/open.cpp:591
+#, fuzzy
+msgid "Advanced Settings..."
+msgstr "ALSA¥ª¡¼¥Ç¥£¥ª¡¦¥â¥¸¥å¡¼¥ë"
+
+#: modules/gui/wxwindows/open.cpp:1063 modules/gui/wxwindows/streamout.cpp:800
 #, fuzzy
 msgid "Save file"
 msgstr "¥Õ¥¡¥¤¥ë¤ÎÊݸ"
 
-#: modules/gui/wxwindows/playlist.cpp:116
+#: modules/gui/wxwindows/playlist.cpp:118
 #, fuzzy
 msgid "&Simple Add..."
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯(_O)..."
 
-#: modules/gui/wxwindows/playlist.cpp:117
+#: modules/gui/wxwindows/playlist.cpp:119
 msgid "&Add MRL..."
 msgstr ""
 
-#: modules/gui/wxwindows/playlist.cpp:118
+#: modules/gui/wxwindows/playlist.cpp:120
+#, fuzzy
+msgid "&Sort"
+msgstr "¥Ý¡¼¥ÈÈÖ¹æ"
+
+#: modules/gui/wxwindows/playlist.cpp:121
+#, fuzzy
+msgid "&Reverse Sort"
+msgstr "¥µ¡¼¥Ð¡¼¡¦¥Ý¡¼¥È"
+
+#: modules/gui/wxwindows/playlist.cpp:122
 #, fuzzy
 msgid "&Open Playlist..."
 msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
 
-#: modules/gui/wxwindows/playlist.cpp:119
+#: modules/gui/wxwindows/playlist.cpp:123
 #, fuzzy
 msgid "&Save Playlist..."
 msgstr "¥×¥ì¥¤¥ê¥¹¥È..."
 
-#: modules/gui/wxwindows/playlist.cpp:121
+#: modules/gui/wxwindows/playlist.cpp:125
 #, fuzzy
 msgid "&Close"
 msgstr "ÊĤ¸¤ë"
 
-#: modules/gui/wxwindows/playlist.cpp:125
+#: modules/gui/wxwindows/playlist.cpp:129
 #, fuzzy
 msgid "&Invert"
 msgstr "µÕž"
 
-#: modules/gui/wxwindows/playlist.cpp:126
+#: modules/gui/wxwindows/playlist.cpp:130
 #, fuzzy
 msgid "&Delete"
 msgstr "ºï½ü"
 
-#: modules/gui/wxwindows/playlist.cpp:127
+#: modules/gui/wxwindows/playlist.cpp:131
 #, fuzzy
 msgid "&Select All"
 msgstr "¤¹¤Ù¤Æ¤òÁªÂò"
 
-#: modules/gui/wxwindows/playlist.cpp:131
+#: modules/gui/wxwindows/playlist.cpp:135
 #, fuzzy
 msgid "&Manage"
 msgstr "¸À¸ì"
 
-#: modules/gui/wxwindows/playlist.cpp:132
+#: modules/gui/wxwindows/playlist.cpp:136
 #, fuzzy
 msgid "&Selection"
 msgstr "ÁªÂò"
 
-#: modules/gui/wxwindows/playlist.cpp:228
+#: modules/gui/wxwindows/playlist.cpp:165
+msgid "Random"
+msgstr ""
+
+#: modules/gui/wxwindows/playlist.cpp:183
+msgid "Search"
+msgstr ""
+
+#: modules/gui/wxwindows/playlist.cpp:272
 msgid "no info"
 msgstr ""
 
-#: modules/gui/wxwindows/playlist.cpp:332
+#: modules/gui/wxwindows/playlist.cpp:376
 #, fuzzy
 msgid "Save playlist"
 msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
 
-#: modules/gui/wxwindows/preferences.cpp:318
+#: modules/gui/wxwindows/preferences.cpp:301
 msgid "Reset config file"
 msgstr ""
 
-#: modules/gui/wxwindows/preferences.cpp:901
+#: modules/gui/wxwindows/preferences.cpp:840
+#, fuzzy
+msgid "Alt"
+msgstr "¤¹¤Ù¤Æ"
+
+#: modules/gui/wxwindows/preferences.cpp:842
+#, fuzzy
+msgid "Ctrl"
+msgstr "¥³¥ó¥È¥í¡¼¥ë"
+
+#: modules/gui/wxwindows/preferences.cpp:844
+msgid "Shift"
+msgstr ""
+
+#: modules/gui/wxwindows/preferences.cpp:906
 #, fuzzy
 msgid "No configuration options available"
 msgstr "¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¡¦¥ª¥×¥·¥ç¥ó¤Ë¥Ä¡¼¥ë¥Á¥Ã¥×¤òɽ¼¨"
 
-#: modules/gui/wxwindows/preferences.cpp:922
+#: modules/gui/wxwindows/preferences.cpp:927
 #, fuzzy
 msgid "Advanced options"
 msgstr "ALSA¥ª¡¼¥Ç¥£¥ª¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/gui/wxwindows/streamout.cpp:186
+#: modules/gui/wxwindows/streamout.cpp:156
 msgid "Stream output MRL"
 msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏMRL"
 
-#: modules/gui/wxwindows/streamout.cpp:190
+#: modules/gui/wxwindows/streamout.cpp:160 modules/gui/wxwindows/v4l.cpp:125
 #, fuzzy
 msgid "Destination Target:"
 msgstr "Á÷¿®Àè¤Î¥¢¥¹¥Ú¥¯¥È¡¦¥ì¥·¥ª"
 
-#: modules/gui/wxwindows/streamout.cpp:193
+#: modules/gui/wxwindows/streamout.cpp:163 modules/gui/wxwindows/v4l.cpp:128
 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:378
+#: modules/gui/wxwindows/streamout.cpp:373
 msgid "Output Methods"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:384
+#: modules/gui/wxwindows/streamout.cpp:380
 #, fuzzy
 msgid "Play locally"
 msgstr "¥¹¥í¡¼ºÆÀ¸"
 
-#: modules/gui/wxwindows/streamout.cpp:408
+#: modules/gui/wxwindows/streamout.cpp:383
+msgid "MMSH"
+msgstr ""
+
+#: modules/gui/wxwindows/streamout.cpp:406
 #, fuzzy
 msgid "Filename"
 msgstr "¥í¥°¡¦¥Õ¥¡¥¤¥ë̾"
 
-#: modules/gui/wxwindows/streamout.cpp:496
+#: modules/gui/wxwindows/streamout.cpp:490
 msgid "SAP Announce"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:498
+#: modules/gui/wxwindows/streamout.cpp:492
+msgid "SLP Announce"
+msgstr ""
+
+#: modules/gui/wxwindows/streamout.cpp:495
 #, fuzzy
-msgid "Channel Name "
+msgid "Channel Name"
 msgstr "¥Á¥ã¥ó¥Í¥ë¡¦¥µ¡¼¥Ð¡¼"
 
-#: modules/gui/wxwindows/streamout.cpp:570
+#: modules/gui/wxwindows/streamout.cpp:573
 #, fuzzy
 msgid "Transcoding options"
 msgstr "»ý³´ü´Ö"
 
-#: modules/gui/wxwindows/streamout.cpp:603
+#: modules/gui/wxwindows/streamout.cpp:607
 #, fuzzy
 msgid "Video codec"
 msgstr "DVD¥Ç¥Ð¥¤¥¹"
 
-#: modules/gui/wxwindows/streamout.cpp:650
+#: modules/gui/wxwindows/streamout.cpp:654
 #, fuzzy
 msgid "Audio codec"
 msgstr "DVD¥Ç¥Ð¥¤¥¹"
 
-#: modules/gui/wxwindows/subtitles.cpp:83
+#: modules/gui/wxwindows/subtitles.cpp:67
 #, fuzzy
 msgid "Open Subtitles File"
 msgstr "»úËë¤ÎÁªÂò"
 
-#: modules/gui/wxwindows/subtitles.cpp:123
+#: modules/gui/wxwindows/subtitles.cpp:107
 #, fuzzy
 msgid "Subtitles encoding"
 msgstr "»úË롦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/gui/wxwindows/subtitles.cpp:155
+#: modules/gui/wxwindows/subtitles.cpp:139
 #, fuzzy
 msgid "Subtitles options"
 msgstr "»úËë"
 
-#: modules/gui/wxwindows/subtitles.cpp:159
+#: modules/gui/wxwindows/subtitles.cpp:143
 #, fuzzy
 msgid "Delay subtitles (in 1/10s)"
 msgstr "»úËë¤ÎÁªÂò"
 
-#: modules/gui/wxwindows/subtitles.cpp:170
+#: modules/gui/wxwindows/subtitles.cpp:155
 msgid "Frames per second"
 msgstr ""
 
-#: modules/gui/wxwindows/subtitles.cpp:178
+#: modules/gui/wxwindows/subtitles.cpp:164
 msgid "Override frames per second. It will only work with MicroDVD subtitles."
 msgstr ""
 
-#: modules/gui/wxwindows/wxwindows.cpp:96
+#: modules/gui/wxwindows/v4l.cpp:106
+#, fuzzy
+msgid "Video Device Advanced Options"
+msgstr "ALSA¥ª¡¼¥Ç¥£¥ª¡¦¥â¥¸¥å¡¼¥ë"
+
+#: modules/gui/wxwindows/v4l.cpp:121
+#, fuzzy
+msgid "Video Device MRL"
+msgstr "DVD¥Ç¥Ð¥¤¥¹"
+
+#: modules/gui/wxwindows/v4l.cpp:247
+msgid "Common Options"
+msgstr ""
+
+#: modules/gui/wxwindows/v4l.cpp:269
+msgid "Size"
+msgstr "¥µ¥¤¥º"
+
+#: modules/gui/wxwindows/v4l.cpp:290
+#, fuzzy
+msgid "Norm"
+msgstr "¤Ê¤·"
+
+#: modules/gui/wxwindows/v4l.cpp:306
+msgid "The frequency in KHz"
+msgstr ""
+
+#: modules/gui/wxwindows/v4l.cpp:335
+#, fuzzy
+msgid "Audio Options"
+msgstr "ÀßÄê(_S)"
+
+#: modules/gui/wxwindows/v4l.cpp:348
+#, fuzzy
+msgid "Audio Device"
+msgstr "DVD¥Ç¥Ð¥¤¥¹"
+
+#: modules/gui/wxwindows/v4l.cpp:384
+#, fuzzy
+msgid "Bitrate Options"
+msgstr "¥¹¥È¥ê¡¼¥à¤Î°ì»þÄä»ß"
+
+#: modules/gui/wxwindows/v4l.cpp:396
+#, fuzzy
+msgid "Bitrate"
+msgstr "¥ª¡¼¥Ç¥£¥ª"
+
+#: modules/gui/wxwindows/v4l.cpp:406
+#, fuzzy
+msgid "Maximum Bitrate"
+msgstr "¥ª¡¼¥Ç¥£¥ª"
+
+#: modules/gui/wxwindows/wxwindows.cpp:84
 #, fuzzy
 msgid "wxWindows interface module"
 msgstr "xosd¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/gui/wxwindows/wxwindows.cpp:105
+#: modules/gui/wxwindows/wxwindows.cpp:93
 #, fuzzy
 msgid "wxWindows dialogs provider"
 msgstr "xosd¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
@@ -5655,30 +6007,30 @@ msgstr "
 msgid "Using the dummy interface plugin..."
 msgstr "¥À¥ß¡¼¤Î¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥×¥é¥°¥¤¥ó¤ò»ÈÍѤ·¤Þ¤¹¡£"
 
-#: modules/misc/freetype.c:72 modules/visualization/xosd/xosd.c:71
+#: modules/misc/freetype.c:74 modules/visualization/xosd/xosd.c:71
 #, fuzzy
 msgid "Font"
 msgstr "¥Õ¥©¥ó¥È"
 
-#: modules/misc/freetype.c:73
+#: modules/misc/freetype.c:75
 #, fuzzy
 msgid "Filename of Font"
 msgstr "¥í¥°¡¦¥Õ¥¡¥¤¥ë̾"
 
-#: modules/misc/freetype.c:74
+#: modules/misc/freetype.c:76
 msgid "Font size"
 msgstr ""
 
-#: modules/misc/freetype.c:75
+#: modules/misc/freetype.c:77
 msgid "The size of the fonts used by the osd module"
 msgstr ""
 
-#: modules/misc/freetype.c:78
+#: modules/misc/freetype.c:82
 #, fuzzy
 msgid "Fonts"
 msgstr "¥Õ¥©¥ó¥È"
 
-#: modules/misc/freetype.c:81
+#: modules/misc/freetype.c:86
 msgid "freetype2 font renderer"
 msgstr ""
 
@@ -5687,7 +6039,7 @@ msgstr ""
 msgid "Gtk+ GUI helper"
 msgstr "Gtk+¥Ø¥ë¥Ñ¡¼¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/misc/httpd.c:94
+#: modules/misc/httpd.c:97
 msgid "HTTP 1.0 daemon"
 msgstr ""
 
@@ -5768,39 +6120,39 @@ msgstr ""
 msgid "Qt Embedded GUI helper"
 msgstr "QTËä¤á¹þ¤ß¥â¥¸¥å¡¼¥ë"
 
-#: modules/misc/sap.c:144 modules/misc/sap.c:145
+#: modules/misc/sap.c:155 modules/misc/sap.c:156
 msgid "SAP multicast address"
 msgstr ""
 
-#: modules/misc/sap.c:146
+#: modules/misc/sap.c:157
 msgid "No IPv4-SAP listening"
 msgstr ""
 
-#: modules/misc/sap.c:147
+#: modules/misc/sap.c:158
 msgid "Set this if you do not want SAP to listen for IPv4 announces"
 msgstr ""
 
-#: modules/misc/sap.c:148
+#: modules/misc/sap.c:159
 msgid "IPv6-SAP listening"
 msgstr ""
 
-#: modules/misc/sap.c:149
+#: modules/misc/sap.c:160
 msgid "Set this if you want SAP to listen for IPv6 announces"
 msgstr ""
 
-#: modules/misc/sap.c:150
+#: modules/misc/sap.c:161
 msgid "IPv6 SAP scope"
 msgstr ""
 
-#: modules/misc/sap.c:151
+#: modules/misc/sap.c:162
 msgid "Sets the scope for IPv6 announces (default is 8)"
 msgstr ""
 
-#: modules/misc/sap.c:154
+#: modules/misc/sap.c:165
 msgid "SAP"
 msgstr ""
 
-#: modules/misc/sap.c:167
+#: modules/misc/sap.c:178
 #, fuzzy
 msgid "SAP interface"
 msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹"
@@ -5818,12 +6170,17 @@ msgstr "C
 msgid "Miscellaneous stress tests"
 msgstr "¤½¤Î¾ Éé²Ù¥Æ¥¹¥È"
 
-#: modules/mux/avi.c:94
+#: modules/mux/asf.c:42
+#, fuzzy
+msgid "Asf muxer"
+msgstr "MPEG 1/2¥ì¥¤¥ä1/2¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
+
+#: modules/mux/avi.c:44
 msgid "Avi muxer"
 msgstr ""
 
-#: modules/mux/dummy.c:60
-msgid "Dummy muxer"
+#: modules/mux/dummy.c:43
+msgid "Dummy/Raw muxer"
 msgstr ""
 
 #: modules/mux/mp4.c:56
@@ -5834,11 +6191,11 @@ msgstr ""
 msgid "PS muxer"
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:78
+#: modules/mux/mpeg/ts.c:80
 msgid "TS muxer"
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:83
+#: modules/mux/mpeg/ts.c:85
 msgid "TS muxer (libdvbpsi)"
 msgstr ""
 
@@ -5846,10 +6203,6 @@ msgstr ""
 msgid "Ogg/ogm muxer"
 msgstr ""
 
-#: modules/packetizer/a52.c:71
-msgid "A/52 audio packetizer"
-msgstr ""
-
 #: modules/packetizer/copy.c:43
 msgid "Copy packetizer"
 msgstr ""
@@ -5862,7 +6215,7 @@ msgstr ""
 msgid "MPEG4 Video packetizer"
 msgstr ""
 
-#: modules/packetizer/mpegaudio.c:70
+#: modules/packetizer/mpegaudio.c:41
 #, fuzzy
 msgid "MPEG-I/II audio packetizer"
 msgstr "MPEG 1/2¥ì¥¤¥ä1/2¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
@@ -5872,11 +6225,6 @@ msgstr "MPEG 1/2
 msgid "MPEG-I/II video packetizer"
 msgstr "MPEG 1/2¥Ó¥Ç¥ª¡¦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/packetizer/vorbis.c:89
-#, fuzzy
-msgid "Vorbis audio packetizer"
-msgstr "»úË롦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
-
 #: modules/stream_out/display.c:50
 #, fuzzy
 msgid "Display stream"
@@ -5897,6 +6245,11 @@ msgstr "
 msgid "ES stream"
 msgstr "¥¹¥È¥ê¡¼¥à¤ÎÄä»ß"
 
+#: modules/stream_out/gather.c:40
+#, fuzzy
+msgid "Gather stream"
+msgstr "¥¹¥È¥ê¡¼¥à¤Î°ì»þÄä»ß"
+
 #: modules/stream_out/standard.c:51
 #, fuzzy
 msgid "Standard stream"
@@ -6221,11 +6574,6 @@ msgstr ""
 msgid "DirectX video output"
 msgstr "DirectX¥Ó¥Ç¥ª¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/video_output/encoder.c:53
-#, fuzzy
-msgid "Encoder wrapper"
-msgstr "¥¨¥ó¥³¡¼¥À"
-
 #: modules/video_output/fb.c:68
 msgid "Frame Buffer"
 msgstr ""
@@ -6239,8 +6587,8 @@ msgstr "
 msgid "Linux console framebuffer video output"
 msgstr "Linux¥³¥ó¥½¡¼¥ë¡¦¥Õ¥ì¡¼¥à¡¦¥Ð¥Ã¥Õ¥¡¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/video_output/ggi.c:56 modules/video_output/mga/xmga.c:96
-#: modules/video_output/x11/x11.c:52 modules/video_output/x11/xvideo.c:58
+#: modules/video_output/ggi.c:56 modules/video_output/x11/x11.c:52
+#: modules/video_output/x11/xvideo.c:58
 msgid "X11 display name"
 msgstr "X11¥Ç¥£¥¹¥×¥ì¥¤Ì¾"
 
@@ -6262,43 +6610,6 @@ msgstr "
 msgid "Matrox Graphic Array video output"
 msgstr "Matrox¥°¥é¥Õ¥£¥Ã¥¯¡¦¥¢¥ì¥¤¡¦¥Ó¥Ç¥ª¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/video_output/mga/xmga.c:87 modules/video_output/x11/x11.c:43
-#: modules/video_output/x11/xvideo.c:49
-#, fuzzy
-msgid "Alternate fullscreen method"
-msgstr "ÂåÂؤ¨¥Õ¥ë¥¹¥¯¥ê¡¼¥ó"
-
-#: modules/video_output/mga/xmga.c:89 modules/video_output/x11/x11.c:45
-#: modules/video_output/x11/xvideo.c:51
-msgid ""
-"There are two ways to make a fullscreen window, unfortunately each one has "
-"its drawbacks.\n"
-"1) Let the window manager handle your fullscreen window (default). But "
-"things like taskbars will likely show on top of the video.\n"
-"2) Completly bypass the window manager, but then nothing will be able to "
-"show on top of the video."
-msgstr ""
-"¥Õ¥ë¥¹¥¯¥ê¡¼¥ó¡¦¥¦¥£¥ó¥É¥¦¤Ë¤¹¤ë¤Ë¤Ï£²¤Ä¤ÎÊýË¡¤¬¤¢¤ê¤Þ¤¹¡£¤¢¤¤¤Ë¤¯¤É¤ì¤â·çÅÀ"
-"¤¬¤¢¤ê¤Þ¤¹¡£\n"
-"1) ¥¦¥£¥ó¥É¥¦¡¦¥Þ¥Í¡¼¥¸¥ã¡¼¤¬À©¸æ¤¹¤ë¥Õ¥ë¥¹¥¯¥ê¡¼¥ó¡¦¥â¡¼¥É\n"
-"   ¥¿¥¹¥¯¥Ð¡¼¤¬¥Ó¥Ç¥ª¤Î¾å¤Ëɽ¼¨¤µ¤ì¤Æ¤·¤Þ¤¤¤Þ¤¹¡£\n"
-"2) ´°Á´¤Ë¥¦¥£¥ó¥É¥¦¡¦¥Þ¥Í¡¼¥¸¥ã¡¼¤ò¥Ð¥¤¥Ñ¥¹¤¹¤ë¥Õ¥ë¥¹¥¯¥ê¡¼¥ó¡¦¥â¡¼¥É\n"
-"   ¥Ó¥Ç¥ª¤Î¾å¤Ë²¿¤âɽ¼¨¤µ¤ì¤Þ¤»¤ó¡£"
-
-#: modules/video_output/mga/xmga.c:98 modules/video_output/x11/x11.c:54
-#: modules/video_output/x11/xvideo.c:60
-msgid ""
-"Specify the X11 hardware display you want to use. By default VLC will use "
-"the value of the DISPLAY environment variable."
-msgstr ""
-"»ÈÍѤ·¤¿¤¤X11¤Î¥Ï¡¼¥É¥¦¥§¥¢¡¦¥Ç¥£¥¹¥×¥ì¥¤¤ò»ØÄꤷ¤Þ¤¹¡£\n"
-"¥Ç¥Õ¥©¥ë¥È¤Ç¤ÏVLC¤Ï¡¢DISPLAY´Ä¶­ÊÑ¿ô¤ËÀßÄꤵ¤ì¤Æ¤¤¤ë¤â¤Î¤ò»ÈÍѤ·¤Þ¤¹¡£"
-
-#: modules/video_output/mga/xmga.c:105
-#, fuzzy
-msgid "X11 MGA video output"
-msgstr "¥ª¡¼¥Ð¡¼¥ì¥¤"
-
 #: modules/video_output/qte/qte.cpp:79
 msgid "QT Embedded display name"
 msgstr "Ëä¤á¹þ¤ßQT¤ÎX11¥Ç¥£¥¹¥×¥ì¥¤Ì¾"
@@ -6331,6 +6642,35 @@ msgstr "
 msgid "Windows GDI video output"
 msgstr "¥Ó¥Ç¥ª½ÐÎϥ⥸¥å¡¼¥ë"
 
+#: modules/video_output/x11/x11.c:43 modules/video_output/x11/xvideo.c:49
+#, fuzzy
+msgid "Alternate fullscreen method"
+msgstr "ÂåÂؤ¨¥Õ¥ë¥¹¥¯¥ê¡¼¥ó"
+
+#: modules/video_output/x11/x11.c:45 modules/video_output/x11/xvideo.c:51
+msgid ""
+"There are two ways to make a fullscreen window, unfortunately each one has "
+"its drawbacks.\n"
+"1) Let the window manager handle your fullscreen window (default). But "
+"things like taskbars will likely show on top of the video.\n"
+"2) Completly bypass the window manager, but then nothing will be able to "
+"show on top of the video."
+msgstr ""
+"¥Õ¥ë¥¹¥¯¥ê¡¼¥ó¡¦¥¦¥£¥ó¥É¥¦¤Ë¤¹¤ë¤Ë¤Ï£²¤Ä¤ÎÊýË¡¤¬¤¢¤ê¤Þ¤¹¡£¤¢¤¤¤Ë¤¯¤É¤ì¤â·çÅÀ"
+"¤¬¤¢¤ê¤Þ¤¹¡£\n"
+"1) ¥¦¥£¥ó¥É¥¦¡¦¥Þ¥Í¡¼¥¸¥ã¡¼¤¬À©¸æ¤¹¤ë¥Õ¥ë¥¹¥¯¥ê¡¼¥ó¡¦¥â¡¼¥É\n"
+"   ¥¿¥¹¥¯¥Ð¡¼¤¬¥Ó¥Ç¥ª¤Î¾å¤Ëɽ¼¨¤µ¤ì¤Æ¤·¤Þ¤¤¤Þ¤¹¡£\n"
+"2) ´°Á´¤Ë¥¦¥£¥ó¥É¥¦¡¦¥Þ¥Í¡¼¥¸¥ã¡¼¤ò¥Ð¥¤¥Ñ¥¹¤¹¤ë¥Õ¥ë¥¹¥¯¥ê¡¼¥ó¡¦¥â¡¼¥É\n"
+"   ¥Ó¥Ç¥ª¤Î¾å¤Ë²¿¤âɽ¼¨¤µ¤ì¤Þ¤»¤ó¡£"
+
+#: modules/video_output/x11/x11.c:54 modules/video_output/x11/xvideo.c:60
+msgid ""
+"Specify the X11 hardware display you want to use. By default VLC will use "
+"the value of the DISPLAY environment variable."
+msgstr ""
+"»ÈÍѤ·¤¿¤¤X11¤Î¥Ï¡¼¥É¥¦¥§¥¢¡¦¥Ç¥£¥¹¥×¥ì¥¤¤ò»ØÄꤷ¤Þ¤¹¡£\n"
+"¥Ç¥Õ¥©¥ë¥È¤Ç¤ÏVLC¤Ï¡¢DISPLAY´Ä¶­ÊÑ¿ô¤ËÀßÄꤵ¤ì¤Æ¤¤¤ë¤â¤Î¤ò»ÈÍѤ·¤Þ¤¹¡£"
+
 #: modules/video_output/x11/x11.c:57 modules/video_output/x11/xvideo.c:68
 #, fuzzy
 msgid "Use shared memory"
@@ -6392,10 +6732,84 @@ msgstr ""
 msgid "XVideo extension video output"
 msgstr "XVideo¥¨¥¯¥¹¥Æ¥ó¥·¥ç¥ó¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/visualization/scope/scope.c:67
+#: modules/visualization/goom.c:50
+#, fuzzy
+msgid "goom effect"
+msgstr "¥¹¥³¡¼¥×¸ú²Ì"
+
+#: modules/visualization/scope/scope.c:65
 msgid "scope effect"
 msgstr "¥¹¥³¡¼¥×¸ú²Ì"
 
+#: modules/visualization/visual/visual.c:43
+#, fuzzy
+msgid "Effects list"
+msgstr "¥Ç¥£¥¹¥¯¤Î¼è½Ð¤·"
+
+#: modules/visualization/visual/visual.c:45
+msgid ""
+"A list of visual effect, separated by commas.\n"
+"Current effects include: dummy, random, scope, spectrum"
+msgstr ""
+
+#: modules/visualization/visual/visual.c:50
+#: modules/visualization/visual/visual.c:54
+msgid "The width of the effects video window, in pixels."
+msgstr ""
+
+#: modules/visualization/visual/visual.c:56
+#, fuzzy
+msgid "Number of bands"
+msgstr "¥¯¥í¡¼¥ó¿ô"
+
+#: modules/visualization/visual/visual.c:58
+msgid "Number of bands used by spectrum analizer, should be 20 or 80"
+msgstr ""
+
+#: modules/visualization/visual/visual.c:60
+msgid "Band separator"
+msgstr ""
+
+#: modules/visualization/visual/visual.c:62
+msgid "Number of blank pixels between bands"
+msgstr ""
+
+#: modules/visualization/visual/visual.c:64
+#, fuzzy
+msgid "Amplification"
+msgstr "¤³¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ë¤Ä¤¤¤Æ"
+
+#: modules/visualization/visual/visual.c:66
+msgid "This is a coefficient that modifies the height of the bands"
+msgstr ""
+
+#: modules/visualization/visual/visual.c:68
+#, fuzzy
+msgid "Enable peaks"
+msgstr "¥Ó¥Ç¥ª¤òÍ­¸ú¤Ë¤¹¤ë"
+
+#: modules/visualization/visual/visual.c:70
+msgid "Defines whether to draw peaks"
+msgstr ""
+
+#: modules/visualization/visual/visual.c:72
+#, fuzzy
+msgid "Number of stars"
+msgstr "¹Ô¿ô"
+
+#: modules/visualization/visual/visual.c:74
+msgid "Defines the number of stars to draw with random effect"
+msgstr ""
+
+#: modules/visualization/visual/visual.c:77
+msgid "visualizer"
+msgstr ""
+
+#: modules/visualization/visual/visual.c:78
+#, fuzzy
+msgid "visualizer filter"
+msgstr "¥Ó¥Ç¥ª¡¦¥Õ¥£¥ë¥¿¡¼¡¦¥â¥¸¥å¡¼¥ë"
+
 #: modules/visualization/xosd/xosd.c:61
 #, fuzzy
 msgid "Flip vertical position"
@@ -6436,6 +6850,51 @@ msgstr "XOSD
 msgid "xosd interface"
 msgstr "xosd¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
 
+#, fuzzy
+#~ msgid "Video encoding codec"
+#~ msgstr "DV¥Ó¥Ç¥ª¡¦¥Ç¥³¡¼¥À"
+
+#, fuzzy
+#~ msgid "Audio encoding codec"
+#~ msgstr "MPEG 1/2¥Ó¥Ç¥ª¡¦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
+
+#, fuzzy
+#~ msgid "Encoders"
+#~ msgstr "¥¨¥ó¥³¡¼¥À"
+
+#, fuzzy
+#~ msgid "ffmpeg video encoder"
+#~ msgstr "DV¥Ó¥Ç¥ª¡¦¥Ç¥³¡¼¥À"
+
+#, fuzzy
+#~ msgid "ffmpeg audio encoder"
+#~ msgstr "µ¿»÷AC3¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
+
+#, fuzzy
+#~ msgid "XviD video encoder (MPEG-4)"
+#~ msgstr "DV¥Ó¥Ç¥ª¡¦¥Ç¥³¡¼¥À"
+
+#, fuzzy
+#~ msgid ""
+#~ "This is the VideoLAN Client, a DVD, MPEG and DivX player.\n"
+#~ "It can play MPEG and MPEG2 files from a file or from a network source."
+#~ msgstr ""
+#~ "¤³¤Î¥½¥Õ¥È¥¦¥§¥¢¤ÏDVD¤ª¤è¤Ó¡¢MPEG¤òºÆÀ¸¤¹¤ëVideoLAN¥¯¥é¥¤¥¢¥ó¥È¤Ç¤¹¡£\n"
+#~ "¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ï¡¢¥Í¥Ã¥È¥ï¡¼¥¯¤«¤éMPEG¤ÈMPEG 2¥Ç¡¼¥¿¤òºÆÀ¸¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ"
+#~ "¤¹¡£"
+
+#, fuzzy
+#~ msgid "Close Menu"
+#~ msgstr "¥á¥Ë¥å¡¼¤ò¥¯¥ê¥¢¤¹¤ë"
+
+#, fuzzy
+#~ msgid "Encoder wrapper"
+#~ msgstr "¥¨¥ó¥³¡¼¥À"
+
+#, fuzzy
+#~ msgid "X11 MGA video output"
+#~ msgstr "¥ª¡¼¥Ð¡¼¥ì¥¤"
+
 #, fuzzy
 #~ msgid "Familiar Linux Gtk+ interface"
 #~ msgstr "Gtk+¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
@@ -6621,10 +7080,6 @@ msgstr "xosd
 #~ msgid "&Jump..."
 #~ msgstr "¥¸¥ã¥ó¥×(_J)..."
 
-#, fuzzy
-#~ msgid "Audio settings"
-#~ msgstr "ÀßÄê(_S)"
-
 #, fuzzy
 #~ msgid "Video settings"
 #~ msgstr "ÀßÄê(_S)"
@@ -6789,12 +7244,6 @@ msgstr "xosd
 #~ msgid "font"
 #~ msgstr "¥Õ¥©¥ó¥È"
 
-#, fuzzy
-#~ msgid "This option allows you to enable the translation of the interface."
-#~ msgstr ""
-#~ "¥Õ¥¡¥¤¥ë¤ò¸«¤Ä¤±¤ë¤È¤­¤Ë¥ª¡¼¥×¥ó¤µ¤ì¤ë¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Î´ûÄê¤Î¥Ñ¥¹¤òÀßÄꤷ¤Þ"
-#~ "¤¹¡£"
-
 #~ msgid "enable network channel mode"
 #~ msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¡¦¥Á¥ã¥ó¥Í¥ë¥â¡¼¥É¤òÍ­¸ú¤Ë¤¹¤ë"