* configure.ac: bumped version number to 0.6.1.

[vlc] / po / ja.po

diff --git a/po/ja.po b/po/ja.po
index d3317ddc22b99c15a4927ce7e6b2346dde756f6c..69e5604d635847117b9add64fa5ad352cf688030 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,7 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vlc\n"
-"POT-Creation-Date: 2003-05-15 17:38+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-07-29 19:02+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"
@@ -12,11 +13,12 @@ msgstr ""
 "Content-Type: text/plain; charset=euc-jp\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: include/interface.h:72
+#: include/vlc_interface.h:105
+#, fuzzy
 msgid ""
 "\n"
 "Warning: if you can't access the GUI anymore, open a dos command box, go to "
-"the directory where you installed VLC and run \"vlc -I win32\"\n"
+"the directory where you installed VLC and run \"vlc -I wxwin\"\n"
 msgstr ""
 "\n"
 "·Ù¹ð¡§¤â¤·¡¢GUI¤¬¥¢¥¯¥»¥¹¤Ç¤­¤Ê¤¤¤Ê¤é¡¢DOS¤Î¥³¥Þ¥ó¥É¡¦¥×¥í¥ó¥×¥È¤ò³«¤¤¤Æ¡¢VLC"
@@ -24,14 +26,15 @@ msgstr ""
 "¤µ¤¤¡£\n"
 
 #: 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
 msgid "Audio channels"
 msgstr "¥ª¡¼¥Ç¥£¥ª¡¦¥Á¥ã¥ó¥Í¥ë¤ÎÁªÂò"
 
 #: src/audio_output/output.c:107 src/audio_output/output.c:142
-#: modules/audio_output/alsa.c:165 modules/audio_output/directx.c:423
+#: modules/audio_output/alsa.c:179 modules/audio_output/directx.c:423
 #: modules/audio_output/oss.c:202 modules/audio_output/sdl.c:181
-#: modules/audio_output/sdl.c:198 modules/audio_output/waveout.c:358
+#: modules/audio_output/sdl.c:198 modules/audio_output/waveout.c:386
 msgid "Stereo"
 msgstr "¥¹¥Æ¥ì¥ª"
 
@@ -106,103 +109,134 @@ msgstr ""
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr ""
 
-#: src/input/input.c:151
+#: src/input/input.c:171
 msgid "General"
 msgstr ""
 
-#: src/input/input.c:152
+#: src/input/input.c:172
 #, fuzzy
 msgid "Playlist Item"
 msgstr "¥ê¥¹¥È"
 
 #: src/input/input_programs.c:94 modules/gui/gtk/gnome_interface.c:1078
 #: modules/gui/gtk/gtk_interface.c:1199 modules/gui/kde/interface.cpp:142
-#: modules/gui/macosx/intf.m:347 modules/gui/macosx/intf.m:348
-#: modules/gui/win32/strings.cpp:85
+#: modules/gui/macosx/intf.m:371 modules/gui/macosx/intf.m:372
 msgid "Program"
 msgstr "¥×¥í¥°¥é¥à"
 
-#: src/input/input_programs.c:97 modules/demux/asf/libasf.c:696
-#: modules/gui/beos/MediaControlView.cpp:1258
+#: src/input/input_programs.c:98 modules/demux/asf/libasf.c:696
+#: modules/demux/mkv.cpp:2394 modules/gui/beos/MediaControlView.cpp:1258
 #: modules/gui/gtk/gnome_interface.c:1650 modules/gui/gtk/gtk_interface.c:1956
 #: modules/gui/gtk/menu.c:1402 modules/gui/gtk/menu.c:1423
-#: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:349
-#: modules/gui/macosx/intf.m:350 modules/gui/macosx/open.m:149
-#: modules/gui/wxwindows/open.cpp:370
+#: 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
 msgid "Title"
 msgstr "¥¿¥¤¥È¥ë"
 
-#: src/input/input_programs.c:100 modules/gui/beos/MediaControlView.cpp:1259
+#: src/input/input_programs.c:102 modules/gui/beos/MediaControlView.cpp:1259
 #: modules/gui/gtk/gnome_interface.c:1640 modules/gui/gtk/gtk_interface.c:1946
 #: modules/gui/gtk/menu.c:1019 modules/gui/gtk/menu.c:1432
-#: modules/gui/kde/interface.cpp:146 modules/gui/macosx/intf.m:351
-#: modules/gui/macosx/intf.m:352 modules/gui/macosx/open.m:150
-#: modules/gui/wxwindows/open.cpp:376
+#: 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
 msgid "Chapter"
 msgstr "¥Á¥ã¥×¥¿¡¼"
 
-#: src/input/input_programs.c:103 modules/gui/beos/InterfaceWindow.cpp:271
-#: modules/gui/win32/strings.cpp:84
+#: src/input/input_programs.c:106 modules/gui/beos/InterfaceWindow.cpp:271
 #, fuzzy
 msgid "Navigation"
 msgstr "¥Ê¥Ó¥²¡¼¥·¥ç¥ó(_N)"
 
-#: src/input/input_programs.c:106
+#: src/input/input_programs.c:110 modules/gui/macosx/intf.m:396
+#: modules/gui/macosx/intf.m:397
 #, fuzzy
 msgid "Video track"
 msgstr "¥Ó¥Ç¥ª"
 
-#: src/input/input_programs.c:109
+#: src/input/input_programs.c:113 modules/gui/macosx/intf.m:382
+#: modules/gui/macosx/intf.m:383
 #, fuzzy
 msgid "Audio track"
 msgstr "¥ª¡¼¥Ç¥£¥ª"
 
-#: src/input/input_programs.c:112
+#: src/input/input_programs.c:116 modules/gui/macosx/intf.m:400
+#: modules/gui/macosx/intf.m:401
 #, fuzzy
-msgid "Subtitle track"
+msgid "Subtitles track"
 msgstr "»úËë(_S)"
 
-#: src/input/input_programs.c:617
+#: src/input/input_programs.c:352 src/input/input_programs.c:354
+#, fuzzy, c-format
+msgid "Title %i"
+msgstr "¥¿¥¤¥È¥ë"
+
+#: src/input/input_programs.c:360 src/input/input_programs.c:367
+#, fuzzy, c-format
+msgid "Chapter %i"
+msgstr "¥Á¥ã¥×¥¿¡¼ %d"
+
+#: src/input/input_programs.c:382
+#, fuzzy
+msgid "Next title"
+msgstr "¼¡¤Î¥Õ¥¡¥¤¥ë"
+
+#: src/input/input_programs.c:385
+#, fuzzy
+msgid "Previous title"
+msgstr "Á°¤Î¥Õ¥¡¥¤¥ë"
+
+#: src/input/input_programs.c:391 modules/gui/beos/InterfaceWindow.cpp:267
+#, fuzzy
+msgid "Next Chapter"
+msgstr "¥Á¥ã¥×¥¿¡¼"
+
+#: src/input/input_programs.c:394
+#, fuzzy
+msgid "Previous Chapter"
+msgstr "¥Á¥ã¥×¥¿¡¼"
+
+#: src/input/input_programs.c:673 src/video_output/video_output.c:419
 msgid "Disable"
 msgstr ""
 
-#: src/input/input_programs.c:629 src/input/input_programs.c:631
+#: src/input/input_programs.c:685 src/input/input_programs.c:687
 #, c-format
 msgid "Track %i"
 msgstr ""
 
-#: src/libvlc.c:255 src/libvlc.c:342
+#: src/libvlc.c:262 src/libvlc.c:349
 msgid "C"
 msgstr "ja"
 
-#: src/libvlc.c:298 src/libvlc.c:1351
+#: src/libvlc.c:305 src/libvlc.c:1368
 #, c-format
 msgid ""
 "Usage: %s [options] [items]...\n"
 "\n"
 msgstr ""
 
-#: src/libvlc.c:1183 src/misc/configuration.c:961
+#: src/libvlc.c:1200 src/misc/configuration.c:1019
 msgid "string"
 msgstr "ʸ»úÎó"
 
-#: src/libvlc.c:1200 src/misc/configuration.c:946
+#: src/libvlc.c:1217 src/misc/configuration.c:1000
 msgid "integer"
 msgstr "À°¿ô"
 
-#: src/libvlc.c:1203 src/misc/configuration.c:953
+#: src/libvlc.c:1220 src/misc/configuration.c:1009
 msgid "float"
 msgstr "ÉâÆ°¾®¿ôÅÀ"
 
-#: src/libvlc.c:1209
+#: src/libvlc.c:1226
 msgid " (default enabled)"
 msgstr " (¥Ç¥Õ¥©¥ë¥È¡§Í­¸ú)"
 
-#: src/libvlc.c:1210
+#: src/libvlc.c:1227
 msgid " (default disabled)"
 msgstr " (¥Ç¥Õ¥©¥ë¥È¡§Ìµ¸ú)"
 
-#: src/libvlc.c:1326 src/libvlc.c:1381 src/libvlc.c:1405
+#: src/libvlc.c:1343 src/libvlc.c:1398 src/libvlc.c:1422
 msgid ""
 "\n"
 "Press the RETURN key to continue...\n"
@@ -210,11 +244,11 @@ msgstr ""
 "\n"
 "³¤±¤ë¤Ë¤ÏEnter¥­¡¼¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: src/libvlc.c:1354
+#: src/libvlc.c:1371
 msgid "[module]              [description]\n"
 msgstr "[¥â¥¸¥å¡¼¥ë]          [ÀâÌÀ]\n"
 
-#: src/libvlc.c:1399
+#: src/libvlc.c:1416
 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"
@@ -226,12 +260,12 @@ msgstr ""
 "COPYING¥Õ¥¡¥¤¥ë¤Ë¾ÜºÙ¤¬½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¤Î¤Ç¡¢»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 "Written by the VideoLAN team at Ecole Centrale, Paris.\n"
 
-#: src/libvlc.h:40
+#: src/libvlc.h:42
 #, fuzzy
 msgid "Interface module"
 msgstr "¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
 
-#: src/libvlc.h:42
+#: src/libvlc.h:44
 msgid ""
 "This option allows you to select the interface used by VLC. The default "
 "behavior is to automatically select the best module available."
@@ -239,48 +273,48 @@ msgstr ""
 "»ÈÍѤ¹¤ë¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤¬ÁªÂò²Äǽ¤Ç¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¼«Æ°Åª¤ËºÇŬ¤Ê¥â¥¸¥å¡¼¥ë¤¬"
 "ÁªÂò¤µ¤ì¤Þ¤¹¡£"
 
-#: src/libvlc.h:46
+#: src/libvlc.h:48
 #, fuzzy
 msgid "Extra interface modules"
 msgstr "Qt¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
 
-#: src/libvlc.h:48
+#: src/libvlc.h:50
 #, fuzzy
 msgid ""
 "This option allows you to select additional interfaces used by VLC. They "
 "will be launched in the background in addition to the default interface. Use "
-"a comma separated list of interface modules."
+"a comma separated list of interface modules. (common values are: logger,"
+"gestures,sap,rc,http,screensaver)"
 msgstr ""
 "»ÈÍѤ¹¤ë¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤¬ÁªÂò²Äǽ¤Ç¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¼«Æ°Åª¤ËºÇŬ¤Ê¥â¥¸¥å¡¼¥ë¤¬"
 "ÁªÂò¤µ¤ì¤Þ¤¹¡£"
 
-#: src/libvlc.h:52
+#: src/libvlc.h:55
 #, fuzzy
 msgid "Verbosity (0,1,2)"
 msgstr "¾éĹ (0,1,2)"
 
-#: src/libvlc.h:54
+#: src/libvlc.h:57
 msgid ""
 "This options sets the verbosity level (0=only errors and standard messages, "
 "1=warnings, 2=debug)."
 msgstr ""
 "¾éĹ¥ì¥Ù¥ë¤ò»ØÄꤷ¤Þ¤¹ (0=¥¨¥é¡¼¤Èɸ½à¥á¥Ã¥»¡¼¥¸¤Î¤ß¡¢1=·Ù¹ð¡¢2=¥Ç¥Ð¥Ã¥°)"
 
-#: src/libvlc.h:57
+#: src/libvlc.h:60
 #, fuzzy
 msgid "Be quiet"
 msgstr "¥¨¥é¡¼¤Î¤ß"
 
-#: src/libvlc.h:59
+#: src/libvlc.h:62
 msgid "This options turns off all warning and information messages."
 msgstr "¤¹¤Ù¤Æ¤Î·Ù¹ð¤È¾ðÊó¥á¥Ã¥»¡¼¥¸¤òÍ޻ߤ·¤Þ¤¹¡£"
 
-#: src/libvlc.h:61 modules/gui/beos/InterfaceWindow.cpp:255
-#: modules/gui/win32/strings.cpp:86
+#: src/libvlc.h:64 modules/gui/beos/InterfaceWindow.cpp:255
 msgid "Language"
 msgstr "¸À¸ì"
 
-#: src/libvlc.h:62
+#: src/libvlc.h:65
 #, fuzzy
 msgid ""
 "This option allows you to set the language of the interface. The system "
@@ -289,12 +323,12 @@ msgstr ""
 "¥Õ¥¡¥¤¥ë¤ò¸«¤Ä¤±¤ë¤È¤­¤Ë¥ª¡¼¥×¥ó¤µ¤ì¤ë¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Î´ûÄê¤Î¥Ñ¥¹¤òÀßÄꤷ¤Þ"
 "¤¹¡£"
 
-#: src/libvlc.h:66
+#: src/libvlc.h:69
 #, fuzzy
 msgid "Color messages"
 msgstr "¥«¥é¡¼¡¦¥á¥Ã¥»¡¼¥¸"
 
-#: src/libvlc.h:68
+#: src/libvlc.h:71
 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."
@@ -302,22 +336,22 @@ msgstr ""
 "¤³¤Î¥ª¥×¥·¥ç¥ó¤òÀßÄꤹ¤ë¤È¡¢¥³¥ó¥½¡¼¥ë¤ËÁ÷¿®¤µ¤ì¤ë¥á¥Ã¥»¡¼¥¸¤Ï¥«¥é¡¼²½¤µ¤ì¤Þ"
 "¤¹¡£¤³¤ÎÆ°ºî¤ÏüËö¤¬Linux¥«¥é¡¼¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£"
 
-#: src/libvlc.h:71
+#: src/libvlc.h:74
 msgid "Show advanced options"
 msgstr ""
 
-#: src/libvlc.h:73
+#: src/libvlc.h:76
 msgid ""
-"When this option is turned on, the interfaces will show all the available "
-"options, including those that most users should never touch"
+"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:76
+#: src/libvlc.h:80
 #, fuzzy
 msgid "Interface default search path"
 msgstr "¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Î´ûÄê¤Î¸¡º÷¥Ñ¥¹"
 
-#: src/libvlc.h:78
+#: src/libvlc.h:82
 msgid ""
 "This option allows you to set the default path that the interface will open "
 "when looking for a file."
@@ -325,24 +359,24 @@ msgstr ""
 "¥Õ¥¡¥¤¥ë¤ò¸«¤Ä¤±¤ë¤È¤­¤Ë¥ª¡¼¥×¥ó¤µ¤ì¤ë¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Î´ûÄê¤Î¥Ñ¥¹¤òÀßÄꤷ¤Þ"
 "¤¹¡£"
 
-#: src/libvlc.h:81
+#: src/libvlc.h:85
 #, fuzzy
 msgid "Plugin search path"
 msgstr "¥×¥é¥°¥¤¥ó¤Î¸¡º÷¥Ñ¥¹"
 
-#: src/libvlc.h:83
+#: src/libvlc.h:87
 #, fuzzy
 msgid ""
 "This option allows you to specify an additional path for VLC to look for its "
 "plugins."
 msgstr "VLC¤¬¥×¥é¥°¥¤¥ó¤ò¸«¤Ä¤±¤ë¤È¤­¤Ë¸¡º÷¤µ¤ì¤ëÄɲäΥѥ¹¤òÀßÄꤷ¤Þ¤¹¡£"
 
-#: src/libvlc.h:86
+#: src/libvlc.h:90
 #, fuzzy
 msgid "Audio output module"
 msgstr "¥ª¡¼¥Ç¥£¥ª½ÐÎϥ⥸¥å¡¼¥ë"
 
-#: src/libvlc.h:88
+#: src/libvlc.h:92
 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."
@@ -350,53 +384,54 @@ msgstr ""
 "¥ª¡¼¥Ç¥£¥ª½ÐÎÏÊýË¡¤¬ÁªÂò²Äǽ¤Ç¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¼«Æ°Åª¤ËºÇŬ¤ÊÊýË¡¤¬ÁªÂò¤µ¤ì¤Þ"
 "¤¹¡£"
 
-#: src/libvlc.h:92
+#: src/libvlc.h:96
 #, fuzzy
 msgid "Enable audio"
 msgstr "¥ª¡¼¥Ç¥£¥ª¤òÍ­¸ú¤Ë¤¹¤ë"
 
-#: src/libvlc.h:94
+#: src/libvlc.h:98
+#, fuzzy
 msgid ""
 "You can completely disable the audio output. In this case the audio decoding "
-"stage won't be done, and it will save some processing power."
+"will not take place, and it will save some processing power."
 msgstr ""
 "¥ª¡¼¥Ç¥£¥ª½ÐÎϤò´°Á´¤Ë̵¸ú¤Ë¤·¤Þ¤¹¡£¥ª¡¼¥Ç¥£¥ª¤Ï¥Ç¥³¡¼¥É¤µ¤ì¤Þ¤»¤ó¡£¤³¤ì¤Ë¤è"
 "¤ê¡¢¤¤¤¯¤é¤«¤Î½èÍý¥Ñ¥ï¡¼¤ò¥»¡¼¥Ö¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
 
-#: src/libvlc.h:97
+#: src/libvlc.h:101
 #, fuzzy
 msgid "Force mono audio"
 msgstr "¥â¥Î¥é¥ë"
 
-#: src/libvlc.h:98
+#: src/libvlc.h:102
 msgid "This will force a mono audio output"
 msgstr "¥ª¡¼¥Ç¥£¥ª½ÐÎϤò¶¯À©Åª¤Ë¥â¥Î¥é¥ë¤Ë¤·¤Þ¤¹¡£"
 
-#: src/libvlc.h:100
+#: src/libvlc.h:104
 #, fuzzy
 msgid "Audio output volume"
 msgstr "¥ª¡¼¥Ç¥£¥ª¡¦¥Ü¥ê¥å¡¼¥à"
 
-#: src/libvlc.h:102
+#: src/libvlc.h:106
 msgid ""
 "You can set the default audio output volume here, in a range from 0 to 1024."
 msgstr "¥ª¡¼¥Ç¥£¥ª¡¦¥Ü¥ê¥å¡¼¥à¤Î´ûÄêÃͤò0¤«¤é1024¤Î´Ö¤ÇÀßÄê²Äǽ¤Ç¤¹¡£"
 
-#: src/libvlc.h:105
+#: src/libvlc.h:109
 #, fuzzy
 msgid "Audio output saved volume"
 msgstr "¥ª¡¼¥Ç¥£¥ª¡¦¥Ü¥ê¥å¡¼¥à"
 
-#: src/libvlc.h:107
+#: src/libvlc.h:111
 msgid "This saves the audio output volume when you select mute."
 msgstr ""
 
-#: src/libvlc.h:109
+#: src/libvlc.h:113
 #, fuzzy
 msgid "Audio output frequency (Hz)"
 msgstr "¥ª¡¼¥Ç¥£¥ª½ÐÎϼþÇÈ¿ô(Hz)"
 
-#: src/libvlc.h:111
+#: src/libvlc.h:115
 #, fuzzy
 msgid ""
 "You can force the audio output frequency here. Common values are -1 "
@@ -405,12 +440,22 @@ msgstr ""
 "¥ª¡¼¥Ç¥£¥ª½ÐÎϤμþÇÈ¿ô¤ò¶¯À©Åª¤ËÀßÄê²Äǽ¤Ç¤¹¡£\n"
 "°ìÈÌŪ¤ÊÃͤϡ¢48000, 44100, 32000, 22050, 16000, 11025, 8000¤Ç¤¹¡£"
 
-#: src/libvlc.h:114
+#: src/libvlc.h:119
+msgid "High quality audio resampling"
+msgstr ""
+
+#: src/libvlc.h:121
+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
 #, fuzzy
 msgid "Compensate desynchronization of audio (in ms)"
 msgstr "Êä½þ¤¹¤ë²»À¼¤Î¥º¥ì(»þ´Ö:ms)"
 
-#: src/libvlc.h:116
+#: src/libvlc.h:127
 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."
@@ -418,11 +463,26 @@ msgstr ""
 "¥ª¡¼¥Ç¥£¥ª½ÐÎϤÎÃÙ¤ì¤òÀßÄꤷ¤Þ¤¹¡£¥Ó¥Ç¥ª¤È²»À¼¤Î¥º¥ì¤¬¤¢¤ë¾ì¹ç¤Ë¤Ï¡¢Å¬ÀÚ¤ÊÃÍ"
 "¤òÀßÄê¤Ç¤­¤Þ¤¹¡£"
 
-#: src/libvlc.h:119
+#: src/libvlc.h:130
+#, fuzzy
+msgid "Choose prefered audio output channels mode"
+msgstr "½àÈ÷¤µ¤ì¤Æ¤¤¤ë¥³¡¼¥Ç¥Ã¥¯¤Î°ìÍ÷¤ÎÁªÂò"
+
+#: src/libvlc.h:132
+#, fuzzy
+msgid ""
+"This option allows you to set the audio output channels mode that will be "
+"used by default when possible (ie. if your hardware supports it as well as "
+"the audio stream being played)"
+msgstr ""
+"¥ª¡¼¥Ç¥£¥ª½ÐÎÏÊýË¡¤¬ÁªÂò²Äǽ¤Ç¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¼«Æ°Åª¤ËºÇŬ¤ÊÊýË¡¤¬ÁªÂò¤µ¤ì¤Þ"
+"¤¹¡£"
+
+#: src/libvlc.h:136
 msgid "Use the S/PDIF audio output when available"
 msgstr ""
 
-#: src/libvlc.h:121
+#: src/libvlc.h:138
 #, fuzzy
 msgid ""
 "This option allows you to use the S/PDIF audio output by default when your "
@@ -431,14 +491,15 @@ msgstr ""
 "¥ª¡¼¥Ç¥£¥ª½ÐÎÏÊýË¡¤¬ÁªÂò²Äǽ¤Ç¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¼«Æ°Åª¤ËºÇŬ¤ÊÊýË¡¤¬ÁªÂò¤µ¤ì¤Þ"
 "¤¹¡£"
 
-#: src/libvlc.h:124
+#: src/libvlc.h:141
 #, fuzzy
 msgid "Headphone virtual spatialization effect"
 msgstr "¥Ø¥Ã¥É¥Û¡¼¥ó¤Î²¾ÁÛŪ¤Ê²»¤Î¹­¤¬¤ê¸ú²Ì"
 
-#: src/libvlc.h:126
+#: src/libvlc.h:143
+#, fuzzy
 msgid ""
-"This effect gives you the feeling that you stands in a real room with a "
+"This effect gives you the feeling that you are standing in a room with a "
 "complete 5.1 speaker set when using only a headphone, providing a more "
 "realistic sound experience. It should also be more comfortable and less "
 "tiring when listening to music for long periods of time.\n"
@@ -450,12 +511,12 @@ msgstr ""
 "¤³¤Îµ¡Ç½¤Ï¡¢¥â¥Î¥é¥ë¤«¤é5.1¥Á¥ã¥ó¥Í¥ë¤Þ¤Ç¤Î¤¹¤Ù¤Æ¤Î¥½¡¼¥¹¡¦¥Õ¥©¡¼¥Þ¥Ã¥È¤ÇÆ°ºî"
 "¤·¤Þ¤¹¡£"
 
-#: src/libvlc.h:133
+#: src/libvlc.h:150
 #, fuzzy
 msgid "Video output module"
 msgstr "¥Ó¥Ç¥ª½ÐÎϥ⥸¥å¡¼¥ë"
 
-#: src/libvlc.h:135
+#: src/libvlc.h:152
 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."
@@ -463,73 +524,63 @@ msgstr ""
 "¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï»ÈÍѤ¹¤ë¥Ó¥Ç¥ª½ÐÎÏÊýË¡¤¬ÁªÂò¤Ç¤­¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¼«Æ°Åª¤ËºÇ"
 "Ŭ¤ÊÊýË¡¤¬ÁªÂò¤µ¤ì¤Þ¤¹¡£"
 
-#: src/libvlc.h:139
+#: src/libvlc.h:156
 #, fuzzy
 msgid "Enable video"
 msgstr "¥Ó¥Ç¥ª¤òÍ­¸ú¤Ë¤¹¤ë"
 
-#: src/libvlc.h:141
+#: src/libvlc.h:158
+#, fuzzy
 msgid ""
 "You can completely disable the video output. In this case the video decoding "
-"stage won't be done, which will save some processing power."
+"stage will not take place, which will save some processing power."
 msgstr ""
 "¥Ó¥Ç¥ª½ÐÎϤò´°Á´¤Ë̵¸ú²½¤·¤Þ¤¹¡£¥Ó¥Ç¥ª¤Ï¥Ç¥³¡¼¥É¤µ¤ì¤Þ¤»¤ó¡£¤³¤ì¤Ë¤è¤ê¡¢¤¤¤¯"
 "¤é¤«¤Î½èÍý¥Ñ¥ï¡¼¤ò¥»¡¼¥Ö¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
 
-#: src/libvlc.h:144
-#, fuzzy
-msgid "Display identifier"
-msgstr "¥Ç¥£¥¹¥×¥ì¥¤Ì¾"
-
-#: src/libvlc.h:146
-msgid ""
-"This is the local display port that will be used for X11 drawing. For "
-"instance :0.1."
-msgstr ""
-"X11¤¬ÉÁ²è¤¹¤ë¥í¡¼¥«¥ë¤Î¥Ç¥£¥¹¥×¥ì¥¤¡¦¥Ý¡¼¥È¤ò»ØÄꤷ¤Þ¤¹¡£¥¤¥ó¥¹¥¿¥ó¥¹¤Ï¡¢:0.1"
-"¤Ç¤¹¡£"
-
-#: src/libvlc.h:149
+#: src/libvlc.h:161
 #, fuzzy
 msgid "Video width"
 msgstr "¥Ó¥Ç¥ª¤ÎÉý"
 
-#: src/libvlc.h:151
+#: src/libvlc.h:163
+#, fuzzy
 msgid ""
-"You can enforce the video width here. By default VLC will adapt to the video "
-"characteristics."
+"You can enforce the video width here. By default (-1) VLC will adapt to the "
+"video characteristics."
 msgstr ""
 "¥Ó¥Ç¥ª¤ÎÉý¤ò¶¯À©Åª¤Ë»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£\n"
 "¢¨VLC¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç¥Ó¥Ç¥ª¤ÎÆÃÀ­¤Ë¹ç¤ï¤»¤Þ¤¹¡£"
 
-#: src/libvlc.h:154
+#: src/libvlc.h:166
 #, fuzzy
 msgid "Video height"
 msgstr "¥Ó¥Ç¥ª¤Î¹â¤µ"
 
-#: src/libvlc.h:156
+#: src/libvlc.h:168
+#, fuzzy
 msgid ""
-"You can enforce the video height here. By default VLC will adapt to the "
+"You can enforce the video height here. By default (-1) VLC will adapt to the "
 "video characteristics."
 msgstr ""
 "¥Ó¥Ç¥ª¤Î¹â¤µ¤ò¶¯À©Åª¤Ë»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£\n"
 "¢¨VLC¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç¥Ó¥Ç¥ª¤ÎÆÃÀ­¤Ë¹ç¤ï¤»¤Þ¤¹¡£"
 
-#: src/libvlc.h:159
+#: src/libvlc.h:171
 #, fuzzy
 msgid "Zoom video"
 msgstr "¥Ó¥Ç¥ª¡¦¥º¡¼¥à"
 
-#: src/libvlc.h:161
+#: src/libvlc.h:173
 msgid "You can zoom the video by the specified factor."
 msgstr "Ǥ°Õ¤Ë¥Ó¥Ç¥ª¤ò¥º¡¼¥à¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
 
-#: src/libvlc.h:163
+#: src/libvlc.h:175
 #, fuzzy
 msgid "Grayscale video output"
 msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
 
-#: src/libvlc.h:165
+#: src/libvlc.h:177
 msgid ""
 "When enabled, the color information from the video won't be decoded (this "
 "can also allow you to save some processing power)."
@@ -537,34 +588,35 @@ msgstr ""
 "¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤È¡¢VLC¤Ï¥«¥é¡¼¾ðÊó¤ò¥Ç¥³¡¼¥É¤·¤Þ¤»¤ó¡£(¤³¤ì¤Ë¤è¤ê¡¢"
 "¤¤¤¯¤é¤«¤Î½èÍý¥Ñ¥ï¡¼¤ò¥»¡¼¥Ö¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£)"
 
-#: src/libvlc.h:168
+#: src/libvlc.h:180
 #, fuzzy
 msgid "Fullscreen video output"
 msgstr "¥Õ¥ë¥¹¥¯¥ê¡¼¥ó½ÐÎÏ"
 
-#: src/libvlc.h:170
+#: src/libvlc.h:182
 msgid ""
 "If this option is enabled, VLC will always start a video in fullscreen mode."
 msgstr ""
 "¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤È¡¢VLC¤Ï¾ï¤Ë¥Ó¥Ç¥ª¤ò¥Õ¥ë¥¹¥¯¥ê¡¼¥ó¡¦¥â¡¼¥É¤Ë¤·¤Þ¤¹¡£"
 
-#: src/libvlc.h:173
+#: src/libvlc.h:185
 #, fuzzy
 msgid "Overlay video output"
 msgstr "¥ª¡¼¥Ð¡¼¥ì¥¤"
 
-#: src/libvlc.h:175
+#: src/libvlc.h:187
+#, fuzzy
 msgid ""
 "If enabled, VLC will try to take advantage of the overlay capabilities of "
-"your graphic card."
+"your graphics card."
 msgstr "VLC¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç¥°¥é¥Õ¥£¥Ã¥¯¥«¡¼¥É¤Î¥ª¡¼¥Ð¥ì¥¤µ¡Ç½¤Î»ÈÍѤò»î¤ß¤Þ¤¹¡£"
 
-#: src/libvlc.h:178
+#: src/libvlc.h:190
 #, fuzzy
 msgid "Force SPU position"
 msgstr "¥µ¥Ö¥¿¥¤¥È¥ë¤Î°ÌÃÖ"
 
-#: src/libvlc.h:180
+#: src/libvlc.h:192
 msgid ""
 "You can use this option to place the subtitles under the movie, instead of "
 "over the movie. Try several positions."
@@ -572,12 +624,12 @@ msgstr ""
 "¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï±ÇÁüÃæ¤Î¥µ¥Ö¥¿¥¤¥È¥ë¤Î°ÌÃÖ¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£¤¤¤¯¤Ä¤«¤Î°ÌÃÖ¤ò»î"
 "¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: src/libvlc.h:183
+#: src/libvlc.h:195
 #, fuzzy
 msgid "Video filter module"
 msgstr "¥Ó¥Ç¥ª¡¦¥Õ¥£¥ë¥¿¡¼¡¦¥â¥¸¥å¡¼¥ë"
 
-#: src/libvlc.h:185
+#: src/libvlc.h:197
 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."
@@ -585,12 +637,12 @@ msgstr ""
 "¥Î¥ó¥¤¥ó¥¿¥ì¡¼¥¹¤Î¥¤¥ó¥¹¥¿¥ó¥¹¤Þ¤¿¤Ï¡¢¥¯¥í¡¼¥ó¡¢ÏѶʲ½¤µ¤ì¤¿¥Ó¥Ç¥ª¡¦¥¦¥£¥ó¥É"
 "¥¦¤Î±ÇÁü¥¯¥©¥ê¥Æ¥£¤Ë¸ú²Ì¤ò²Ã¤¨¤ë¥Õ¥£¥ë¥¿¡¼¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£"
 
-#: src/libvlc.h:189
+#: src/libvlc.h:201
 #, fuzzy
 msgid "Source aspect ratio"
 msgstr "¥½¡¼¥¹¤Î¥¢¥¹¥Ú¥¯¥È¡¦¥ì¥·¥ª"
 
-#: src/libvlc.h:191
+#: src/libvlc.h:203
 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 "
@@ -604,12 +656,12 @@ msgstr ""
 "x:y (4:3, 16:9, etc.)¤Î·Á¼°¤Ç¥¢¥¹¥Ú¥¯¥È¤ò»ØÄꤹ¤ë¤«¡¢ÉâÆ°¾®¿ôÅÀÃÍ (1.25, "
 "1.3333, etc.)¤Î·Á¼°¤Ç¥Ô¥¯¥»¥ë¤Î¶ë·Á¤ò»ØÄꤷ¤Þ¤¹¡£"
 
-#: src/libvlc.h:199
+#: src/libvlc.h:211
 #, fuzzy
 msgid "Destination aspect ratio"
 msgstr "Á÷¿®Àè¤Î¥¢¥¹¥Ú¥¯¥È¡¦¥ì¥·¥ª"
 
-#: src/libvlc.h:201
+#: src/libvlc.h:213
 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 "
@@ -623,20 +675,20 @@ msgstr ""
 "¤¹¤ë¤¿¤á¤Ë»ÈÍѤµ¤ì¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£»ØÄê¤Ç¤­¤ë¥Õ¥©¡¼¥Þ¥Ã¥È¤Ï¡¢ÉâÆ°¾®¿ôÅÀÃÍ "
 "(1, 1.25, 1.3333¤Ê¤É)¤Ç¤¹¡£"
 
-#: src/libvlc.h:208
+#: src/libvlc.h:220
 #, fuzzy
 msgid "Server port"
 msgstr "¥µ¡¼¥Ð¡¼¡¦¥Ý¡¼¥È"
 
-#: src/libvlc.h:210
+#: src/libvlc.h:222
 msgid "This is the port used for UDP streams. By default, we chose 1234."
 msgstr "UDP¥¹¥È¥ê¡¼¥à¤Ç»ÈÍѤµ¤ì¤ë¥Ý¡¼¥È¤ò»ØÄꤷ¤Þ¤¹¡£´ûÄêÃͤÏ1234¤Ç¤¹¡£"
 
-#: src/libvlc.h:212
+#: src/libvlc.h:224
 msgid "MTU of the network interface"
 msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ÎMTU"
 
-#: src/libvlc.h:214
+#: src/libvlc.h:226
 msgid ""
 "This is the typical size of UDP packets that we expect. On Ethernet it is "
 "usually 1500."
@@ -644,12 +696,12 @@ msgstr ""
 "´üÂÔ¤¹¤ëŵ·¿Åª¤ÊUDP¥Ñ¥±¥Ã¥È¤Î¥µ¥¤¥º¤Ç¤¹¡£¥¤¡¼¥µ¥Í¥Ã¥È¤Ç¤Ï¡¢¤½¤ÎÃͤϡ¢Ä̾ï1500"
 "¤Ç¤¹¡£"
 
-#: src/libvlc.h:217
+#: src/libvlc.h:229
 #, fuzzy
 msgid "Network interface address"
 msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹"
 
-#: src/libvlc.h:219
+#: src/libvlc.h:231
 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 "
@@ -659,62 +711,64 @@ msgstr ""
 "¥ê¥å¡¼¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¾ì¹ç¤Ë¤Ï¡¢¤ª¤½¤é¤¯¡¢IP¥¢¥É¥ì¥¹¤«¥Þ¥ë¥Á¥­¥ã¥¹¥È¤ò¹Ô¤Ã¤Æ"
 "¤¤¤ë¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ò»ØÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£"
 
-#: src/libvlc.h:223
+#: src/libvlc.h:235
 msgid "Time to live"
 msgstr ""
 
-#: src/libvlc.h:225
+#: src/libvlc.h:237
 msgid ""
 "Indicate here the Time To Live of the multicast packets sent by the stream "
 "output."
 msgstr ""
 
