# HG changeset patch
# User diego
# Date 1067214219 0
# Node ID 119703388a95d9e3f110a314309386e125cc59bd
# Parent  47b69dcf384dd55dc06d2da96dd0d3ce19912194
_ ---> - in option names, approved by Alex.

diff -r 47b69dcf384d -r 119703388a95 DOCS/man/de/mplayer.1
--- a/DOCS/man/de/mplayer.1	Mon Oct 27 00:14:33 2003 +0000
+++ b/DOCS/man/de/mplayer.1	Mon Oct 27 00:23:39 2003 +0000
@@ -1561,12 +1561,12 @@
 .PD 1
 .
 .TP
-.B \-monitor_dotclock <dotclock\-\ (oder\ pixelclock\-)Bereich> (nur bei fbdev und vesa)
+.B \-monitor-dotclock <dotclock\-\ (oder\ pixelclock\-)Bereich> (nur bei fbdev und vesa)
 Lies etc/\:example.conf und DOCS/\:video.html für weitere Erklärungen.
 .TP
-.B \-monitor_hfreq <Bereich der Horizontalfrequenz> (nur bei fbdev und vesa)
+.B \-monitor-hfreq <Bereich der Horizontalfrequenz> (nur bei fbdev und vesa)
 .TP
-.B \-monitor_vfreq <Bereich der Vertikalfrequenz> (nue bei fbdev und vesa)
+.B \-monitor-vfreq <Bereich der Vertikalfrequenz> (nue bei fbdev und vesa)
 .TP
 .B \-monitoraspect <Verhältnis>
 Gibt das Höhen-/Breitenverhältnis deines Monitors oder Fernsehers an.
@@ -1620,7 +1620,7 @@
 Bildschirmauflösung weiß (fbdev/\:x11 und/\:oder TV-Ausgang), dann kannst
 du hiermit die horizontale und vertikale Auflösung angeben.
 .TP
-.B \-stop_xscreensaver
+.B \-stop-xscreensaver
 Deaktiviert den Bildschirmschoner beim Start von MPlayer und aktiviert ihn
 beim Beenden wieder.
 .TP
diff -r 47b69dcf384d -r 119703388a95 DOCS/man/en/mplayer.1
--- a/DOCS/man/en/mplayer.1	Mon Oct 27 00:14:33 2003 +0000
+++ b/DOCS/man/en/mplayer.1	Mon Oct 27 00:23:39 2003 +0000
@@ -1146,7 +1146,7 @@
 .PD 1
 .
 .TP
-.B \-flip_hebrew
+.B \-flip-hebrew
 Turns on flipping subtitles using FriBiDi.
 .TP
 .B \-font <path\ to\ font.desc\ file>
@@ -1174,7 +1174,7 @@
 Display only "forced subtitles" for the DVD subtitle stream selected by e.g.
 \-slang.
 .TP
-.B \-fribidi_charset <charset\ name>
+.B \-fribidi-charset <charset\ name>
 Specifies the charset that will be passed to FriBiDi when decoding a non-UTF8
 subtitles. Default is "ISO8859-8".
 .TP
@@ -1770,13 +1770,13 @@
 .PD 1
 .
 .TP
-.B \-monitor_dotclock <dotclock\ (or\ pixelclock) range> (fbdev and vesa only)
+.B \-monitor-dotclock <dotclock\ (or\ pixelclock) range> (fbdev and vesa only)
 Look into etc/\:example.conf for further information and in
 DOCS/\:HTML/\:en/\:devices.html#video-dev.
 .TP
-.B \-monitor_hfreq <horizontal frequency range> (fbdev and vesa only)
-.TP
-.B \-monitor_vfreq <vertical frequency range> (fbdev and vesa only)
+.B \-monitor-hfreq <horizontal frequency range> (fbdev and vesa only)
+.TP
+.B \-monitor-vfreq <vertical frequency range> (fbdev and vesa only)
 .TP
 .B \-monitoraspect <ratio>
 Set aspect ratio of your monitor or TV screen.