-#: src/libvlc.h:228
+#: src/libvlc.h:240
 #, fuzzy
 msgid "Choose program (SID)"
 msgstr "¥×¥í¥°¥é¥à¤ÎÁªÂò (SID)"
 
-#: src/libvlc.h:230
+#: src/libvlc.h:242
 msgid "Choose the program to select by giving its Service ID."
 msgstr "Í¿¤¨¤é¤ì¤¿¥µ¡¼¥Ó¥¹ID¤òÁªÂò¤¹¤ë¤¿¤á¤Î¥×¥í¥°¥é¥à¤ò»ØÄꤷ¤Þ¤¹¡£"
 
-#: src/libvlc.h:232
+#: src/libvlc.h:244
 #, fuzzy
 msgid "Choose audio"
 msgstr "¥ª¡¼¥Ç¥£¥ª¤ÎÁªÂò"
 
-#: src/libvlc.h:234
-msgid "Give the default type of audio you want to use in a DVD."
+#: src/libvlc.h:246
+#, fuzzy
+msgid ""
+"Give the default type of audio you want to use in a DVD. (Developers only)"
 msgstr "DVD¤ÎÃæ¤Ç»ÈÍѤ·¤¿¤¤¥ª¡¼¥Ç¥£¥ª¤Î´ûÄê¤Î¥¿¥¤¥×¤ò»ØÄꤷ¤Þ¤¹¡£"
 
-#: src/libvlc.h:236
+#: src/libvlc.h:249
 #, fuzzy
 msgid "Choose channel"
 msgstr "¥Á¥ã¥ó¥Í¥ë¤ÎÁªÂò"
 
-#: src/libvlc.h:238
+#: src/libvlc.h:251
 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:241
+#: src/libvlc.h:254
 #, fuzzy
 msgid "Choose subtitles"
 msgstr "»úËë¤ÎÁªÂò"
 
-#: src/libvlc.h:243
+#: src/libvlc.h:256
 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:246
+#: src/libvlc.h:259
 msgid "DVD device"
 msgstr "DVD¥Ç¥Ð¥¤¥¹"
 
-#: src/libvlc.h:249
+#: src/libvlc.h:262
 msgid ""
 "This is the default DVD drive (or file) to use. Don't forget the colon after "
 "the drive letter (eg D:)"
@@ -722,24 +776,24 @@ msgstr ""
 "»ÈÍѤ¹¤ë´ûÄê¤ÎDVD¥É¥é¥¤¥Ö(¤Þ¤¿¤Ï¥Õ¥¡¥¤¥ë)¤Ç¤¹¡£¥É¥é¥¤¥Öʸ»ú¤Î¸å¤Ë¥³¥í¥ó¤òÉÕ²Ã"
 "¤¹¤ë¤³¤È¤ò˺¤ì¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£(Îã D:)"
 
-#: src/libvlc.h:253
+#: src/libvlc.h:266
 msgid "This is the default DVD device to use."
 msgstr "DVD¥Ç¥Ð¥¤¥¹¤Î´ûÄêÃͤòÀßÄꤷ¤Þ¤¹¡£"
 
-#: src/libvlc.h:256
+#: src/libvlc.h:269
 msgid "VCD device"
 msgstr "VCD¥Ç¥Ð¥¤¥¹"
 
-#: src/libvlc.h:258
+#: src/libvlc.h:271
 msgid "This is the default VCD device to use."
 msgstr "VCD¥Ç¥Ð¥¤¥¹¤Î´ûÄêÃͤò»ØÄꤷ¤Þ¤¹¡£"
 
-#: src/libvlc.h:260
+#: src/libvlc.h:273
 #, fuzzy
 msgid "Force IPv6"
 msgstr "IPv6¤Î»ÈÍÑ"
 
-#: src/libvlc.h:262
+#: src/libvlc.h:275
 msgid ""
 "If you check this box, IPv6 will be used by default for all UDP and HTTP "
 "connections."
@@ -747,12 +801,12 @@ msgstr ""
 "¤³¤Î¥Á¥§¥Ã¥¯¥Ü¥Ã¥¯¥¹¤ò¥ª¥ó¤Ë¤¹¤ë¤È¡¢IPv6¤¬¤¹¤Ù¤Æ¤ÎUDP¤ÈHTTP¤ÎÀܳ¤Ç´ûÄêÃͤȤ·"
 "¤Æ»ÈÍѤµ¤ì¤Þ¤¹¡£"
 
-#: src/libvlc.h:265
+#: src/libvlc.h:278
 #, fuzzy
 msgid "Force IPv4"
 msgstr "IPv4¤Î»ÈÍÑ"
 
-#: src/libvlc.h:267
+#: src/libvlc.h:280
 msgid ""
 "If you check this box, IPv4 will be used by default for all UDP and HTTP "
 "connections."
@@ -760,12 +814,12 @@ msgstr ""
 "¤³¤Î¥Á¥§¥Ã¥¯¥Ü¥Ã¥¯¥¹¤ò¥ª¥ó¤Ë¤¹¤ë¤È¡¢IPv4¤¬¤¹¤Ù¤Æ¤ÎUDP¤ÈHTTP¤ÎÀܳ¤Ç´ûÄêÃͤȤ·"
 "¤Æ»ÈÍѤµ¤ì¤Þ¤¹¡£"
 
-#: src/libvlc.h:270
+#: src/libvlc.h:283
 #, fuzzy
 msgid "Choose preferred codec list"
 msgstr "½àÈ÷¤µ¤ì¤Æ¤¤¤ë¥³¡¼¥Ç¥Ã¥¯¤Î°ìÍ÷¤ÎÁªÂò"
 
-#: src/libvlc.h:272
+#: src/libvlc.h:285
 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. "
@@ -779,46 +833,46 @@ msgstr ""
 "¥×¤¬»ØÄꤵ¤ì¤Ê¤«¤Ã¤¿¾ì¹ç¤Î¥Õ¥©¡¼¥ë¥Ð¥Ã¥¯¤Î¤¿¤á¤Ë¡¢¥ê¥¹¥È¤ÎºÇ¸å¤Ë¾ï¤Ë'any'¤ò»Ø"
 "Äꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£"
 
-#: src/libvlc.h:279
+#: src/libvlc.h:292
 #, fuzzy
 msgid "Choose preferred video encoder list"
 msgstr "½àÈ÷¤µ¤ì¤Æ¤¤¤ë¥³¡¼¥Ç¥Ã¥¯¤Î°ìÍ÷¤ÎÁªÂò"
 
-#: src/libvlc.h:281 src/libvlc.h:285
+#: src/libvlc.h:294 src/libvlc.h:298
 #, fuzzy
 msgid ""
 "This allows you to select the order in which VLC will choose its codecs. "
 msgstr "VLC¤¬ÁªÂò¤¹¤ë¥Ñ¥±¥Ã¥¿¥é¥¤¥¶¡¼¤Î½ç½ø¤òÁªÂò¤·¤Þ¤¹¡£"
 
-#: src/libvlc.h:283
+#: src/libvlc.h:296
 #, fuzzy
 msgid "Choose preferred audio encoder list"
 msgstr "½àÈ÷¤µ¤ì¤Æ¤¤¤ë¥³¡¼¥Ç¥Ã¥¯¤Î°ìÍ÷¤ÎÁªÂò"
 
-#: src/libvlc.h:288
+#: src/libvlc.h:301
 #, fuzzy
 msgid "Choose a stream output"
 msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò"
 
-#: src/libvlc.h:290
+#: src/libvlc.h:303
 msgid "Empty if no stream output."
 msgstr "½ÐÎÏ¥¹¥È¥ê¡¼¥à¤¬¤Ê¤¤¾ì¹ç¡¢¶õ¤Ë¤¹¤ë"
 
-#: src/libvlc.h:292
+#: src/libvlc.h:305
 msgid "Display while streaming"
 msgstr ""
 
-#: src/libvlc.h:294
+#: src/libvlc.h:307
 #, fuzzy
 msgid "This allows you to play the stream while streaming it."
 msgstr "VLC¤¬ÁªÂò¤¹¤ë¥Ñ¥±¥Ã¥¿¥é¥¤¥¶¡¼¤Î½ç½ø¤òÁªÂò¤·¤Þ¤¹¡£"
 
-#: src/libvlc.h:296
+#: src/libvlc.h:309
 #, fuzzy
 msgid "Enable video stream output"
 msgstr "¥Ó¥Ç¥ª¡¦¥¹¥È¥ê¡¼¥à¤Î½ÐÎϤòÍ­¸ú¤Ë¤¹¤ë"
 
-#: src/libvlc.h:298 src/libvlc.h:311
+#: src/libvlc.h:311 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."
@@ -826,79 +880,79 @@ msgstr ""
 "¥Ó¥Ç¥ª¡¦¥¹¥È¥ê¡¼¥à½ÐÎϵ¡¹½¤ÎºÇ¸å¤Î¤â¤Î¤¬Í­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤È¥Ó¥Ç¥ª¡¦¥¹¥È¥ê¡¼¥à"
 "¤¬½ÐÎϵ¡¹½¤Ë¥ê¥À¥¤¥ì¥¯¥È¤µ¤ì¤ë¤Ù¤­¾ì¹ç¡¢ÁªÂò²Äǽ¤Ç¤¹¡£"
 
-#: src/libvlc.h:301
+#: src/libvlc.h:314
 #, fuzzy
 msgid "Video encoding codec"
 msgstr "DV¥Ó¥Ç¥ª¡¦¥Ç¥³¡¼¥À"
 
-#: src/libvlc.h:303
+#: src/libvlc.h:316
 msgid "This allows you to force video encoding"
 msgstr ""
 
-#: src/libvlc.h:305
+#: src/libvlc.h:318
 msgid "Video bitrate encoding (kB/s)"
 msgstr ""
 
-#: src/libvlc.h:307
+#: src/libvlc.h:320
 msgid "This allows you to specify video bitrate in kB/s."
 msgstr ""
 
-#: src/libvlc.h:309
+#: src/libvlc.h:322
 #, fuzzy
 msgid "Enable audio stream output"
 msgstr "¥ª¡¼¥Ç¥£¥ª¡¦¥¹¥È¥ê¡¼¥à¤Î½ÐÎϤòÍ­¸ú¤Ë¤¹¤ë"
 
-#: src/libvlc.h:314
+#: src/libvlc.h:327
 #, fuzzy
 msgid "Audio encoding codec"
 msgstr "MPEG 1/2¥Ó¥Ç¥ª¡¦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
 
-#: src/libvlc.h:316
+#: src/libvlc.h:329
 msgid "This allows you to force audio encoding"
 msgstr ""
 
-#: src/libvlc.h:318
+#: src/libvlc.h:331
 msgid "Audio bitrate encoding (kB/s)"
 msgstr ""
 
-#: src/libvlc.h:320
+#: src/libvlc.h:333
 msgid "This allows you to specify audio bitrate in kB/s."
 msgstr ""
 
-#: src/libvlc.h:322
+#: src/libvlc.h:335
 #, fuzzy
 msgid "Choose preferred packetizer list"
 msgstr "½àÈ÷¤µ¤ì¤Æ¤¤¤ë¥Ñ¥±¥Ã¥¿¥é¥¤¥¶¡¼°ìÍ÷¤ÎÁªÂò"
 
-#: src/libvlc.h:324
+#: src/libvlc.h:337
 msgid ""
 "This allows you to select the order in which VLC will choose its packetizers."
 msgstr "VLC¤¬ÁªÂò¤¹¤ë¥Ñ¥±¥Ã¥¿¥é¥¤¥¶¡¼¤Î½ç½ø¤òÁªÂò¤·¤Þ¤¹¡£"
 
-#: src/libvlc.h:327
+#: src/libvlc.h:340
 #, fuzzy
 msgid "Mux module"
 msgstr "mux¥â¥¸¥å¡¼¥ë"
 
-#: src/libvlc.h:329
+#: src/libvlc.h:342
 msgid "This is a legacy entry to let you configure mux modules"
 msgstr "mux¥â¥¸¥å¡¼¥ë¤òÀßÄꤹ¤ë¥ì¥¬¥·¡¼¡¦¥¨¥ó¥È¥ê¤Ç¤¹¡£"
 
-#: src/libvlc.h:331
+#: src/libvlc.h:344
 #, fuzzy
 msgid "Access output module"
 msgstr "¥ª¡¼¥Ç¥£¥ª½ÐÎϥ⥸¥å¡¼¥ë"
 
-#: src/libvlc.h:333
+#: src/libvlc.h:346
 msgid "This is a legacy entry to let you configure access output modules"
 msgstr "¥¢¥¯¥»¥¹½ÐÎϥ⥸¥å¡¼¥ë¤òÀßÄꤹ¤ë¥ì¥¬¥·¡¼¡¦¥¨¥ó¥È¥ê¤Ç¤¹¡£"
 
-#: src/libvlc.h:336
+#: src/libvlc.h:349
 #, fuzzy
 msgid "Enable CPU MMX support"
 msgstr "CPU¤ÎMMX¥µ¥Ý¡¼¥È¤ò̵¸ú¤Ë¤¹¤ë"
 
-#: src/libvlc.h:338
+#: src/libvlc.h:351
 msgid ""
 "If your processor supports the MMX instructions set, VLC can take advantage "
 "of them."
@@ -906,12 +960,12 @@ msgstr ""
 "¥×¥í¥»¥Ã¥µ¤¬MMX¤Îµ¡Ç½¥»¥Ã¥È¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢VLC¤Ï¤½¤Î¥¢¥É¥Ð¥ó¥Æ¡¼"
 "¥¸¤òÍøÍѤǤ­¤Þ¤¹¡£"
 
-#: src/libvlc.h:341
+#: src/libvlc.h:354
 #, fuzzy
 msgid "Enable CPU 3D Now! support"
 msgstr "CPU¤Î3D Now!¥µ¥Ý¡¼¥È¤ò̵¸ú¤Ë¤¹¤ë"
 
-#: src/libvlc.h:343
+#: src/libvlc.h:356
 msgid ""
 "If your processor supports the 3D Now! instructions set, VLC can take "
 "advantage of them."
@@ -919,12 +973,12 @@ msgstr ""
 "¥×¥í¥»¥Ã¥µ¤¬3D Now!µ¡Ç½¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢VLC¤Ï¤½¤Î¥¢¥É¥Ð¥ó¥Æ¡¼¥¸¤ò"
 "ÍøÍѤǤ­¤Þ¤¹¡£"
 
-#: src/libvlc.h:346
+#: src/libvlc.h:359
 #, fuzzy
 msgid "Enable CPU MMX EXT support"
 msgstr "CPU¤ÎMMX³ÈÄ¥µ¡Ç½¥µ¥Ý¡¼¥È¤ò̵¸ú¤Ë¤¹¤ë"
 
-#: src/libvlc.h:348
+#: src/libvlc.h:361
 msgid ""
 "If your processor supports the MMX EXT instructions set, VLC can take "
 "advantage of them."
@@ -932,12 +986,12 @@ msgstr ""
 "¥×¥í¥»¥Ã¥µ¤¬MMX¤Î³ÈÄ¥µ¡Ç½¥»¥Ã¥È¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢VLC¤Ï¤½¤Î¥¢¥É¥Ð¥ó"
 "¥Æ¡¼¥¸¤òÍøÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
 
-#: src/libvlc.h:351
+#: src/libvlc.h:364
 #, fuzzy
 msgid "Enable CPU SSE support"
 msgstr "CPU¤ÎSSE¥µ¥Ý¡¼¥È¤ò̵¸ú¤Ë¤¹¤ë"
 
-#: src/libvlc.h:353
+#: src/libvlc.h:366
 msgid ""
 "If your processor supports the SSE instructions set, VLC can take advantage "
 "of them."
@@ -945,12 +999,12 @@ msgstr ""
 "¥×¥í¥»¥Ã¥µ¤¬SSE¤Îµ¡Ç½¥»¥Ã¥È¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢VLC¤Ï¤½¤Î¥¢¥É¥Ð¥ó¥Æ¡¼"
 "¥¸¤òÍøÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
 
-#: src/libvlc.h:356
+#: src/libvlc.h:369
 #, fuzzy
 msgid "Enable CPU AltiVec support"
 msgstr "CPU¤ÎAltiVec¥µ¥Ý¡¼¥È¤ò̵¸ú¤Ë¤¹¤ë"
 
-#: src/libvlc.h:358
+#: src/libvlc.h:371
 msgid ""
 "If your processor supports the AltiVec instructions set, VLC can take "
 "advantage of them."
@@ -958,12 +1012,12 @@ msgstr ""
 "¥×¥í¥»¥Ã¥µ¤¬AltiVec¤Îµ¡Ç½¥»¥Ã¥È¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢¤½¤Î¥¢¥É¥Ð¥ó¥Æ¡¼¥¸"
 "¤òÍøÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
 
-#: src/libvlc.h:361
+#: src/libvlc.h:374
 #, fuzzy
 msgid "Play files randomly forever"
 msgstr "¥Õ¥¡¥¤¥ë¤ò¥é¥ó¥À¥à¤ËºÆÀ¸"
 
-#: src/libvlc.h:363
+#: src/libvlc.h:376
 msgid ""
 "When selected, VLC will randomly play files in the playlist until "
 "interrupted."
@@ -971,22 +1025,12 @@ msgstr ""
 "¤³¤Î¥ª¥×¥·¥ç¥ó¤¬ÁªÂò¤µ¤ì¤ë¤ÈVLC¤Ï¥×¥ì¥¤¥ê¥¹¥È¤Î¥Õ¥¡¥¤¥ë¤ò¥é¥ó¥À¥à¤ËºÆÀ¸¤·¤Þ"
 "¤¹¡£"
 
-#: src/libvlc.h:366
-#, fuzzy
-msgid "Launch playlist on startup"
-msgstr "µ¯Æ°»þ¤Ë¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
-
-#: src/libvlc.h:368
-msgid "If you want VLC to start playing on startup, then enable this option."
-msgstr ""
-"VLC¤Îµ¯Æ°»þ¤Ë¥×¥ì¥¤¥ê¥¹¥È¤òµ¯Æ°¤·¤¿¤¤¾ì¹ç¤Ë¤Ï¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤òÁªÂò¤·¤Þ¤¹¡£"
-
-#: src/libvlc.h:370
+#: src/libvlc.h:379
 #, fuzzy
 msgid "Enqueue items in playlist"
 msgstr "¥Ç¥Õ¥©¥ë¥È¤Ç¥×¥ì¥¤¥ê¥¹¥È¤ËÄɲÃ"
 
-#: src/libvlc.h:372
+#: src/libvlc.h:381
 msgid ""
 "If you want VLC to add items to the playlist as you open them, then enable "
 "this option."
@@ -994,24 +1038,24 @@ msgstr ""
 "¥×¥ì¥¤¥ê¥¹¥È¤Ë¥ª¡¼¥×¥ó¤·¤Æ¤¤¤ë¹àÌܤòÄɲä·¤¿¤¤¾ì¹ç¤Ë¤Ï¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤òÁªÂò"
 "¤·¤Þ¤¹¡£"
 
-#: src/libvlc.h:375
+#: src/libvlc.h:384
 #, fuzzy
 msgid "Loop playlist on end"
 msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ÎºÇ¸å¤Ç¥ë¡¼¥×"
 
-#: src/libvlc.h:377
+#: src/libvlc.h:386
 msgid ""
 "If you want VLC to keep playing the playlist indefinitely then enable this "
 "option."
 msgstr ""
 "¥×¥ì¥¤¥ê¥¹¥È¤ÎºÆÀ¸¤ò·«¤êÊÖ¤·¤Æ¹Ô¤¤¤¿¤¤¾ì¹ç¤Ë¤Ï¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤òÁªÂò¤·¤Þ¤¹¡£"
 
-#: src/libvlc.h:380
+#: src/libvlc.h:389
 #, fuzzy
 msgid "Memory copy module"
 msgstr "¥á¥â¥ê¡¼¡¦¥³¥Ô¡¼¡¦¥â¥¸¥å¡¼¥ë"
 
-#: src/libvlc.h:382
+#: src/libvlc.h:391
 msgid ""
 "You can select which memory copy module you want to use. By default VLC will "
 "select the fastest one supported by your hardware."
@@ -1019,30 +1063,44 @@ msgstr ""
 "»ÈÍѤ·¤¿¤¤¥á¥â¥ê¡¼¡¦¥³¥Ô¡¼¡¦¥â¥¸¥å¡¼¥ë¤òÁªÂò¤·¤Þ¤¹¡£VLC¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç¥Ï¡¼¥É"
 "¥¦¥§¥¢¤¬¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ëºÇ¤â®¤¤¤â¤Î¤òÁªÂò¤·¤Þ¤¹¡£"
 
-#: src/libvlc.h:385
+#: src/libvlc.h:394
 #, fuzzy
 msgid "Access module"
 msgstr "¥¢¥¯¥»¥¹¡¦¥â¥¸¥å¡¼¥ë"
 
-#: src/libvlc.h:387
+#: src/libvlc.h:396
 msgid "This is a legacy entry to let you configure access modules"
 msgstr "¥¢¥¯¥»¥¹¡¦¥â¥¸¥å¡¼¥ë¤òÁªÂò¤¹¤ë¥ì¥¬¥·¡¼¡¦¥¨¥ó¥È¥ê¤Ç¤¹¡£"
 
-#: src/libvlc.h:389
+#: src/libvlc.h:398
 #, fuzzy
 msgid "Demux module"
 msgstr "demux¥â¥¸¥å¡¼¥ë"
 
-#: src/libvlc.h:391
+#: src/libvlc.h:400
 msgid "This is a legacy entry to let you configure demux modules"
 msgstr "demux¥â¥¸¥å¡¼¥ë¤òÁªÂò¤¹¤ë¥ì¥¬¥·¡¼¡¦¥¨¥ó¥È¥ê¤Ç¤¹¡£"
 
-#: src/libvlc.h:393
+#: src/libvlc.h:402
+msgid "Increase the priority of the process"
+msgstr ""
+
+#: src/libvlc.h:404
+msgid ""
+"Increasing the priority of the process will very likely improve your playing "
+"experience as it allows VLC not to be disturbed by other applications that "
+"could otherwise take too much processor time.\n"
+"However be advise that in certain circumstances (bugs) VLC could take all "
+"the processor time and render the whole system unresponsive which might "
+"require a reboot of your machine."
+msgstr ""
+
+#: src/libvlc.h:411
 #, fuzzy
-msgid "Dast mutex on NT/2K/XP (developers only)"
+msgid "Fast mutex on NT/2K/XP (developers only)"
 msgstr "¹â®mutex¤Î»ÈÍÑ NT/2K/XP (³«È¯¼Ô¸þ¤±)"
 
-#: src/libvlc.h:395
+#: src/libvlc.h:413
 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 "
@@ -1052,11 +1110,11 @@ msgstr ""
 "¤·¡¢¤è¤ê®¤¤mutex¤Î¼ÂÁõ¤ò»ÈÍѤ¹¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡£¤½¤Î¾ì¹ç¡¢ÌäÂ꤬ȯÀ¸¤¹¤ë²Äǽ"
 "À­¤¬¤¢¤ê¤Þ¤¹¡£"
 
-#: src/libvlc.h:400
+#: src/libvlc.h:418
 msgid "Condition variables implementation for Win9x (developers only)"
 msgstr "Win9x¸þ¤±¾ò·ïÃͤμÂÁõ (³«È¯¼Ô¸þ¤±)"
 
-#: src/libvlc.h:403
+#: src/libvlc.h:421
 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 "
@@ -1068,11 +1126,7 @@ msgstr ""
 "¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹)¤ò»ÈÍѤ·¤Þ¤¹¡£¤·¤«¤·¡¢ÂåÂؤ¨¤È¤Ê¤ëÃÙ¤¯¤Æ¤â°ÂÄꤷ¤¿¼ÂÁõ¤òÁª"
 "Âò¤¹¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡£¸½»þÅÀ¤Ç¤Ï¡¢0(´ûÄêÃͤκÇ®¤Î¤â¤Î), 1, 2¤¬ÁªÂò²Äǽ¤Ç¤¹¡£"
 
-#: src/libvlc.h:411
-msgid "Real-time priority"
-msgstr ""
-
-#: src/libvlc.h:413
+#: src/libvlc.h:429
 msgid ""
 "\n"
 "Playlist items:\n"
@@ -1098,109 +1152,173 @@ msgstr ""
 "  vlc:pause                      ¥×¥ì¥¤¥ê¥¹¥È¤Î¹àÌܤκÆÀ¸Ää»ß\n"
 "  vlc:quit                       VLC¤ò½ªÎ»\n"
 
-#: src/libvlc.h:443 modules/misc/dummy/dummy.c:60
+#: src/libvlc.h:459 modules/misc/dummy/dummy.c:58
 msgid "Interface"
 msgstr "¥¤¥ó¥¿¥Õ¥§¡¼¥¹"
 
-#: src/libvlc.h:458 modules/audio_output/coreaudio.c:224
+#: src/libvlc.h:474 modules/audio_output/coreaudio.c:227
 #: modules/audio_output/file.c:108 modules/demux/asf/asf.c:228
-#: modules/demux/ogg.c:554 modules/demux/ogg.c:813 modules/demux/ogg.c:986
-#: modules/gui/beos/InterfaceWindow.cpp:259
+#: modules/demux/mkv.cpp:2445 modules/demux/ogg.c:557 modules/demux/ogg.c:829
+#: modules/demux/ogg.c:1002 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:354 modules/gui/macosx/output.m:150
+#: modules/gui/macosx/intf.m:378 modules/gui/macosx/output.m:156
 msgid "Audio"
 msgstr "¥ª¡¼¥Ç¥£¥ª"
 
-#: src/libvlc.h:474 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1203
-#: modules/demux/ogg.c:613 modules/demux/ogg.c:653 modules/demux/ogg.c:718
-#: modules/demux/ogg.c:893 modules/gui/gtk/gnome_interface.c:1099
-#: modules/gui/gtk/gtk_interface.c:1296 modules/gui/macosx/intf.m:365
-#: modules/gui/macosx/macosx.m:66 modules/gui/macosx/output.m:140
-#: modules/misc/dummy/dummy.c:83 modules/video_output/directx/directx.c:108
+#: src/libvlc.h:493 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1217
+#: modules/demux/mkv.cpp:2461 modules/demux/ogg.c:629 modules/demux/ogg.c:669
+#: modules/demux/ogg.c:734 modules/demux/ogg.c:909
+#: 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/video_output/directx/directx.c:112
 msgid "Video"
 msgstr "¥Ó¥Ç¥ª"
 
-#: src/libvlc.h:494 modules/access/satellite/satellite.c:66
+#: src/libvlc.h:515 modules/access/satellite/satellite.c:66
 msgid "Input"
 msgstr "ÆþÎÏ"
 
-#: src/libvlc.h:517
+#: src/libvlc.h:537
 msgid "Decoders"
 msgstr "¥Ç¥³¡¼¥À"
 
-#: src/libvlc.h:520
+#: src/libvlc.h:541
 #, fuzzy
 msgid "Encoders"
 msgstr "¥¨¥ó¥³¡¼¥À"
 
-#: src/libvlc.h:525 modules/gui/gtk/gnome_interface.c:2042
+#: src/libvlc.h:547 modules/gui/gtk/gnome_interface.c:2042
 #: modules/gui/gtk/gtk_interface.c:2361 modules/gui/gtk/gtk_interface.c:3034
-#: modules/gui/win32/strings.cpp:221 modules/gui/wxwindows/open.cpp:213
-#: modules/gui/wxwindows/streamout.cpp:151
+#: modules/gui/wxwindows/open.cpp:194 modules/gui/wxwindows/streamout.cpp:171
 msgid "Stream output"
 msgstr "¥¹¥È¥ê¡¼¥à½ÐÎÏ"
 
-#: src/libvlc.h:544
+#: src/libvlc.h:567
 msgid "CPU"
 msgstr ""
 
-#: src/libvlc.h:556 modules/gui/beos/InterfaceWindow.cpp:206
+#: src/libvlc.h:579 modules/gui/beos/InterfaceWindow.cpp:206
 #: modules/gui/familiar/interface.c:610 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:297
-#: modules/gui/macosx/intf.m:385 modules/gui/win32/strings.cpp:120
-#: modules/gui/win32/strings.cpp:180 modules/gui/wxwindows/interface.cpp:337
-#: modules/gui/wxwindows/playlist.cpp:102
+#: 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:345
+#: modules/gui/wxwindows/playlist.cpp:104
 msgid "Playlist"
 msgstr "¥ê¥¹¥È"
 
-#: src/libvlc.h:563 modules/audio_filter/converter/a52tofloat32.c:85
+#: src/libvlc.h:585 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/familiar/familiar.c:70
-#: modules/gui/win32/win32.cpp:312 modules/misc/logger/logger.c:88
+#: 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
 msgid "Miscellaneous"
 msgstr "¤½¤Î¾"
 
-#: src/libvlc.h:576
+#: src/libvlc.h:599
 msgid "main program"
 msgstr "¥á¥¤¥ó¡¦¥×¥í¥°¥é¥à"
 
-#: src/libvlc.h:582
+#: src/libvlc.h:605
 msgid "print help"
 msgstr "¥Ø¥ë¥×¤Î°õºþ"
 
-#: src/libvlc.h:584
+#: src/libvlc.h:607
 msgid "print detailed help"
 msgstr "¾ÜºÙ¤Ê¥Ø¥ë¥×¤Î°õºþ"
 
-#: src/libvlc.h:587
+#: src/libvlc.h:610
 msgid "print a list of available modules"
 msgstr "Í­¸ú¤Ê¥â¥¸¥å¡¼¥ë¤Î¥ê¥¹¥È¤ò°õºþ"
 
-#: src/libvlc.h:589
+#: src/libvlc.h:612
 msgid "print help on module"
 msgstr "¥â¥¸¥å¡¼¥ë¾å¤Î¥Ø¥ë¥×¤ò°õºþ <ʸ»úÎó>"
 
-#: src/libvlc.h:592
+#: src/libvlc.h:615
 msgid "print version information"
 msgstr "¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤Î°õºþ"
 
-#: src/misc/configuration.c:946
+#: src/misc/configuration.c:1000
 msgid "boolean"
 msgstr "¿¿µ¶ÃÍ"
 
+#: src/video_output/video_output.c:406 modules/gui/beos/VideoOutput.cpp:1151
+#: modules/gui/macosx/applescript.m:122 modules/gui/macosx/controls.m:350
+#: modules/gui/macosx/controls.m:692 modules/gui/macosx/intf.m:394
+msgid "Fullscreen"
+msgstr "Á´²èÌ̲½"
+
+#: src/video_output/video_output.c:417 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
+#: modules/video_filter/deinterlace/deinterlace.c:81
+msgid "Deinterlace"
+msgstr "¥Î¥ó¥¤¥ó¥¿¥ì¡¼¥¹²½"
+
+#: src/video_output/video_output.c:421
+#, fuzzy
+msgid "Discard"
+msgstr "¥Ç¥£¥¹¥¯"
+
+#: src/video_output/video_output.c:423
+msgid "Blend"
+msgstr ""
+
+#: src/video_output/video_output.c:425
+#, fuzzy
+msgid "Mean"
+msgstr "¥á¥Ç¥£¥¢"
+
+#: src/video_output/video_output.c:427
+msgid "Bob"
+msgstr ""
+
+#: src/video_output/video_output.c:429
+#, 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
+#, fuzzy
+msgid "Caching value in ms"
+msgstr "¥­¥ã¥Ã¥·¥ó¥°ÃÍ (ms)"
+
+#: modules/access/cdda.c:88
+#, fuzzy
+msgid ""
+"Allows you to modify the default caching value for cdda streams. This value "
+"should be set in miliseconds units."
+msgstr ""
+"udp¥¹¥È¥ê¡¼¥à¤Ç»ÈÍѤµ¤ì¤ë´ûÄê¤Î¥­¥ã¥Ã¥·¥ó¥°Ãͤ¬Êѹ¹²Äǽ¤Ç¤¹¡£Ã±°Ì¤Ï¥ß¥êÉäǻØ"
+"Äꤷ¤Þ¤¹¡£"
+
+#: modules/access/cdda.c:92
+#, fuzzy
+msgid "CD Audio input"
+msgstr "VCDÆþÎϥ⥸¥å¡¼¥ë"
+
+#: modules/access/cdda.c:99
+#, fuzzy
+msgid "CD Audio demux"
+msgstr "ÀßÄê(_S)"
+
 #: modules/access/directory.c:82
 #, fuzzy
 msgid "Standard filesystem directory input"
 msgstr "ɸ½àŪ¤Ê¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥Õ¥¡¥¤¥ë¤òÆɤà"
 
 #: modules/access/dvd/dvd.c:65
-msgid "method to use by libdvdcss for key decryption"
+#, fuzzy
+msgid "Method to use by libdvdcss for key decryption"
 msgstr "libdvdcss¤ò¸°¤ÎÊ£¹ç²½¤Ë»ÈÍÑ"
 
 #: modules/access/dvd/dvd.c:67
@@ -1263,24 +1381,18 @@ msgstr ""
 msgid "DVD input (using libdvdread)"
 msgstr "DVDÆþÎϥ⥸¥å¡¼¥ë, libdvdcss¤ò»ÈÍÑ"
 
-#: modules/access/file.c:69 modules/access/ftp.c:86 modules/access/http.c:80
-#: modules/access/mms/mms.c:57 modules/access/udp.c:72
-#: modules/access/v4l/v4l.c:64
-msgid "caching value in ms"
-msgstr "¥­¥ã¥Ã¥·¥ó¥°ÃÍ (ms)"
-
-#: modules/access/file.c:71
+#: modules/access/file.c:74
 msgid ""
 "Allows you to modify the default caching value for file streams. This value "
 "should be set in miliseconds units."
 msgstr "¥Õ¥¡¥¤¥ë¡¦¥¹¥È¥ê¡¼¥à¤Î´ûÄê¤Î¥­¥ã¥Ã¥·¥ó¥°ÃͤòÊѹ¹¤Ç¤­¤Þ¤¹¡£Ã±°Ì¤Ï¥ß¥êÉÃ"
 
-#: modules/access/file.c:75
+#: modules/access/file.c:78
 #, fuzzy
 msgid "Standard filesystem file input"
 msgstr "ɸ½àŪ¤Ê¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥Õ¥¡¥¤¥ë¤òÆɤà"
 
-#: modules/access/file.c:76
+#: modules/access/file.c:79
 msgid "file"
 msgstr "¥Õ¥¡¥¤¥ë"
 
@@ -1298,7 +1410,8 @@ msgid "FTP input"
 msgstr ""
 
 #: modules/access/http.c:74
-msgid "specify an HTTP proxy"
+#, fuzzy
+msgid "Specify an HTTP proxy"
 msgstr "HTTP¥×¥í¥­¥·¤ò»ØÄê"
 
 #: modules/access/http.c:76
@@ -1340,36 +1453,85 @@ msgstr ""
 msgid "Microsoft Media Server (MMS) input"
 msgstr ""
 
+#: modules/access_output/dummy.c:56
+#, fuzzy
+msgid "Dummy stream ouput"
+msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò"
+
+#: modules/access_output/file.c:66
+#, fuzzy
+msgid "File stream ouput"
+msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò"
+
+#: modules/access_output/http.c:54
+#, fuzzy
+msgid "HTTP stream ouput"
+msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò"
+
+#: modules/access_output/udp.c:74 modules/access/udp.c:72
+msgid "caching value in ms"
+msgstr "¥­¥ã¥Ã¥·¥ó¥°ÃÍ (ms)"
+
+#: modules/access_output/udp.c:76 modules/access/udp.c:74
+msgid ""
+"Allows you to modify the default caching value for udp streams. This value "
+"should be set in miliseconds units."
+msgstr ""
+"udp¥¹¥È¥ê¡¼¥à¤Ç»ÈÍѤµ¤ì¤ë´ûÄê¤Î¥­¥ã¥Ã¥·¥ó¥°Ãͤ¬Êѹ¹²Äǽ¤Ç¤¹¡£Ã±°Ì¤Ï¥ß¥êÉäǻØ"
+"Äꤷ¤Þ¤¹¡£"
+
+#: modules/access_output/udp.c:80
+#, fuzzy
+msgid "UDP stream ouput"
+msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò"
+
+#: modules/access_output/udp.c:81
+#, fuzzy
+msgid "udp stream output"
+msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò"
+
+#: modules/access/pvr/pvr.c:75
+msgid "Hauppauge PVR cards input"
+msgstr ""
+
 #: modules/access/satellite/satellite.c:41
-msgid "satellite default transponder frequency"
+#, fuzzy
+msgid "Satellite default transponder frequency"
 msgstr "±ÒÀ± ´ûÄêžÁ÷¼þÇÈ¿ô"
 
 #: modules/access/satellite/satellite.c:44
-msgid "satellite default transponder polarization"
+#, fuzzy
+msgid "Satellite default transponder polarization"
 msgstr "±ÒÀ± ´ûÄêžÁ÷¶Ë"
 
 #: modules/access/satellite/satellite.c:47
-msgid "satellite default transponder FEC"
+#, fuzzy
+msgid "Satellite default transponder FEC"
 msgstr "±ÒÀ± ´ûÄêžÁ÷FEC"
 
 #: modules/access/satellite/satellite.c:50
-msgid "satellite default transponder symbol rate"
+#, fuzzy
+msgid "Satellite default transponder symbol rate"
 msgstr "±ÒÀ± ´ûÄêžÁ÷¥·¥ó¥Ü¥ë¡¦¥ì¡¼¥È"
 
 #: modules/access/satellite/satellite.c:53
-msgid "use diseqc with antenna"
+#, fuzzy
+msgid "Use diseqc with antenna"
 msgstr "¥¢¥ó¥Æ¥Ê¤Èdiseqc¤ò»ÈÍÑ"
 
 #: modules/access/satellite/satellite.c:56
-msgid "antenna lnb_lof1 (kHz)"
+#, fuzzy
+msgid "Antenna lnb_lof1 (kHz)"
 msgstr "¥¢¥ó¥Æ¥Ê lnb_lof1 (kHz)"
 
 #: modules/access/satellite/satellite.c:59
-msgid "antenna lnb_lof2 (kHz)"
+#, fuzzy
+msgid "Antenna lnb_lof2 (kHz)"
 msgstr "¥¢¥ó¥Æ¥Ê lnb_lof2 (kHz)"
 
 #: modules/access/satellite/satellite.c:62
-msgid "antenna lnb_slof (kHz)"
+#, fuzzy
+msgid "Antenna lnb_slof (kHz)"
 msgstr "¥¢¥ó¥Æ¥Ê lnb_slof (kHz)"
 
 #: modules/access/satellite/satellite.c:81
@@ -1385,14 +1547,6 @@ msgstr ""
 msgid "slp"
 msgstr ""
 
-#: modules/access/udp.c:74
-msgid ""
-"Allows you to modify the default caching value for udp streams. This value "
-"should be set in miliseconds units."
-msgstr ""
-"udp¥¹¥È¥ê¡¼¥à¤Ç»ÈÍѤµ¤ì¤ë´ûÄê¤Î¥­¥ã¥Ã¥·¥ó¥°Ãͤ¬Êѹ¹²Äǽ¤Ç¤¹¡£Ã±°Ì¤Ï¥ß¥êÉäǻØ"
-"Äꤷ¤Þ¤¹¡£"
-
 #: modules/access/udp.c:78
 #, fuzzy
 msgid "UDP/RTP input"
@@ -1402,23 +1556,23 @@ msgstr "UDP
 msgid "udp"
 msgstr ""
 
-#: modules/access/v4l/v4l.c:66
+#: modules/access/v4l/v4l.c:68
 #, 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:70
+#: modules/access/v4l/v4l.c:72
 #, fuzzy
 msgid "Video4Linux input"
 msgstr "Video4LinuxÆþÎϥ⥸¥å¡¼¥ë"
 
-#: modules/access/v4l/v4l.c:71
+#: modules/access/v4l/v4l.c:73
 msgid "v4l"
 msgstr ""
 
-#: modules/access/v4l/v4l.c:79
+#: modules/access/v4l/v4l.c:81
 #, fuzzy
 msgid "Video4Linux demuxer"
 msgstr "Video4LinuxÆþÎϥ⥸¥å¡¼¥ë"
@@ -1428,37 +1582,9 @@ msgstr "Video4Linux
 msgid "VCD input"
 msgstr "VCDÆþÎϥ⥸¥å¡¼¥ë"
 
-#: modules/access/vlcs.c:131 modules/misc/sap.c:131
-msgid "SAP"
-msgstr ""
-
-#: modules/access/vlcs.c:134
-#, fuzzy
-msgid "SAP interface module"
-msgstr "¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
-
-#: modules/access_output/dummy.c:56
-#, fuzzy
-msgid "Dummy stream ouput"
-msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò"
-
-#: modules/access_output/file.c:58
-#, fuzzy
-msgid "File stream ouput"
-msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò"
-
-#: modules/access_output/http.c:54
-#, fuzzy
-msgid "HTTP stream ouput"
-msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò"
-
-#: modules/access_output/udp.c:73
-#, fuzzy
-msgid "UDP stream ouput"
-msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò"
-
 #: modules/audio_filter/channel_mixer/headphone.c:48
-msgid "characteristic dimension"
+#, fuzzy
+msgid "Characteristic dimension"
 msgstr "¶õ´Ö¤ÎÆÃÀ­"
 
 #: modules/audio_filter/channel_mixer/headphone.c:50
@@ -1608,35 +1734,46 @@ msgstr "
 msgid "trivial audio mixer"
 msgstr "Èù̯¤Ê¥ª¡¼¥Ç¥£¥ª¡¦¥ß¥­¥µ¡¼¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/audio_output/alsa.c:91
+#: modules/audio_output/alsa.c:97
 msgid "ALSA"
 msgstr ""
 
-#: modules/audio_output/alsa.c:93
+#: modules/audio_output/alsa.c:99
 msgid "ALSA device name"
 msgstr "ALSA¥Ç¥Ð¥¤¥¹Ì¾"
 
-#: modules/audio_output/alsa.c:94
+#: modules/audio_output/alsa.c:100
 #, fuzzy
 msgid "ALSA audio output"
 msgstr "ALSA¥ª¡¼¥Ç¥£¥ª¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/audio_output/alsa.c:110 modules/audio_output/coreaudio.c:1470
-#: modules/audio_output/directx.c:377 modules/audio_output/oss.c:129
-#: modules/audio_output/sdl.c:176 modules/audio_output/sdl.c:194
-#: modules/audio_output/waveout.c:309 modules/gui/win32/strings.cpp:58
+#: 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/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
 #, fuzzy
 msgid "Audio device"
 msgstr "DVD¥Ç¥Ð¥¤¥¹"
 
-#: modules/audio_output/alsa.c:159 modules/audio_output/directx.c:435
+#: modules/audio_output/alsa.c:173 modules/audio_output/directx.c:435
 #: modules/audio_output/oss.c:222 modules/audio_output/sdl.c:182
-#: modules/audio_output/sdl.c:201 modules/audio_output/waveout.c:371
+#: modules/audio_output/sdl.c:201 modules/audio_output/waveout.c:399
 msgid "Mono"
 msgstr "¥â¥Î¥é¥ë"
 
-#: modules/audio_output/alsa.c:201 modules/audio_output/directx.c:478
-#: modules/audio_output/oss.c:246 modules/audio_output/waveout.c:387
+#: modules/audio_output/alsa.c:186 modules/audio_output/directx.c:409
+#: 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:192 modules/audio_output/directx.c:391
+#: modules/audio_output/oss.c:167 modules/audio_output/waveout.c:352
+msgid "5.1"
+msgstr ""
+
+#: modules/audio_output/alsa.c:219 modules/audio_output/directx.c:478
+#: modules/audio_output/oss.c:246 modules/audio_output/waveout.c:415
 msgid "A/52 over S/PDIF"
 msgstr ""
 
@@ -1645,12 +1782,14 @@ msgstr ""
 msgid "aRts audio output"
 msgstr "aRts¥ª¡¼¥Ç¥£¥ª¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/audio_output/coreaudio.c:218
-#, fuzzy
-msgid "audio device"
-msgstr "DVD¥Ç¥Ð¥¤¥¹"
+#: modules/audio_output/coreaudio.c:219
+msgid ""
+"Choose a number corresponding to the number of an audio device, as listed in "
+"your 'audio device' menu. This device will then be used by default for audio "
+"playback."
+msgstr ""
 
-#: modules/audio_output/coreaudio.c:221
+#: modules/audio_output/coreaudio.c:224
 #, fuzzy
 msgid "CoreAudio output"
 msgstr "¥ª¡¼¥Ç¥£¥ª¡¦¥Ü¥ê¥å¡¼¥à"
@@ -1660,46 +1799,39 @@ msgstr "
 msgid "DirectX audio output"
 msgstr "DirectX¥ª¡¼¥Ç¥£¥ª¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/audio_output/directx.c:391 modules/audio_output/oss.c:167
-#: modules/audio_output/waveout.c:324
-msgid "5.1"
-msgstr ""
-
-#: modules/audio_output/directx.c:409 modules/audio_output/oss.c:178
-#: modules/audio_output/waveout.c:343
-msgid "2 Front 2 Rear"
-msgstr "¥Õ¥í¥ó¥È 2, ¥ê¥¢ 2"
-
-#: modules/audio_output/esd.c:64
+#: modules/audio_output/esd.c:66
 #, fuzzy
 msgid "EsounD audio output"
 msgstr "EsounD¥ª¡¼¥Ç¥£¥ª¡¦¥â¥¸¥å¡¼¥ë"
 
 #: modules/audio_output/file.c:82
-msgid "output format"
+#, fuzzy
+msgid "Output format"
 msgstr "½ÐÎÏ¥Õ¥©¡¼¥Þ¥Ã¥È"
 
 #: modules/audio_output/file.c:83
 msgid ""
-"one of \"u8\", \"s8\", \"u16\", \"s16\", \"u16_le\", \"s16_le\", \"u16_be\", "
+"One of \"u8\", \"s8\", \"u16\", \"s16\", \"u16_le\", \"s16_le\", \"u16_be\", "
 "\"s16_be\", \"fixed32\", \"float32\" or \"spdif\""
 msgstr ""
 
 #: modules/audio_output/file.c:86
-msgid "add wave header"
+#, fuzzy
+msgid "Add wave header"
 msgstr "wave¥Ø¥Ã¥À¤òÄɲÃ"
 
 #: modules/audio_output/file.c:87
-msgid "instead of writing a raw file, you can add a wav header to the file"
+#, fuzzy
+msgid "Instead of writing a raw file, you can add a wav header to the file"
 msgstr "raw¥Õ¥¡¥¤¥ë¤ò½ñ¤­½Ð¤¹Âå¤ï¤ê¤Ë¡¢wav¥Ø¥Ã¥À¤ò¥Õ¥¡¥¤¥ë¤ËÄɲ乤롣"
 
 #: modules/audio_output/file.c:104
 #, fuzzy
-msgid "output file"
+msgid "Output file"
 msgstr "½ÐÎÏ¥Õ¥©¡¼¥Þ¥Ã¥È"
 
 #: modules/audio_output/file.c:105
-msgid "file to which the audio samples will be written to"
+msgid "File to which the audio samples will be written to"
 msgstr ""
 
 #: modules/audio_output/file.c:114
@@ -1709,7 +1841,7 @@ msgstr "
 
 #: modules/audio_output/oss.c:101
 #, fuzzy
-msgid "try to work around buggy OSS drivers"
+msgid "Try to work around buggy OSS drivers"
 msgstr "OSS¥É¥é¥¤¥Ð¤Î¥Ð¥°¤Î²óÈò¤ò»î¤ß¤ë"
 
 #: modules/audio_output/oss.c:103
@@ -1740,7 +1872,7 @@ msgstr "
 msgid "Simple DirectMedia Layer audio output"
 msgstr "¥·¥ó¥×¥ë DirectMedia ¥ì¥¤¥ä¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/audio_output/waveout.c:124
+#: modules/audio_output/waveout.c:135
 #, fuzzy
 msgid "Win32 waveOut extension output"
 msgstr "Win32 wave½ÐÎÏÍѳÈÄ¥¥â¥¸¥å¡¼¥ë"
@@ -1779,10 +1911,10 @@ msgstr "3D Now! AC3 IMDCT
 
 #: modules/codec/adpcm.c:92
 #, fuzzy
-msgid "ADPCM audio deocder"
+msgid "ADPCM audio decoder"
 msgstr "µ¿»÷AC3¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
 
-#: modules/codec/araw.c:72
+#: modules/codec/araw.c:69
 #, fuzzy
 msgid "Pseudo Raw/Log Audio decoder"
 msgstr "µ¿»÷AC3¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
@@ -1806,11 +1938,79 @@ msgstr "DV
 msgid "AAC audio decoder (using libfaad2)"
 msgstr "AAC¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë (libfaad2)"
 
-#: modules/codec/ffmpeg/ffmpeg.c:154
-msgid "ffmpeg"
+#: modules/codec/ffmpeg/ffmpeg.c:84
+msgid "Direct rendering"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:86
+msgid "Error resilience"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:88
+msgid ""
+"ffmpeg can make errors resiliences.          \n"
+"Nevertheless, with a buggy encoder (like ISO MPEG-4 encoder from M$) this "
+"will produce a lot of errors.\n"
+"Valid range is -1 to 99 (-1 disables all errors resiliences)."
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:93
+msgid "Workaround bugs"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:95
+msgid ""
+"Try to fix some bugs\n"
+"1  autodetect\n"
+"2  old msmpeg4\n"
+"4  xvid interlaced\n"
+"8  ump4 \n"
+"16 no padding\n"
+"32 ac vlc\n"
+"64 Qpel chroma"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:104
+msgid "Hurry up"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:106
+msgid ""
+"Allow the decoder to partially decode or skip frame(s) when there is not "
+"enough time. It's useful with low CPU power but it can produce distorted "
+"pictures."
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:110
+#, fuzzy
+msgid "Truncated stream"
+msgstr "¥¹¥È¥ê¡¼¥à¤ÎºÆÀ¸"
+
+#: modules/codec/ffmpeg/ffmpeg.c:111
+msgid "truncated stream -1:auto,0:disable,:1:enable"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:113
+#, fuzzy
+msgid "Post processing quality"
+msgstr "¸å½èÍý"
+
+#: modules/codec/ffmpeg/ffmpeg.c:115
+msgid ""
+"Quality of post processing. Valid range is 0 to 6\n"
+"Higher levels require considerable more CPU power, but produce better "
+"looking pictures."
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:119
+msgid "Ffmpeg postproc filter chains"
 msgstr ""
 
 #: modules/codec/ffmpeg/ffmpeg.c:157
+msgid "ffmpeg"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:160
 msgid "ffmpeg audio/video decoder((MS)MPEG4,SVQ1,H263,WMV,WMA)"
 msgstr "ffmpeg ¥ª¡¼¥Ç¥£¥ª¡¿¥Ó¥Ç¥ª¡¦¥Ç¥³¡¼¥À((MS)MPEG4,SVQ1,H263,WMV,WMA)"
 
@@ -1818,11 +2018,7 @@ msgstr "ffmpeg 
 msgid "Post processing"
 msgstr "¸å½èÍý"
 
-#: modules/codec/ffmpeg/ffmpeg.c:177
-msgid "ffmpeg postprocessing module"
-msgstr "ffmpeg ¸å½èÍý¥â¥¸¥å¡¼¥ë"
-
-#: modules/codec/ffmpeg/ffmpeg.c:204
+#: modules/codec/ffmpeg/ffmpeg.c:179
 msgid "ffmpeg chroma conversion"
 msgstr ""
 
@@ -1846,12 +2042,12 @@ msgstr "MMX
 msgid "flac audio decoder"
 msgstr "µ¿»÷AC3¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
 
-#: modules/codec/libmpeg2.c:89
+#: modules/codec/libmpeg2.c:94
 #, fuzzy
 msgid "MPEG I/II video decoder (using libmpeg2)"
 msgstr "MPEG 1/2¥Ó¥Ç¥ª¡¦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/codec/lpcm.c:90
+#: modules/codec/lpcm.c:95
 msgid "linear PCM audio parser"
 msgstr "¥ê¥Ë¥¢PCM¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
 
@@ -1864,15 +2060,15 @@ msgstr ""
 msgid "MPEG I/II layer 1/2 audio decoder"
 msgstr "MPEG 1/2¥Ó¥Ç¥ª¡¦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/codec/mpeg_video/idct/idct.c:41
-msgid "IDCT"
-msgstr ""
-
 #: modules/codec/mpeg_video/idct/idctaltivec.c:45
 #, fuzzy
 msgid "AltiVec IDCT"
 msgstr "Altivec IDCT¥â¥¸¥å¡¼¥ë"
 
+#: modules/codec/mpeg_video/idct/idct.c:41
+msgid "IDCT"
+msgstr ""
+
 #: modules/codec/mpeg_video/idct/idctclassic.c:41
 #, fuzzy
 msgid "classic IDCT"
@@ -1888,11 +2084,6 @@ msgstr "MMX IDCT
 msgid "MMX EXT IDCT"
 msgstr "MMX¥¨¥¯¥¹¥Æ¥ó¥·¥ç¥óIDCT¥â¥¸¥å¡¼¥ë"
 
-#: modules/codec/mpeg_video/motion/motion.c:42
-#, fuzzy
-msgid "motion compensation"
-msgstr "¥â¡¼¥·¥ç¥óÊäÀµ¥â¥¸¥å¡¼¥ë"
-
 #: modules/codec/mpeg_video/motion/motion3dnow.c:44
 #, fuzzy
 msgid "3D Now! motion compensation"
@@ -1903,6 +2094,11 @@ msgstr "3D Now!
 msgid "AltiVec motion compensation"
 msgstr "AltiVec¥â¡¼¥·¥ç¥óÊäÀµ¥â¥¸¥å¡¼¥ë"
 
+#: modules/codec/mpeg_video/motion/motion.c:42
+#, fuzzy
+msgid "motion compensation"
+msgstr "¥â¡¼¥·¥ç¥óÊäÀµ¥â¥¸¥å¡¼¥ë"
+
 #: modules/codec/mpeg_video/motion/motionmmx.c:45
 #, fuzzy
 msgid "MMX motion compensation"
@@ -1926,7 +2122,8 @@ msgstr ""
 "¥È¤Ç¼«Æ°Åª¤ËºÇŬ¤Ê¥â¥¸¥å¡¼¥ë¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£"
 
 #: modules/codec/mpeg_video/parser.c:65
-msgid "motion compensation module"
+#, fuzzy
+msgid "Motion compensation module"
 msgstr "¥â¡¼¥·¥ç¥óÊäÀµ¥â¥¸¥å¡¼¥ë"
 
 #: modules/codec/mpeg_video/parser.c:67
@@ -1939,7 +2136,8 @@ msgstr ""
 "¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¼«Æ°Åª¤ËºÇŬ¤Ê¥â¥¸¥å¡¼¥ë¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£"
 
 #: modules/codec/mpeg_video/parser.c:71
-msgid "use additional processors"
+#, fuzzy
+msgid "Use additional processors"
 msgstr "ÄÉ²Ã¥×¥í¥»¥Ã¥µ¤Î»ÈÍÑ"
 
 #: modules/codec/mpeg_video/parser.c:73
@@ -1951,7 +2149,8 @@ msgstr ""
 "¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£"
 
 #: modules/codec/mpeg_video/parser.c:76
-msgid "force synchro algorithm {I|I+|IP|IP+|IPB}"
+#, fuzzy
+msgid "Force synchro algorithm {I|I+|IP|IP+|IPB}"
 msgstr "Ʊ´ü¥¢¥ë¥´¥ê¥º¥à¤ò¶¯À©Åª¤Ë»ØÄꤷ¤Þ¤¹ (I|I+|IP|IP+|IPB)"
 
 #: modules/codec/mpeg_video/parser.c:78
@@ -1970,39 +2169,46 @@ msgstr ""
 msgid "MPEG I/II video decoder"
 msgstr "MPEG 1/2¥Ó¥Ç¥ª¡¦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
 
+#: modules/codec/quicktime.c:70
+msgid "QuickTime library decoder"
+msgstr ""
+
 #: modules/codec/rawvideo.c:65
 #, fuzzy
 msgid "Pseudo Raw Video decoder"
 msgstr "µ¿»÷AC3¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
 
-#: modules/codec/spudec/spudec.c:48
+#: modules/codec/spudec/spudec.c:49
 #, fuzzy
-msgid "font used by the text subtitler"
-msgstr "ʸ»ú»úËë¤Ç»ÈÍѤµ¤ì¤ë¥Õ¥©¥ó¥È"
+msgid "DVD subtitles decoder"
+msgstr "»úË롦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/codec/spudec/spudec.c:50
-msgid ""
-"When the subtitles are coded in text form then, you can choose which font "
-"will be used to display them."
-msgstr ""
-"»úË뤬¥Æ¥­¥¹¥È¡¦¥Õ¥©¡¼¥à¤Ç¥³¡¼¥É²½¤µ¤ì¤Æ¤¤¤ë»þ¡¢É½¼¨¤¹¤ë¤¿¤á¤Î¥Õ¥©¥ó¥È¤òÁªÂò"
-"²Äǽ¤Ç¤¹¡£"
+#: modules/codec/subsdec/subsdec.c:68
+#, fuzzy
+msgid "subtitle text encoding"
+msgstr "»úË롦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/codec/spudec/spudec.c:56
-msgid "subtitles"
-msgstr "»úËë(_S)"
+#: modules/codec/subsdec/subsdec.c:69
+#, fuzzy
+msgid "change the encoding used in text subtitles"
+msgstr "ʸ»ú»úËë¤Ç»ÈÍѤµ¤ì¤ë¥Õ¥©¥ó¥È"
 
-#: modules/codec/spudec/spudec.c:65
+#: modules/codec/subsdec/subsdec.c:72
 #, fuzzy
-msgid "subtitles decoder"
+msgid "file subtitles decoder"
 msgstr "»úË롦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
 
+#: modules/codec/subsdec/subsdec.c:75 modules/gui/beos/InterfaceWindow.cpp:256
+#: modules/gui/kde/interface.cpp:93
+msgid "Subtitles"
+msgstr "»úËë"
+
 #: modules/codec/tarkin.c:95
 #, fuzzy
 msgid "Tarkin decoder module"
 msgstr "MPEG 1/2¥Ó¥Ç¥ª¡¦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/codec/theora.c:84
+#: modules/codec/theora.c:85
 #, fuzzy
 msgid "Theora video decoder"
 msgstr "DV¥Ó¥Ç¥ª¡¦¥Ç¥³¡¼¥À"
@@ -2021,7 +2227,17 @@ msgstr ""
 msgid "Xvid video decoder"
 msgstr "DV¥Ó¥Ç¥ª¡¦¥Ç¥³¡¼¥À"
 
-#: modules/control/gestures.c:77
+#: modules/control/corba/corba.c:614
+#, fuzzy
+msgid "Corba control"
+msgstr "¥³¥ó¥È¥í¡¼¥ë"
+
+#: modules/control/corba/corba.c:615
+#, fuzzy
+msgid "corba control module"
+msgstr "»úË롦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
+
+#: modules/control/gestures.c:77 modules/control/joystick.c:132
 msgid "Motion threshold"
 msgstr ""
 
@@ -2046,33 +2262,80 @@ msgstr ""
 msgid "mouse gestures control interface"
 msgstr "ÀÖ³°Àþ¥ê¥â¡¼¥È¡¦¥³¥ó¥È¥í¡¼¥ë¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/control/http.c:74
+#: modules/control/http.c:131
 #, fuzzy
-msgid "http interface bind port"
-msgstr "Qt¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
+msgid "Host address"
+msgstr "¥Û¥¹¥È̾/¥¢¥É¥ì¥¹"
 
-#: modules/control/http.c:76
-msgid ""
-"You can set the port on which the http interface will accept connections"
+#: modules/control/http.c:133
+msgid "You can set the address and port on which the http interface will bind"
 msgstr ""
 
-#: modules/control/http.c:77
+#: modules/control/http.c:134 modules/control/http.c:135
 #, fuzzy
-msgid "http interface bind address"
-msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹"
+msgid "Source directory"
+msgstr "¥½¡¼¥¹¤Î¥¢¥¹¥Ú¥¯¥È¡¦¥ì¥·¥ª"
 
-#: modules/control/http.c:79
-msgid "You can set the address on which the http interface will bind"
-msgstr ""
+#: modules/control/http.c:138
+#, fuzzy
+msgid "HTTP remote control interface"
+msgstr "¥ê¥â¡¼¥È¡¦¥³¥ó¥È¥í¡¼¥ë¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/control/http.c:82
+#: modules/control/http.c:139
 #, fuzzy
 msgid "HTTP remote control"
 msgstr "¥ê¥â¡¼¥È¡¦¥³¥ó¥È¥í¡¼¥ë"
 
-#: modules/control/http.c:85
+#: modules/control/joystick.c:134
+msgid "the amount of joystick movement required for a movement to berecorded"
+msgstr ""
+
+#: modules/control/joystick.c:137
+msgid "Joystick device"
+msgstr ""
+
+#: modules/control/joystick.c:139
+msgid ""
+"the device for the joystick (usually /dev/jsX or /dev/input/jsXwith X the "
+"number of the joystick"
+msgstr ""
+
+#: modules/control/joystick.c:142
 #, fuzzy
-msgid "HTTP remote control interface"
+msgid "Repeat time"
+msgstr "¥Õ¥¡¥¤¥ë¤ÎÁªÂò"
+
+#: modules/control/joystick.c:144
+msgid ""
+"the time waited before the action is repeated if it is still trigeredin "
+"miscroseconds"
+msgstr ""
+
+#: modules/control/joystick.c:147
+msgid "Wait before repeat time"
+msgstr ""
+
+#: modules/control/joystick.c:149
+msgid " the time waited before the repeat starts, in microseconds"
+msgstr ""
+
+#: modules/control/joystick.c:151
+msgid "Max seek interval"
+msgstr ""
+
+#: modules/control/joystick.c:153
+msgid ""
+" the number of seconds that will be seeked if the axis is pushed at its "
+"maximum"
+msgstr ""
+
+#: modules/control/joystick.c:157
+msgid "Joystick"
+msgstr ""
+
+#: modules/control/joystick.c:168
+#, fuzzy
+msgid "joystick control interface"
 msgstr "¥ê¥â¡¼¥È¡¦¥³¥ó¥È¥í¡¼¥ë¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
 
 #: modules/control/lirc/lirc.c:64
@@ -2088,26 +2351,27 @@ msgstr "VLC
 #: modules/control/lirc/lirc.c:297 modules/control/lirc/lirc.c:323
 #: modules/gui/familiar/interface.c:177 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:880
-#: modules/gui/macosx/intf.m:881 modules/gui/macosx/intf.m:882
-#: modules/gui/win32/strings.cpp:102 modules/gui/wxwindows/interface.cpp:763
+#: 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:685
 msgid "Pause"
 msgstr "°ì»þÄä»ß"
 
 #: modules/control/lirc/lirc.c:310 modules/gui/familiar/interface.c:190
 #: 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:300 modules/gui/macosx/intf.m:338
-#: modules/gui/macosx/intf.m:398 modules/gui/macosx/intf.m:887
-#: modules/gui/macosx/intf.m:888 modules/gui/macosx/intf.m:889
-#: modules/gui/macosx/playlist.m:172 modules/gui/win32/strings.cpp:100
-#: modules/gui/win32/strings.cpp:204 modules/gui/wxwindows/interface.cpp:334
-#: modules/gui/wxwindows/interface.cpp:768
+#: 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:342
+#: modules/gui/wxwindows/interface.cpp:691
 msgid "Play"
 msgstr "ºÆÀ¸"
 
 #: modules/control/rc/rc.c:77
-msgid "show stream position"
+#, fuzzy
+msgid "Show stream position"
 msgstr "¥µ¥Ö¡¦¥¹¥È¥ê¡¼¥à¤Î°ÌÃÖ"
 
 #: modules/control/rc/rc.c:78
@@ -2116,7 +2380,8 @@ msgid ""
 msgstr "ľ¤Á¤Ë¸½ºß¤Î°ÌÃÖ¤ò¼¨¤·¤Þ¤¹¡£"
 
 #: modules/control/rc/rc.c:80
-msgid "fake TTY"
+#, fuzzy
+msgid "Fake TTY"
 msgstr "µ¿»÷ TTY"
 
 #: modules/control/rc/rc.c:81
@@ -2156,18 +2421,18 @@ msgid "Layer"
 msgstr ""
 
 #: modules/demux/aac/demux.c:562 modules/demux/asf/asf.c:275
-#: modules/demux/avi/avi.c:1171 modules/demux/ogg.c:821
-#: modules/demux/ogg.c:994 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/intf.m:360
-#: modules/gui/macosx/intf.m:361 modules/gui/win32/strings.cpp:81
+#: modules/demux/avi/avi.c:1178 modules/demux/mkv.cpp:2449
+#: modules/demux/ogg.c:561 modules/demux/ogg.c:837 modules/demux/ogg.c:1010
+#: 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
 msgid "Channels"
 msgstr "¥Á¥ã¥ó¥Í¥ë"
 
 #: modules/demux/aac/demux.c:564 modules/demux/asf/asf.c:277
-#: modules/demux/avi/avi.c:1173 modules/demux/mpeg/audio.c:632
-#: modules/demux/ogg.c:556 modules/demux/ogg.c:655 modules/demux/ogg.c:816
-#: modules/demux/ogg.c:989
+#: modules/demux/avi/avi.c:1180 modules/demux/mkv.cpp:2453
+#: modules/demux/mpeg/audio.c:632 modules/demux/ogg.c:559
+#: modules/demux/ogg.c:671 modules/demux/ogg.c:832 modules/demux/ogg.c:1005
 #, fuzzy
 msgid "Sample Rate"
 msgstr "¥·¥ó¥Ü¥ë¡¦¥ì¡¼¥È"
@@ -2176,25 +2441,28 @@ msgstr "
 msgid "ASF v1.0 demuxer (file only)"
 msgstr ""
 
-#: modules/demux/asf/asf.c:165
+#: modules/demux/asf/asf.c:165 modules/demux/mkv.cpp:2412
 #, fuzzy
 msgid "Number of streams"
 msgstr "¹Ô¿ô"
 
 #: modules/demux/asf/asf.c:228 modules/demux/asf/asf.c:302
-#: modules/demux/avi/avi.c:1167 modules/demux/avi/avi.c:1203
-#: modules/demux/avi/avi.c:1234 modules/demux/ogg.c:554
-#: modules/demux/ogg.c:613 modules/demux/ogg.c:653 modules/demux/ogg.c:718
-#: modules/demux/ogg.c:813 modules/demux/ogg.c:893 modules/demux/ogg.c:986
-#: modules/gui/familiar/interface.c:370 modules/gui/macosx/output.m:130
+#: modules/demux/avi/avi.c:1172 modules/demux/avi/avi.c:1217
+#: modules/demux/avi/avi.c:1250 modules/demux/mkv.cpp:2445
+#: modules/demux/mkv.cpp:2461 modules/demux/mkv.cpp:2477
+#: modules/demux/ogg.c:557 modules/demux/ogg.c:629 modules/demux/ogg.c:669
+#: modules/demux/ogg.c:734 modules/demux/ogg.c:829 modules/demux/ogg.c:909
+#: modules/demux/ogg.c:1002 modules/gui/familiar/interface.c:370
+#: modules/gui/macosx/output.m:139 modules/gui/pda/interface.c:372
 msgid "Type"
 msgstr "¥¿¥¤¥×"
 
 #: modules/demux/asf/asf.c:260 modules/demux/asf/asf.c:318
-#: modules/demux/avi/avi.c:1169 modules/demux/avi/avi.c:1204
-#: modules/demux/ogg.c:555 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/demux/avi/avi.c:1174 modules/demux/avi/avi.c:1218
+#: modules/demux/mkv.cpp:2446 modules/demux/mkv.cpp:2462
+#: modules/demux/mkv.cpp:2478 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
 #, fuzzy
 msgid "Codec"
 msgstr "ÊĤ¸¤ë"
@@ -2203,7 +2471,8 @@ msgstr "
 msgid "Avg. byterate"
 msgstr ""
 
-#: modules/demux/asf/asf.c:282 modules/demux/avi/avi.c:1175
+#: modules/demux/asf/asf.c:282 modules/demux/avi/avi.c:1185
+#: modules/demux/mkv.cpp:2457
 msgid "Bits Per Sample"
 msgstr ""
 
@@ -2211,7 +2480,8 @@ msgstr ""
 msgid "Size"
 msgstr "¥µ¥¤¥º"
 
-#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1206
+#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1222
+#: modules/demux/mkv.cpp:2465
 #, fuzzy
 msgid "Resolution"
 msgstr "ÁªÂò"
@@ -2221,7 +2491,7 @@ msgstr "
 msgid "Planes"
 msgstr "ºÆÀ¸"
 
-#: modules/demux/asf/asf.c:339 modules/demux/avi/avi.c:1212
+#: modules/demux/asf/asf.c:339 modules/demux/avi/avi.c:1228
 msgid "Bits Per Pixel"
 msgstr ""
 
@@ -2294,36 +2564,50 @@ msgstr "
 msgid "AVI demuxer"
 msgstr ""
 
-#: modules/demux/avi/avi.c:1096
+#: modules/demux/avi/avi.c:1101
 msgid "Avi"
 msgstr ""
 
-#: modules/demux/avi/avi.c:1097
+#: modules/demux/avi/avi.c:1102
 #, fuzzy
 msgid "Number of Streams"
 msgstr "¹Ô¿ô"
 
-#: modules/demux/avi/avi.c:1098
+#: modules/demux/avi/avi.c:1103
 #, fuzzy
 msgid "Flags"
 msgstr "ÁáÁ÷¤ê"
 
-#: modules/demux/avi/avi.c:1209 modules/demux/ogg.c:615
-#: modules/demux/ogg.c:721 modules/demux/ogg.c:896
+#: 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
+msgid "FOURCC"
+msgstr ""
+
+#: modules/demux/avi/avi.c:1187
+#, fuzzy
+msgid "Audio Bitrate"
+msgstr "¥ª¡¼¥Ç¥£¥ª"
+
+#: modules/demux/avi/avi.c:1225 modules/demux/ogg.c:631
+#: modules/demux/ogg.c:737 modules/demux/ogg.c:912
 msgid "Frame Rate"
 msgstr ""
 
-#: modules/demux/avi/avi.c:1234
+#: modules/demux/avi/avi.c:1250
 msgid "Unknown"
 msgstr ""
 
 #: modules/demux/demuxdump.c:48
 #, fuzzy
-msgid "dump file name"
+msgid "Dump file name"
 msgstr "¥í¥°¡¦¥Õ¥¡¥¤¥ë̾"
 
 #: modules/demux/demuxdump.c:50
-msgid "specify a file name to which the raw stream will be dumped."
+msgid "Specify a file name to which the raw stream will be dumped."
 msgstr ""
 
 #: modules/demux/demuxdump.c:53
@@ -2334,11 +2618,89 @@ msgstr ""
 msgid "flac demuxer"
 msgstr ""
 
-#: modules/demux/m3u.c:65
+#: modules/demux/m3u.c:63
 #, fuzzy
 msgid "playlist metademux"
 msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
 