@@ -1826,7 +1826,7 @@
 (fbdev/\:x11 and/\:or TVout) this is where you can specify the horizontal and
 vertical resolution.
 .TP
-.B \-stop_xscreensaver
+.B \-stop-xscreensaver
 Turns off xscreensaver at startup and turns it on again on exit.
 .TP
 .B \-vm \ \ \ 
diff -r 47b69dcf384d -r 119703388a95 DOCS/man/es/mplayer.1
--- a/DOCS/man/es/mplayer.1	Mon Oct 27 00:14:33 2003 +0000
+++ b/DOCS/man/es/mplayer.1	Mon Oct 27 00:23:39 2003 +0000
@@ -1115,7 +1115,7 @@
 .PD 1
 .
 .TP
-.B \-flip_hebrew
+.B \-flip-hebrew
 Activa inversión de subtítulos usando FriBiDi.
 .TP
 .B \-font <ruta\ a\ archivo\ font.desc>
@@ -1144,7 +1144,7 @@
 Muestra solo "subtítulos forzados" para el flujo de subtítulos de DVD seleccionado,
 p.e. \-slang.
 .TP
-.B \-fribidi_charset <nombre\ de\ conjunto\ de\ caracteres>
+.B \-fribidi-charset <nombre\ de\ conjunto\ de\ caracteres>
 Especifica el conjunto de caracteres que será pasado a FriBiDi
 cuando se decodifiquen subtítulos no-UTF8. Por defecto es "ISO8859-8".
 .TP
@@ -1747,13 +1747,13 @@
 .PD 1
 .
 .TP
-.B \-monitor_dotclock <rango\ dotclock\ (o\ pixelclock)> (fbdev y vesa solamente)
+.B \-monitor-dotclock <rango\ dotclock\ (o\ pixelclock)> (fbdev y vesa solamente)
 Consulte en etc/\:example.conf para más información y en
 DOCS/\:HTML/\:es/\:devices.html#video-dev.
 .TP
-.B \-monitor_hfreq <rango frecuencia horizontal> (fbdev y vesa solamente)
-.TP
-.B \-monitor_vfreq <rango frecuencia vertical> (fbdev y vesa solamente)
+.B \-monitor-hfreq <rango frecuencia horizontal> (fbdev y vesa solamente)
+.TP
+.B \-monitor-vfreq <rango frecuencia vertical> (fbdev y vesa solamente)
 .TP
 .B \-monitoraspect <razón>
 Establece la razón de aspecto de su monitor o pantalla de TV.
@@ -1804,7 +1804,7 @@
 (fbdev/\:x11 y/\:o TVout) aquí es donde puede especificar la resolución
 horizontal y vertical.
 .TP
-.B \-stop_xscreensaver
+.B \-stop-xscreensaver
 Desactiva el protector de pantalla al comienzo y lo vuelve a activar
 al finalizar.
 .TP
diff -r 47b69dcf384d -r 119703388a95 DOCS/man/fr/mplayer.1
--- a/DOCS/man/fr/mplayer.1	Mon Oct 27 00:14:33 2003 +0000
+++ b/DOCS/man/fr/mplayer.1	Mon Oct 27 00:23:39 2003 +0000
@@ -1134,7 +1134,7 @@
 .PD 1
 .
 .TP
-.B \-flip_hebrew
+.B \-flip-hebrew
 Active les sous-titres bidirectionnels en utilisant FriBiDi.
 .TP
 .B \-font <chemin\ vers\ le\fichier\ font.desc>
@@ -1160,7 +1160,7 @@
 .PD 1
 .
 .TP
-.B \-fribidi_charset <nom\ charset>
+.B \-fribidi-charset <nom\ charset>
 Spécifie le charset a passer à FriBiDi pour le décodage de sous-titres non-UTF8.
 La valeur par Défaut est "ISO8859-8".
 .TP
@@ -1784,15 +1784,15 @@
 .PD 1
 .
 .TP