+#: modules/demux/mkv.cpp:94
+msgid "mkv-demuxer"
+msgstr ""
+
+#: modules/demux/mkv.cpp:96 modules/demux/mkv.cpp:97
+msgid "Seek based on percent not time"
+msgstr ""
+
+#: modules/demux/mkv.cpp:99
+#, fuzzy
+msgid "mka/mkv stream demuxer"
+msgstr "MPEG 1/2¥ì¥¤¥ä1/2¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
+
+#: modules/demux/mkv.cpp:2389 modules/gui/gtk/gnome_interface.c:2436
+#: modules/gui/gtk/gtk_interface.c:2857 modules/gui/wxwindows/playlist.cpp:150
+msgid "Duration"
+msgstr "»ý³´ü´Ö"
+
+#: modules/demux/mkv.cpp:2398
+msgid "Date UTC"
+msgstr ""
+
+#: modules/demux/mkv.cpp:2402
+#, fuzzy
+msgid "Segment Filename"
+msgstr "¥í¥°¡¦¥Õ¥¡¥¤¥ë̾"
+
+#: modules/demux/mkv.cpp:2406
+#, fuzzy
+msgid "Muxing Application"
+msgstr "¤³¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ë¤Ä¤¤¤Æ"
+
+#: modules/demux/mkv.cpp:2410
+#, fuzzy
+msgid "Writing Application"
+msgstr "¿âľÊý¸þ°ÌÃÖ"
+
+#: modules/demux/mkv.cpp:2423 modules/gui/beos/PlayListWindow.cpp:144
+#: modules/gui/familiar/interface.c:362 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:2427
+#, fuzzy
+msgid "Codec Name"
+msgstr "¥Ç¥Ð¥¤¥¹Ì¾"
+
+#: modules/demux/mkv.cpp:2431
+#, fuzzy
+msgid "Codec Setting"
+msgstr "ÀßÄê(_S)"
+
+#: modules/demux/mkv.cpp:2435
+#, fuzzy
+msgid "Codec Info"
+msgstr "¥Ç¥Ð¥¤¥¹Ì¾"
+
+#: modules/demux/mkv.cpp:2439
+#, fuzzy
+msgid "Codec Download"
+msgstr "¥Ç¥Ð¥¤¥¹Ì¾"
+
+#: modules/demux/mkv.cpp:2469
+#, fuzzy
+msgid "Display Resolution"
+msgstr "ÁªÂò"
+
+#: modules/demux/mkv.cpp:2473
+msgid "Frame Per Second"
+msgstr ""
+
+#: modules/demux/mkv.cpp:2477 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
 msgid "MP4 demuxer"
 msgstr ""
@@ -2384,7 +2746,8 @@ msgid "generic ISO 13818-1 MPEG demultiplexing"
 msgstr "°ìÈÌŪ¤ÊISO 13818-1 MPEG¿½ÅÁ÷¿®"
 
 #: modules/demux/mpeg/ts.c:97
-msgid "compatibility with pre-0.4 VLS"
+#, fuzzy
+msgid "Compatibility with pre-0.4 VLS"
 msgstr "0.4°ÊÁ°¤ÎVLS¤È¤Î¸ß´¹"
 
 #: modules/demux/mpeg/ts.c:99
@@ -2398,7 +2761,7 @@ msgstr ""
 "ÍѤ·¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤òÁªÂò¤·¤Þ¤¹¡£"
 
 #: modules/demux/mpeg/ts.c:103
-msgid "buggy PSI"
+msgid "Buggy PSI"
 msgstr ""
 
 #: modules/demux/mpeg/ts.c:105
@@ -2415,42 +2778,42 @@ msgstr "ISO 13818-1 MPEGž
 msgid "ISO 13818-1 MPEG Transport Stream input (libdvbpsi)"
 msgstr "ISO 13818-1 MPEGžÁ÷¥¹¥È¥ê¡¼¥àÆþÎÏ(libdvdpsi)"
 
-#: modules/demux/ogg.c:187
+#: modules/demux/ogg.c:188
 #, fuzzy
 msgid "ogg stream demuxer"
 msgstr "MPEG 1/2¥ì¥¤¥ä1/2¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
 
-#: modules/demux/ogg.c:555
+#: modules/demux/ogg.c:558
 msgid "Vorbis"
 msgstr ""
 
-#: modules/demux/ogg.c:558 modules/demux/ogg.c:617 modules/demux/ogg.c:657
-#: modules/demux/ogg.c:818 modules/demux/ogg.c:991
+#: modules/demux/ogg.c:563 modules/demux/ogg.c:633 modules/demux/ogg.c:673
+#: modules/demux/ogg.c:834 modules/demux/ogg.c:1007
 msgid "Bit Rate"
 msgstr ""
 
-#: modules/demux/ogg.c:614
+#: modules/demux/ogg.c:630
 msgid "Theora"
 msgstr ""
 
-#: modules/demux/ogg.c:654
+#: modules/demux/ogg.c:670
 #, fuzzy
 msgid "tarkin"
 msgstr "ʸ»úÎó"
 
-#: modules/demux/ogg.c:723 modules/demux/ogg.c:898
+#: modules/demux/ogg.c:739 modules/demux/ogg.c:914
 msgid "Bit Count"
 msgstr ""
 
-#: modules/demux/ogg.c:725 modules/demux/ogg.c:900
+#: modules/demux/ogg.c:741 modules/demux/ogg.c:916
 msgid "Width"
 msgstr ""
 
-#: modules/demux/ogg.c:727 modules/demux/ogg.c:902
+#: modules/demux/ogg.c:743 modules/demux/ogg.c:918
 msgid "Height"
 msgstr ""
 
-#: modules/demux/ogg.c:823 modules/demux/ogg.c:996
+#: modules/demux/ogg.c:839 modules/demux/ogg.c:1012
 msgid "Bits per Sample"
 msgstr ""
 
@@ -2458,7 +2821,7 @@ msgstr ""
 msgid "raw dv demuxer"
 msgstr ""
 
-#: modules/demux/util/id3.c:46
+#: modules/demux/util/id3.c:44
 msgid "Simple id3 tag skipper"
 msgstr "¥·¥ó¥×¥ë¤Êid3¥¿¥°¡¦¥¹¥­¥Ã¥Ñ"
 
@@ -2808,7 +3171,7 @@ msgstr ""
 msgid "id3 tag parser using libid3tag"
 msgstr "id3¥¿¥°¥Ñ¡¼¥µ¤Çlibid3tag¤ò»ÈÍÑ"
 
-#: modules/demux/util/sub.c:72
+#: modules/demux/util/sub.c:67
 #, fuzzy
 msgid "Text subtitles demux"
 msgstr "»úËë¤ÎÁªÂò"
@@ -2832,7 +3195,7 @@ msgstr "
 msgid "XviD video encoder (MPEG-4)"
 msgstr "DV¥Ó¥Ç¥ª¡¦¥Ç¥³¡¼¥À"
 
-#: modules/gui/beos/BeOS.cpp:53
+#: modules/gui/beos/BeOS.cpp:55
 #, fuzzy
 msgid "BeOS standard API interface"
 msgstr "BeOSɸ½àAPI¥â¥¸¥å¡¼¥ë"
@@ -2851,19 +3214,20 @@ msgid "Yes"
 msgstr ""
 
 #: modules/gui/beos/InterfaceWindow.cpp:201
-#: modules/gui/beos/InterfaceWindow.cpp:300
+#: modules/gui/beos/InterfaceWindow.cpp:308
 #: modules/gui/familiar/interface.c:149 modules/gui/familiar/interface.c:150
-#: modules/gui/macosx/intf.m:304 modules/gui/macosx/prefs.m:192
-#: modules/gui/win32/strings.cpp:211 modules/gui/wxwindows/preferences.cpp:229
+#: 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
 msgid "Preferences"
 msgstr "ÀßÄê..."
 
 #: modules/gui/beos/InterfaceWindow.cpp:211
-#: modules/gui/beos/InterfaceWindow.cpp:298
+#: modules/gui/beos/InterfaceWindow.cpp:306
 #: modules/gui/gtk/gnome_interface.c:2692 modules/gui/gtk/gtk_interface.c:2947
 #: modules/gui/kde/info.cpp:9 modules/gui/kde/messages.cpp:8
-#: modules/gui/macosx/intf.m:310 modules/gui/macosx/intf.m:387
-#: modules/gui/win32/strings.cpp:153 modules/gui/wxwindows/messages.cpp:79
+#: modules/gui/macosx/intf.m:334 modules/gui/macosx/intf.m:411
+#: modules/gui/wxwindows/messages.cpp:83
 msgid "Messages"
 msgstr "¥á¥Ã¥»¡¼¥¸"
 
@@ -2876,24 +3240,24 @@ 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:141 modules/gui/macosx/open.m:263
-#: modules/gui/macosx/output.m:121 modules/gui/macosx/output.m:194
-#: modules/gui/macosx/output.m:279 modules/gui/win32/strings.cpp:93
-#: modules/gui/win32/strings.cpp:226 modules/gui/wxwindows/interface.cpp:321
-#: modules/gui/wxwindows/open.cpp:271 modules/gui/wxwindows/streamout.cpp:345
+#: 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:329 modules/gui/wxwindows/open.cpp:253
+#: modules/gui/wxwindows/streamout.cpp:385
 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:614 modules/gui/macosx/open.m:661
+#: modules/gui/gtk2/gnome2_interface.c:113
+#: modules/gui/gtk/gnome_interface.c:2179 modules/gui/macosx/open.m:331
+#: modules/gui/macosx/open.m:630 modules/gui/macosx/open.m:676
 msgid "Open File"
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯"
 
 #: modules/gui/beos/InterfaceWindow.cpp:243
-#: modules/gui/beos/PlayListWindow.cpp:89 modules/gui/win32/strings.cpp:19
+#: modules/gui/beos/PlayListWindow.cpp:89
 #, fuzzy
 msgid "Open Disc"
 msgstr "¥Ç¥£¥¹¥¯¤ò³«¤¯(_D)..."
@@ -2906,16 +3270,11 @@ msgstr "
 #: modules/gui/beos/InterfaceWindow.cpp:249
 #: modules/gui/familiar/interface.c:231 modules/gui/familiar/interface.c:232
 #: modules/gui/familiar/interface.c:765 modules/gui/gtk/gtk_interface.c:1580
-#: modules/gui/win32/strings.cpp:7
+#: modules/gui/pda/interface.c:233 modules/gui/pda/interface.c:234
+#: modules/gui/pda/interface.c:767
 msgid "About"
 msgstr "VideoLAN¤Ë¤Ä¤¤¤Æ"
 
-#: modules/gui/beos/InterfaceWindow.cpp:256 modules/gui/kde/interface.cpp:93
-#: modules/gui/macosx/intf.m:376 modules/gui/macosx/intf.m:377
-#: modules/gui/win32/strings.cpp:87
-msgid "Subtitles"
-msgstr "»úËë"
-
 #: modules/gui/beos/InterfaceWindow.cpp:264
 #, fuzzy
 msgid "Prev Title"
@@ -2931,11 +3290,6 @@ msgstr "
 msgid "Prev Chapter"
 msgstr "¥Á¥ã¥×¥¿¡¼"
 
-#: modules/gui/beos/InterfaceWindow.cpp:267
-#, fuzzy
-msgid "Next Chapter"
-msgstr "¥Á¥ã¥×¥¿¡¼"
-
 #: modules/gui/beos/InterfaceWindow.cpp:268
 msgid "Goto Menu"
 msgstr ""
@@ -2955,53 +3309,33 @@ msgstr "
 msgid "Speed"
 msgstr "ÁªÂòºÑ¤ß"
 
-#: modules/gui/beos/InterfaceWindow.cpp:286 modules/gui/macosx/controls.m:422
-#: modules/gui/macosx/intf.m:299 modules/gui/macosx/intf.m:341
-msgid "Slower"
-msgstr "¥¹¥í¡¼"
-
-#: modules/gui/beos/InterfaceWindow.cpp:287
-msgid "Normal"
-msgstr ""
-
-#: modules/gui/beos/InterfaceWindow.cpp:290 modules/gui/macosx/controls.m:421
-#: modules/gui/macosx/intf.m:302 modules/gui/macosx/intf.m:340
-msgid "Faster"
-msgstr "ÁáÁ÷¤ê"
-
-#: modules/gui/beos/InterfaceWindow.cpp:295 modules/gui/macosx/intf.m:381
+#: modules/gui/beos/InterfaceWindow.cpp:303 modules/gui/macosx/intf.m:405
 msgid "Window"
 msgstr "¥¦¥£¥ó¥É¥¦"
 
-#: modules/gui/beos/InterfaceWindow.cpp:296
+#: modules/gui/beos/InterfaceWindow.cpp:304
 #, fuzzy
 msgid "Play List"
 msgstr "¥ê¥¹¥È"
 
-#: modules/gui/beos/InterfaceWindow.cpp:356
+#: modules/gui/beos/InterfaceWindow.cpp:364
 #: modules/gui/gtk/gtk_interface.c:1661 modules/gui/gtk/gtk_interface.c:2396
 #: modules/gui/gtk/gtk_interface.c:2638 modules/gui/gtk/gtk_interface.c:2869
 #: modules/gui/gtk/gtk_interface.c:2976 modules/gui/gtk/gtk_interface.c:3250
-#: modules/gui/gtk/preferences.c:605 modules/gui/macosx/open.m:138
-#: modules/gui/macosx/open.m:178 modules/gui/macosx/output.m:117
-#: modules/gui/macosx/prefs.m:587 modules/gui/macosx/prefs.m:750
-#: modules/gui/win32/strings.cpp:13 modules/gui/win32/strings.cpp:26
-#: modules/gui/win32/strings.cpp:154 modules/gui/win32/strings.cpp:173
-#: modules/gui/win32/strings.cpp:183 modules/gui/win32/strings.cpp:214
-#: modules/gui/win32/strings.cpp:233 modules/gui/win32/strings.cpp:249
-#: modules/gui/wxwindows/fileinfo.cpp:96
-#: modules/gui/wxwindows/messages.cpp:102 modules/gui/wxwindows/open.cpp:262
-#: modules/gui/wxwindows/preferences.cpp:250
-#: modules/gui/wxwindows/streamout.cpp:194
+#: 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/open.cpp:971
+#: modules/gui/wxwindows/preferences.cpp:253
+#: modules/gui/wxwindows/streamout.cpp:217
 #: modules/gui/wxwindows/subtitles.cpp:149
 msgid "OK"
 msgstr ""
 
-#: modules/gui/beos/InterfaceWindow.cpp:364
+#: modules/gui/beos/InterfaceWindow.cpp:372
 msgid "VideoLAN Client: Open Media Files"
 msgstr ""
 
-#: modules/gui/beos/InterfaceWindow.cpp:368
+#: modules/gui/beos/InterfaceWindow.cpp:376
 #, fuzzy
 msgid "VideoLAN Client: Open Subtitle File"
 msgstr "»úËë¤ÎÁªÂò"
@@ -3010,17 +3344,19 @@ msgstr "
 msgid "Drop files to play"
 msgstr ""
 
-#: modules/gui/beos/PlayListWindow.cpp:93 modules/gui/wxwindows/menus.cpp:163
-#: modules/gui/wxwindows/playlist.cpp:154
+#: modules/gui/beos/PlayListWindow.cpp:93
+#: modules/gui/wxwindows/fileinfo.cpp:96
+#: modules/gui/wxwindows/messages.cpp:106
+#: modules/gui/wxwindows/playlist.cpp:156
 msgid "Close"
 msgstr "ÊĤ¸¤ë"
 
-#: modules/gui/beos/PlayListWindow.cpp:98 modules/gui/macosx/intf.m:330
+#: modules/gui/beos/PlayListWindow.cpp:98 modules/gui/macosx/intf.m:354
 msgid "Edit"
 msgstr "ÊÔ½¸"
 
-#: modules/gui/beos/PlayListWindow.cpp:100 modules/gui/macosx/intf.m:335
-#: modules/gui/macosx/playlist.m:174
+#: modules/gui/beos/PlayListWindow.cpp:100 modules/gui/macosx/intf.m:359
+#: modules/gui/macosx/playlist.m:196
 msgid "Select All"
 msgstr "¤¹¤Ù¤Æ¤òÁªÂò"
 
@@ -3063,90 +3399,82 @@ msgstr "ɽ
 msgid "Path"
 msgstr "¥Ý¡¼¥ÈÈÖ¹æ"
 
-#: modules/gui/beos/PlayListWindow.cpp:144
-#: modules/gui/familiar/interface.c:362 modules/gui/gtk/preferences.c:325
-#: modules/gui/kde/pluginsbox.cpp:45
-msgid "Name"
-msgstr "̾Á°"
-
-#: modules/gui/beos/PreferencesWindow.cpp:103
-#: modules/gui/gtk/gnome_interface.c:2216
+#: modules/gui/beos/PreferencesWindow.cpp:44
+#: modules/gui/beos/PreferencesWindow.cpp:46
+#: modules/gui/beos/PreferencesWindow.cpp:98
+#: modules/gui/gtk/gnome_interface.c:2216 modules/gui/macosx/prefs.m:806
+#: modules/gui/macosx/prefs.m:814 modules/gui/macosx/prefs.m:884
 msgid "Modules"
 msgstr "¥â¥¸¥å¡¼¥ë"
 
-#: modules/gui/beos/PreferencesWindow.cpp:255
-#: modules/gui/gtk/preferences.c:609 modules/gui/win32/strings.cpp:212
+#: modules/gui/beos/PreferencesWindow.cpp:219
+#: modules/gui/gtk/preferences.c:610
 msgid "Apply"
 msgstr "ŬÍÑ"
 
-#: modules/gui/beos/PreferencesWindow.cpp:260
-#: modules/gui/gtk/preferences.c:596 modules/gui/gtk/preferences.c:613
-#: modules/gui/macosx/output.m:329 modules/gui/win32/strings.cpp:213
-#: modules/gui/wxwindows/preferences.cpp:254
+#: 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
 msgid "Save"
 msgstr "Êݸ"
 
-#: modules/gui/beos/PreferencesWindow.cpp:264
+#: modules/gui/beos/PreferencesWindow.cpp:228
 #, fuzzy
 msgid "Defaults"
 msgstr "ºï½ü"
 
-#: modules/gui/beos/VideoOutput.cpp:1125
+#: modules/gui/beos/VideoOutput.cpp:1138
 #, fuzzy
 msgid "Show Interface"
 msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹"
 
-#: modules/gui/beos/VideoOutput.cpp:1129
+#: modules/gui/beos/VideoOutput.cpp:1142
 msgid "50%"
 msgstr ""
 
-#: modules/gui/beos/VideoOutput.cpp:1132
+#: modules/gui/beos/VideoOutput.cpp:1145
 msgid "100%"
 msgstr ""
 
-#: modules/gui/beos/VideoOutput.cpp:1135
+#: modules/gui/beos/VideoOutput.cpp:1148
 msgid "200%"
 msgstr ""
 
-#: modules/gui/beos/VideoOutput.cpp:1138 modules/gui/macosx/controls.m:342
-#: modules/gui/macosx/controls.m:486 modules/gui/macosx/intf.m:370
-msgid "Fullscreen"
-msgstr "Á´²èÌ̲½"
-
-#: modules/gui/beos/VideoOutput.cpp:1145
+#: modules/gui/beos/VideoOutput.cpp:1158
 #, fuzzy
 msgid "Vertical Sync"
 msgstr "¿âľ"
 
-#: modules/gui/beos/VideoOutput.cpp:1149
+#: modules/gui/beos/VideoOutput.cpp:1162
 #, fuzzy
 msgid "Correct Aspect Ratio"
 msgstr "¥½¡¼¥¹¤Î¥¢¥¹¥Ú¥¯¥È¡¦¥ì¥·¥ª"
 
-#: modules/gui/beos/VideoOutput.cpp:1178
+#: modules/gui/beos/VideoOutput.cpp:1191
 msgid "Stay On Top"
 msgstr ""
 
-#: modules/gui/beos/VideoOutput.cpp:1184
+#: modules/gui/beos/VideoOutput.cpp:1197
 msgid "Take Screen Shot"
 msgstr ""
 
-#: modules/gui/beos/VlcWrapper.cpp:185 modules/gui/gtk/menu.c:733
-#: modules/gui/macosx/prefs.m:403 modules/gui/macosx/prefs.m:432
-#: modules/gui/macosx/prefs.m:684 modules/gui/macosx/prefs.m:713
+#: modules/gui/beos/VlcWrapper.cpp:165 modules/gui/gtk/menu.c:733
 msgid "None"
 msgstr "¤Ê¤·"
 
-#: modules/gui/beos/VlcWrapper.cpp:198
+#: modules/gui/beos/VlcWrapper.cpp:178
 msgid "<unknown>"
 msgstr ""
 
-#: modules/gui/familiar/familiar.c:62
-msgid "autoplay selected file"
+#: modules/gui/familiar/familiar.c:62 modules/gui/pda/pda.c:62
+#, fuzzy
+msgid "Autoplay selected file"
 msgstr "ÁªÂò¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤ò¼«Æ°ºÆÀ¸"
 
-#: modules/gui/familiar/familiar.c:63
-msgid "automatically play a file when selected in the file selection list"
+#: modules/gui/familiar/familiar.c:63 modules/gui/pda/pda.c:63
+#, fuzzy
+msgid "Automatically play a file when selected in the file selection list"
 msgstr "ÁªÂò¥ê¥¹¥È¤ÇÁªÂò¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤ò¼«Æ°Åª¤ËºÆÀ¸¤·¤Þ¤¹¡£"
 
 #: modules/gui/familiar/familiar.c:72
@@ -3156,72 +3484,74 @@ msgstr "Gtk+
 
 #: modules/gui/familiar/interface.c:99 modules/gui/familiar/interface.c:732
 #: modules/gui/gtk/gnome_interface.c:274 modules/gui/gtk/gtk_interface.c:121
-#: modules/gui/gtk/gtk_interface.c:1595 modules/gui/win32/strings.cpp:8
-#: modules/gui/win32/strings.cpp:34
+#: modules/gui/gtk/gtk_interface.c:1595 modules/gui/pda/interface.c:99
+#: modules/gui/pda/interface.c:734
 msgid "VLC media player"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:124 modules/gui/wxwindows/open.cpp:590
-#: modules/gui/wxwindows/preferences.cpp:965
+#: modules/gui/familiar/interface.c:124 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:196
 msgid "Open file"
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯"
 
-#: modules/gui/familiar/interface.c:164
+#: modules/gui/familiar/interface.c:164 modules/gui/pda/interface.c:166
 msgid "Rewind"
 msgstr "´¬¤­Ì᤹"
 
-#: modules/gui/familiar/interface.c:165
+#: modules/gui/familiar/interface.c:165 modules/gui/pda/interface.c:167
 msgid "Rewind stream"
 msgstr "¥¹¥È¥ê¡¼¥à¤ò³«¤¯"
 
-#: modules/gui/familiar/interface.c:178 modules/gui/win32/strings.cpp:103
+#: modules/gui/familiar/interface.c:178 modules/gui/pda/interface.c:180
 msgid "Pause stream"
 msgstr "¥¹¥È¥ê¡¼¥à¤Î°ì»þÄä»ß"
 
-#: modules/gui/familiar/interface.c:191 modules/gui/win32/strings.cpp:101
+#: modules/gui/familiar/interface.c:191 modules/gui/pda/interface.c:193
 msgid "Play stream"
 msgstr "¥¹¥È¥ê¡¼¥à¤ÎºÆÀ¸"
 
 #: modules/gui/familiar/interface.c:203 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:435
-#: modules/gui/macosx/intf.m:301 modules/gui/macosx/intf.m:339
-#: modules/gui/macosx/intf.m:399 modules/gui/win32/strings.cpp:104
-#: modules/gui/wxwindows/interface.cpp:332
+#: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:641
+#: 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:340
 msgid "Stop"
 msgstr "Ää»ß"
 
-#: modules/gui/familiar/interface.c:204 modules/gui/win32/strings.cpp:105
+#: modules/gui/familiar/interface.c:204 modules/gui/pda/interface.c:206
 msgid "Stop stream"
 msgstr "¥¹¥È¥ê¡¼¥à¤ÎÄä»ß"
 
-#: modules/gui/familiar/interface.c:216
+#: modules/gui/familiar/interface.c:216 modules/gui/pda/interface.c:218
 msgid "Forward"
 msgstr "žÁ÷"
 
-#: modules/gui/familiar/interface.c:217
+#: modules/gui/familiar/interface.c:217 modules/gui/pda/interface.c:219
 msgid "Forward stream"
 msgstr "¥¹¥È¥ê¡¼¥à¤ÎžÁ÷"
 
 #: modules/gui/familiar/interface.c:285 modules/gui/gtk/gnome_interface.c:2345
-#: modules/gui/gtk/gtk_interface.c:2712 modules/gui/macosx/playlist.m:176
+#: modules/gui/gtk/gtk_interface.c:2712 modules/gui/macosx/playlist.m:198
+#: modules/gui/pda/interface.c:287
 msgid "Add"
 msgstr "ÄɲÃ"
 
-#: modules/gui/familiar/interface.c:293
+#: modules/gui/familiar/interface.c:293 modules/gui/pda/interface.c:295
 msgid "MRL :"
 msgstr ""
 
 #: modules/gui/familiar/interface.c:394
 #, fuzzy
-msgid "UDP/RTP (Adress when Multicast)"
+msgid "UDP/RTP (Address when Multicast)"
 msgstr "UDP¥Þ¥ë¥Á¥­¥ã¥¹¥È"
 
 #: modules/gui/familiar/interface.c:412 modules/gui/gtk/gnome_interface.c:1747
-#: modules/gui/gtk/gtk_interface.c:2062 modules/gui/macosx/open.m:159
-#: modules/gui/macosx/output.m:124 modules/gui/wxwindows/open.cpp:433
-#: modules/gui/wxwindows/streamout.cpp:385
+#: 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
 msgid "Address"
 msgstr "¥Û¥¹¥È̾/¥¢¥É¥ì¥¹"
 
@@ -3229,94 +3559,96 @@ msgstr "
 #: modules/gui/gtk/gnome_interface.c:1786
 #: modules/gui/gtk/gnome_interface.c:2912 modules/gui/gtk/gtk_interface.c:2052
 #: modules/gui/gtk/gtk_interface.c:2101 modules/gui/gtk/gtk_interface.c:3225
-#: modules/gui/macosx/open.m:158 modules/gui/macosx/open.m:160
-#: modules/gui/macosx/output.m:125 modules/gui/wxwindows/open.cpp:418
-#: modules/gui/wxwindows/open.cpp:441 modules/gui/wxwindows/streamout.cpp:395
+#: 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
 msgid "Port"
 msgstr "¥Ý¡¼¥ÈÈÖ¹æ"
 
-#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:127
-#: modules/gui/macosx/output.m:221 modules/gui/macosx/output.m:289
-#: modules/gui/wxwindows/streamout.cpp:346
+#: modules/gui/familiar/interface.c:478 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
 msgid "HTTP"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:488
+#: modules/gui/familiar/interface.c:488 modules/gui/pda/interface.c:490
 msgid "FTP"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:498
+#: modules/gui/familiar/interface.c:498 modules/gui/pda/interface.c:500
 msgid "MMS"
 msgstr ""
 
 #: modules/gui/familiar/interface.c:516 modules/gui/gtk/gnome_interface.c:1830
 #: modules/gui/gtk/gnome_interface.c:2281 modules/gui/gtk/gtk_interface.c:2145
-#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:143
-#: modules/gui/macosx/open.m:271 modules/gui/wxwindows/open.cpp:275
+#: 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
 msgid "Network"
 msgstr "¥Í¥Ã¥È¥ï¡¼¥¯"
 
-#: modules/gui/familiar/interface.c:524
+#: modules/gui/familiar/interface.c:524 modules/gui/pda/interface.c:526
 msgid "Media"
 msgstr "¥á¥Ç¥£¥¢"
 
-#: modules/gui/familiar/interface.c:560
+#: modules/gui/familiar/interface.c:560 modules/gui/pda/interface.c:562
 msgid "MRL"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:569
+#: modules/gui/familiar/interface.c:569 modules/gui/pda/interface.c:571
 #, fuzzy
 msgid "Time"
 msgstr "¥¿¥¤¥È¥ë"
 
-#: modules/gui/familiar/interface.c:586
+#: modules/gui/familiar/interface.c:586 modules/gui/pda/interface.c:588
 msgid "Update"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:594
+#: modules/gui/familiar/interface.c:594 modules/gui/pda/interface.c:596
 msgid " Del "
 msgstr ""
 
-#: modules/gui/familiar/interface.c:602
+#: modules/gui/familiar/interface.c:602 modules/gui/pda/interface.c:604
 #, fuzzy
 msgid " Clear "
 msgstr "¥¯¥ê¥¢"
 
-#: modules/gui/familiar/interface.c:626
+#: modules/gui/familiar/interface.c:626 modules/gui/pda/interface.c:628
 #, fuzzy
 msgid "Automatically play file"
 msgstr "¥Õ¥¡¥¤¥ë¤Î¼«Æ°ºÆÀ¸"
 
-#: modules/gui/familiar/interface.c:643
+#: modules/gui/familiar/interface.c:643 modules/gui/pda/interface.c:645
 #, fuzzy
 msgid " Save "
 msgstr "Êݸ"
 
-#: modules/gui/familiar/interface.c:651
+#: modules/gui/familiar/interface.c:651 modules/gui/pda/interface.c:653
 #, fuzzy
 msgid " Apply "
 msgstr "ŬÍÑ"
 
-#: modules/gui/familiar/interface.c:659
+#: modules/gui/familiar/interface.c:659 modules/gui/pda/interface.c:661
 #, fuzzy
 msgid " Cancel "
 msgstr "¥­¥ã¥ó¥»¥ë"
 
-#: modules/gui/familiar/interface.c:667
+#: modules/gui/familiar/interface.c:667 modules/gui/pda/interface.c:669
 msgid "Preference"
 msgstr "ÀßÄê(_P)..."
 
 #: modules/gui/familiar/interface.c:711 modules/gui/gtk/gnome_interface.c:1361
 #: modules/gui/gtk/gtk_interface.c:1603 modules/gui/kde/kde.cpp:111
-#: modules/gui/win32/strings.cpp:9
+#: modules/gui/pda/interface.c:713
 msgid "(c) 1996-2003 the VideoLAN team"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:721
+#: modules/gui/familiar/interface.c:721 modules/gui/pda/interface.c:723
 msgid "Authors: The VideoLAN Team, http://www.videolan.org"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:753
+#: modules/gui/familiar/interface.c:753 modules/gui/pda/interface.c:755
 msgid ""
 "The VideoLAN Client is a MPEG, MPEG 2, MP3, DivX player, that accepts input "
 "from local or network sources."
@@ -3324,29 +3656,96 @@ msgstr ""
 "VideoLAN Client¤Ï¡¢MPEG, MPEG 2, MP3 DivX¤ò¥í¡¼¥«¥ë¤ª¤è¤Ó¡¢¥Í¥Ã¥È¥ï¡¼¥¯¾å¤Î"
 "¥½¡¼¥¹¤«¤éºÆÀ¸¤Ç¤­¤ë¥×¥ì¥¤¥ä¡¼¤Ç¤¹¡£"
 
-#: modules/gui/familiar/support.c:121 modules/gui/gtk/gnome_support.c:100
+#: modules/gui/familiar/support.c:121 modules/gui/gtk2/gnome2_support.c:60
+#: modules/gui/gtk2/gnome2_support.c:85 modules/gui/gtk2/gtk2_support.c:90
+#: modules/gui/gtk2/gtk2_support.c:114 modules/gui/gtk/gnome_support.c:100
 #: modules/gui/gtk/gnome_support.c:138 modules/gui/gtk/gtk_support.c:121
-#: modules/gui/gtk2/gnome2_support.c:60 modules/gui/gtk2/gnome2_support.c:85
-#: modules/gui/gtk2/gtk2_support.c:90 modules/gui/gtk2/gtk2_support.c:114
+#: modules/gui/pda/support.c:121
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "¥Ô¥Ã¥¯¥¹¥Þ¥Ã¥×¡¦¥Õ¥¡¥¤¥ë %s ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£"
 
 #: modules/gui/familiar/support.c:130 modules/gui/gtk/gtk_support.c:130
+#: modules/gui/pda/support.c:130
 #, c-format
 msgid "Error loading pixmap file: %s"
 msgstr "¥Ô¥Ã¥¯¥¹¥Þ¥Ã¥×¡¦¥Õ¥¡¥¤¥ë %s ¤Î¥í¡¼¥É¤Ç¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£"
 
-#: modules/gui/gtk/gnome.c:55 modules/gui/gtk/gtk.c:57
-msgid "show tooltips"
-msgstr "¥Ä¡¼¥ë¥Á¥Ã¥×¤òɽ¼¨"
+#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55
+#, fuzzy
+msgid "Gtk2 interface"
+msgstr "Gtk+¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/gui/gtk/gnome.c:56 modules/gui/gtk/gtk.c:58
-msgid "Show tooltips for configuration options."
-msgstr "¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¡¦¥ª¥×¥·¥ç¥ó¤Ë¥Ä¡¼¥ë¥Á¥Ã¥×¤òɽ¼¨"
+#: modules/gui/gtk2/gnome2_interface.c:31
+#, fuzzy
+msgid "_New"
+msgstr "ɽ¼¨(_V)"
+
+#: modules/gui/gtk2/gnome2_interface.c:87
+msgid "gnome2"
+msgstr ""
+
+#: modules/gui/gtk2/gnome2_interface.c:112
+msgid "button4"
+msgstr ""
+
+#: modules/gui/gtk2/gnome2_interface.c:122
+#: modules/gui/gtk2/gtk2_interface.c:183
+msgid "button3"
+msgstr ""
+
+#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:364
+msgid "Save File"
+msgstr "¥Õ¥¡¥¤¥ë¤ÎÊݸ"
+
+#: modules/gui/gtk2/gtk2_interface.c:67
+#, fuzzy
+msgid "window1"
+msgstr "¥¦¥£¥ó¥É¥¦"
+
+#: modules/gui/gtk2/gtk2_interface.c:77 modules/gui/gtk/gtk_interface.c:147
+#: modules/gui/gtk/gtk_interface.c:1373
+msgid "_File"
+msgstr "¥Õ¥¡¥¤¥ë(_F)"
+
+#: modules/gui/gtk2/gtk2_interface.c:109
+#, fuzzy
+msgid "_Edit"
+msgstr "ÊÔ½¸"
+
+#: modules/gui/gtk2/gtk2_interface.c:132 modules/gui/gtk/gtk_interface.c:268
+msgid "_View"
+msgstr "ɽ¼¨(_V)"
+
+#: modules/gui/gtk2/gtk2_interface.c:139 modules/gui/gtk/gtk_interface.c:569
+msgid "_Help"
+msgstr "¥Ø¥ë¥×(_H)"
+
+#: modules/gui/gtk2/gtk2_interface.c:146
+#, fuzzy
+msgid "_About"
+msgstr "VideoLAN¤Ë¤Ä¤¤¤Æ"
+
+#: modules/gui/gtk2/gtk2_interface.c:163
+msgid "button1"
+msgstr ""
+
+#: modules/gui/gtk2/gtk2_interface.c:173
+msgid "button2"
+msgstr ""
+
+#: modules/gui/gtk/gnome.c:55 modules/gui/gtk/gtk.c:57
+#, fuzzy
+msgid "Show tooltips"
+msgstr "¥Ä¡¼¥ë¥Á¥Ã¥×¤òɽ¼¨"
+
+#: modules/gui/gtk/gnome.c:56 modules/gui/gtk/gtk.c:58
+msgid "Show tooltips for configuration options."
+msgstr "¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¡¦¥ª¥×¥·¥ç¥ó¤Ë¥Ä¡¼¥ë¥Á¥Ã¥×¤òɽ¼¨"
 
 #: modules/gui/gtk/gnome.c:58
-msgid "show text on toolbar buttons"
+#, fuzzy
+msgid "Show text on toolbar buttons"
 msgstr "¥Ä¡¼¥ë¥Ð¡¼¡¦¥Ü¥¿¥ó¾å¤Î¥Æ¥­¥¹¥È¤òɽ¼¨"
 
 #: modules/gui/gtk/gnome.c:59
@@ -3354,7 +3753,8 @@ msgid "Show the text below icons on the toolbar."
 msgstr "¥Ä¡¼¥ë¥Ð¡¼¤Î¥¢¥¤¥³¥ó¾å¤Ëɽ¼¨¤µ¤ì¤ë¥Æ¥­¥¹¥È¤òɽ¼¨¤·¤Þ¤¹¡£"
 
 #: modules/gui/gtk/gnome.c:61 modules/gui/gtk/gtk.c:60
-msgid "maximum height for the configuration windows"
+#, fuzzy
+msgid "Maximum height for the configuration windows"
 msgstr "¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¡¦¥¦¥£¥ó¥É¥¦¤Î¹â¤µ¤ÎºÇÂçÃÍ"
 
 #: modules/gui/gtk/gnome.c:63 modules/gui/gtk/gtk.c:62
@@ -3382,7 +3782,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/win32/strings.cpp:94 modules/gui/wxwindows/interface.cpp:218
+#: modules/gui/wxwindows/interface.cpp:222
 #, fuzzy
 msgid "Open a file"
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯"
@@ -3395,7 +3795,6 @@ msgstr "
 #: modules/gui/gtk/gnome_interface.c:27 modules/gui/gtk/gnome_interface.c:516
 #: modules/gui/gtk/gnome_interface.c:993 modules/gui/gtk/gtk_interface.c:188
 #: modules/gui/gtk/gtk_interface.c:630 modules/gui/gtk/gtk_interface.c:1411
-#: modules/gui/win32/strings.cpp:96
 msgid "Open a DVD or VCD"
 msgstr "DVD¤Þ¤¿¤ÏVCD¤ò³«¤¯"
 
@@ -3407,7 +3806,6 @@ msgstr "
 #: modules/gui/gtk/gnome_interface.c:34 modules/gui/gtk/gnome_interface.c:528
 #: modules/gui/gtk/gnome_interface.c:1000 modules/gui/gtk/gtk_interface.c:203
 #: modules/gui/gtk/gtk_interface.c:641 modules/gui/gtk/gtk_interface.c:1423
-#: modules/gui/win32/strings.cpp:98
 #, fuzzy
 msgid "Select a network stream"
 msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¥¹¥È¥ê¡¼¥à¤òÁªÂò¤¹¤ë"
@@ -3417,8 +3815,7 @@ msgid "_Eject Disc"
 msgstr "¥Ç¥£¥¹¥¯¤Î¼è½Ð¤·(_E)"
 
 #: modules/gui/gtk/gnome_interface.c:42 modules/gui/gtk/gnome_interface.c:579
-#: modules/gui/gtk/gtk_interface.c:226 modules/gui/win32/strings.cpp:106
-#: modules/gui/win32/strings.cpp:107
+#: modules/gui/gtk/gtk_interface.c:226
 msgid "Eject disc"
 msgstr "¥Ç¥£¥¹¥¯¤Î¼è½Ð¤·"
 
@@ -3431,7 +3828,6 @@ msgid "Progr_am"
 msgstr "¥×¥í¥°¥é¥à(_a)"
 
 #: modules/gui/gtk/gnome_interface.c:65 modules/gui/gtk/gtk_interface.c:315
-#: modules/gui/win32/strings.cpp:63
 msgid "Choose the program"
 msgstr "¥×¥í¥°¥é¥à¤ÎÁªÂò"
 
@@ -3439,7 +3835,7 @@ msgstr "
 msgid "_Title"
 msgstr "¥¿¥¤¥È¥ë(_T)"
 
-#: modules/gui/gtk/gnome_interface.c:72 modules/gui/win32/strings.cpp:65
+#: modules/gui/gtk/gnome_interface.c:72
 msgid "Choose title"
 msgstr "¥¿¥¤¥È¥ë¤ÎÁªÂò"
 
@@ -3447,7 +3843,7 @@ msgstr "
 msgid "_Chapter"
 msgstr "¥Á¥ã¥×¥¿¡¼(_C)"
 
-#: modules/gui/gtk/gnome_interface.c:79 modules/gui/win32/strings.cpp:67
+#: modules/gui/gtk/gnome_interface.c:79
 msgid "Choose chapter"
 msgstr "¥Á¥ã¥×¥¿¡¼¤ÎÁªÂò"
 
@@ -3456,7 +3852,6 @@ msgid "_Playlist..."
 msgstr "¥×¥ì¥¤¥ê¥¹¥È(_P)..."
 
 #: modules/gui/gtk/gnome_interface.c:87 modules/gui/gtk/gtk_interface.c:360
-#: modules/gui/win32/strings.cpp:121
 msgid "Open the playlist window"
 msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
 
@@ -3469,12 +3864,11 @@ msgid "Open the module manager"
 msgstr "¥â¥¸¥å¡¼¥ë¡¦¥Þ¥Í¡¼¥¸¥ã¡¼"
 
 #: modules/gui/gtk/gnome_interface.c:100 modules/gui/gtk/gtk_interface.c:375
-#: modules/gui/kde/interface.cpp:133 modules/gui/win32/strings.cpp:128
+#: modules/gui/kde/interface.cpp:133
 msgid "Messages..."
 msgstr "¥á¥Ã¥»¡¼¥¸..."
 
 #: modules/gui/gtk/gnome_interface.c:101 modules/gui/gtk/gtk_interface.c:381
-#: modules/gui/win32/strings.cpp:129
 msgid "Open the messages window"
 msgstr "¥á¥Ã¥»¡¼¥¸¥¦¥£¥ó¥É¥¦¤òɽ¼¨"
 
@@ -3485,33 +3879,30 @@ msgid "_Language"
 msgstr "¸À¸ì"
 
 #: modules/gui/gtk/gnome_interface.c:119 modules/gui/gtk/gnome_interface.c:902
-#: modules/gui/gtk/gtk_interface.c:442 modules/gui/win32/strings.cpp:60
-#: modules/gui/win32/strings.cpp:71
+#: modules/gui/gtk/gtk_interface.c:442
 msgid "Select audio channel"
 msgstr "¥ª¡¼¥Ç¥£¥ª¡¦¥Á¥ã¥ó¥Í¥ë¤ÎÁªÂò"
 
 #: modules/gui/gtk/gnome_interface.c:126 modules/gui/gtk/gnome_interface.c:909
 #: modules/gui/gtk/gtk_interface.c:452 modules/gui/gtk/gtk_interface.c:1253
-#: modules/gui/macosx/intf.m:355
+#: modules/gui/macosx/intf.m:379
 msgid "Volume Up"
 msgstr "¥Ü¥ê¥å¡¼¥à¤ò¾å¤²¤ë"
 
 #: modules/gui/gtk/gnome_interface.c:133 modules/gui/gtk/gnome_interface.c:916
 #: modules/gui/gtk/gtk_interface.c:459 modules/gui/gtk/gtk_interface.c:1260
-#: modules/gui/macosx/intf.m:356
+#: modules/gui/macosx/intf.m:380
 msgid "Volume Down"
 msgstr "¥Ü¥ê¥å¡¼¥à¤ò²¼¤²¤ë"
 
 #: modules/gui/gtk/gnome_interface.c:140 modules/gui/gtk/gnome_interface.c:923
 #: modules/gui/gtk/gtk_interface.c:466 modules/gui/gtk/gtk_interface.c:1267
-#: modules/gui/macosx/controls.m:482 modules/gui/macosx/intf.m:357
+#: modules/gui/macosx/controls.m:688 modules/gui/macosx/intf.m:381
 msgid "Mute"
 msgstr "¥ß¥å¡¼¥È¤¹¤ë"
 
 #: modules/gui/gtk/gnome_interface.c:155 modules/gui/gtk/gnome_interface.c:938
 #: modules/gui/gtk/gtk_interface.c:488 modules/gui/gtk/gtk_interface.c:1289
-#: modules/gui/macosx/intf.m:362 modules/gui/macosx/intf.m:363
-#: modules/gui/win32/strings.cpp:80
 msgid "Device"
 msgstr "DVD¥Ç¥Ð¥¤¥¹"
 
@@ -3521,7 +3912,7 @@ msgid "_Subtitles"
 msgstr "»úËë(_S)"
 
 #: modules/gui/gtk/gnome_interface.c:168 modules/gui/gtk/gnome_interface.c:951
-#: modules/gui/gtk/gtk_interface.c:524 modules/gui/win32/strings.cpp:73
+#: modules/gui/gtk/gtk_interface.c:524
 msgid "Select subtitles channel"
 msgstr "»úËë¤ÎÁªÂò"
 
@@ -3530,19 +3921,9 @@ msgstr "
 msgid "_Fullscreen"
 msgstr "Á´²èÌ̲½(_F)"
 
-#: 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/controls.m:526 modules/gui/macosx/intf.m:378
-#: modules/gui/macosx/intf.m:379
-#: modules/video_filter/deinterlace/deinterlace.c:81
-msgid "Deinterlace"
-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/intf.m:374 modules/gui/macosx/intf.m:375
-#: modules/gui/macosx/output.m:120 modules/gui/macosx/vout.m:202
-#: modules/gui/win32/strings.cpp:83
+#: modules/gui/macosx/output.m:129 modules/gui/macosx/vout.m:199
 msgid "Screen"
 msgstr "¥¹¥¯¥ê¡¼¥ó"
 
@@ -3559,20 +3940,19 @@ msgstr "
 #: modules/gui/gtk/gnome_interface.c:1690
 #: modules/gui/gtk/gnome_interface.c:2267 modules/gui/gtk/gtk_interface.c:629
 #: modules/gui/gtk/gtk_interface.c:816 modules/gui/gtk/gtk_interface.c:2005
-#: modules/gui/gtk/gtk_interface.c:2726 modules/gui/macosx/open.m:142
-#: modules/gui/macosx/open.m:267 modules/gui/win32/strings.cpp:43
-#: modules/gui/win32/strings.cpp:95 modules/gui/wxwindows/interface.cpp:323
-#: modules/gui/wxwindows/open.cpp:273
+#: modules/gui/gtk/gtk_interface.c:2726 modules/gui/macosx/open.m:143
+#: modules/gui/macosx/open.m:267 modules/gui/wxwindows/interface.cpp:331
+#: modules/gui/wxwindows/open.cpp:255
 msgid "Disc"
 msgstr "¥Ç¥£¥¹¥¯"
 
 #: modules/gui/gtk/gnome_interface.c:527 modules/gui/gtk/gtk_interface.c:640
-#: modules/gui/win32/strings.cpp:97 modules/gui/wxwindows/interface.cpp:325
+#: modules/gui/wxwindows/interface.cpp:333
 msgid "Net"
 msgstr "Network"
 
 #: modules/gui/gtk/gnome_interface.c:539 modules/gui/gtk/gtk_interface.c:651
-#: modules/gui/wxwindows/interface.cpp:328
+#: modules/gui/wxwindows/interface.cpp:336
 msgid "Sat"
 msgstr "±ÒÀ±"
 
@@ -3582,7 +3962,7 @@ msgstr "
 
 #: modules/gui/gtk/gnome_interface.c:553
 #: modules/gui/gtk/gnome_interface.c:1034 modules/gui/gtk/gtk_interface.c:664
-#: modules/gui/gtk/gtk_interface.c:1134 modules/gui/win32/strings.cpp:99
+#: modules/gui/gtk/gtk_interface.c:1134
 msgid "Back"
 msgstr "µÕž"
 
@@ -3608,7 +3988,7 @@ msgstr "
 
 #: modules/gui/gtk/gnome_interface.c:617
 #: modules/gui/gtk/gnome_interface.c:1041 modules/gui/gtk/gtk_interface.c:723
-#: modules/gui/gtk/gtk_interface.c:1142 modules/gui/win32/strings.cpp:108
+#: modules/gui/gtk/gtk_interface.c:1142
 msgid "Slow"
 msgstr "¥¹¥í¡¼"
 
@@ -3618,7 +3998,7 @@ msgstr "
 
 #: modules/gui/gtk/gnome_interface.c:630
 #: modules/gui/gtk/gnome_interface.c:1048 modules/gui/gtk/gtk_interface.c:735
-#: modules/gui/gtk/gtk_interface.c:1150 modules/gui/win32/strings.cpp:110
+#: modules/gui/gtk/gtk_interface.c:1150
 msgid "Fast"
 msgstr "ÁáÁ÷¤ê"
 
@@ -3633,14 +4013,12 @@ msgstr "
 #: modules/gui/gtk/gnome_interface.c:655
 #: modules/gui/gtk/gnome_interface.c:1063 modules/gui/gtk/gtk_interface.c:758
 #: modules/gui/gtk/gtk_interface.c:844 modules/gui/gtk/gtk_interface.c:888
-#: modules/gui/gtk/gtk_interface.c:1173 modules/gui/win32/strings.cpp:112
-#: modules/gui/win32/strings.cpp:132 modules/gui/win32/strings.cpp:136
-#: modules/gui/wxwindows/interface.cpp:339
+#: modules/gui/gtk/gtk_interface.c:1173
+#: modules/gui/wxwindows/interface.cpp:347
 msgid "Prev"
 msgstr "Á°"
 
 #: modules/gui/gtk/gnome_interface.c:656 modules/gui/gtk/gtk_interface.c:759
-#: modules/gui/win32/strings.cpp:113
 #, fuzzy
 msgid "Previous file"
 msgstr "Á°¤Î¥Õ¥¡¥¤¥ë"
@@ -3648,11 +4026,9 @@ 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:443
-#: modules/gui/macosx/intf.m:303 modules/gui/macosx/intf.m:343
-#: modules/gui/macosx/intf.m:400 modules/gui/win32/strings.cpp:114
-#: modules/gui/win32/strings.cpp:134 modules/gui/win32/strings.cpp:138
-#: modules/gui/wxwindows/interface.cpp:341
+#: modules/gui/gtk/gtk_interface.c:1166 modules/gui/macosx/controls.m:649
+#: modules/gui/macosx/intf.m:327 modules/gui/macosx/intf.m:367
+#: modules/gui/macosx/intf.m:425 modules/gui/wxwindows/interface.cpp:349
 msgid "Next"
 msgstr "¼¡"
 
@@ -3661,33 +4037,30 @@ msgid "Next File"
 msgstr "¼¡¤Î¥Õ¥¡¥¤¥ë"
 
 #: modules/gui/gtk/gnome_interface.c:732 modules/gui/gtk/gtk_interface.c:830
-#: modules/gui/win32/strings.cpp:44
 msgid "Title:"
 msgstr "¥¿¥¤¥È¥ë:"
 
-#: modules/gui/gtk/gnome_interface.c:752 modules/gui/win32/strings.cpp:133
+#: modules/gui/gtk/gnome_interface.c:752
 msgid "Select previous title"
 msgstr "Á°¤Î¥¿¥¤¥È¥ë¤òÁªÂò"
 
 #: modules/gui/gtk/gnome_interface.c:775 modules/gui/gtk/gtk_interface.c:874
-#: modules/gui/win32/strings.cpp:45
 msgid "Chapter:"
 msgstr "¥Á¥ã¥×¥¿¡¼:"
 
-#: modules/gui/gtk/gnome_interface.c:795 modules/gui/win32/strings.cpp:137
+#: modules/gui/gtk/gnome_interface.c:795
 msgid "Select previous chapter"
 msgstr "Á°¤Î¥Á¥ã¥×¥¿¡¼¤òÁªÂò"
 
-#: modules/gui/gtk/gnome_interface.c:803 modules/gui/win32/strings.cpp:139
+#: modules/gui/gtk/gnome_interface.c:803
 msgid "Select next chapter"
 msgstr "¼¡¤Î¥Á¥ã¥×¥¿¡¼¤òÁªÂò"
 
 #: modules/gui/gtk/gnome_interface.c:811 modules/gui/gtk/gtk_interface.c:911
-#: modules/gui/win32/strings.cpp:41
 msgid "No server"
 msgstr "¥µ¡¼¥Ð¡¼¤Ê¤·"
 
-#: modules/gui/gtk/gnome_interface.c:959 modules/gui/win32/strings.cpp:125
+#: modules/gui/gtk/gnome_interface.c:959
 msgid "Toggle fullscreen mode"
 msgstr "Á´²èÌÌɽ¼¨¤ÎÀÚÂؤ¨"
 
@@ -3716,12 +4089,11 @@ msgid "Toggle _Interface"
 msgstr "¥á¥¤¥ó¥¦¥£¥ó¥É¥¦¤Îɽ¼¨/Èóɽ¼¨(_I)"
 
 #: modules/gui/gtk/gnome_interface.c:1115 modules/gui/gtk/gtk_interface.c:1455
-#: modules/gui/win32/strings.cpp:88
 msgid "Playlist..."
 msgstr "¥×¥ì¥¤¥ê¥¹¥È..."
 
 #: modules/gui/gtk/gnome_interface.c:1363 modules/gui/gtk/gtk_interface.c:1646
-#: modules/gui/kde/kde.cpp:108 modules/gui/win32/strings.cpp:10
+#: modules/gui/kde/kde.cpp:108
 #, fuzzy
 msgid ""
 "This is the VideoLAN Client, a DVD, MPEG and DivX player. It can play MPEG "
@@ -3735,17 +4107,17 @@ msgid "Open Stream"
 msgstr "¥¹¥È¥ê¡¼¥à¤ò³«¤¯"
 
 #: modules/gui/gtk/gnome_interface.c:1476 modules/gui/gtk/gtk_interface.c:1791
-#: modules/gui/macosx/open.m:135 modules/gui/wxwindows/open.cpp:165
+#: modules/gui/macosx/open.m:136 modules/gui/wxwindows/open.cpp:169
 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:169
+#: modules/gui/wxwindows/open.cpp:173
 msgid "Open Target:"
 msgstr "¥¿¡¼¥²¥Ã¥È¤ò³«¤¯"
 
 #: modules/gui/gtk/gnome_interface.c:1518 modules/gui/gtk/gtk_interface.c:1833
-#: modules/gui/wxwindows/open.cpp:184
+#: modules/gui/wxwindows/open.cpp:188
 msgid ""
 "Alternatively, you can build an MRL using one of the following predefined "
 "targets:"
@@ -3755,67 +4127,63 @@ msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1562
 #: modules/gui/gtk/gnome_interface.c:1998 modules/gui/gtk/gtk_interface.c:1877
-#: modules/gui/gtk/gtk_interface.c:2315 modules/gui/macosx/open.m:145
-#: modules/gui/macosx/open.m:151 modules/gui/macosx/open.m:172
-#: modules/gui/macosx/output.m:123 modules/gui/win32/strings.cpp:229
-#: modules/gui/win32/strings.cpp:248 modules/gui/wxwindows/open.cpp:241
-#: modules/gui/wxwindows/open.cpp:333
-#: modules/gui/wxwindows/preferences.cpp:778
-#: modules/gui/wxwindows/streamout.cpp:372
+#: 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:107
 msgid "Browse..."
 msgstr "¥Ö¥é¥¦¥º..."
 
 #: modules/gui/gtk/gnome_interface.c:1586 modules/gui/gtk/gtk_interface.c:1901
-#: modules/gui/win32/strings.cpp:25 modules/gui/wxwindows/open.cpp:356
+#: modules/gui/wxwindows/open.cpp:392
 msgid "Disc type"
 msgstr "¥Ç¥£¥¹¥¯¡¦¥¿¥¤¥×"
 
 #: modules/gui/gtk/gnome_interface.c:1605 modules/gui/gtk/gtk_interface.c:1920
-#: modules/gui/macosx/open.m:155 modules/gui/macosx/open.m:472
-#: modules/gui/wxwindows/open.cpp:351
+#: modules/gui/macosx/open.m:156 modules/gui/macosx/open.m:487
+#: modules/gui/wxwindows/open.cpp:386
 msgid "DVD"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1613 modules/gui/gtk/gtk_interface.c:1928
-#: modules/gui/macosx/open.m:156 modules/gui/macosx/open.m:381
-#: modules/gui/macosx/open.m:464 modules/gui/wxwindows/open.cpp:353
+#: modules/gui/macosx/open.m:157 modules/gui/macosx/open.m:381
+#: modules/gui/macosx/open.m:471 modules/gui/wxwindows/open.cpp:387
 msgid "VCD"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1621 modules/gui/gtk/gtk_interface.c:1936
-#: modules/gui/macosx/open.m:148 modules/gui/wxwindows/open.cpp:362
+#: modules/gui/macosx/open.m:149 modules/gui/wxwindows/open.cpp:398
 msgid "Device name"
 msgstr "¥Ç¥Ð¥¤¥¹Ì¾"
 
 #: modules/gui/gtk/gnome_interface.c:1660 modules/gui/gtk/gtk_interface.c:1996
-#: modules/gui/macosx/open.m:152
+#: modules/gui/macosx/open.m:153
 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:163 modules/gui/macosx/open.m:531
-#: modules/gui/macosx/open.m:569 modules/gui/win32/strings.cpp:169
-#: modules/gui/wxwindows/open.cpp:397
+#: modules/gui/macosx/open.m:165 modules/gui/macosx/open.m:546
+#: modules/gui/macosx/open.m:584 modules/gui/wxwindows/open.cpp:433
 msgid "UDP/RTP"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1717 modules/gui/gtk/gtk_interface.c:2032
-#: modules/gui/macosx/open.m:164 modules/gui/macosx/open.m:532
-#: modules/gui/macosx/open.m:581 modules/gui/win32/strings.cpp:170
-#: modules/gui/wxwindows/open.cpp:398
+#: modules/gui/macosx/open.m:166 modules/gui/macosx/open.m:547
+#: modules/gui/macosx/open.m:596 modules/gui/wxwindows/open.cpp:434
 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:165 modules/gui/macosx/open.m:533
-#: modules/gui/macosx/open.m:594 modules/gui/win32/strings.cpp:172
-#: modules/gui/wxwindows/open.cpp:399
+#: modules/gui/macosx/open.m:167 modules/gui/macosx/open.m:548
+#: modules/gui/macosx/open.m:609 modules/gui/wxwindows/open.cpp:435
 msgid "HTTP/FTP/MMS"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1759 modules/gui/gtk/gtk_interface.c:2074
-#: modules/gui/macosx/open.m:161 modules/gui/wxwindows/open.cpp:455
+#: modules/gui/macosx/open.m:163 modules/gui/wxwindows/open.cpp:492
 msgid "URL"
 msgstr ""
 
@@ -3844,29 +4212,24 @@ msgid "Horizontal"
 msgstr "¿åÊ¿"
 
 #: modules/gui/gtk/gnome_interface.c:1956 modules/gui/gtk/gtk_interface.c:2271
-#: modules/gui/wxwindows/open.cpp:278
+#: modules/gui/wxwindows/open.cpp:260
 msgid "Satellite"
 msgstr "±ÒÀ±"
 
-#: modules/gui/gtk/gnome_interface.c:1963 modules/gui/gtk/gtk_interface.c:2278
-#, fuzzy
-msgid "Subtitle"
-msgstr "»úËë(_S)"
-
 #: modules/gui/gtk/gnome_interface.c:2005 modules/gui/gtk/gtk_interface.c:2322
-#: modules/gui/macosx/open.m:174
+#: modules/gui/macosx/open.m:176
 #, fuzzy
 msgid "delay"
 msgstr "ºÆÀ¸"
 
 #: modules/gui/gtk/gnome_interface.c:2020 modules/gui/gtk/gtk_interface.c:2338
-#: modules/gui/macosx/open.m:176
+#: modules/gui/macosx/open.m:178
 msgid "fps"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2049 modules/gui/gtk/gtk_interface.c:2369
-#: modules/gui/macosx/open.m:171 modules/gui/macosx/output.m:116
-#: modules/gui/wxwindows/open.cpp:196 modules/gui/wxwindows/open.cpp:218
+#: modules/gui/macosx/open.m:173 modules/gui/macosx/output.m:125
+#: modules/gui/wxwindows/open.cpp:199 modules/gui/wxwindows/open.cpp:354
 #, fuzzy
 msgid "Settings..."
 msgstr "ÀßÄê(_S)"
@@ -3881,12 +4244,11 @@ 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:147
+#: modules/gui/wxwindows/playlist.cpp:149
 msgid "Url"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2300 modules/gui/gtk/gtk_interface.c:2768
-#: modules/gui/win32/strings.cpp:202
 msgid "All"
 msgstr "¤¹¤Ù¤Æ"
 
@@ -3894,23 +4256,21 @@ msgstr "
 msgid "Item"
 msgstr "¹àÌÜ"
 
-#: modules/gui/gtk/gnome_interface.c:2319 modules/gui/win32/strings.cpp:198
-#: modules/video_filter/crop.c:61
+#: modules/gui/gtk/gnome_interface.c:2319 modules/video_filter/crop.c:61
 msgid "Crop"
 msgstr "±ï¼è¤ê"
 
-#: modules/gui/gtk/gnome_interface.c:2326 modules/gui/win32/strings.cpp:196
+#: modules/gui/gtk/gnome_interface.c:2326
 msgid "Invert"
 msgstr "µÕž"
 
 #: modules/gui/gtk/gnome_interface.c:2333 modules/gui/gtk/preferences.c:382
-#: modules/gui/kde/pluginsbox.cpp:48 modules/gui/macosx/prefs.m:400
+#: modules/gui/kde/pluginsbox.cpp:48 modules/gui/macosx/prefs.m:199
 msgid "Select"
 msgstr "ÁªÂò"
 
 #: modules/gui/gtk/gnome_interface.c:2352 modules/gui/gtk/gtk_interface.c:2754
-#: modules/gui/macosx/playlist.m:173 modules/gui/macosx/playlist.m:177
-#: modules/gui/win32/strings.cpp:200
+#: modules/gui/macosx/playlist.m:195 modules/gui/macosx/playlist.m:199
 msgid "Delete"
 msgstr "ºï½ü"
 
@@ -3918,11 +4278,6 @@ msgstr "
 msgid "Selection"
 msgstr "ÁªÂò"
 
-#: modules/gui/gtk/gnome_interface.c:2436 modules/gui/gtk/gtk_interface.c:2857
-#: modules/gui/win32/strings.cpp:182 modules/gui/wxwindows/playlist.cpp:148
-msgid "Duration"
-msgstr "»ý³´ü´Ö"
-
 #: modules/gui/gtk/gnome_interface.c:2588
 msgid "Jump to: "
 msgstr "»ØÄê»þ´Ö¤Ø¥¸¥ã¥ó¥×: "
@@ -3950,16 +4305,14 @@ msgid "Destination Target: "
 msgstr "Á÷¿®Àè¤Î¥¢¥¹¥Ú¥¯¥È¡¦¥ì¥·¥ª"
 
 #: modules/gui/gtk/gnome_interface.c:2857 modules/gui/gtk/gtk_interface.c:3112
-#: modules/gui/macosx/output.m:128 modules/gui/macosx/output.m:231
-#: modules/gui/macosx/output.m:290 modules/gui/win32/strings.cpp:227
-#: modules/gui/wxwindows/streamout.cpp:347
+#: modules/gui/macosx/output.m:137 modules/gui/macosx/output.m:247
+#: modules/gui/macosx/output.m:313 modules/gui/wxwindows/streamout.cpp:387
 msgid "UDP"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2867 modules/gui/gtk/gtk_interface.c:3122
-#: modules/gui/macosx/output.m:129 modules/gui/macosx/output.m:241
-#: modules/gui/macosx/output.m:292 modules/gui/win32/strings.cpp:228
-#: modules/gui/wxwindows/streamout.cpp:348
+#: modules/gui/macosx/output.m:138 modules/gui/macosx/output.m:260
+#: modules/gui/macosx/output.m:323 modules/gui/wxwindows/streamout.cpp:388
 msgid "RTP"
 msgstr ""
 
@@ -3969,25 +4322,21 @@ msgid "Path:"
 msgstr "¥Ý¡¼¥ÈÈÖ¹æ"
 
 #: modules/gui/gtk/gnome_interface.c:2887 modules/gui/gtk/gtk_interface.c:3157
-#: modules/gui/win32/strings.cpp:166 modules/gui/win32/strings.cpp:167
-#: modules/gui/win32/strings.cpp:224
 #, fuzzy
 msgid "Address:"
 msgstr "¥Û¥¹¥È̾/¥¢¥É¥ì¥¹"
 
 #: modules/gui/gtk/gnome_interface.c:2956 modules/gui/gtk/gtk_interface.c:3201
-#: modules/gui/win32/strings.cpp:232
 msgid "TS"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2964 modules/gui/gtk/gtk_interface.c:3209
-#: modules/gui/win32/strings.cpp:231
 msgid "PS"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2972 modules/gui/gtk/gtk_interface.c:3217
-#: modules/gui/macosx/output.m:135 modules/gui/macosx/output.m:273
-#: modules/gui/macosx/output.m:316
+#: modules/gui/macosx/output.m:145 modules/gui/macosx/output.m:293
+#: modules/gui/macosx/output.m:352
 msgid "AVI"
 msgstr ""
 
@@ -4005,11 +4354,6 @@ msgstr ""
 msgid "Gtk+ interface"
 msgstr "Gtk+¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/gui/gtk/gtk_interface.c:147 modules/gui/gtk/gtk_interface.c:1373
-#: modules/gui/gtk2/gtk2_interface.c:77
-msgid "_File"
-msgstr "¥Õ¥¡¥¤¥ë(_F)"
-
 #: modules/gui/gtk/gtk_interface.c:238
 msgid "_Close"
 msgstr "ÊĤ¸¤ë(_C)"
@@ -4022,15 +4366,11 @@ msgstr "
 msgid "E_xit"
 msgstr "½ªÎ»(_x)"
 
-#: modules/gui/gtk/gtk_interface.c:261 modules/gui/win32/strings.cpp:123
+#: modules/gui/gtk/gtk_interface.c:261
 msgid "Exit the program"
 msgstr "¥×¥í¥°¥é¥à¤Î½ªÎ»"
 
-#: modules/gui/gtk/gtk_interface.c:268 modules/gui/gtk2/gtk2_interface.c:132
-msgid "_View"
-msgstr "ɽ¼¨(_V)"
-
-#: modules/gui/gtk/gtk_interface.c:294 modules/gui/win32/strings.cpp:53
+#: modules/gui/gtk/gtk_interface.c:294
 msgid "Hide the main interface window"
 msgstr "¥¤¥ó¥¿¥Õ¥§¡¼¥¹¥¦¥£¥ó¥É¥¦¤ò±£¤¹"
 
@@ -4046,19 +4386,15 @@ msgstr "
 msgid "_Preferences..."
 msgstr "ÀßÄê(_P)..."
 
-#: modules/gui/gtk/gtk_interface.c:411 modules/gui/win32/strings.cpp:127
+#: modules/gui/gtk/gtk_interface.c:411
 msgid "Configure the application"
 msgstr "¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ÎÀßÄê"
 
-#: modules/gui/gtk/gtk_interface.c:569 modules/gui/gtk2/gtk2_interface.c:139
-msgid "_Help"
-msgstr "¥Ø¥ë¥×(_H)"
-
 #: modules/gui/gtk/gtk_interface.c:587 modules/gui/gtk/gtk_interface.c:1435
 msgid "_About..."
 msgstr "VideoLAN¤Ë¤Ä¤¤¤Æ(_A)..."
 
-#: modules/gui/gtk/gtk_interface.c:595 modules/gui/win32/strings.cpp:131
+#: modules/gui/gtk/gtk_interface.c:595
 msgid "About this application"
 msgstr "¤³¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ë¤Ä¤¤¤Æ"
 
@@ -4070,7 +4406,7 @@ msgstr "
 msgid "Authors"
 msgstr "ºîÀ®¼Ô"
 
-#: modules/gui/gtk/gtk_interface.c:1626 modules/gui/win32/strings.cpp:11
+#: modules/gui/gtk/gtk_interface.c:1626
 msgid "the VideoLAN team <videolan@videolan.org>"
 msgstr ""
 
@@ -4083,16 +4419,16 @@ msgstr "
 msgid "Use a subtitles file"
 msgstr "»úËë¤ÎÁªÂò"
 
-#: modules/gui/gtk/gtk_interface.c:2306 modules/gui/win32/strings.cpp:241
+#: modules/gui/gtk/gtk_interface.c:2306
 #, fuzzy
 msgid "Select a subtitles file"
 msgstr "»úËë¤ÎÁªÂò"
 
-#: modules/gui/gtk/gtk_interface.c:2336 modules/gui/win32/strings.cpp:244
+#: modules/gui/gtk/gtk_interface.c:2336
 msgid "Set the delay (in seconds)"
 msgstr ""
 
-#: modules/gui/gtk/gtk_interface.c:2352 modules/gui/win32/strings.cpp:246
+#: modules/gui/gtk/gtk_interface.c:2352
 msgid "Set the number of Frames Per Second"
 msgstr ""
 
@@ -4108,13 +4444,11 @@ msgstr "
 
 #: modules/gui/gtk/gtk_interface.c:2403 modules/gui/gtk/gtk_interface.c:2645
 #: modules/gui/gtk/gtk_interface.c:2876 modules/gui/gtk/gtk_interface.c:3257
-#: modules/gui/gtk/preferences.c:617 modules/gui/macosx/open.m:139
-#: modules/gui/macosx/prefs.m:591 modules/gui/win32/strings.cpp:27
-#: modules/gui/win32/strings.cpp:174 modules/gui/win32/strings.cpp:215
-#: modules/gui/win32/strings.cpp:234 modules/gui/win32/strings.cpp:250
-#: modules/gui/wxwindows/open.cpp:265
-#: modules/gui/wxwindows/preferences.cpp:253
-#: modules/gui/wxwindows/streamout.cpp:197
+#: modules/gui/gtk/preferences.c:618 modules/gui/macosx/open.m:140
+#: modules/gui/macosx/prefs.m:79 modules/gui/wxwindows/open.cpp:247
+#: modules/gui/wxwindows/open.cpp:974
+#: modules/gui/wxwindows/preferences.cpp:256
+#: modules/gui/wxwindows/streamout.cpp:220
 #: modules/gui/wxwindows/subtitles.cpp:152
 msgid "Cancel"
 msgstr "¥­¥ã¥ó¥»¥ë"
@@ -4157,7 +4491,7 @@ msgstr "
 msgid "Chapter %d"
 msgstr "¥Á¥ã¥×¥¿¡¼ %d"
 
-#: modules/gui/gtk/preferences.c:371 modules/gui/macosx/prefs.m:383
+#: modules/gui/gtk/preferences.c:371
 msgid "Configure"
 msgstr "ÀßÄê"
 
@@ -4165,56 +4499,6 @@ msgstr "
 msgid "Selected:"
 msgstr "ÁªÂòºÑ¤ß:"
 
-#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55
-#, fuzzy
-msgid "Gtk2 interface"
-msgstr "Gtk+¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
-
-#: modules/gui/gtk2/gnome2_interface.c:31
-#, fuzzy
-msgid "_New"
-msgstr "ɽ¼¨(_V)"
-
-#: modules/gui/gtk2/gnome2_interface.c:87
-msgid "gnome2"
-msgstr ""
-
-#: modules/gui/gtk2/gnome2_interface.c:112
-msgid "button4"
-msgstr ""
-
-#: modules/gui/gtk2/gnome2_interface.c:122
-#: modules/gui/gtk2/gtk2_interface.c:183
-msgid "button3"
-msgstr ""
-
-#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:328
-msgid "Save File"
-msgstr "¥Õ¥¡¥¤¥ë¤ÎÊݸ"
-
-#: modules/gui/gtk2/gtk2_interface.c:67
-#, fuzzy
-msgid "window1"
-msgstr "¥¦¥£¥ó¥É¥¦"
-
-#: modules/gui/gtk2/gtk2_interface.c:109
-#, fuzzy
-msgid "_Edit"
-msgstr "ÊÔ½¸"
-
-#: modules/gui/gtk2/gtk2_interface.c:146
-#, fuzzy
-msgid "_About"
-msgstr "VideoLAN¤Ë¤Ä¤¤¤Æ"
-
-#: modules/gui/gtk2/gtk2_interface.c:163
-msgid "button1"
-msgstr ""
-
-#: modules/gui/gtk2/gtk2_interface.c:173
-msgid "button2"
-msgstr ""
-
 #: modules/gui/kde/interface.cpp:88
 msgid "Languages"
 msgstr "¸À¸ì"