-.B \-monitor_dotclock <dotclock\ (ou\ pixelclock) range> (fbdev et vesa
+.B \-monitor-dotclock <dotclock\ (ou\ pixelclock) range> (fbdev et vesa
 uniquement)
 Regardez dans etc/\:example.conf pour plus d'info, ainsi que dans
 DOCS/\:video.html.
 .TP
-.B \-monitor_hfreq <intervalle de fréquence horizontal> (fbdev et vesa
+.B \-monitor-hfreq <intervalle de fréquence horizontal> (fbdev et vesa
 uniquement)
 .TP
-.B \-monitor_vfreq <intervalle de fréquence vertical> (fbdev et vesa uniquement)
+.B \-monitor-vfreq <intervalle de fréquence vertical> (fbdev et vesa uniquement)
 .TP
 .B \-monitoraspect <rapport>
 Fixe le rapport hauteur/largeur de votre moniteur ou de votre TV.
@@ -1843,7 +1843,7 @@
 (fbdev/\:x11 et/\:ou TVout) vous pouvez spécifier ici les résolutions 
 horizontales et verticales.
 .TP
-.B \-stop_xscreensaver
+.B \-stop-xscreensaver
 Désactive xscreensaver au lancement et le réactive à la sortie.
 .TP
 .B \-vm \ \ \
diff -r 47b69dcf384d -r 119703388a95 DOCS/man/hu/mplayer.1
--- a/DOCS/man/hu/mplayer.1	Mon Oct 27 00:14:33 2003 +0000
+++ b/DOCS/man/hu/mplayer.1	Mon Oct 27 00:23:39 2003 +0000
@@ -924,7 +924,7 @@
 .PD 1
 .
 .TP
-.B \-flip_hebrew
+.B \-flip-hebrew
 Feliratok megfordítása FriBiDi-vel.
 .TP
 .B \-font <útvonal\ a\ font.desc\ filehoz>
@@ -948,7 +948,7 @@
 .PD 1
 .
 .TP
-.B \-fribidi_charset <karakterkészlet\ neve>
+.B \-fribidi-charset <karakterkészlet\ neve>
 Nem UTF8 felirat esetén itt adható meg a FriBiDi-nek adandó karakterkészlet
 neve. Alapértelmezésben "ISO8859-8".
 .TP
@@ -1551,12 +1551,12 @@
 A használható opciók: [no]progressive, [no]baseline, optimize, smooth, quality
 és outdir.
 .TP
-.B \-monitor_dotclock <dotclock\ (vagy\ pixelclock) tartomány> (csak fbdev és vesa)
+.B \-monitor-dotclock <dotclock\ (vagy\ pixelclock) tartomány> (csak fbdev és vesa)
 Lásd az etc/\:example.conf és DOCS/\:video.html file-okat.
 .TP
-.B \-monitor_hfreq <horizontális frekvenciatartomány> (csak fbdev és vesa)
+.B \-monitor-hfreq <horizontális frekvenciatartomány> (csak fbdev és vesa)
 .TP
-.B \-monitor_vfreq <vertikális frekvenciatartomány> (csak fbdev és vesa)
+.B \-monitor-vfreq <vertikális frekvenciatartomány> (csak fbdev és vesa)
 .TP
 .B \-monitoraspect <ratio>
 Monitor vagy TV képarányának megadása.
@@ -1604,7 +1604,7 @@
 (fbdev/\:x11 és/\:vagy TV kimenet), itt lehet megadni annak horizontális
 és vertikális méreteit.
 .TP
-.B \-stop_xscreensaver
+.B \-stop-xscreensaver
 xscreensaver kikapcsolása a lejátszás indításakor, kilépéskor újraindítás.
 .TP
 .B \-vm \ \ \ 
diff -r 47b69dcf384d -r 119703388a95 DOCS/man/pl/mplayer.1
--- a/DOCS/man/pl/mplayer.1	Mon Oct 27 00:14:33 2003 +0000
+++ b/DOCS/man/pl/mplayer.1	Mon Oct 27 00:23:39 2003 +0000
@@ -1548,12 +1548,12 @@
 .PD 1
 .
 .TP
-.B \-monitor_dotclock <zakres\ dotclock\ (lub\ pixelclock)>  (tylko fbdev i vesa)
+.B \-monitor-dotclock <zakres\ dotclock\ (lub\ pixelclock)>  (tylko fbdev i vesa)
 Zajrzyj do etc/\:example.conf po dalsze informacje i do DOCS/\:video.html.
 .TP
-.B \-monitor_hfreq <czêstotliwo¶æ pozioma>  (tylko fbdev i vesa)
+.B \-monitor-hfreq <czêstotliwo¶æ pozioma>  (tylko fbdev i vesa)
 .TP
-.B \-monitor_vfreq <czêstotliwo¶æ pionowa>  (tylko fbdev i vesa)
+.B \-monitor-vfreq <czêstotliwo¶æ pionowa>  (tylko fbdev i vesa)
 .TP
 .B \-monitoraspect <stosunek>
 Ustaw stosunek twojego monitora lub ekranu TV.
@@ -1604,7 +1604,7 @@
 ekranu (fbdev/\:x11 i/\:lub TVout) tutaj mo¿esz wybraæ pionow± i poziom±
 rozdzielczo¶æ.
 .TP
-.B \-stop_xscreensaver
+.B \-stop-xscreensaver
 Wy³±cz wygaszacz ekranu przy starcie i w³±cz go ponownie podczas wychodzenia.
 .TP
 .B \-vm \ \ \
diff -r 47b69dcf384d -r 119703388a95 DOCS/man/zh/mplayer.1
--- a/DOCS/man/zh/mplayer.1	Mon Oct 27 00:14:33 2003 +0000
+++ b/DOCS/man/zh/mplayer.1	Mon Oct 27 00:23:39 2003 +0000
@@ -1386,12 +1386,12 @@
 .PD 1
 .
 .TP
-.B \-monitor_dotclock <dotclock\ (or\ pixelclock) range> (½öÓÃÓÚfbdevºÍvesa)
+.B \-monitor-dotclock <dotclock\ (or\ pixelclock) range> (½öÓÃÓÚfbdevºÍvesa)
 ²ì¿´etc/\:example.confºÍDOCS/\:video.htmlÀ´½øÒ»²½Á˽âÐÅÏ¢.
 .TP
-.B \-monitor_hfreq <ˮƽƵÂÊ·¶Î§> (½öÓÃÓÚfbdevºÍvesa)
+.B \-monitor-hfreq <ˮƽƵÂÊ·¶Î§> (½öÓÃÓÚfbdevºÍvesa)
 .TP
-.B \-monitor_vfreq <´¹Ö±ÆµÂÊ·¶Î§> (½öÓÃÓÚfbdevºÍvesa)
+.B \-monitor-vfreq <´¹Ö±ÆµÂÊ·¶Î§> (½öÓÃÓÚfbdevºÍvesa)
 .TP
 .B \-monitoraspect <³¤¿í±È>
 ÉèÖÃÄãµÄÏÔʾÆ÷»òµçÊÓÆÁÄ»µÄ³¤¿í±È, ²Î¼ûÓÃÓÚµçÓ°³¤¿í±ÈµÄ\-aspectÑ¡Ïî.
@@ -1439,7 +1439,7 @@
 Èç¹ûÄãʹÓõÄÊä³öÇý¶¯ÎÞ·¨»ñµÃÆÁÄ»·Ö±æÂÊ(fbdev/\:x11ºÍ/\:»òÕß TVout)£¬
 Äã¿ÉÒÔÔÚÕâÀïÉèÖÃˮƽºÍ´¹Ö±·Ö±æÂÊ.
 .TP
-.B \-stop_xscreensaver
+.B \-stop-xscreensaver
 ÔÚÆô¶¯ÊǹرÕxscreensaverÔÚÍ˳öʱÔÙ´ò¿ªËü.
 .TP
 .B \-vm
diff -r 47b69dcf384d -r 119703388a95 cfg-common.h
--- a/cfg-common.h	Mon Oct 27 00:14:33 2003 +0000
+++ b/cfg-common.h	Mon Oct 27 00:23:39 2003 +0000
@@ -208,13 +208,13 @@
 #ifdef USE_SUB
 	{"sub", &sub_name, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
 #ifdef USE_FRIBIDI
-	{"fribidi_charset", &fribidi_charset, CONF_TYPE_STRING, 0, 0, 0, NULL},
-	{"flip_hebrew", &flip_hebrew, CONF_TYPE_FLAG, 0, 0, 1, NULL},
-	{"noflip_hebrew", &flip_hebrew, CONF_TYPE_FLAG, 0, 1, 0, NULL},
+	{"fribidi-charset", &fribidi_charset, CONF_TYPE_STRING, 0, 0, 0, NULL},
+	{"flip-hebrew", &flip_hebrew, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+	{"noflip-hebrew", &flip_hebrew, CONF_TYPE_FLAG, 0, 1, 0, NULL},
 #else 
-	{"fribidi_charset", "MPlayer wasn't compiled with FriBiDi support\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
-	{"flip_hebrew", "MPlayer wasn't compiled with FriBiDi support\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
-	{"noflip_hebrew", "MPlayer wasn't compiled with FriBiDi support\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+	{"fribidi-charset", "MPlayer wasn't compiled with FriBiDi support\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+	{"flip-hebrew", "MPlayer wasn't compiled with FriBiDi support\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+	{"noflip-hebrew", "MPlayer wasn't compiled with FriBiDi support\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 #endif
 #ifdef USE_ICONV
 	{"subcp", &sub_cp, CONF_TYPE_STRING, 0, 0, 0, NULL},
diff -r 47b69dcf384d -r 119703388a95 cfg-mplayer.h
--- a/cfg-mplayer.h	Mon Oct 27 00:14:33 2003 +0000
+++ b/cfg-mplayer.h	Mon Oct 27 00:23:39 2003 +0000
@@ -230,9 +230,9 @@
 #endif
 
 #if defined(HAVE_FBDEV)||defined(HAVE_VESA) 
-       {"monitor_hfreq", &monitor_hfreq_str, CONF_TYPE_STRING, 0, 0, 0, NULL}, 
-       {"monitor_vfreq", &monitor_vfreq_str, CONF_TYPE_STRING, 0, 0, 0, NULL}, 
-       {"monitor_dotclock", &monitor_dotclock_str, CONF_TYPE_STRING, 0, 0, 0, NULL}, 
+       {"monitor-hfreq", &monitor_hfreq_str, CONF_TYPE_STRING, 0, 0, 0, NULL}, 
+       {"monitor-vfreq", &monitor_vfreq_str, CONF_TYPE_STRING, 0, 0, 0, NULL}, 
+       {"monitor-dotclock", &monitor_dotclock_str, CONF_TYPE_STRING, 0, 0, 0, NULL}, 
 #endif 
 
 #ifdef HAVE_FBDEV
@@ -289,8 +289,9 @@
 	{"wid", &WinID, CONF_TYPE_INT, 0, 0, 0, NULL},
 	{"rootwin", &WinID, CONF_TYPE_FLAG, 0, -1, 0, NULL},
 	{"icelayer", "Use -fstype layer:<number> instead. -icelayer was obsoleted\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
-	{"stop_xscreensaver", &stop_xscreensaver, CONF_TYPE_FLAG, 0, 0, 1, NULL},
-	{"nostop_xscreensaver", &stop_xscreensaver, CONF_TYPE_FLAG, 0, 1, 0, NULL},
+	{"stop-xscreensaver", &stop_xscreensaver, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+	{"nostop-xscreensaver", &stop_xscreensaver, CONF_TYPE_FLAG, 0, 1, 0, NULL},
+	{"stop_xscreensaver", "Use -stop-xscreensaver instead, options with _ have been obsoleted.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
 	{"keepaspect", &vo_x11_keepaspect, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 	{"nokeepaspect", &vo_x11_keepaspect, CONF_TYPE_FLAG, 0, 1, 0, NULL},
 	{"fstype", &vo_fstype_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},