@@ -4241,382 +4525,436 @@ msgstr "KDE
 msgid "Messages:"
 msgstr "¥á¥Ã¥»¡¼¥¸:"
 
-#: modules/gui/kde/preferences.cpp:95
-#: modules/gui/wxwindows/preferences.cpp:395
+#: modules/gui/kde/preferences.cpp:96
+#: modules/gui/wxwindows/preferences.cpp:398
 msgid "Plugins"
 msgstr ""
 
-#: modules/gui/macosx/about.m:73 modules/gui/macosx/intf.m:315
+#: modules/gui/macosx/about.m:73 modules/gui/macosx/intf.m:339
 #, fuzzy
 msgid "About VLC media player"
 msgstr "VLC¥á¥Ç¥£¥¢¡¦¥×¥ì¥¤¥ä¡¼¤Ë¤Ä¤¤¤Æ"
 
-#: modules/gui/macosx/controls.m:344 modules/gui/macosx/controls.m:487
-#: modules/gui/macosx/intf.m:366
+#: modules/gui/macosx/controls.m:352 modules/gui/macosx/controls.m:693
+#: modules/gui/macosx/intf.m:390
 #, fuzzy
 msgid "Half Size"
 msgstr "¥µ¥¤¥º"
 
-#: modules/gui/macosx/controls.m:346 modules/gui/macosx/controls.m:488
-#: modules/gui/macosx/intf.m:367
+#: modules/gui/macosx/controls.m:354 modules/gui/macosx/controls.m:694
+#: modules/gui/macosx/intf.m:391
 msgid "Normal Size"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:348 modules/gui/macosx/controls.m:489
-#: modules/gui/macosx/intf.m:368
+#: modules/gui/macosx/controls.m:356 modules/gui/macosx/controls.m:695
+#: modules/gui/macosx/intf.m:392
 msgid "Double Size"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:350 modules/gui/macosx/controls.m:491
-#: modules/gui/macosx/controls.m:498 modules/gui/macosx/controls.m:520
-#: modules/gui/macosx/intf.m:371
+#: modules/gui/macosx/controls.m:358 modules/gui/macosx/controls.m:697
+#: modules/gui/macosx/controls.m:704 modules/gui/macosx/intf.m:395
 msgid "Float On Top"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:352 modules/gui/macosx/controls.m:490
-#: modules/gui/macosx/intf.m:369
+#: modules/gui/macosx/controls.m:360 modules/gui/macosx/controls.m:696
+#: modules/gui/macosx/intf.m:393
 #, fuzzy
 msgid "Fit To Screen"
 msgstr "¥¹¥¯¥ê¡¼¥ó"
 
-#: modules/gui/macosx/controls.m:442 modules/gui/macosx/intf.m:298
-#: modules/gui/macosx/intf.m:342 modules/gui/macosx/intf.m:401
+#: modules/gui/macosx/controls.m:627 modules/gui/macosx/intf.m:326
+#: modules/gui/macosx/intf.m:364 modules/gui/wxwindows/interface.cpp:353
+msgid "Faster"
+msgstr "ÁáÁ÷¤ê"
+
+#: modules/gui/macosx/controls.m:628 modules/gui/macosx/intf.m:323
+#: modules/gui/macosx/intf.m:365 modules/gui/wxwindows/interface.cpp:351
+msgid "Slower"
+msgstr "¥¹¥í¡¼"
+
+#: modules/gui/macosx/controls.m:648 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:461 modules/gui/macosx/intf.m:344
+#: modules/gui/macosx/controls.m:667 modules/gui/macosx/intf.m:368
 msgid "Loop"
 msgstr "¥ë¡¼¥×"
 
-#: modules/gui/macosx/controls.m:468 modules/gui/macosx/intf.m:345
+#: modules/gui/macosx/controls.m:674 modules/gui/macosx/intf.m:369
 #, fuzzy
 msgid "Step Forward"
 msgstr "žÁ÷"
 
-#: modules/gui/macosx/controls.m:469 modules/gui/macosx/intf.m:346
+#: modules/gui/macosx/controls.m:675 modules/gui/macosx/intf.m:370
 #, fuzzy
 msgid "Step Backward"
 msgstr "µÕžºÆÀ¸"
 
-#: modules/gui/macosx/info.m:172 modules/gui/macosx/intf.m:386
-#: modules/gui/macosx/intf.m:410
+#: modules/gui/macosx/info.m:172 modules/gui/macosx/intf.m:410
+#: modules/gui/macosx/intf.m:435
 msgid "Info"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:293
+#: modules/gui/macosx/intf.m:317
 #, fuzzy
 msgid "VLC - Controller"
 msgstr "¥³¥ó¥È¥í¡¼¥ë"
 
-#: modules/gui/macosx/intf.m:305
+#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/control.cpp:160
+#: modules/gui/wxwindows/control.cpp:370
 #, fuzzy
 msgid "Volume"
 msgstr "¥Ü¥ê¥å¡¼¥à¤ò¾å¤²¤ë"
 
-#: modules/gui/macosx/intf.m:306
+#: modules/gui/macosx/intf.m:330
 #, fuzzy
 msgid "Position"
 msgstr "¶ËÀ­"
 
-#: modules/gui/macosx/intf.m:312
+#: modules/gui/macosx/intf.m:336
 msgid "Open CrashLog"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:316 modules/gui/win32/strings.cpp:126
+#: modules/gui/macosx/intf.m:340
 #, fuzzy
 msgid "Preferences..."
 msgstr "ÀßÄê(_P)..."
 
-#: modules/gui/macosx/intf.m:317
+#: modules/gui/macosx/intf.m:341
 msgid "Hide VLC"
 msgstr "VLC¤ò±£¤¹"
 
-#: modules/gui/macosx/intf.m:318
+#: modules/gui/macosx/intf.m:342
 msgid "Hide Others"
 msgstr "¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ò±£¤¹"
 
-#: modules/gui/macosx/intf.m:319
+#: modules/gui/macosx/intf.m:343
 msgid "Show All"
 msgstr "¤¹¤Ù¤Æ¤òɽ¼¨"
 
-#: modules/gui/macosx/intf.m:320
+#: modules/gui/macosx/intf.m:344
 msgid "Quit VLC"
 msgstr "VLC¤ò½ªÎ»"
 
-#: modules/gui/macosx/intf.m:322
+#: modules/gui/macosx/intf.m:346
 msgid "1:File"
 msgstr "1:¥Õ¥¡¥¤¥ë"
 
-#: modules/gui/macosx/intf.m:323
+#: modules/gui/macosx/intf.m:347
 msgid "Open..."
 msgstr "³«¤¯..."
 
-#: modules/gui/macosx/intf.m:324 modules/gui/win32/strings.cpp:90
+#: modules/gui/macosx/intf.m:348
 msgid "Open File..."
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯..."
 
-#: modules/gui/macosx/intf.m:325 modules/gui/win32/strings.cpp:91
+#: modules/gui/macosx/intf.m:349
 msgid "Open Disc..."
 msgstr "¥Ç¥£¥¹¥¯¤ò³«¤¯..."
 
-#: modules/gui/macosx/intf.m:326
+#: modules/gui/macosx/intf.m:350
 msgid "Open Network..."
 msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¤ò³«¤¯"
 
-#: modules/gui/macosx/intf.m:327
+#: modules/gui/macosx/intf.m:351
 msgid "Open Recent"
 msgstr "ºÇ¶á»È¤Ã¤¿¹àÌܤò³«¤¯"
 
-#: modules/gui/macosx/intf.m:328 modules/gui/macosx/intf.m:1295
+#: modules/gui/macosx/intf.m:352 modules/gui/macosx/intf.m:1202
 msgid "Clear Menu"
 msgstr "¥á¥Ë¥å¡¼¤ò¥¯¥ê¥¢¤¹¤ë"
 
-#: modules/gui/macosx/intf.m:331
+#: modules/gui/macosx/intf.m:355
 msgid "Cut"
 msgstr "¥«¥Ã¥È"
 
-#: modules/gui/macosx/intf.m:332
+#: modules/gui/macosx/intf.m:356
 msgid "Copy"
 msgstr "¥³¥Ô¡¼"
 
-#: modules/gui/macosx/intf.m:333
+#: modules/gui/macosx/intf.m:357
 msgid "Paste"
 msgstr "¥Ú¡¼¥¹¥È"
 
-#: modules/gui/macosx/intf.m:334
+#: modules/gui/macosx/intf.m:358 modules/gui/wxwindows/messages.cpp:111
 msgid "Clear"
 msgstr "¥¯¥ê¥¢"
 
-#: modules/gui/macosx/intf.m:337 modules/gui/win32/strings.cpp:77
+#: modules/gui/macosx/intf.m:361
 msgid "Controls"
 msgstr "¥³¥ó¥È¥í¡¼¥ë"
 
-#: modules/gui/macosx/intf.m:358 modules/gui/macosx/intf.m:359
-#, fuzzy
-msgid "Audio Track"
-msgstr "¥ª¡¼¥Ç¥£¥ª"
-
-#: modules/gui/macosx/intf.m:372 modules/gui/macosx/intf.m:373
+#: modules/gui/macosx/intf.m:398 modules/gui/macosx/intf.m:399
+#: modules/gui/macosx/macosx.m:47 modules/gui/macosx/vout.m:188
 #, fuzzy
-msgid "Video Track"
-msgstr "¥Ó¥Ç¥ª"
+msgid "Video device"
+msgstr "DVD¥Ç¥Ð¥¤¥¹"
 
-#: modules/gui/macosx/intf.m:382
+#: modules/gui/macosx/intf.m:406
 msgid "Minimize Window"
 msgstr "¥¦¥£¥ó¥É¥¦¤òºÇ¾®²½"
 
-#: modules/gui/macosx/intf.m:383
+#: modules/gui/macosx/intf.m:407
 msgid "Close Window"
 msgstr "¥¦¥£¥ó¥É¥¦¤òÊĤ¸¤ë"
 
-#: modules/gui/macosx/intf.m:384
+#: modules/gui/macosx/intf.m:408
 #, fuzzy
 msgid "Controller"
 msgstr "¥³¥ó¥È¥í¡¼¥ë"
 
-#: modules/gui/macosx/intf.m:389
+#: modules/gui/macosx/intf.m:413
 msgid "Bring All to Front"
 msgstr "¤¹¤Ù¤Æ¤òÁ°¤Ë"
 
-#: modules/gui/macosx/intf.m:391
+#: modules/gui/macosx/intf.m:415
 #, fuzzy
 msgid "Help"
 msgstr "¥Ø¥ë¥×"
 
-#: modules/gui/macosx/intf.m:392
+#: modules/gui/macosx/intf.m:416
 #, fuzzy
 msgid "ReadMe..."
 msgstr "¥á¥Ã¥»¡¼¥¸..."
 
-#: modules/gui/macosx/intf.m:393
+#: modules/gui/macosx/intf.m:417
+#, fuzzy
+msgid "Online Documentation"
+msgstr "¥â¡¼¥·¥ç¥óÊäÀµ¥â¥¸¥å¡¼¥ë"
+
+#: modules/gui/macosx/intf.m:418
 msgid "Report a Bug"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:394
+#: modules/gui/macosx/intf.m:419
 #, fuzzy
 msgid "VideoLAN Website"
 msgstr "VideoLAN¥¯¥é¥¤¥¢¥ó¥È"
 
-#: modules/gui/macosx/intf.m:395
+#: modules/gui/macosx/intf.m:420 modules/gui/macosx/intf.m:1195
 msgid "License"
 msgstr "¥é¥¤¥»¥ó¥¹"
 
-#: modules/gui/macosx/intf.m:404
+#: modules/gui/macosx/intf.m:429
 msgid "Error"
 msgstr "¥¨¥é¡¼"
 
-#: modules/gui/macosx/intf.m:405
+#: modules/gui/macosx/intf.m:430
 #, fuzzy
 msgid ""
 "An error has occurred which probably prevented the execution of your request:"
 msgstr "Í׵ᤵ¤ì¤¿½èÍý¤Î¼Â¹Ô¤Ç¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ :"
 
-#: modules/gui/macosx/intf.m:406
+#: modules/gui/macosx/intf.m:431
 #, fuzzy
 msgid "If you believe that it is a bug, please follow the instructions at:"
 msgstr "¤â¤·¡¢¥Ð¥°¤Ç¤¢¤ë¤È»×¤ï¤ì¤ë¤Ê¤é¡¢°Ê²¼¤Î¼ê½ç¤Ë¤·¤¿¤¬¤Ã¤Æ¤¯¤À¤µ¤¤ :"
 
-#: modules/gui/macosx/intf.m:407
+#: modules/gui/macosx/intf.m:432
 msgid "Open Messages Window"
 msgstr "¥á¥Ã¥»¡¼¥¸¥¦¥£¥ó¥É¥¦¤òɽ¼¨"
 
-#: modules/gui/macosx/intf.m:408
+#: modules/gui/macosx/intf.m:433
 msgid "Dismiss"
 msgstr "¤ä¤êľ¤·"
 
-#: modules/gui/macosx/intf.m:1258
+#: modules/gui/macosx/intf.m:1159
 #, fuzzy
 msgid "No CrashLog found"
 msgstr "%@s ¤Ï¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: modules/gui/macosx/intf.m:1258
+#: modules/gui/macosx/intf.m:1159
 msgid ""
 "Either you are running Mac OS X pre 10.2 or you haven't experienced any "
 "heavy crashes yet."
 msgstr ""
 
-#: modules/gui/macosx/macosx.m:47
-#, fuzzy
-msgid "video device"
-msgstr "DVD¥Ç¥Ð¥¤¥¹"
+#: modules/gui/macosx/macosx.m:48
+msgid ""
+"Choose a number corresponding to a screen in you video device selection menu "
+"and this screen will be used by default as the screen for 'fullscreen'."
+msgstr ""
 
-#: modules/gui/macosx/macosx.m:49
-msgid "opaqueness"
+#: modules/gui/macosx/macosx.m:52
+msgid "Opaqueness"
 msgstr ""
 
-#: modules/gui/macosx/macosx.m:51
+#: modules/gui/macosx/macosx.m:54
 msgid ""
 "Set the transparency of the video output. 1 is non-transparent (default) 0 "
 "is fully transparent."
 msgstr ""
 
-#: modules/gui/macosx/macosx.m:54
-msgid "float on top"
+#: modules/gui/macosx/macosx.m:57
+msgid "Always float on top"
 msgstr ""
 
-#: modules/gui/macosx/macosx.m:56
+#: modules/gui/macosx/macosx.m:59
 #, fuzzy
 msgid "Let the video window float on top of other windows."
 msgstr "¥Ó¥Ç¥ª¤ò¥¯¥í¡¼¥ó¤¹¤ë¤¿¤á¤Ë¥Ó¥Ç¥ª¡¦¥¦¥£¥ó¥É¥¦¿ô¤òÁªÂò¤¹¤ë"
 
-#: modules/gui/macosx/macosx.m:59
+#: modules/gui/macosx/macosx.m:62
 msgid "MacOS X interface, sound and video"
 msgstr ""
 
-#: modules/gui/macosx/open.m:134
+#: modules/gui/macosx/open.m:135
 msgid "Open Source"
 msgstr "¥½¡¼¥¹¤ò³«¤¯"
 
-#: modules/gui/macosx/open.m:136
+#: modules/gui/macosx/open.m:137
 #, fuzzy
 msgid "Only enqueue in playlist, do not play"
 msgstr "¥Ç¥Õ¥©¥ë¥È¤Ç¥×¥ì¥¤¥ê¥¹¥È¤ËÄɲÃ"
 
-#: modules/gui/macosx/open.m:146
+#: modules/gui/macosx/open.m:147
 msgid "Treat as a pipe rather than as a file"
 msgstr "¥Õ¥¡¥¤¥ë¤È¤·¤Æ¤Ç¤Ï¤Ê¤¯¡¢¥Ñ¥¤¥×¤È¤·¤Æ°·¤¦"
 
-#: modules/gui/macosx/open.m:154 modules/gui/macosx/open.m:370
+#: modules/gui/macosx/open.m:155 modules/gui/macosx/open.m:370
 msgid "VIDEO_TS folder"
 msgstr "VIDEO_TS¥Õ¥©¥ë¥À"
 
-#: modules/gui/macosx/open.m:170
+#: modules/gui/macosx/open.m:158 modules/gui/macosx/open.m:388
+#: modules/gui/macosx/open.m:479
+#, fuzzy
+msgid "Audio CD"
+msgstr "¥ª¡¼¥Ç¥£¥ª"
+
+#: modules/gui/macosx/open.m:172
 #, fuzzy
 msgid "Load subtitles file:"
 msgstr "»úËë"
 
-#: modules/gui/macosx/open.m:173
+#: modules/gui/macosx/open.m:175
 msgid "Override"
 msgstr ""
 
-#: modules/gui/macosx/open.m:332 modules/gui/macosx/open.m:511
-#: modules/gui/macosx/open.m:615 modules/gui/macosx/open.m:662
+#: modules/gui/macosx/open.m:332 modules/gui/macosx/open.m:526
+#: modules/gui/macosx/open.m:631 modules/gui/macosx/open.m:677
 msgid "Open"
 msgstr "³«¤¯"
 
-#: modules/gui/macosx/open.m:415 modules/gui/macosx/open.m:467
-#: modules/gui/macosx/open.m:475
+#: modules/gui/macosx/open.m:422 modules/gui/macosx/open.m:474
+#: modules/gui/macosx/open.m:482 modules/gui/macosx/open.m:490
 msgid "No %@s found"
 msgstr "%@s ¤Ï¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: modules/gui/macosx/open.m:510
+#: modules/gui/macosx/open.m:525
 msgid "Open VIDEO_TS Directory"
 msgstr "VIDEO_TS¥Ç¥£¥ì¥¯¥È¥ê¤ò³«¤¯"
 
-#: modules/gui/macosx/output.m:115
+#: modules/gui/macosx/output.m:124
 #, fuzzy
 msgid "Advanced output:"
 msgstr "ALSA¥ª¡¼¥Ç¥£¥ª¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/gui/macosx/output.m:119
+#: modules/gui/macosx/output.m:128
 msgid "Output Options"
 msgstr ""
 
-#: modules/gui/macosx/output.m:122 modules/gui/macosx/output.m:210
-#: modules/gui/macosx/output.m:285
+#: modules/gui/macosx/output.m:131 modules/gui/macosx/output.m:225
+#: modules/gui/macosx/output.m:306
 #, fuzzy
 msgid "Stream"
 msgstr "¥¹¥È¥ê¡¼¥à¤ÎÄä»ß"
 
-#: modules/gui/macosx/output.m:126
+#: modules/gui/macosx/output.m:135
 msgid "TTL"
 msgstr ""
 
-#: modules/gui/macosx/output.m:132 modules/gui/wxwindows/streamout.cpp:440
+#: modules/gui/macosx/output.m:141 modules/gui/wxwindows/streamout.cpp:531
 msgid "Encapsulation Method"
 msgstr ""
 
-#: modules/gui/macosx/output.m:133
+#: modules/gui/macosx/output.m:142
 msgid "MPEG TS"
 msgstr ""
 
-#: modules/gui/macosx/output.m:134 modules/gui/macosx/output.m:275
-#: modules/gui/macosx/output.m:314
+#: 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:136 modules/gui/macosx/output.m:274
-#: modules/gui/macosx/output.m:318
-msgid "Ogg"
+#: 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:137 modules/gui/macosx/output.m:276
-#: modules/gui/macosx/output.m:320
-msgid "mp4"
+#: 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:139
+#: modules/gui/macosx/output.m:149
 #, fuzzy
 msgid "Transcode options"
 msgstr "¥¹¥È¥ê¡¼¥à¤Î°ì»þÄä»ß"
 
-#: modules/gui/macosx/output.m:149 modules/gui/macosx/output.m:153
-msgid "Bitrate (bps)"
+#: modules/gui/macosx/output.m:153 modules/gui/macosx/output.m:159
+#: modules/gui/wxwindows/streamout.cpp:610
+#: modules/gui/wxwindows/streamout.cpp:662
+msgid "Bitrate (kb/s)"
 msgstr ""
 
-#: modules/gui/macosx/output.m:151
-msgid "mpga"
+#: modules/gui/macosx/output.m:166 modules/gui/wxwindows/streamout.cpp:484
+#, fuzzy
+msgid "Miscellaneous Options"
+msgstr "¤½¤Î¾"
+
+#: modules/gui/macosx/output.m:167
+msgid "Announce streams via SAP Channel:"
 msgstr ""
 
-#: modules/gui/macosx/output.m:152
-msgid "a52 "
+#: modules/gui/macosx/output.m:296 modules/gui/macosx/output.m:356
+msgid "mp4"
 msgstr ""
 
-#: modules/gui/macosx/prefs.m:599 modules/gui/macosx/prefs.m:803
-#: modules/gui/macosx/prefs.m:825
+#: modules/gui/macosx/prefs.m:80 modules/gui/wxwindows/preferences.cpp:259
+#, fuzzy
+msgid "Reset All"
+msgstr "¤¹¤Ù¤Æ¤òÁªÂò"
+
+#: modules/gui/macosx/prefs.m:81
 msgid "Advanced"
 msgstr ""
 
-#: modules/gui/macosx/vout.m:191
+#: modules/gui/macosx/prefs.m:170
 #, fuzzy
-msgid "Video device"
-msgstr "DVD¥Ç¥Ð¥¤¥¹"
+msgid "Reset Preferences"
+msgstr "ÀßÄê..."
+
+#: modules/gui/macosx/prefs.m:172 modules/gui/wxwindows/preferences.cpp:316
+msgid ""
+"Beware this will reset your VLC Media Player config file.\n"
+"Are you sure you want to continue?"
+msgstr ""
+
+#: modules/gui/macosx/prefs.m:198
+msgid "Select file or directory"
+msgstr ""
+
+#: modules/gui/macosx/prefs.m:408 modules/gui/wxwindows/preferences.cpp:767
+#, fuzzy
+msgid "Default"
+msgstr "ºï½ü"
 
 #: modules/gui/ncurses/ncurses.c:66
 #, fuzzy
 msgid "ncurses interface"
 msgstr "ncurses¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
 
+#: modules/gui/pda/interface.c:396
+#, fuzzy
+msgid "UDP/RTP (Adress when Multicast)"
+msgstr "UDP¥Þ¥ë¥Á¥­¥ã¥¹¥È"
+
+#: modules/gui/pda/pda.c:72
+#, fuzzy
+msgid "PDA Linux Gtk2+ interface"
+msgstr "Gtk+¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
+
 #: modules/gui/qnx/qnx.c:44
 #, fuzzy
 msgid "QNX RTOS video and audio output"
@@ -4627,683 +4965,249 @@ msgstr "
 msgid "Qt interface"
 msgstr "Qt¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/gui/skins/src/skin_main.cpp:251
-#: modules/gui/skins/src/vlcproc.cpp:338
+#: modules/gui/skins/src/dialogs.cpp:136
 #, fuzzy
 msgid "Open a skin file"
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯"
 
-#: modules/gui/skins/src/skin_main.cpp:292
-#: modules/gui/skins/src/skin_main.cpp:293
+#: modules/gui/skins/src/skin_main.cpp:305
+#: modules/gui/skins/src/skin_main.cpp:306
 msgid "Last skin actually used"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:294
-#: modules/gui/skins/src/skin_main.cpp:295
+#: modules/gui/skins/src/skin_main.cpp:307
+#: modules/gui/skins/src/skin_main.cpp:308
 msgid "Config of last used skin"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:296
-#: modules/gui/skins/src/skin_main.cpp:297
+#: modules/gui/skins/src/skin_main.cpp:309
+#: modules/gui/skins/src/skin_main.cpp:310
 msgid "Show application in system tray"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:298
-#: modules/gui/skins/src/skin_main.cpp:299
+#: modules/gui/skins/src/skin_main.cpp:311
+#: modules/gui/skins/src/skin_main.cpp:312
 msgid "Show application in taskbar"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:310
+#: modules/gui/skins/src/skin_main.cpp:323
 #, fuzzy
 msgid "Skinnable Interface"
 msgstr "¥á¥¤¥ó¥¦¥£¥ó¥É¥¦¤Îɽ¼¨/Èóɽ¼¨(_I)"
 
-#: modules/gui/win32/strings.cpp:12
-msgid "Version x.y.z"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:20
+#: modules/gui/wxwindows/fileinfo.cpp:77
 #, fuzzy
-msgid "Device &name:"
-msgstr "¥Ç¥Ð¥¤¥¹Ì¾"
-
-#: modules/gui/win32/strings.cpp:21
-msgid "&Menus"
-msgstr ""
+msgid "FileInfo"
+msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯(_O)..."
 
-#: modules/gui/win32/strings.cpp:22
+#: modules/gui/wxwindows/interface.cpp:223
 #, fuzzy
-msgid "Starting position"
-msgstr "¿âľÊý¸þ°ÌÃÖ"
+msgid "Open a DVD or (S)VCD"
+msgstr "DVD¤Þ¤¿¤ÏVCD¤ò³«¤¯"
 
-#: modules/gui/win32/strings.cpp:23
+#: modules/gui/wxwindows/interface.cpp:224
 #, fuzzy
-msgid "&Title:"
-msgstr "¥¿¥¤¥È¥ë:"
+msgid "Open a network stream"
+msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¥¹¥È¥ê¡¼¥à¤òÁªÂò¤¹¤ë"
 
-#: modules/gui/win32/strings.cpp:24
+#: modules/gui/wxwindows/interface.cpp:225
 #, fuzzy
-msgid "&Chapter:"
-msgstr "¥Á¥ã¥×¥¿¡¼:"
+msgid "Open a satellite stream"
+msgstr "±ÒÀ±¥«¡¼¥É¤ò³«¤¯"
 
-#: modules/gui/win32/strings.cpp:28
-msgid "F:\\"
+#: modules/gui/wxwindows/interface.cpp:226
+msgid "Eject the DVD/CD"
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:35
-msgid "ToolBar"
-msgstr ""
+#: modules/gui/wxwindows/interface.cpp:227
+#, fuzzy
+msgid "Exit this program"
+msgstr "¥×¥í¥°¥é¥à¤Î½ªÎ»"
 
-#: modules/gui/win32/strings.cpp:36
-msgid "ToolButtonSep1"
-msgstr ""
+#: modules/gui/wxwindows/interface.cpp:229
+#, fuzzy
+msgid "Open the playlist"
+msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
 
-#: modules/gui/win32/strings.cpp:37
-msgid "ToolButtonSep2"
-msgstr ""
+#: modules/gui/wxwindows/interface.cpp:230
+#, fuzzy
+msgid "Show the program logs"
+msgstr "¥×¥í¥°¥é¥à¤ÎÁªÂò"
 
-#: modules/gui/win32/strings.cpp:38
-msgid "ToolButtonSep3"
+#: modules/gui/wxwindows/interface.cpp:231
+msgid "Show information about the file being played"
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:39
-#, fuzzy
-msgid "File read"
-msgstr "¥Õ¥¡¥¤¥ë"
-
-#: modules/gui/win32/strings.cpp:40
-msgid "Channel:"
-msgstr "¥Á¥ã¥ó¥Í¥ë:"
-
-#: modules/gui/win32/strings.cpp:42
-msgid "Go!"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:46
-msgid "0:00:00"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:47 modules/gui/wxwindows/interface.cpp:284
-#, fuzzy
-msgid "&File"
-msgstr "¥Õ¥¡¥¤¥ë"
-
-#: modules/gui/win32/strings.cpp:48
-#, fuzzy
-msgid "Open &file..."
-msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯(_O)..."
-
-#: modules/gui/win32/strings.cpp:49
-#, fuzzy
-msgid "Open &disc..."
-msgstr "¥Ç¥£¥¹¥¯¤ò³«¤¯(_D)..."
-
-#: modules/gui/win32/strings.cpp:50
-#, fuzzy
-msgid "&Network stream..."
-msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¥¹¥È¥ê¡¼¥à(_N)..."
-
-#: modules/gui/win32/strings.cpp:51 modules/gui/wxwindows/interface.cpp:285
-#, fuzzy
-msgid "&View"
-msgstr "ɽ¼¨(_V)"
-
-#: modules/gui/win32/strings.cpp:52
-#, fuzzy
-msgid "&Hide interface"
-msgstr "¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ò±£¤¹(_H)"
-
-#: modules/gui/win32/strings.cpp:54 modules/gui/wxwindows/interface.cpp:255
-#, fuzzy
-msgid "&Playlist..."
-msgstr "¥×¥ì¥¤¥ê¥¹¥È..."
-
-#: modules/gui/win32/strings.cpp:55
-#, fuzzy
-msgid "&Add interface"
-msgstr "¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ò±£¤¹(_H)"
-
-#: modules/gui/win32/strings.cpp:56
-#, fuzzy
-msgid "Spawn a new interface"
-msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹"
-
-#: modules/gui/win32/strings.cpp:57
-#, fuzzy
-msgid "&Controls"
-msgstr "¥³¥ó¥È¥í¡¼¥ë"
-
-#: modules/gui/win32/strings.cpp:59
-#, fuzzy
-msgid "C&hannels"
-msgstr "¥Á¥ã¥ó¥Í¥ë"
-
-#: modules/gui/win32/strings.cpp:61
-#, fuzzy
-msgid "Sc&reen"
-msgstr "¥¹¥¯¥ê¡¼¥ó"
-
-#: modules/gui/win32/strings.cpp:62
-#, fuzzy
-msgid "&Program"
-msgstr "¥×¥í¥°¥é¥à"
-
-#: modules/gui/win32/strings.cpp:64
-#, fuzzy
-msgid "&Title"
-msgstr "¥¿¥¤¥È¥ë"
-
-#: modules/gui/win32/strings.cpp:66
-#, fuzzy
-msgid "&Chapter"
-msgstr "¥Á¥ã¥×¥¿¡¼"
-
-#: modules/gui/win32/strings.cpp:68
-msgid "&Angle"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:69
-#, fuzzy
-msgid "Select angle"
-msgstr "¥Õ¥¡¥¤¥ë¤ÎÁªÂò"
-
-#: modules/gui/win32/strings.cpp:70
-#, fuzzy
-msgid "&Language"
-msgstr "¸À¸ì"
-
-#: modules/gui/win32/strings.cpp:72
-#, fuzzy
-msgid "&Subtitles"
-msgstr "»úËë(_S)"
-
-#: modules/gui/win32/strings.cpp:74 modules/gui/wxwindows/interface.cpp:290
-#, fuzzy
-msgid "&Help"
-msgstr "¥Ø¥ë¥×(_H)"
-
-#: modules/gui/win32/strings.cpp:75
-#, fuzzy
-msgid "Close this popup"
-msgstr "¥¦¥£¥ó¥É¥¦¤òÊĤ¸¤ë"
-
-#: modules/gui/win32/strings.cpp:76
-#, fuzzy
-msgid "Show interface"
-msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹"
-
-#: modules/gui/win32/strings.cpp:78
-#, fuzzy
-msgid "&Jump..."
-msgstr "¥¸¥ã¥ó¥×(_J)..."
-
-#: modules/gui/win32/strings.cpp:79
-#, fuzzy
-msgid "Audio settings"
-msgstr "ÀßÄê(_S)"
-
-#: modules/gui/win32/strings.cpp:82
-#, fuzzy
-msgid "Video settings"
-msgstr "ÀßÄê(_S)"
-
-#: modules/gui/win32/strings.cpp:89
-#, fuzzy
-msgid "New stream"
-msgstr "¥¹¥È¥ê¡¼¥à¤ò³«¤¯"
-
-#: modules/gui/win32/strings.cpp:92
-#, fuzzy
-msgid "Network Stream..."
-msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¥¹¥È¥ê¡¼¥à(_N)..."
-
-#: modules/gui/win32/strings.cpp:109
-#, fuzzy
-msgid "Play slower"
-msgstr "¥¹¥í¡¼ºÆÀ¸"
-
-#: modules/gui/win32/strings.cpp:111
-#, fuzzy
-msgid "Play faster"
-msgstr "ÁáÁ÷¤êºÆÀ¸"
-
-#: modules/gui/win32/strings.cpp:115
-#, fuzzy
-msgid "Next file"
-msgstr "¼¡¤Î¥Õ¥¡¥¤¥ë"
-
-#: modules/gui/win32/strings.cpp:116
-#, fuzzy
-msgid "&Stream output..."
-msgstr "¥¹¥È¥ê¡¼¥à½ÐÎÏ"
-
-#: modules/gui/win32/strings.cpp:117
-#, fuzzy
-msgid "Open the stream output"
-msgstr "¥Ó¥Ç¥ª¡¦¥¹¥È¥ê¡¼¥à¤Î½ÐÎϤòÍ­¸ú¤Ë¤¹¤ë"
-
-#: modules/gui/win32/strings.cpp:118
-#, fuzzy
-msgid "&Add subtitles..."
-msgstr "»úËë(_S)"
-
-#: modules/gui/win32/strings.cpp:119
-msgid "Add a subtitle file"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:122
-#, fuzzy
-msgid "Exit"
-msgstr "½ªÎ»(_x)"
-
-#: modules/gui/win32/strings.cpp:124
-#, fuzzy
-msgid "&Fullscreen"
-msgstr "Á´²èÌ̲½(_F)"
-
-#: modules/gui/win32/strings.cpp:130
-#, fuzzy
-msgid "About..."
-msgstr "VideoLAN¤Ë¤Ä¤¤¤Æ(_A)..."
-
-#: modules/gui/win32/strings.cpp:135
-#, fuzzy
-msgid "Select next title"
-msgstr "¥Õ¥¡¥¤¥ë¤ÎÁªÂò"
-
-#: modules/gui/win32/strings.cpp:140
-#, fuzzy
-msgid "Volume &Up"
-msgstr "¥Ü¥ê¥å¡¼¥à¤ò¾å¤²¤ë"
-
-#: modules/gui/win32/strings.cpp:141
-msgid "Increase the volume"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:142
-#, fuzzy
-msgid "Volume &Down"
-msgstr "¥Ü¥ê¥å¡¼¥à¤ò²¼¤²¤ë"
-
-#: modules/gui/win32/strings.cpp:143
-msgid "Decrease the volume"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:144
-#, fuzzy
-msgid "&Mute"
-msgstr "¥ß¥å¡¼¥È¤¹¤ë"
-
-#: modules/gui/win32/strings.cpp:145
-#, fuzzy
-msgid "Toggle mute"
-msgstr "¥á¥¤¥ó¥¦¥£¥ó¥É¥¦¤Îɽ¼¨/Èóɽ¼¨(_I)"
-
-#: modules/gui/win32/strings.cpp:146
-msgid "Always on top..."
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:147
-#, fuzzy
-msgid "Set the window on top"
-msgstr "¥¦¥£¥ó¥É¥¦¤òÊĤ¸¤ë"
-
-#: modules/gui/win32/strings.cpp:155
-msgid "&Copy text"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:161
-#, fuzzy
-msgid "Open network"
-msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¤ò³«¤¯"
-
-#: modules/gui/win32/strings.cpp:162
-#, fuzzy
-msgid "Network mode"
-msgstr "¥Í¥Ã¥È¥ï¡¼¥¯"
-
-#: modules/gui/win32/strings.cpp:163 modules/gui/win32/strings.cpp:164
-#: modules/gui/win32/strings.cpp:165 modules/gui/win32/strings.cpp:223
-#, fuzzy
-msgid "Port:"
-msgstr "¥Ý¡¼¥ÈÈÖ¹æ"
-
-#: modules/gui/win32/strings.cpp:168
-msgid "URL:"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:171
-msgid "Channel server"
-msgstr "¥Á¥ã¥ó¥Í¥ë¡¦¥µ¡¼¥Ð¡¼"
-
-#: modules/gui/win32/strings.cpp:181 modules/gui/wxwindows/streamout.cpp:368
-#, fuzzy
-msgid "Filename"
-msgstr "¥í¥°¡¦¥Õ¥¡¥¤¥ë̾"
-
-#: modules/gui/win32/strings.cpp:184
-#, fuzzy
-msgid "&Add"
-msgstr "ÄɲÃ"
-
-#: modules/gui/win32/strings.cpp:185
-#, fuzzy
-msgid "&File..."
-msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯(_O)..."
-
-#: modules/gui/win32/strings.cpp:186
-#, fuzzy
-msgid "&Disc..."
-msgstr "¥Ç¥£¥¹¥¯¤ò³«¤¯(_D)..."
-
-#: modules/gui/win32/strings.cpp:187
-#, fuzzy
-msgid "&Network..."
-msgstr "¥Í¥Ã¥È¥ï¡¼¥¯"
-
-#: modules/gui/win32/strings.cpp:188
-msgid "&Url"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:189 modules/gui/wxwindows/playlist.cpp:124
-#, fuzzy
-msgid "&Delete"
-msgstr "ºï½ü"
-
-#: modules/gui/win32/strings.cpp:190 modules/gui/win32/strings.cpp:191
-#: modules/gui/wxwindows/playlist.cpp:130
-#, fuzzy
-msgid "&Selection"
-msgstr "ÁªÂò"
-
-#: modules/gui/win32/strings.cpp:192
-#, fuzzy
-msgid "&Invert selection"
-msgstr "ÁªÂò"
-
-#: modules/gui/win32/strings.cpp:193
-#, fuzzy
-msgid "&Crop selection"
-msgstr "ÁªÂò"
-
-#: modules/gui/win32/strings.cpp:194
-#, fuzzy
-msgid "&Delete selection"
-msgstr "ÁªÂò"
-
-#: modules/gui/win32/strings.cpp:195
-#, fuzzy
-msgid "Delete &all"
-msgstr "ºï½ü"
-
-#: modules/gui/win32/strings.cpp:197
-#, fuzzy
-msgid "Invert selection"
-msgstr "ÁªÂò"
-
-#: modules/gui/win32/strings.cpp:199
-#, fuzzy
-msgid "Crop selection"
-msgstr "ÁªÂò"
-
-#: modules/gui/win32/strings.cpp:201
-#, fuzzy
-msgid "Delete selection"
-msgstr "ÁªÂò"
-
-#: modules/gui/win32/strings.cpp:203
-msgid "Delete all items"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:205
-#, fuzzy
-msgid "Play the selected stream"
-msgstr "¥¹¥È¥ê¡¼¥à¤ÎºÆÀ¸"
-
-#: modules/gui/win32/strings.cpp:222
-#, fuzzy
-msgid "Stream output MRL (Media Resource Locator)"
-msgstr "¥á¥Ç¥£¥¢¡¦¥ê¥½¡¼¥¹¡¦¥í¥±¡¼¥¿ (MRL)"
-
-#: modules/gui/win32/strings.cpp:225
-msgid "file/ts://"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:230
-msgid "239.239.0.1"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:240
-#, fuzzy
-msgid "Add subtitles"
-msgstr "»úËë(_S)"
-
-#: modules/gui/win32/strings.cpp:242
-msgid "Delay:"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:243
-msgid "FPS:"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:245 modules/gui/win32/strings.cpp:247
-msgid "0.0"
-msgstr ""
-
-#: modules/gui/win32/win32.cpp:302
-msgid "maximum number of lines in the log window"
-msgstr "¥í¥°¡¦¥¦¥£¥ó¥É¥¦¤ÎºÇÂç¹Ô¿ô"
-
-#: modules/gui/win32/win32.cpp:304
-#, fuzzy
-msgid ""
-"You can set the maximum number of lines that the log window will display."
-msgstr ""
-"ɽ¼¨¤µ¤ì¤ë¥í¥°¡¦¥¦¥£¥ó¥É¥¦¤ÎºÇÂç¹Ô¿ô¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£¤¹¤Ù¤Æ¤Î¥á¥Ã¥»¡¼¥¸¤òÊÝ»ý"
-"¤¹¤ë¾ì¹ç¤Ë¤Ï¡¢-1¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£"
-
-#: modules/gui/win32/win32.cpp:305
-msgid " Enter -1 if you want to keep all messages."
-msgstr ""
-
-#: modules/gui/win32/win32.cpp:306
-msgid "display text under images in the toolbar"
-msgstr ""
-
-#: modules/gui/win32/win32.cpp:308
-#, fuzzy
-msgid "Check this option if you want to display the caption of the buttons in "
-msgstr ""
-"VideoLAN¤Î¥Á¥ã¥ó¥Í¥ë¡¦¥µ¡¼¥Ð¡¼¤ò»ÈÍѤ¹¤ë¾ì¹ç¤Ë¤Ï¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤òÍ­¸ú¤Ë¤·¤Þ"
-"¤¹¡£"
-
-#: modules/gui/win32/win32.cpp:309
-msgid "the toolbar. Beware, the display may be messed up"
-msgstr ""
-
-#: modules/gui/win32/win32.cpp:317
-#, fuzzy
-msgid "Native Windows interface"
-msgstr "¥Í¥¤¥Æ¥£¥ÖWindows¥¤¥ó¥¿¥Õ¥§¡¼¥¹"
-
-#: modules/gui/wxwindows/fileinfo.cpp:77
-#, fuzzy
-msgid "FileInfo"
-msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯(_O)..."
-
-#: modules/gui/wxwindows/interface.cpp:219
-#, fuzzy
-msgid "Open a DVD or (S)VCD"
-msgstr "DVD¤Þ¤¿¤ÏVCD¤ò³«¤¯"
-
-#: modules/gui/wxwindows/interface.cpp:220
-#, fuzzy
-msgid "Open a network stream"
-msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¥¹¥È¥ê¡¼¥à¤òÁªÂò¤¹¤ë"
-
-#: modules/gui/wxwindows/interface.cpp:221
-#, fuzzy
-msgid "Open a satellite stream"
-msgstr "±ÒÀ±¥«¡¼¥É¤ò³«¤¯"
-
-#: modules/gui/wxwindows/interface.cpp:222
-msgid "Eject the DVD/CD"
-msgstr ""
-
-#: modules/gui/wxwindows/interface.cpp:223
-#, fuzzy
-msgid "Exit this program"
-msgstr "¥×¥í¥°¥é¥à¤Î½ªÎ»"
-
-#: modules/gui/wxwindows/interface.cpp:225
-#, fuzzy
-msgid "Open the playlist"
-msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
-
-#: modules/gui/wxwindows/interface.cpp:226
-#, fuzzy
-msgid "Show the program logs"
-msgstr "¥×¥í¥°¥é¥à¤ÎÁªÂò"
-
-#: modules/gui/wxwindows/interface.cpp:227
-msgid "Show information about the file being played"
-msgstr ""
-
-#: modules/gui/wxwindows/interface.cpp:229
+#: modules/gui/wxwindows/interface.cpp:233
 msgid "Go to the preferences menu"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:231
+#: modules/gui/wxwindows/interface.cpp:235
 #, fuzzy
 msgid "About this program"
 msgstr "¥×¥í¥°¥é¥à¤Î½ªÎ»"
 
-#: modules/gui/wxwindows/interface.cpp:235
+#: modules/gui/wxwindows/interface.cpp:239 modules/gui/wxwindows/menus.cpp:108
+#, fuzzy
+msgid "Simple &Open ..."
+msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯..."
+
+#: modules/gui/wxwindows/interface.cpp:241 modules/gui/wxwindows/menus.cpp:109
 #, fuzzy
-msgid "&Open File..."
+msgid "Open &File..."
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯..."
 
-#: modules/gui/wxwindows/interface.cpp:237
+#: modules/gui/wxwindows/interface.cpp:243 modules/gui/wxwindows/menus.cpp:110
 #, fuzzy
 msgid "Open &Disc..."
 msgstr "¥Ç¥£¥¹¥¯¤ò³«¤¯..."
 
-#: modules/gui/wxwindows/interface.cpp:239
+#: modules/gui/wxwindows/interface.cpp:245 modules/gui/wxwindows/menus.cpp:111
 #, fuzzy
-msgid "&Network Stream..."
+msgid "Open &Network Stream..."
 msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¥¹¥È¥ê¡¼¥à(_N)..."
 
-#: modules/gui/wxwindows/interface.cpp:242
+#: modules/gui/wxwindows/interface.cpp:248
 #, fuzzy
-msgid "&Satellite Stream..."
+msgid "Open &Satellite Stream..."
 msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¥¹¥È¥ê¡¼¥à(_N)..."
 
-#: modules/gui/wxwindows/interface.cpp:247
+#: modules/gui/wxwindows/interface.cpp:253
 #, fuzzy
 msgid "&Eject Disc"
 msgstr "¥Ç¥£¥¹¥¯¤Î¼è½Ð¤·(_E)"
 
-#: modules/gui/wxwindows/interface.cpp:251
+#: modules/gui/wxwindows/interface.cpp:257
 #, fuzzy
 msgid "E&xit"
 msgstr "½ªÎ»(_x)"
 
-#: modules/gui/wxwindows/interface.cpp:257
+#: modules/gui/wxwindows/interface.cpp:261
 #, fuzzy
-msgid "&Logs..."
-msgstr "¥Ç¥£¥¹¥¯¤ò³«¤¯(_D)..."
+msgid "&Playlist..."
+msgstr "¥×¥ì¥¤¥ê¥¹¥È..."
+
+#: modules/gui/wxwindows/interface.cpp:263
+#, fuzzy
+msgid "&Messages..."
+msgstr "¥á¥Ã¥»¡¼¥¸..."
 
-#: modules/gui/wxwindows/interface.cpp:258
+#: modules/gui/wxwindows/interface.cpp:264
 #, fuzzy
 msgid "&File info..."
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯(_O)..."
 
-#: modules/gui/wxwindows/interface.cpp:263
+#: modules/gui/wxwindows/interface.cpp:269
 #, fuzzy
 msgid "&Preferences..."
 msgstr "ÀßÄê(_P)..."
 
-#: modules/gui/wxwindows/interface.cpp:280
+#: modules/gui/wxwindows/interface.cpp:286
 #, fuzzy
 msgid "&About..."
 msgstr "VideoLAN¤Ë¤Ä¤¤¤Æ(_A)..."
 
-#: modules/gui/wxwindows/interface.cpp:286
+#: modules/gui/wxwindows/interface.cpp:290
+#, fuzzy
+msgid "&File"
+msgstr "¥Õ¥¡¥¤¥ë"
+
+#: modules/gui/wxwindows/interface.cpp:291
+#, fuzzy
+msgid "&View"
+msgstr "ɽ¼¨(_V)"
+
+#: modules/gui/wxwindows/interface.cpp:292
 #, fuzzy
 msgid "&Settings"
 msgstr "ÀßÄê(_S)"
 
-#: modules/gui/wxwindows/interface.cpp:287
-#: modules/gui/wxwindows/interface.cpp:453
-#: modules/gui/wxwindows/interface.cpp:501
+#: modules/gui/wxwindows/interface.cpp:293
+#: modules/gui/wxwindows/interface.cpp:414
+#: modules/gui/wxwindows/interface.cpp:462
 #, fuzzy
 msgid "&Audio"
 msgstr "¥ª¡¼¥Ç¥£¥ª"
 
-#: modules/gui/wxwindows/interface.cpp:288
-#: modules/gui/wxwindows/interface.cpp:472
-#: modules/gui/wxwindows/interface.cpp:505
+#: modules/gui/wxwindows/interface.cpp:294
+#: modules/gui/wxwindows/interface.cpp:433
+#: modules/gui/wxwindows/interface.cpp:466
 #, fuzzy
 msgid "&Video"
 msgstr "¥Ó¥Ç¥ª"
 
-#: modules/gui/wxwindows/interface.cpp:289
-#: modules/gui/wxwindows/interface.cpp:491
-#: modules/gui/wxwindows/interface.cpp:509
+#: modules/gui/wxwindows/interface.cpp:295
+#: modules/gui/wxwindows/interface.cpp:452
+#: modules/gui/wxwindows/interface.cpp:470
 #, fuzzy
 msgid "&Navigation"
 msgstr "¥Ê¥Ó¥²¡¼¥·¥ç¥ó(_N)"
 
-#: modules/gui/wxwindows/interface.cpp:306
+#: modules/gui/wxwindows/interface.cpp:296
+#, fuzzy
+msgid "&Help"
+msgstr "¥Ø¥ë¥×(_H)"
+
+#: modules/gui/wxwindows/interface.cpp:312
 #, fuzzy
 msgid "Stop current playlist item"
 msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
 
-#: modules/gui/wxwindows/interface.cpp:307
+#: modules/gui/wxwindows/interface.cpp:313
 msgid "Play current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:308
+#: modules/gui/wxwindows/interface.cpp:314
 msgid "Pause current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:309
-#: modules/gui/wxwindows/playlist.cpp:351
+#: modules/gui/wxwindows/interface.cpp:315
+#: modules/gui/wxwindows/playlist.cpp:353
 #, fuzzy
 msgid "Open playlist"
 msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
 
-#: modules/gui/wxwindows/interface.cpp:310
+#: modules/gui/wxwindows/interface.cpp:316
 #, fuzzy
 msgid "Previous playlist item"
 msgstr "Á°¤Î¥Õ¥¡¥¤¥ë"
 
-#: modules/gui/wxwindows/interface.cpp:311
+#: modules/gui/wxwindows/interface.cpp:317
 #, fuzzy
 msgid "Next playlist item"
 msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
 
-#: modules/gui/wxwindows/interface.cpp:537
+#: modules/gui/wxwindows/interface.cpp:318
+#, fuzzy
+msgid "Play slower"
+msgstr "¥¹¥í¡¼ºÆÀ¸"
+
+#: modules/gui/wxwindows/interface.cpp:319
+#, fuzzy
+msgid "Play faster"
+msgstr "ÁáÁ÷¤êºÆÀ¸"
+
+#: modules/gui/wxwindows/interface.cpp:506
 #, fuzzy
 msgid ""
 " (wxWindows interface)\n"
 "\n"
 msgstr "¥Í¥¤¥Æ¥£¥ÖWindows¥¤¥ó¥¿¥Õ¥§¡¼¥¹"
 
-#: modules/gui/wxwindows/interface.cpp:538
+#: modules/gui/wxwindows/interface.cpp:507
 msgid ""
 "(C) 1996-2003 - the VideoLAN Team\n"
 "\n"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:539
+#: modules/gui/wxwindows/interface.cpp:508
 msgid ""
 "The VideoLAN team <videolan@videolan.org>\n"
 "http://www.videolan.org/\n"
 "\n"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:541
+#: modules/gui/wxwindows/interface.cpp:510
 #, fuzzy
 msgid ""
 "This is the VideoLAN Client, a DVD, MPEG and DivX player.\n"
@@ -5312,185 +5216,218 @@ msgstr ""
 "¤³¤Î¥½¥Õ¥È¥¦¥§¥¢¤ÏDVD¤ª¤è¤Ó¡¢MPEG¤òºÆÀ¸¤¹¤ëVideoLAN¥¯¥é¥¤¥¢¥ó¥È¤Ç¤¹¡£\n"
 "¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ï¡¢¥Í¥Ã¥È¥ï¡¼¥¯¤«¤éMPEG¤ÈMPEG 2¥Ç¡¼¥¿¤òºÆÀ¸¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
 
-#: modules/gui/wxwindows/interface.cpp:545
+#: modules/gui/wxwindows/interface.cpp:514
 #, fuzzy, c-format
 msgid "About %s"
 msgstr "VideoLAN¤Ë¤Ä¤¤¤Æ"
 
-#: modules/gui/wxwindows/menus.cpp:107
+#: modules/gui/wxwindows/menus.cpp:127
 #, fuzzy
 msgid "Audio menu"
 msgstr "ÀßÄê(_S)"
 
-#: modules/gui/wxwindows/menus.cpp:123
+#: modules/gui/wxwindows/menus.cpp:143
 #, fuzzy
 msgid "Video menu"
 msgstr "ÀßÄê(_S)"
 
-#: modules/gui/wxwindows/menus.cpp:137
+#: modules/gui/wxwindows/menus.cpp:161
 #, fuzzy
 msgid "Input menu"
 msgstr "ÆþÎÏ"
 
-#: modules/gui/wxwindows/menus.cpp:311
+#: modules/gui/wxwindows/menus.cpp:197
+#, fuzzy
+msgid "Close Menu"
+msgstr "¥á¥Ë¥å¡¼¤ò¥¯¥ê¥¢¤¹¤ë"
+
+#: modules/gui/wxwindows/menus.cpp:358
 msgid "Empty"
 msgstr ""
 
-#: modules/gui/wxwindows/messages.cpp:107
+#: modules/gui/wxwindows/messages.cpp:116
+#, fuzzy
+msgid "Save As..."
+msgstr "¥×¥ì¥¤¥ê¥¹¥È..."
+
+#: modules/gui/wxwindows/messages.cpp:121
 msgid "Verbose"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:173
+#: modules/gui/wxwindows/messages.cpp:222
+msgid "Save Messages As a file..."
+msgstr ""
+
+#: modules/gui/wxwindows/open.cpp:177
 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:190 modules/gui/wxwindows/subtitles.cpp:98
-#, fuzzy
-msgid "Subtitles file"
-msgstr "»úËë"
-
-#: modules/gui/wxwindows/open.cpp:191
-msgid "Load an additional subtitles file. Currently only works with AVI files."
-msgstr ""
-
-#: modules/gui/wxwindows/open.cpp:214
+#: modules/gui/wxwindows/open.cpp:195
 msgid "Use VLC as a stream server"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:234
+#: modules/gui/wxwindows/open.cpp:216
 #, fuzzy
 msgid "Capture input stream"
 msgstr "¥¹¥È¥ê¡¼¥à¤Î°ì»þÄä»ß"
 
-#: modules/gui/wxwindows/open.cpp:236
+#: modules/gui/wxwindows/open.cpp:218
 msgid "Capture the stream you are playing to a file"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:352
+#: modules/gui/wxwindows/open.cpp:348 modules/gui/wxwindows/subtitles.cpp:98
+#, fuzzy
+msgid "Subtitles file"
+msgstr "»úËë"
+
+#: modules/gui/wxwindows/open.cpp:349
+msgid "Load an additional subtitles file. Currently only works with AVI files."
+msgstr ""
+
+#: modules/gui/wxwindows/open.cpp:385
 msgid "DVD (menus support)"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:757 modules/gui/wxwindows/streamout.cpp:728
+#: modules/gui/wxwindows/open.cpp:388
+#, fuzzy
+msgid "CD Audio"
+msgstr "¥ª¡¼¥Ç¥£¥ª"
+
+#: modules/gui/wxwindows/open.cpp:900 modules/gui/wxwindows/streamout.cpp:784
 #, fuzzy
 msgid "Save file"
 msgstr "¥Õ¥¡¥¤¥ë¤ÎÊݸ"
 
-#: modules/gui/wxwindows/playlist.cpp:115
+#: modules/gui/wxwindows/open.cpp:953
+#, fuzzy
+msgid "Advanced open options"
+msgstr "ALSA¥ª¡¼¥Ç¥£¥ª¡¦¥â¥¸¥å¡¼¥ë"
+
+#: modules/gui/wxwindows/playlist.cpp:116
+#, fuzzy
+msgid "&Simple Add..."
+msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯(_O)..."
+
+#: modules/gui/wxwindows/playlist.cpp:117
 msgid "&Add MRL..."
 msgstr ""
 
-#: modules/gui/wxwindows/playlist.cpp:116
+#: modules/gui/wxwindows/playlist.cpp:118
 #, fuzzy
 msgid "&Open Playlist..."
 msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
 
-#: modules/gui/wxwindows/playlist.cpp:117
+#: modules/gui/wxwindows/playlist.cpp:119
 #, fuzzy
 msgid "&Save Playlist..."
 msgstr "¥×¥ì¥¤¥ê¥¹¥È..."
 
-#: modules/gui/wxwindows/playlist.cpp:119
+#: modules/gui/wxwindows/playlist.cpp:121
 #, fuzzy
 msgid "&Close"
 msgstr "ÊĤ¸¤ë"
 
-#: modules/gui/wxwindows/playlist.cpp:123
+#: modules/gui/wxwindows/playlist.cpp:125
 #, fuzzy
 msgid "&Invert"
 msgstr "µÕž"
 
-#: modules/gui/wxwindows/playlist.cpp:125
+#: modules/gui/wxwindows/playlist.cpp:126
+#, fuzzy
+msgid "&Delete"
+msgstr "ºï½ü"
+
+#: modules/gui/wxwindows/playlist.cpp:127
 #, fuzzy
 msgid "&Select All"
 msgstr "¤¹¤Ù¤Æ¤òÁªÂò"
 
-#: modules/gui/wxwindows/playlist.cpp:129
+#: modules/gui/wxwindows/playlist.cpp:131
 #, fuzzy
 msgid "&Manage"
 msgstr "¸À¸ì"
 
-#: modules/gui/wxwindows/playlist.cpp:226
+#: modules/gui/wxwindows/playlist.cpp:132
+#, fuzzy
+msgid "&Selection"
+msgstr "ÁªÂò"
+
+#: modules/gui/wxwindows/playlist.cpp:228
 msgid "no info"
 msgstr ""
 
-#: modules/gui/wxwindows/playlist.cpp:330
+#: modules/gui/wxwindows/playlist.cpp:332
 #, fuzzy
 msgid "Save playlist"
 msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
 
-#: modules/gui/wxwindows/preferences.cpp:256
-#, fuzzy
-msgid "Reset All"
-msgstr "¤¹¤Ù¤Æ¤òÁªÂò"
-
-#: modules/gui/wxwindows/preferences.cpp:313
-msgid ""
-"Beware this will reset your VLC Media Player config file.\n"
-"Are you sure you want to continue?"
-msgstr ""
-
-#: modules/gui/wxwindows/preferences.cpp:315
+#: modules/gui/wxwindows/preferences.cpp:318
 msgid "Reset config file"
 msgstr ""
 
-#: modules/gui/wxwindows/preferences.cpp:718
-#, fuzzy
-msgid "Default"
-msgstr "ºï½ü"
-
-#: modules/gui/wxwindows/preferences.cpp:844
+#: modules/gui/wxwindows/preferences.cpp:901
 #, fuzzy
 msgid "No configuration options available"
 msgstr "¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¡¦¥ª¥×¥·¥ç¥ó¤Ë¥Ä¡¼¥ë¥Á¥Ã¥×¤òɽ¼¨"
 
-#: modules/gui/wxwindows/preferences.cpp:865
-msgid "Advanced..."
-msgstr ""
+#: modules/gui/wxwindows/preferences.cpp:922
+#, fuzzy
+msgid "Advanced options"
+msgstr "ALSA¥ª¡¼¥Ç¥£¥ª¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/gui/wxwindows/streamout.cpp:166
+#: modules/gui/wxwindows/streamout.cpp:186
 msgid "Stream output MRL"
 msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏMRL"
 
-#: modules/gui/wxwindows/streamout.cpp:170
+#: modules/gui/wxwindows/streamout.cpp:190
 #, fuzzy
 msgid "Destination Target:"
 msgstr "Á÷¿®Àè¤Î¥¢¥¹¥Ú¥¯¥È¡¦¥ì¥·¥ª"
 
-#: modules/gui/wxwindows/streamout.cpp:173
+#: modules/gui/wxwindows/streamout.cpp:193
 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:338
+#: modules/gui/wxwindows/streamout.cpp:378
 msgid "Output Methods"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:344
+#: modules/gui/wxwindows/streamout.cpp:384
 #, fuzzy
 msgid "Play locally"
 msgstr "¥¹¥í¡¼ºÆÀ¸"
 
-#: modules/gui/wxwindows/streamout.cpp:478
+#: modules/gui/wxwindows/streamout.cpp:408
+#, fuzzy
+msgid "Filename"
+msgstr "¥í¥°¡¦¥Õ¥¡¥¤¥ë̾"
+
+#: modules/gui/wxwindows/streamout.cpp:496
+msgid "SAP Announce"
+msgstr ""
+
+#: modules/gui/wxwindows/streamout.cpp:498
+#, fuzzy
+msgid "Channel Name "
+msgstr "¥Á¥ã¥ó¥Í¥ë¡¦¥µ¡¼¥Ð¡¼"
+
+#: modules/gui/wxwindows/streamout.cpp:570
 #, fuzzy
 msgid "Transcoding options"
 msgstr "»ý³´ü´Ö"
 
-#: modules/gui/wxwindows/streamout.cpp:511
+#: modules/gui/wxwindows/streamout.cpp:603
 #, fuzzy
 msgid "Video codec"
 msgstr "DVD¥Ç¥Ð¥¤¥¹"
 
-#: modules/gui/wxwindows/streamout.cpp:517
-#: modules/gui/wxwindows/streamout.cpp:556
-msgid "Bitrate (kb/s)"
-msgstr ""
-
-#: modules/gui/wxwindows/streamout.cpp:550
+#: modules/gui/wxwindows/streamout.cpp:650
 #, fuzzy
 msgid "Audio codec"
 msgstr "DVD¥Ç¥Ð¥¤¥¹"
@@ -5518,13 +5455,19 @@ msgstr ""
 msgid "Override frames per second. It will only work with MicroDVD subtitles."
 msgstr ""
 
-#: modules/gui/wxwindows/wxwindows.cpp:82
+#: modules/gui/wxwindows/wxwindows.cpp:91
 #, fuzzy
 msgid "wxWindows interface module"
 msgstr "xosd¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
 
+#: modules/gui/wxwindows/wxwindows.cpp:100
+#, fuzzy
+msgid "wxWindows dialogs provider"
+msgstr "xosd¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
+
 #: modules/misc/dummy/dummy.c:37
-msgid "dummy image chroma format"
+#, fuzzy
+msgid "Dummy image chroma format"
 msgstr "¥À¥ß¡¼¤Î²èÁü¿§ºÌ¥Õ¥©¡¼¥Þ¥Ã¥È"
 
 #: modules/misc/dummy/dummy.c:39
@@ -5537,7 +5480,7 @@ msgstr ""
 "¤Þ¤¹¡£"
 
 #: modules/misc/dummy/dummy.c:44
-msgid "don't open a dos command box interface"
+msgid "Don't open a dos command box interface"
 msgstr ""
 
 #: modules/misc/dummy/dummy.c:46
@@ -5549,54 +5492,82 @@ msgstr ""
 
 #: modules/misc/dummy/dummy.c:53
 #, fuzzy
-msgid "dummy functions"
-msgstr "¥À¥ß¡¼¤Îµ¡Ç½¥â¥¸¥å¡¼¥ë"
-
-#: modules/misc/dummy/dummy.c:56
-#, fuzzy
 msgid "dummy interface function"
 msgstr "¥À¥ß¡¼¤Îµ¡Ç½¥â¥¸¥å¡¼¥ë"
 
-#: modules/misc/dummy/dummy.c:64
+#: modules/misc/dummy/dummy.c:62
 #, fuzzy
 msgid "dummy access function"
 msgstr "¥À¥ß¡¼¤Îµ¡Ç½¥â¥¸¥å¡¼¥ë"
 
-#: modules/misc/dummy/dummy.c:68
+#: modules/misc/dummy/dummy.c:66
 #, fuzzy
 msgid "dummy demux function"
 msgstr "¥À¥ß¡¼¤Îµ¡Ç½¥â¥¸¥å¡¼¥ë"
 
-#: modules/misc/dummy/dummy.c:72
+#: modules/misc/dummy/dummy.c:70
 #, fuzzy
 msgid "dummy decoder function"
 msgstr "¥À¥ß¡¼¤Îµ¡Ç½¥â¥¸¥å¡¼¥ë"
 
-#: modules/misc/dummy/dummy.c:76
+#: modules/misc/dummy/dummy.c:74
 #, fuzzy
 msgid "dummy audio output function"
 msgstr "¥À¥ß¡¼¤Îµ¡Ç½¥â¥¸¥å¡¼¥ë"
 
-#: modules/misc/dummy/dummy.c:80
+#: modules/misc/dummy/dummy.c:78
 #, fuzzy
 msgid "dummy video output function"
 msgstr "¥À¥ß¡¼¤Îµ¡Ç½¥â¥¸¥å¡¼¥ë"
 
+#: modules/misc/dummy/dummy.c:84
+#, fuzzy
+msgid "dummy font renderer function"
+msgstr "¥À¥ß¡¼¤Îµ¡Ç½¥â¥¸¥å¡¼¥ë"
+
 #: modules/misc/dummy/interface.c:52
 msgid "Using the dummy interface plugin..."
 msgstr "¥À¥ß¡¼¤Î¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥×¥é¥°¥¤¥ó¤ò»ÈÍѤ·¤Þ¤¹¡£"
 
+#: modules/misc/freetype.c:67 modules/visualization/xosd/xosd.c:71
+#, fuzzy
+msgid "Font"
+msgstr "¥Õ¥©¥ó¥È"
+
+#: modules/misc/freetype.c:68
+#, fuzzy
+msgid "Filename of Font"
+msgstr "¥í¥°¡¦¥Õ¥¡¥¤¥ë̾"
+
+#: modules/misc/freetype.c:69
+msgid "Font size"
+msgstr ""
+
+#: modules/misc/freetype.c:70
+msgid "The size of the fonts used by the osd module"
+msgstr ""
+
+#: modules/misc/freetype.c:73
+#, fuzzy
+msgid "Fonts"
+msgstr "¥Õ¥©¥ó¥È"
+
+#: modules/misc/freetype.c:76
+msgid "freetype2 font renderer"
+msgstr ""
+
 #: modules/misc/gtk_main.c:60
 #, fuzzy
 msgid "Gtk+ GUI helper"
 msgstr "Gtk+¥Ø¥ë¥Ñ¡¼¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/misc/httpd.c:95
+#: modules/misc/httpd.c:94
 msgid "HTTP 1.0 daemon"
 msgstr ""
 
 #: modules/misc/logger/logger.c:85
-msgid "log format"
+#, fuzzy
+msgid "Log format"
 msgstr "¥í¥°¡¦¥Õ¥©¡¼¥Þ¥Ã¥È"
 
 #: modules/misc/logger/logger.c:86
@@ -5606,23 +5577,28 @@ msgstr ""
 "¥í¥°¡¦¥Õ¥©¡¼¥Þ¥Ã¥È¤ò»ØÄꤷ¤Þ¤¹¡£\"text\" (¥Ç¥Õ¥©¥ë¥È) and \"html\"¤¬ÁªÂò¤Ç¤­"
 "¤Þ¤¹¡£"
 
-#: modules/misc/logger/logger.c:89
+#: modules/misc/logger/logger.c:90
 msgid "log filename"
 msgstr "¥í¥°¡¦¥Õ¥¡¥¤¥ë̾"
 
-#: modules/misc/logger/logger.c:89
+#: modules/misc/logger/logger.c:90
 msgid "Specify the log filename."
 msgstr "¥í¥°¡¦¥Õ¥¡¥¤¥ë̾¤ò»ØÄꤷ¤Þ¤¹¡£"
 
-#: modules/misc/logger/logger.c:91
+#: modules/misc/logger/logger.c:92
 #, fuzzy
 msgid "file logging interface"
 msgstr "¥Õ¥¡¥¤¥ë¡¦¥í¥®¥ó¥°¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/misc/logger/logger.c:105
+#: modules/misc/logger/logger.c:106
 msgid "Using the logger interface plugin..."
 msgstr "¥í¥®¥ó¥°¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥×¥é¥°¥¤¥ó¤ò»ÈÍѤ·¤Þ¤¹¡£"
 
+#: modules/misc/memcpy/memcpyaltivec.c:52
+#, fuzzy
+msgid "AltiVec memcpy"
+msgstr "AltiVec memcpy¥â¥¸¥å¡¼¥ë"
+
 #: modules/misc/memcpy/memcpy.c:81
 #, fuzzy
 msgid "libc memcpy"
@@ -5643,25 +5619,62 @@ msgstr "MMX memcpy
 msgid "MMX EXT memcpy"
 msgstr "MMX¥¨¥¯¥¹¥Æ¥ó¥·¥ç¥ómemcpy¥â¥¸¥å¡¼¥ë"
 
-#: modules/misc/memcpy/memcpyaltivec.c:52
-#, fuzzy
-msgid "AltiVec memcpy"
-msgstr "AltiVec memcpy¥â¥¸¥å¡¼¥ë"
-
 #: modules/misc/network/ipv4.c:85
 msgid "IPv4 network abstraction layer"
 msgstr "IPv4¥Í¥Ã¥È¥ï¡¼¥¯Ãê¾Ý¥ì¥¤¥ä"
 
-#: modules/misc/network/ipv6.c:80
+#: modules/misc/network/ipv6.c:86
 msgid "IPv6 network abstraction layer"
 msgstr "IPv6¥Í¥Ã¥È¥ï¡¼¥¯Ãê¾Ý¥ì¥¤¥ä"
 
 #: modules/misc/qte_main.cpp:66
+msgid "Run as standalone Qt/Embedded Gui Server"
+msgstr ""
+
+#: modules/misc/qte_main.cpp:67
+msgid ""
+"Use this option to run as standalone Qt/Embedded Gui Server. This option is "
+"equivalent to the -qws option from normal Qt."
+msgstr ""
+
+#: modules/misc/qte_main.cpp:71
 #, fuzzy
 msgid "Qt Embedded GUI helper"
 msgstr "QTËä¤á¹þ¤ß¥â¥¸¥å¡¼¥ë"
 
-#: modules/misc/sap.c:134
+#: modules/misc/sap.c:144 modules/misc/sap.c:145
+msgid "SAP multicast address"
+msgstr ""
+
+#: modules/misc/sap.c:146
+msgid "No IPv4-SAP listening"
+msgstr ""
+
+#: modules/misc/sap.c:147
+msgid "Set this if you do not want SAP to listen for IPv4 announces"
+msgstr ""
+
+#: modules/misc/sap.c:148
+msgid "IPv6-SAP listening"
+msgstr ""
+
+#: modules/misc/sap.c:149
+msgid "Set this if you want SAP to listen for IPv6 announces"
+msgstr ""
+
+#: modules/misc/sap.c:150
+msgid "IPv6 SAP scope"
+msgstr ""
+
+#: modules/misc/sap.c:151
+msgid "Sets the scope for IPv6 announces (default is 8)"
+msgstr ""
+
+#: modules/misc/sap.c:154
+msgid "SAP"
+msgstr ""
+
+#: modules/misc/sap.c:167
 #, fuzzy
 msgid "SAP interface"
 msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹"
@@ -5691,7 +5704,7 @@ msgstr ""
 msgid "MP4/MOV muxer"
 msgstr ""
 
-#: modules/mux/mpeg/ps.c:77
+#: modules/mux/mpeg/ps.c:79
 msgid "PS muxer"
 msgstr ""
 
@@ -5703,7 +5716,7 @@ msgstr ""
 msgid "TS muxer (libdvbpsi)"
 msgstr ""
 
-#: modules/mux/ogg.c:54
+#: modules/mux/ogg.c:55
 msgid "Ogg/ogm muxer"
 msgstr ""
 
@@ -5728,11 +5741,16 @@ msgstr ""
 msgid "MPEG-I/II audio packetizer"
 msgstr "MPEG 1/2¥ì¥¤¥ä1/2¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
 
-#: modules/packetizer/mpegvideo.c:73
+#: modules/packetizer/mpegvideo.c:88
 #, fuzzy
 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"
@@ -5743,7 +5761,7 @@ msgstr "
 msgid "Dummy stream"
 msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò"
 
-#: modules/stream_out/duplicate.c:47
+#: modules/stream_out/duplicate.c:48
 #, fuzzy
 msgid "Duplicate stream"
 msgstr "¥¹¥È¥ê¡¼¥à¤ÎºÆÀ¸"
@@ -5753,12 +5771,12 @@ msgstr "
 msgid "ES stream"
 msgstr "¥¹¥È¥ê¡¼¥à¤ÎÄä»ß"
 
-#: modules/stream_out/standard.c:47
+#: modules/stream_out/standard.c:51
 #, fuzzy
 msgid "Standard stream"
 msgstr "¥¹¥È¥ê¡¼¥à¤ÎÄä»ß"
 
-#: modules/stream_out/transcode.c:63
+#: modules/stream_out/transcode.c:71
 #, fuzzy
 msgid "Transcode stream"
 msgstr "¥¹¥È¥ê¡¼¥à¤Î°ì»þÄä»ß"
@@ -5788,15 +5806,15 @@ msgid "MMX conversions from "
 msgstr "MMX ÊÑ´¹¸µ "
 
 #: modules/video_filter/adjust.c:60
-msgid "set image contrast"
+msgid "Set image contrast"
 msgstr ""
 
 #: modules/video_filter/adjust.c:61
-msgid "Set the image contrast. Defaults to 1"
+msgid "Set the image contrast, between 0 and 2. Defaults to 1"
 msgstr ""
 
 #: modules/video_filter/adjust.c:62
-msgid "set image hue"
+msgid "Set image hue"
 msgstr ""
 
 #: modules/video_filter/adjust.c:63
@@ -5804,19 +5822,19 @@ msgid "Set the image hue, between 0 and 360. Defaults to 0"
 msgstr ""
 
 #: modules/video_filter/adjust.c:64
-msgid "set image saturation"
+msgid "Set image saturation"
 msgstr ""
 
 #: modules/video_filter/adjust.c:65
-msgid "Set the image saturation. Defaults to 1"
+msgid "Set the image saturation, between 0 and 3. Defaults to 1"
 msgstr ""
 
 #: modules/video_filter/adjust.c:66
-msgid "set image brightness"
+msgid "Set image brightness"
 msgstr ""
 
 #: modules/video_filter/adjust.c:67
-msgid "Set the image brightness. Defaults to 1"
+msgid "Set the image brightness, between 0 and 2. Defaults to 1"
 msgstr ""
 
 #: modules/video_filter/adjust.c:71
@@ -5829,7 +5847,7 @@ msgstr ""
 
 #: modules/video_filter/clone.c:55
 #, fuzzy
-msgid "number of clones"
+msgid "Number of clones"
 msgstr "¥¯¥í¡¼¥ó¿ô"
 
 #: modules/video_filter/clone.c:56
@@ -5838,7 +5856,7 @@ msgstr "
 
 #: modules/video_filter/clone.c:59
 #, fuzzy
-msgid "list of vout modules"
+msgid "List of vout modules"
 msgstr "¥Ó¥Ç¥ª½ÐÎϥ⥸¥å¡¼¥ë"
 
 #: modules/video_filter/clone.c:60
@@ -5856,15 +5874,19 @@ msgid "clone video filter"
 msgstr "¥¤¥á¡¼¥¸¡¦¥¯¥í¡¼¥ó¡¦¥Ó¥Ç¥ª¡¦¥â¥¸¥å¡¼¥ë"
 
 #: modules/video_filter/crop.c:54
-msgid "crop geometry"
+#, fuzzy
+msgid "Crop geometry"
 msgstr "±ï¼è¤ê¥¸¥ª¥á¥È¥ê"
 
 #: modules/video_filter/crop.c:55
-msgid "Set the geometry of the zone to crop"
-msgstr "¶è²è¤«¤é±ï¼è¤ê¤Þ¤Ç¤Î¥¸¥ª¥á¥È¥ê¤ò»ØÄê"
+msgid ""
+"Set the geometry of the zone to crop. This is set as width x heigth + left "
+"offset + top offset."
+msgstr ""
 
 #: modules/video_filter/crop.c:57
-msgid "automatic cropping"
+#, fuzzy
+msgid "Automatic cropping"
 msgstr "¼«Æ°±ï¼è¤ê"
 
 #: modules/video_filter/crop.c:58
@@ -5877,11 +5899,12 @@ msgid "crop video filter"
 msgstr "¥Ó¥Ç¥ª¡¦¥Õ¥£¥ë¥¿¡¼¡¦¥â¥¸¥å¡¼¥ë"
 
 #: modules/video_filter/deinterlace/deinterlace.c:75
-msgid "deinterlace mode"
+#, fuzzy
+msgid "Deinterlace mode"
 msgstr "¥Î¥ó¥¤¥ó¥¿¥ì¡¼¥¹²½¥â¡¼¥É"
 
 #: modules/video_filter/deinterlace/deinterlace.c:76
-msgid "you can choose the default deinterlace mode"
+msgid "You can choose the default deinterlace mode"
 msgstr ""
 
 #: modules/video_filter/deinterlace/deinterlace.c:84
@@ -5890,7 +5913,8 @@ msgid "video deinterlacing filter"
 msgstr "¥Î¥ó¥¤¥ó¥¿¥ì¡¼¥¹²½¥â¥¸¥å¡¼¥ë"
 
 #: modules/video_filter/distort.c:59
-msgid "distort mode"
+#, fuzzy
+msgid "Distort mode"
 msgstr "ÏѶʥ⡼¥É"
 
 #: modules/video_filter/distort.c:60
@@ -5912,49 +5936,61 @@ msgstr "
 msgid "invert video filter"
 msgstr "¥Ó¥Ç¥ªµÕž¥â¥¸¥å¡¼¥ë"
 
-#: modules/video_filter/motionblur.c:54
+#: modules/video_filter/logo.c:58
 #, fuzzy
-msgid "blur factor"
-msgstr "¤«¤¹¤Þ¤»¤ëÍ×ÁÇ"
+msgid "Logo File"
+msgstr "¥Õ¥¡¥¤¥ë"
 
-#: modules/video_filter/motionblur.c:55
-msgid "The degree of blurring from 1 to 127"
-msgstr "¤«¤¹¤Þ¤»¤ë³ä¹ç¤¤(1¤«¤é127)"
+#: modules/video_filter/logo.c:59
+msgid "It must be a PNG in RGBA 8bits (for now)"
+msgstr ""
 
-#: modules/video_filter/motionblur.c:60
-#, fuzzy
-msgid "motion blur filter"
-msgstr "¥â¡¼¥·¥ç¥ó¤ò¤«¤¹¤Þ¤»¤ë¥Õ¥£¥ë¥¿"
+#: modules/video_filter/logo.c:60
+msgid "x postion of the logo"
+msgstr ""
 
-#: modules/video_filter/osd_text.c:62
-#, fuzzy
-msgid "Font"
-msgstr "¥Õ¥©¥ó¥È"
+#: modules/video_filter/logo.c:61 modules/video_filter/logo.c:63
+msgid "You can move the logo by left-clicking on it"
+msgstr ""
 
-#: modules/video_filter/osd_text.c:63
-#, fuzzy
-msgid "Filename of Font"
-msgstr "¥í¥°¡¦¥Õ¥¡¥¤¥ë̾"
+#: modules/video_filter/logo.c:62
+msgid "y position of the logo"
+msgstr ""
 
-#: modules/video_filter/osd_text.c:64
-msgid "Font size"
+#: modules/video_filter/logo.c:64
+msgid "transparency of the logo"
+msgstr ""
+
+#: modules/video_filter/logo.c:65
+msgid "You can change it by middle-clicking and moving mouse left or right"
 msgstr ""
 
-#: modules/video_filter/osd_text.c:65
-msgid "The size of the fonts used by the osd module"
-msgstr ""
+#: modules/video_filter/logo.c:68
+msgid "logo"
+msgstr ""
+
+#: modules/video_filter/logo.c:73
+#, fuzzy
+msgid "logo video filter"
+msgstr "¥¤¥á¡¼¥¸¡¦¥¯¥í¡¼¥ó¡¦¥Ó¥Ç¥ª¡¦¥â¥¸¥å¡¼¥ë"
+
+#: modules/video_filter/motionblur.c:54
+#, fuzzy
+msgid "Blur factor"
+msgstr "¤«¤¹¤Þ¤»¤ëÍ×ÁÇ"
 
-#: modules/video_filter/osd_text.c:68
-msgid "OSD"
-msgstr ""
+#: modules/video_filter/motionblur.c:55
+msgid "The degree of blurring from 1 to 127"
+msgstr "¤«¤¹¤Þ¤»¤ë³ä¹ç¤¤(1¤«¤é127)"
 
-#: modules/video_filter/osd_text.c:71
+#: modules/video_filter/motionblur.c:60
 #, fuzzy
-msgid "osd text filter"
-msgstr "¼¡¤Î¥Õ¥¡¥¤¥ë"
+msgid "motion blur filter"
+msgstr "¥â¡¼¥·¥ç¥ó¤ò¤«¤¹¤Þ¤»¤ë¥Õ¥£¥ë¥¿"
 
 #: modules/video_filter/transform.c:57
-msgid "transform type"
+#, fuzzy
+msgid "Transform type"
 msgstr "ÊÑ´¹¥¿¥¤¥×"
 
 #: modules/video_filter/transform.c:58
@@ -5967,7 +6003,8 @@ msgid "video transformation filter"
 msgstr "¥¤¥á¡¼¥¸ÊÑ´¹¥â¥¸¥å¡¼¥ë"
 
 #: modules/video_filter/wall.c:53
-msgid "number of columns"
+#, fuzzy
+msgid "Number of columns"
 msgstr "Îó¿ô"
 
 #: modules/video_filter/wall.c:54
@@ -5976,7 +6013,8 @@ msgid ""
 msgstr "¥Ó¥Ç¥ª¤Ëʬ³ä¤¹¤ë¿åÊ¿Êý¸þ¤Î¥Ó¥Ç¥ª¡¦¥¦¥£¥ó¥É¥¦¿ô"
 
 #: modules/video_filter/wall.c:57
-msgid "number of rows"
+#, fuzzy
+msgid "Number of rows"
 msgstr "¹Ô¿ô"
 
 #: modules/video_filter/wall.c:58
@@ -5984,7 +6022,8 @@ msgid "Select the number of vertical videowindows in which to split the video"
 msgstr "¥Ó¥Ç¥ª¤Ëʬ³ä¤¹¤ë¿âľÊý¸þ¤Î¥Ó¥Ç¥ª¡¦¥¦¥£¥ó¥É¥¦¿ô"
 
 #: modules/video_filter/wall.c:61
-msgid "active windows"
+#, fuzzy
+msgid "Active windows"
 msgstr "¥¢¥¯¥Æ¥£¥Ö¡¦¥¦¥£¥ó¥É¥¦"
 
 #: modules/video_filter/wall.c:62
@@ -6001,19 +6040,22 @@ msgstr "
 msgid "ASCII-art video output"
 msgstr "ASCII¥¢¡¼¥È¡¦¥Ó¥Ç¥ª½ÐÎϥ⥸¥å¡¼¥ë"
 
-#: modules/video_output/directx/directx.c:90
-msgid "always on top"
+#: modules/video_output/directx/directx.c:94
+#: modules/video_output/directx/directx.c:225
+msgid "Always on top"
 msgstr ""
 
-#: modules/video_output/directx/directx.c:91
-msgid "place the directx window on top of other windows"
-msgstr ""
+#: modules/video_output/directx/directx.c:95
+#, fuzzy
+msgid "Place the directx window on top of other windows"
+msgstr "¥Ó¥Ç¥ª¤ò¥¯¥í¡¼¥ó¤¹¤ë¤¿¤á¤Ë¥Ó¥Ç¥ª¡¦¥¦¥£¥ó¥É¥¦¿ô¤òÁªÂò¤¹¤ë"
 
-#: modules/video_output/directx/directx.c:92
-msgid "use hardware YUV->RGB conversions"
+#: modules/video_output/directx/directx.c:96
+#, fuzzy
+msgid "Use hardware YUV->RGB conversions"
 msgstr "¥Ï¡¼¥É¥¦¥§¥¢¤Ë¤è¤ë YUV->RGBÊÑ´¹¤ò»ÈÍÑ"
 
-#: modules/video_output/directx/directx.c:94
+#: modules/video_output/directx/directx.c:98
 msgid ""
 "Try to use hardware acceleration for YUV->RGB conversions. This option "
 "doesn't have any effect when using overlays."
@@ -6021,11 +6063,12 @@ msgstr ""
 "YUV->RGB¤Î¥Ï¡¼¥É¥¦¥§¥¢¡¦¥¢¥¯¥»¥é¥ì¡¼¥·¥ç¥ó¤Î»ÈÍѤò»î¤ß¤Þ¤¹¡£¥ª¡¼¥Ð¥ì¥¤¤ò»ÈÍÑ"
 "¤¹¤ë¾ì¹ç¤Ë¤Ï²¿¤Î¸ú²Ì¤â¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: modules/video_output/directx/directx.c:96
-msgid "use video buffers in system memory"
+#: modules/video_output/directx/directx.c:100
+#, fuzzy
+msgid "Use video buffers in system memory"
 msgstr "¥·¥¹¥Æ¥à¥á¥â¥êÃæ¤Î¥Ó¥Ç¥ª¥Ð¥Ã¥Õ¥¡¤ò»ÈÍѤ¹¤ë"
 
-#: modules/video_output/directx/directx.c:98
+#: modules/video_output/directx/directx.c:102
 msgid ""
 "Create video buffers in system memory instead of video memory. This isn't "
 "recommended as usually using video memory allows to benefit from more "
@@ -6037,17 +6080,17 @@ msgstr ""
 "¥ª¥×¥·¥ç¥ó¤Ï¿ä¾©¤·¤Þ¤»¤ó¡£(¥ê¥¹¥±¡¼¥ê¥ó¥°¤äYUV->RGBÊÑ´¹)¥ª¡¼¥Ð¥ì¥¤¤ò»ÈÍѤ¹¤ë"
 "¾ì¹ç¤Ë¤Ï²¿¤Î¸ú²Ì¤â¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: modules/video_output/directx/directx.c:102
-msgid "use triple buffering for overlays"
+#: modules/video_output/directx/directx.c:106
+msgid "Use triple buffering for overlays"
 msgstr ""
 
-#: modules/video_output/directx/directx.c:104
+#: modules/video_output/directx/directx.c:108
 msgid ""
 "Try to use triple bufferring when using YUV overlays. That results in much "
 "better video quality (no flickering)."
 msgstr ""
 
-#: modules/video_output/directx/directx.c:113
+#: modules/video_output/directx/directx.c:117
 #, fuzzy
 msgid "DirectX video output"
 msgstr "DirectX¥Ó¥Ç¥ª¡¦¥â¥¸¥å¡¼¥ë"
@@ -6095,7 +6138,8 @@ msgstr "Matrox
 
 #: modules/video_output/mga/xmga.c:87 modules/video_output/x11/x11.c:43
 #: modules/video_output/x11/xvideo.c:49
-msgid "alternate fullscreen method"
+#, fuzzy
+msgid "Alternate fullscreen method"
 msgstr "ÂåÂؤ¨¥Õ¥ë¥¹¥¯¥ê¡¼¥ó"
 
 #: modules/video_output/mga/xmga.c:89 modules/video_output/x11/x11.c:45
@@ -6162,18 +6206,29 @@ msgid "Windows GDI video output"
 msgstr "¥Ó¥Ç¥ª½ÐÎϥ⥸¥å¡¼¥ë"
 
 #: modules/video_output/x11/x11.c:57 modules/video_output/x11/xvideo.c:68
-msgid "use shared memory"
+#, fuzzy
+msgid "Use shared memory"
 msgstr "¶¦Í­¥á¥â¥ê¤Î»ÈÍÑ"
 
 #: modules/video_output/x11/x11.c:59 modules/video_output/x11/xvideo.c:70
 msgid "Use shared memory to communicate between VLC and the X server."
 msgstr "¶¦Í­¥á¥â¥ê¤òVLC¤ÈX¥µ¡¼¥Ð¤ÎÄÌ¿®¤Î¤¿¤á¤Ë»ÈÍѤ·¤Þ¤¹¡£"
 
-#: modules/video_output/x11/x11.c:62
+#: modules/video_output/x11/x11.c:61 modules/video_output/x11/xvideo.c:72
+msgid "choose the screen to be used for fullscreen mode."
+msgstr ""
+
+#: modules/video_output/x11/x11.c:63 modules/video_output/x11/xvideo.c:74
+msgid ""
+"Choose the screen you want to use in fullscreen mode. For instance set it to "
+"0 for first screen, 1 for the second."
+msgstr ""
+
+#: modules/video_output/x11/x11.c:67
 msgid "X11"
 msgstr ""
 
-#: modules/video_output/x11/x11.c:68
+#: modules/video_output/x11/x11.c:76
 #, fuzzy
 msgid "X11 video output"
 msgstr "¥ª¡¼¥Ð¡¼¥ì¥¤"
@@ -6202,11 +6257,11 @@ msgstr ""
 "ºÇ¤â¸ú²ÌŪ¤Ê¤â¤Î¤ò»È¤Ã¤Æ¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹¤ò²þÁ±¤¹¤ë¤«¤ï¤ê¤Ë¡¢ÆÃÄê¤Î¿§ºÌ¥Õ¥©¡¼"
 "¥Þ¥Ã¥È¤ò»ÈÍѤ¹¤ë¤¿¤á¤ÎXVideo¥ì¥ó¥À¥é¤ò¶¯À©Åª¤Ë»ØÄꤷ¤Þ¤¹¡£"
 
-#: modules/video_output/x11/xvideo.c:73
+#: modules/video_output/x11/xvideo.c:78
 msgid "XVideo"
 msgstr ""
 
-#: modules/video_output/x11/xvideo.c:81
+#: modules/video_output/x11/xvideo.c:90
 #, fuzzy
 msgid "XVideo extension video output"
 msgstr "XVideo¥¨¥¯¥¹¥Æ¥ó¥·¥ç¥ó¡¦¥â¥¸¥å¡¼¥ë"
@@ -6216,7 +6271,8 @@ msgid "scope effect"
 msgstr "¥¹¥³¡¼¥×¸ú²Ì"
 
 #: modules/visualization/xosd/xosd.c:61
-msgid "flip vertical position"
+#, fuzzy
+msgid "Flip vertical position"
 msgstr "¿âľÊý¸þ°ÌÃÖ"
 
 #: modules/visualization/xosd/xosd.c:62
@@ -6224,7 +6280,8 @@ msgid "Display xosd output on the bottom of the screen instead of the top"
 msgstr "xosd½ÐÎϤò¥¹¥¯¥ê¡¼¥ó¤ÎºÇ¾åü¤Ç¤Ï¤Ê¤¯¡¢ºÇ²¼Ã¼¤Ëɽ¼¨¤¹¤ë"
 
 #: modules/visualization/xosd/xosd.c:65
-msgid "vertical offset"
+#, fuzzy
+msgid "Vertical offset"
 msgstr "¿âľ¥ª¥Õ¥»¥Ã¥È"
 
 #: modules/visualization/xosd/xosd.c:66
@@ -6232,30 +6289,368 @@ msgid "Vertical offset in pixels of the displayed text"
 msgstr "ɽ¼¨¤µ¤ì¤Æ¤¤¤ëʸ»úÎó¤Î¿âľÊý¸þ¤Î¥ª¥Õ¥»¥Ã¥È"
 
 #: modules/visualization/xosd/xosd.c:68
-msgid "shadow offset"
+#, fuzzy
+msgid "Shadow offset"
 msgstr "±¢¤Î¥ª¥Õ¥»¥Ã¥È"
 
 #: modules/visualization/xosd/xosd.c:69
 msgid "Offset in pixels of the shadow"
 msgstr "±¢¤Î¥ª¥Õ¥»¥Ã¥È(¥Ô¥¯¥»¥ë)"
 
-#: modules/visualization/xosd/xosd.c:71
-msgid "font"
-msgstr "¥Õ¥©¥ó¥È"
-
 #: modules/visualization/xosd/xosd.c:72
 msgid "Font used to display text in the xosd output"
 msgstr "xods½ÐÎϤǥƥ­¥¹¥È½ÐÎϤΤ¿¤á¤Ë»ÈÍѤµ¤ì¤ë¥Õ¥©¥ó¥È"
 
-#: modules/visualization/xosd/xosd.c:76
+#: modules/visualization/xosd/xosd.c:75
 msgid "XOSD module"
 msgstr "XOSD¥â¥¸¥å¡¼¥ë"
 
-#: modules/visualization/xosd/xosd.c:83
+#: modules/visualization/xosd/xosd.c:82
 #, fuzzy
 msgid "xosd interface"
 msgstr "xosd¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
 
+#, fuzzy
+#~ msgid "Font used by the text subtitler"
+#~ msgstr "ʸ»ú»úËë¤Ç»ÈÍѤµ¤ì¤ë¥Õ¥©¥ó¥È"
+
+#~ msgid ""
+#~ "When the subtitles are coded in text form then, you can choose which font "
+#~ "will be used to display them."
+#~ msgstr ""
+#~ "»úË뤬¥Æ¥­¥¹¥È¡¦¥Õ¥©¡¼¥à¤Ç¥³¡¼¥É²½¤µ¤ì¤Æ¤¤¤ë»þ¡¢É½¼¨¤¹¤ë¤¿¤á¤Î¥Õ¥©¥ó¥È¤òÁª"
+#~ "Âò²Äǽ¤Ç¤¹¡£"
+
+#~ msgid "subtitles"
+#~ msgstr "»úËë(_S)"
+
+#, fuzzy
+#~ msgid "SAP interface module"
+#~ msgstr "¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
+
+#, fuzzy
+#~ msgid "HTTP interface bind port"
+#~ msgstr "Qt¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
+
+#, fuzzy
+#~ msgid "HTTP interface bind address"
+#~ msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹"
+
+#, fuzzy
+#~ msgid "osd text filter"
+#~ msgstr "¼¡¤Î¥Õ¥¡¥¤¥ë"
+
+#, fuzzy
+#~ msgid "Ffmpeg postprocessing module"
+#~ msgstr "ffmpeg ¸å½èÍý¥â¥¸¥å¡¼¥ë"
+
+#, fuzzy
+#~ msgid "Auto-level Post processing quality"
+#~ msgstr "C ¸å½èÍý¥â¥¸¥å¡¼¥ë"
+
+#, fuzzy
+#~ msgid "dummy functions"
+#~ msgstr "¥À¥ß¡¼¤Îµ¡Ç½¥â¥¸¥å¡¼¥ë"
+
+#, fuzzy
+#~ msgid "Audio Track"
+#~ msgstr "¥ª¡¼¥Ç¥£¥ª"
+
+#, fuzzy
+#~ msgid "Video Track"
+#~ msgstr "¥Ó¥Ç¥ª"
+
+#, fuzzy
+#~ msgid "Auto"
+#~ msgstr "ºîÀ®¼Ô"
+
+#, fuzzy
+#~ msgid "&Logs..."
+#~ msgstr "¥Ç¥£¥¹¥¯¤ò³«¤¯(_D)..."
+
+#~ msgid "Set the geometry of the zone to crop"
+#~ msgstr "¶è²è¤«¤é±ï¼è¤ê¤Þ¤Ç¤Î¥¸¥ª¥á¥È¥ê¤ò»ØÄê"
+
+#, fuzzy
+#~ msgid "Display identifier"
+#~ msgstr "¥Ç¥£¥¹¥×¥ì¥¤Ì¾"
+
+#~ msgid ""
+#~ "This is the local display port that will be used for X11 drawing. For "
+#~ "instance :0.1."
+#~ msgstr ""
+#~ "X11¤¬ÉÁ²è¤¹¤ë¥í¡¼¥«¥ë¤Î¥Ç¥£¥¹¥×¥ì¥¤¡¦¥Ý¡¼¥È¤ò»ØÄꤷ¤Þ¤¹¡£¥¤¥ó¥¹¥¿¥ó¥¹"
+#~ "¤Ï¡¢:0.1¤Ç¤¹¡£"
+
+#, fuzzy
+#~ msgid "Launch playlist on startup"
+#~ msgstr "µ¯Æ°»þ¤Ë¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
+
+#~ msgid ""
+#~ "If you want VLC to start playing on startup, then enable this option."
+#~ msgstr ""
+#~ "VLC¤Îµ¯Æ°»þ¤Ë¥×¥ì¥¤¥ê¥¹¥È¤òµ¯Æ°¤·¤¿¤¤¾ì¹ç¤Ë¤Ï¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤òÁªÂò¤·¤Þ"
+#~ "¤¹¡£"
+
+#, fuzzy
+#~ msgid "Device &name:"
+#~ msgstr "¥Ç¥Ð¥¤¥¹Ì¾"
+
+#, fuzzy
+#~ msgid "&Title:"
+#~ msgstr "¥¿¥¤¥È¥ë:"
+
+#, fuzzy
+#~ msgid "&Chapter:"
+#~ msgstr "¥Á¥ã¥×¥¿¡¼:"
+
+#, fuzzy
+#~ msgid "File read"
+#~ msgstr "¥Õ¥¡¥¤¥ë"
+
+#~ msgid "Channel:"
+#~ msgstr "¥Á¥ã¥ó¥Í¥ë:"
+
+#, fuzzy
+#~ msgid "Open &file..."
+#~ msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯(_O)..."
+
+#, fuzzy
+#~ msgid "Open &disc..."
+#~ msgstr "¥Ç¥£¥¹¥¯¤ò³«¤¯(_D)..."
+
+#, fuzzy
+#~ msgid "&Network stream..."
+#~ msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¥¹¥È¥ê¡¼¥à(_N)..."
+
+#, fuzzy
+#~ msgid "&Hide interface"
+#~ msgstr "¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ò±£¤¹(_H)"
+
+#, fuzzy
+#~ msgid "&Add interface"
+#~ msgstr "¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ò±£¤¹(_H)"
+
+#, fuzzy
+#~ msgid "Spawn a new interface"
+#~ msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹"
+
+#, fuzzy
+#~ msgid "&Controls"
+#~ msgstr "¥³¥ó¥È¥í¡¼¥ë"
+
+#, fuzzy
+#~ msgid "C&hannels"
+#~ msgstr "¥Á¥ã¥ó¥Í¥ë"
+
+#, fuzzy
+#~ msgid "Sc&reen"
+#~ msgstr "¥¹¥¯¥ê¡¼¥ó"
+
+#, fuzzy
+#~ msgid "&Program"
+#~ msgstr "¥×¥í¥°¥é¥à"
+
+#, fuzzy
+#~ msgid "&Title"
+#~ msgstr "¥¿¥¤¥È¥ë"
+
+#, fuzzy
+#~ msgid "&Chapter"
+#~ msgstr "¥Á¥ã¥×¥¿¡¼"
+
+#, fuzzy
+#~ msgid "Select angle"
+#~ msgstr "¥Õ¥¡¥¤¥ë¤ÎÁªÂò"
+
+#, fuzzy
+#~ msgid "&Language"
+#~ msgstr "¸À¸ì"
+
+#, fuzzy
+#~ msgid "&Subtitles"
+#~ msgstr "»úËë(_S)"
+
+#, fuzzy
+#~ msgid "Close this popup"
+#~ msgstr "¥¦¥£¥ó¥É¥¦¤òÊĤ¸¤ë"
+
+#, fuzzy
+#~ msgid "Show interface"
+#~ msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹"
+
+#, fuzzy
+#~ msgid "&Jump..."
+#~ msgstr "¥¸¥ã¥ó¥×(_J)..."
+
+#, fuzzy
+#~ msgid "Audio settings"
+#~ msgstr "ÀßÄê(_S)"
+
+#, fuzzy
+#~ msgid "Video settings"
+#~ msgstr "ÀßÄê(_S)"
+
+#, fuzzy
+#~ msgid "New stream"
+#~ msgstr "¥¹¥È¥ê¡¼¥à¤ò³«¤¯"
+
+#, fuzzy
+#~ msgid "Network Stream..."
+#~ msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¥¹¥È¥ê¡¼¥à(_N)..."
+
+#, fuzzy
+#~ msgid "Next file"
+#~ msgstr "¼¡¤Î¥Õ¥¡¥¤¥ë"
+
+#, fuzzy
+#~ msgid "&Stream output..."
+#~ msgstr "¥¹¥È¥ê¡¼¥à½ÐÎÏ"
+
+#, fuzzy
+#~ msgid "Open the stream output"
+#~ msgstr "¥Ó¥Ç¥ª¡¦¥¹¥È¥ê¡¼¥à¤Î½ÐÎϤòÍ­¸ú¤Ë¤¹¤ë"
+
+#, fuzzy
+#~ msgid "&Add subtitles..."
+#~ msgstr "»úËë(_S)"
+
+#, fuzzy
+#~ msgid "Exit"
+#~ msgstr "½ªÎ»(_x)"
+
+#, fuzzy
+#~ msgid "&Fullscreen"
+#~ msgstr "Á´²èÌ̲½(_F)"
+
+#, fuzzy
+#~ msgid "About..."
+#~ msgstr "VideoLAN¤Ë¤Ä¤¤¤Æ(_A)..."
+
+#, fuzzy
+#~ msgid "Select next title"
+#~ msgstr "¥Õ¥¡¥¤¥ë¤ÎÁªÂò"
+
+#, fuzzy
+#~ msgid "Volume &Up"
+#~ msgstr "¥Ü¥ê¥å¡¼¥à¤ò¾å¤²¤ë"
+
+#, fuzzy
+#~ msgid "Volume &Down"
+#~ msgstr "¥Ü¥ê¥å¡¼¥à¤ò²¼¤²¤ë"
+
+#, fuzzy
+#~ msgid "&Mute"
+#~ msgstr "¥ß¥å¡¼¥È¤¹¤ë"
+
+#, fuzzy
+#~ msgid "Toggle mute"
+#~ msgstr "¥á¥¤¥ó¥¦¥£¥ó¥É¥¦¤Îɽ¼¨/Èóɽ¼¨(_I)"
+
+#, fuzzy
+#~ msgid "Set the window on top"
+#~ msgstr "¥¦¥£¥ó¥É¥¦¤òÊĤ¸¤ë"
+
+#, fuzzy
+#~ msgid "Open network"
+#~ msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¤ò³«¤¯"
+
+#, fuzzy
+#~ msgid "Network mode"
+#~ msgstr "¥Í¥Ã¥È¥ï¡¼¥¯"
+
+#, fuzzy
+#~ msgid "Port:"
+#~ msgstr "¥Ý¡¼¥ÈÈÖ¹æ"
+
+#~ msgid "Channel server"
+#~ msgstr "¥Á¥ã¥ó¥Í¥ë¡¦¥µ¡¼¥Ð¡¼"
+
+#, fuzzy
+#~ msgid "&Add"
+#~ msgstr "ÄɲÃ"
+
+#, fuzzy
+#~ msgid "&Disc..."
+#~ msgstr "¥Ç¥£¥¹¥¯¤ò³«¤¯(_D)..."
+
+#, fuzzy
+#~ msgid "&Network..."
+#~ msgstr "¥Í¥Ã¥È¥ï¡¼¥¯"
+
+#, fuzzy
+#~ msgid "&Invert selection"
+#~ msgstr "ÁªÂò"
+
+#, fuzzy
+#~ msgid "&Crop selection"
+#~ msgstr "ÁªÂò"
+
+#, fuzzy
+#~ msgid "&Delete selection"
+#~ msgstr "ÁªÂò"
+
+#, fuzzy
+#~ msgid "Delete &all"
+#~ msgstr "ºï½ü"
+
+#, fuzzy
+#~ msgid "Invert selection"
+#~ msgstr "ÁªÂò"
+
+#, fuzzy
+#~ msgid "Crop selection"
+#~ msgstr "ÁªÂò"
+
+#, fuzzy
+#~ msgid "Delete selection"
+#~ msgstr "ÁªÂò"
+
+#, fuzzy
+#~ msgid "Play the selected stream"
+#~ msgstr "¥¹¥È¥ê¡¼¥à¤ÎºÆÀ¸"
+
+#, fuzzy
+#~ msgid "Stream output MRL (Media Resource Locator)"
+#~ msgstr "¥á¥Ç¥£¥¢¡¦¥ê¥½¡¼¥¹¡¦¥í¥±¡¼¥¿ (MRL)"
+
+#, fuzzy
+#~ msgid "Add subtitles"
+#~ msgstr "»úËë(_S)"
+
+#, fuzzy
+#~ msgid "Maximum number of lines in the log window"
+#~ msgstr "¥í¥°¡¦¥¦¥£¥ó¥É¥¦¤ÎºÇÂç¹Ô¿ô"
+
+#, fuzzy
+#~ msgid ""
+#~ "You can set the maximum number of lines that the log window will display."
+#~ msgstr ""
+#~ "ɽ¼¨¤µ¤ì¤ë¥í¥°¡¦¥¦¥£¥ó¥É¥¦¤ÎºÇÂç¹Ô¿ô¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£¤¹¤Ù¤Æ¤Î¥á¥Ã¥»¡¼¥¸¤òÊÝ"
+#~ "»ý¤¹¤ë¾ì¹ç¤Ë¤Ï¡¢-1¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£"
+
+#, fuzzy
+#~ msgid ""
+#~ "Check this option if you want to display the caption of the buttons in "
+#~ msgstr ""
+#~ "VideoLAN¤Î¥Á¥ã¥ó¥Í¥ë¡¦¥µ¡¼¥Ð¡¼¤ò»ÈÍѤ¹¤ë¾ì¹ç¤Ë¤Ï¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤òÍ­¸ú¤Ë¤·"
+#~ "¤Þ¤¹¡£"
+
+#, fuzzy
+#~ msgid "Native Windows interface"
+#~ msgstr "¥Í¥¤¥Æ¥£¥ÖWindows¥¤¥ó¥¿¥Õ¥§¡¼¥¹"
+
+#, fuzzy
+#~ msgid "audio device"
+#~ msgstr "DVD¥Ç¥Ð¥¤¥¹"
+
+#, fuzzy
+#~ msgid "video device"
+#~ msgstr "DVD¥Ç¥Ð¥¤¥¹"
+
+#~ msgid "font"
+#~ msgstr "¥Õ¥©¥ó¥È"
+
 #, fuzzy
 #~ msgid "This option allows you to enable the translation of the interface."
 #~ msgstr ""
@@ -6330,10 +6725,6 @@ msgstr "xosd
 #~ msgid "Add file"
 #~ msgstr "»úËë(_S)"
 
-#, fuzzy
-#~ msgid "Settings"
-#~ msgstr "ÀßÄê(_S)"
-
 #, fuzzy
 #~ msgid "Stream Output"
 #~ msgstr "¥¹¥È¥ê¡¼¥à½ÐÎÏ"
@@ -6372,17 +6763,10 @@ msgstr "xosd
 #~ msgid "flac decoder module"
 #~ msgstr "»úË롦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
 
-#~ msgid "C Post Processing module"
-#~ msgstr "C ¸å½èÍý¥â¥¸¥å¡¼¥ë"
-
 #, fuzzy
 #~ msgid "libmpeg2 decoder module"
 #~ msgstr "»úË롦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
 
-#, fuzzy
-#~ msgid "Theora decoder module"
-#~ msgstr "»úË롦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
-
 #~ msgid "User"
 #~ msgstr "¥æ¡¼¥¶¡¼"
 
@@ -6483,10 +6867,6 @@ msgstr "xosd
 #~ msgid "Select program"
 #~ msgstr "¥×¥í¥°¥é¥à¤ÎÀÚÂؤ¨"
 
-#, fuzzy
-#~ msgid "Select title"
-#~ msgstr "¥Õ¥¡¥¤¥ë¤ÎÁªÂò"
-
 #, fuzzy
 #~ msgid "Select chapter"
 #~ msgstr "¼¡¤Î¥Á¥ã¥×¥¿¡¼¤òÁªÂò"
@@ -6509,7 +6889,3 @@ msgstr "xosd
 #, fuzzy
 #~ msgid "Jump to next chapter"
 #~ msgstr "¼¡¤Î¥Á¥ã¥×¥¿¡¼¤òÁªÂò"
-
-#, fuzzy
-#~ msgid "Channel Server"
-#~ msgstr "¥Á¥ã¥ó¥Í¥ë¡¦¥µ¡¼¥Ð¡¼"