* ./src/misc/configuration.c: support for short options. -V, -A, -I

    are back, and we also have -4 and -6 for IPv4/IPv6.

diff --git a/include/configuration.h b/include/configuration.h
index be5640a380d070916142c289f069d533bad29209..62fd36a495a413c1aeab856080e04b77e18a5f6f 100644 (file)
--- a/include/configuration.h
+++ b/include/configuration.h
@@ -4,7 +4,7 @@
  * It includes functions allowing to declare, get or set configuration options.
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: configuration.h,v 1.6 2002/04/21 11:23:03 gbazin Exp $
+ * $Id: configuration.h,v 1.7 2002/04/21 18:32:12 sam Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -47,16 +47,17 @@
 
 typedef struct module_config_s
 {
-    int         i_type;                                /* Configuration type */
+    int          i_type;                               /* Configuration type */
     char        *psz_name;                                    /* Option name */
+    char         i_short;                      /* Optional short option name */
     char        *psz_text;      /* Short comment on the configuration option */
     char        *psz_longtext;   /* Long comment on the configuration option */
     char        *psz_value;                                  /* Option value */
-    int         i_value;                                     /* Option value */
-    float       f_value;                                     /* Option value */
+    int          i_value;                                    /* Option value */
+    float        f_value;                                    /* Option value */
     void        *p_callback;     /* Function to call when commiting a change */
     vlc_mutex_t *p_lock;            /* lock to use when modifying the config */
-    boolean_t   b_dirty;           /* Dirty flag to indicate a config change */
+    boolean_t    b_dirty;          /* Dirty flag to indicate a config change */
 
 } module_config_t;
 
@@ -109,32 +110,53 @@ int config_LoadCmdLine( int *pi_argc, char *ppsz_argv[],
     static module_config_t p_config[] = {
 
 #define MODULE_CONFIG_STOP \
-    { MODULE_CONFIG_HINT_END, NULL, NULL, NULL, NULL, 0, 0, NULL, 0 } };
+    { MODULE_CONFIG_HINT_END, NULL, '\0', NULL, NULL, NULL, 0, 0, NULL, 0 } };
 
 #define ADD_CATEGORY_HINT( text, longtext ) \
-    { MODULE_CONFIG_HINT_CATEGORY, NULL, text, longtext, NULL, 0, 0, NULL, \
-      NULL, 0 },
+    { MODULE_CONFIG_HINT_CATEGORY, NULL, '\0', text, longtext, NULL, 0, 0, \
+      NULL, NULL, 0 },
 #define ADD_SUBCATEGORY_HINT( text, longtext ) \
-    { MODULE_CONFIG_HINT_SUBCATEGORY, NULL, text, longtext, NULL, 0, 0, NULL, \
-      NULL, 0 },
+    { MODULE_CONFIG_HINT_SUBCATEGORY, NULL, '\0', text, longtext, NULL, 0, 0, \
+      NULL, NULL, 0 },
 #define END_SUBCATEGORY_HINT \
-    { MODULE_CONFIG_HINT_SUBCATEGORY_END, NULL, NULL, NULL, NULL, 0, 0, NULL, \
-      NULL, 0 },
+    { MODULE_CONFIG_HINT_SUBCATEGORY_END, NULL, '\0', NULL, NULL, NULL, 0, 0, \
+      NULL, NULL, 0 },
 #define ADD_STRING( name, value, p_callback, text, longtext ) \
-    { MODULE_CONFIG_ITEM_STRING, name, text, longtext, value, 0, 0, \
+    { MODULE_CONFIG_ITEM_STRING, name, '\0', text, longtext, value, 0, 0, \
       p_callback, NULL, 0 },
 #define ADD_FILE( name, psz_value, p_callback, text, longtext ) \
-    { MODULE_CONFIG_ITEM_FILE, name, text, longtext, psz_value, 0, 0, \
+    { MODULE_CONFIG_ITEM_FILE, name, '\0', text, longtext, psz_value, 0, 0, \
       p_callback, NULL, 0 },
 #define ADD_PLUGIN( name, i_capability, psz_value, p_callback, text, longtext)\
-    { MODULE_CONFIG_ITEM_PLUGIN, name, text, longtext, psz_value, \
+    { MODULE_CONFIG_ITEM_PLUGIN, name, '\0', text, longtext, psz_value, \
       i_capability, 0, p_callback, NULL, 0 },
 #define ADD_INTEGER( name, i_value, p_callback, text, longtext ) \
-    { MODULE_CONFIG_ITEM_INTEGER, name, text, longtext, NULL, i_value, 0, \
-      p_callback, NULL, 0 },
+    { MODULE_CONFIG_ITEM_INTEGER, name, '\0', text, longtext, NULL, i_value, \
+      0, p_callback, NULL, 0 },
 #define ADD_FLOAT( name, f_value, p_callback, text, longtext ) \
-    { MODULE_CONFIG_ITEM_FLOAT, name, text, longtext, NULL, 0, f_value, \
+    { MODULE_CONFIG_ITEM_FLOAT, name, '\0', text, longtext, NULL, 0, f_value, \
       p_callback, NULL, 0 },
 #define ADD_BOOL( name, p_callback, text, longtext ) \
-    { MODULE_CONFIG_ITEM_BOOL, name, text, longtext, NULL, 0, 0, p_callback, \
-      NULL, 0 },
+    { MODULE_CONFIG_ITEM_BOOL, name, '\0', text, longtext, NULL, 0, 0, \
+      p_callback, NULL, 0 },
+#define ADD_STRING_WITH_SHORT( name, ch, value, p_callback, text, longtext ) \
+    { MODULE_CONFIG_ITEM_STRING, name, ch, text, longtext, value, 0, 0, \
+      p_callback, NULL, 0 },
+#define ADD_FILE_WITH_SHORT( name, ch, psz_value, p_callback, text, longtext ) \
+    { MODULE_CONFIG_ITEM_FILE, name, ch, text, longtext, psz_value, 0, 0, \
+      p_callback, NULL, 0 },
+#define ADD_PLUGIN_WITH_SHORT( name, ch, i_capability, psz_value, p_callback, \
+  text, longtext) \
+    { MODULE_CONFIG_ITEM_PLUGIN, name, ch, text, longtext, psz_value, \
+      i_capability, 0, p_callback, NULL, 0 },
+#define ADD_INTEGER_WITH_SHORT( name, ch, i_value, p_callback, text, \
+  longtext ) \
+    { MODULE_CONFIG_ITEM_INTEGER, name, ch, text, longtext, NULL, i_value, 0, \
+      p_callback, NULL, 0 },
+#define ADD_FLOAT_WITH_SHORT( name, f_value, p_callback, text, longtext ) \
+    { MODULE_CONFIG_ITEM_FLOAT, name, ch, text, longtext, NULL, 0, f_value, \
+      p_callback, NULL, 0 },
+#define ADD_BOOL_WITH_SHORT( name, ch, p_callback, text, longtext ) \
+    { MODULE_CONFIG_ITEM_BOOL, name, ch, text, longtext, NULL, 0, 0, \
+      p_callback, NULL, 0 },
+

diff --git a/po/de.po b/po/de.po
index 2b2fa7e897f312f12caa07966c1dfff5ac4ec8fe..49c865b8bef4b89f8dc0dd76d1223fad64101a08 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vlc 0.73.3\n"
-"POT-Creation-Date: 2002-04-21 12:23+0200\n"
+"POT-Creation-Date: 2002-04-21 20:27+0200\n"
 "PO-Revision-Date: 2002-04-18 23:38+0100\n"
 "Last-Translator: Thomas Graf <tgr@reeler.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -206,10 +206,18 @@ msgid ""
 msgstr ""
 
 #: src/interface/main.c:186
+msgid "zoom video"
+msgstr ""
+
+#: src/interface/main.c:188
+msgid "You can zoom the video by the specified factor."
+msgstr ""
+
+#: src/interface/main.c:190
 msgid "grayscale video output"
 msgstr "Graustufen Videoausgabe"
 
-#: src/interface/main.c:188
+#: src/interface/main.c:192
 msgid ""
 "Using this option, vlc will not decode the color information from the video "
 "(this can also allow you to save some processing power)."
@@ -217,21 +225,21 @@ msgstr ""
 "Dies wird die Farbendekodierung komplett deaktivieren, dadurch kann "
 "Prozessorzeit gespart werden."
 
-#: src/interface/main.c:191
+#: src/interface/main.c:195
 msgid "fullscreen video output"
 msgstr "Vollbild Videoausgabe"
 
-#: src/interface/main.c:193
+#: src/interface/main.c:197
 msgid ""
 "If this option is enabled, vlc will always start a video in fullscreen mode."
 msgstr ""
 "Wenn diese Option aktiviert ist, wird vlc immer im Vollbildmodus starten"
 
-#: src/interface/main.c:196
+#: src/interface/main.c:200
 msgid "disable hardware acceleration for the video output"
 msgstr "Hardware Beschleuning für Video Ausgabe deaktivieren"
 
-#: src/interface/main.c:198
+#: src/interface/main.c:202
 msgid ""
 "By default vlc will try to take advantage of the overlay capabilities of you "
 "graphics card."
@@ -239,159 +247,159 @@ msgstr ""
 "Standardmässig wird vlc versuchen die Vorteile (Overlay Erweiterungen) "
 "deiner Grafikkarte zu nutzen."
 
-#: src/interface/main.c:201
+#: src/interface/main.c:205
 msgid "force SPU position"
 msgstr "SPU Position forcieren"
 
-#: src/interface/main.c:204
+#: src/interface/main.c:208
 msgid "video filter module"
 msgstr "Video Filter Modul"
 
-#: src/interface/main.c:207
+#: src/interface/main.c:211
 msgid "server port"
 msgstr "Server Port"
 
-#: src/interface/main.c:210
+#: src/interface/main.c:214
 msgid "enable network channel mode"
 msgstr "Netzwerk Kanal Modus aktivieren"
 
-#: src/interface/main.c:213
+#: src/interface/main.c:217
 msgid "channel server address"
 msgstr "Kanal Server Adresse"
 
-#: src/interface/main.c:216
+#: src/interface/main.c:220
 msgid "channel server port"
 msgstr "Kanal Server Port"
 
-#: src/interface/main.c:219
+#: src/interface/main.c:223
 msgid "network interface"
 msgstr "Netzwerk Schnittstelle"
 
-#: src/interface/main.c:222
+#: src/interface/main.c:226
 msgid "choose program (SID)"
 msgstr "Programm wählen (SID)"
 
-#: src/interface/main.c:224
+#: src/interface/main.c:228
 msgid "Choose the program to select by giving its Service ID."
 msgstr "Wähl das Programm indem du eine Service ID eingibst"
 
-#: src/interface/main.c:226
+#: src/interface/main.c:230
 msgid "choose audio"
 msgstr "Audio wählen"
 
-#: src/interface/main.c:229
+#: src/interface/main.c:233
 msgid "choose channel"
 msgstr "Kanal wählen"
 
-#: src/interface/main.c:232
+#: src/interface/main.c:236
 msgid "choose subtitles"
 msgstr "Untertitel wählen"
 
-#: src/interface/main.c:235
+#: src/interface/main.c:239
 msgid "DVD device"
 msgstr "DVD Gerät"
 
-#: src/interface/main.c:238
+#: src/interface/main.c:242
 msgid "VCD device"
 msgstr "VCD Gerät"
 
-#: src/interface/main.c:241
+#: src/interface/main.c:245
 msgid "satellite transponder frequency"
 msgstr "Satellit Transponder Frequenz"
 
-#: src/interface/main.c:244
+#: src/interface/main.c:248
 msgid "satellite transponder polarization"
 msgstr "Satellit Transponder Polarisation"
 
-#: src/interface/main.c:247
+#: src/interface/main.c:251
 msgid "satellite transponder FEC"
 msgstr "Satellit Transponder FEC"
 
-#: src/interface/main.c:250
+#: src/interface/main.c:254
 msgid "satellite transponder symbol rate"
 msgstr "Satellit Transponder Symbol Rate"
 
-#: src/interface/main.c:253
+#: src/interface/main.c:257
 msgid "use diseqc with antenna"
 msgstr "Verwende diseqc mit Antenne"
 
-#: src/interface/main.c:256
+#: src/interface/main.c:260
 msgid "antenna lnb_lof1 (kHz)"
 msgstr "Antenne lnb_lof1 (kHz)"
 
-#: src/interface/main.c:259
+#: src/interface/main.c:263
 msgid "antenna lnb_lof2 (kHz)"
 msgstr "Antenne lnb_lof2 (kHz)"
 
-#: src/interface/main.c:262
+#: src/interface/main.c:266
 msgid "antenna lnb_slof (kHz)"
 msgstr "Antenne lnb_slof (kHz)"
 
-#: src/interface/main.c:265
+#: src/interface/main.c:269
 msgid "force IPv6"
 msgstr "IPv6 forcieren"
 
-#: src/interface/main.c:268
+#: src/interface/main.c:272
 msgid "force IPv4"
 msgstr "IPv4 forcieren"
 
-#: src/interface/main.c:271
+#: src/interface/main.c:275
 msgid "choose MPEG audio decoder"
 msgstr "MPEG Audio Dekoder wählen"
 
-#: src/interface/main.c:274
+#: src/interface/main.c:278
 msgid "choose AC3 audio decoder"
 msgstr "AC3 Audio Dekoder wählen"
 
-#: src/interface/main.c:277
+#: src/interface/main.c:281
 msgid "use additional processors"
 msgstr "Benutz zusätzliche Prozessoren"
 
-#: src/interface/main.c:280
+#: src/interface/main.c:284
 msgid "force synchro algorithm {I|I+|IP|IP+|IPB}"
 msgstr "Synchro Algorithmus focieren {I|I+|IP|IP+|IPB}"
 
-#: src/interface/main.c:283
+#: src/interface/main.c:287
 msgid "disable CPU's MMX support"
 msgstr "MMX Unterstützung deaktivieren"
 
-#: src/interface/main.c:286
+#: src/interface/main.c:290
 msgid "disable CPU's 3D Now! support"
 msgstr "3D Now! Unterstützung deaktivieren"
 
-#: src/interface/main.c:289
+#: src/interface/main.c:293
 msgid "disable CPU's MMX EXT support"
 msgstr "MMX EXT Unterstützung deaktivieren."
 
-#: src/interface/main.c:292
+#: src/interface/main.c:296
 msgid "disable CPU's SSE support"
 msgstr "SSE Unterstüzung deaktivieren"
 
-#: src/interface/main.c:295
+#: src/interface/main.c:299
 msgid "disable CPU's AltiVec support"
 msgstr "AltiVec Unterstützung deaktiveren"
 
-#: src/interface/main.c:298
+#: src/interface/main.c:302
 msgid "launch playlist on startup"
 msgstr "Abspielliste aufrufen beim Starten"
 
-#: src/interface/main.c:301
+#: src/interface/main.c:305
 msgid "enqueue playlist as default"
 msgstr "Standardmässig in die Abspielliste einreihen"
 
-#: src/interface/main.c:304
+#: src/interface/main.c:308
 msgid "loop playlist on end"
 msgstr "Abspielliste endlos abspielen"
 
-#: src/interface/main.c:307
+#: src/interface/main.c:311
 msgid "memory copy module"
 msgstr "Speicherkopier Modul"
 
-#: src/interface/main.c:310
+#: src/interface/main.c:314
 msgid "fast pthread on NT/2K/XP (developpers only)"
 msgstr ""
 
-#: src/interface/main.c:312
+#: src/interface/main.c:316
 msgid ""
 "On Windows NT/2K/XP we use a slow but correct pthread implementation, you "
 "can also use this faster implementation but you might experience problems "
@@ -399,39 +407,39 @@ msgid ""
 msgstr ""
 
 #. Interface options
-#: src/interface/main.c:334
+#: src/interface/main.c:338
 msgid "Interface"
 msgstr "Oberfläche"
 
 #. Audio options
-#: src/interface/main.c:341
+#: src/interface/main.c:345
 msgid "Audio"
 msgstr ""
 
 #. Video options
-#: src/interface/main.c:352
+#: src/interface/main.c:356
 msgid "Video"
 msgstr ""
 
 #. Input options
-#: src/interface/main.c:364
+#: src/interface/main.c:369
 msgid "Input"
 msgstr "Eingabe"
 
 #. Decoder options
-#: src/interface/main.c:398
+#: src/interface/main.c:403
 msgid "Decoders"
 msgstr "Dekoder"
 
 #. CPU options
-#: src/interface/main.c:405
+#: src/interface/main.c:410
 msgid "CPU"
 msgstr "Prozessor"
 
 #. Playlist options
 #: plugins/gtk/gnome_interface.c:506 plugins/gtk/gnome_interface.c:1806
 #: plugins/gtk/gnome_interface.c:1830 plugins/gtk/gtk_interface.c:611
-#: plugins/gtk/gtk_interface.c:2084 src/interface/main.c:413
+#: plugins/gtk/gtk_interface.c:2084 src/interface/main.c:418
 msgid "Playlist"
 msgstr "Abspielliste"
 
@@ -439,86 +447,90 @@ msgstr "Abspielliste"
 #: plugins/ac3_adec/ac3_adec.c:77 plugins/dsp/dsp.c:42 plugins/fb/fb.c:72
 #: plugins/ggi/ggi.c:68 plugins/gtk/gnome.c:73 plugins/gtk/gtk.c:74
 #: plugins/mga/xmga.c:111 plugins/mpeg_vdec/video_parser.c:80
-#: plugins/x11/x11.c:55 plugins/x11/xvideo.c:60 src/interface/main.c:419
+#: plugins/x11/x11.c:55 plugins/x11/xvideo.c:60 src/interface/main.c:424
 msgid "Miscellaneous"
 msgstr "Sonstiges"
 
-#: src/interface/main.c:429
+#: src/interface/main.c:434
 msgid "main program"
 msgstr "Hauptprogramm"
 
-#: src/interface/main.c:442
-msgid "print help (or use -h)"
-msgstr "Hilfetext anzeigen (oder benutz -h)"
+#: src/interface/main.c:448
+msgid "print help"
+msgstr "Hilfetext anzeigen"
 
-#: src/interface/main.c:444
-msgid "print detailed help (or use -H)"
-msgstr "Detailierter Hilfetext anzeigen (oder benutz -H)"
+#: src/interface/main.c:450
+msgid "print detailed help"
+msgstr "Detailierter Hilfetext anzeigen"
 
-#: src/interface/main.c:446
-msgid "print a list of available plugins (or use -l)"
-msgstr "Liste aller verfügbaren Plugins ausgeben (oder benutz -l)"
+#: src/interface/main.c:452
+msgid "print a list of available plugins"
+msgstr "Liste aller verfügbaren Plugins ausgeben"
 
-#: src/interface/main.c:448
-msgid "print help on plugin (or use -p)"
-msgstr "Hilfe über Plugins ausgeben (oder benutz -p)"
+#: src/interface/main.c:454
+msgid "print help on plugin <string>"
+msgstr "Hilfe über Plugin <text> ausgeben"
 
-#: src/interface/main.c:450
+#: src/interface/main.c:457
 msgid "print version information"
 msgstr "Versionsinformationen ausgeben."
 
 #. Usage
-#: src/interface/main.c:614 src/interface/main.c:1038
+#: src/interface/main.c:622 src/interface/main.c:1071
 #, c-format
 msgid "Usage: %s [options] [parameters] [file]...\n"
 msgstr "Usage: %s [Optionen] [Parameter] [Date]...\n"
 
 #. print module name
-#: src/interface/main.c:939
+#: src/interface/main.c:948
 #, c-format
 msgid "%s module options:\n"
 msgstr "%s Modul Optionen:\n"
 
-#: src/interface/main.c:959 src/interface/main.c:963
+#: src/interface/main.c:981 src/interface/main.c:985
 msgid " <string>"
 msgstr "<text>"
 
-#: src/interface/main.c:970 src/interface/main.c:974
+#: src/interface/main.c:992 src/interface/main.c:996
 msgid " <integer>"
 msgstr " <zahl>"
 
-#: src/interface/main.c:995
+#: src/interface/main.c:1003 src/interface/main.c:1007
+msgid " <float>"
+msgstr ""
+
+#: src/interface/main.c:1028
 msgid ""
 "\n"
 "Playlist items:\n"
-"  *.mpg, *.vob                   \tplain MPEG-1/2 files\n"
+"  *.mpg, *.vob                   plain MPEG-1/2 files\n"
 "  [dvd:][device][@raw_device][@[title][,[chapter][,angle]]]\n"
-"                                 \tDVD device\n"
+"                                 DVD device\n"
 "  [vcd:][device][@[title][,[chapter]]\n"
-"                                 \tVCD device\n"
+"                                 VCD device\n"
 "  udpstream:[@[<bind address>][:<bind port>]]\n"
-"                                 \tUDP stream sent by VLS\n"
-"  vlc:loop                       \tloop execution of the playlist\n"
-"  vlc:pause                      \tpause execution of playlist items\n"
-"  vlc:quit                       \tquit VLC"
+"                                 UDP stream sent by VLS\n"
+"  vlc:loop                       loop execution of the playlist\n"
+"  vlc:pause                      pause execution of playlist items\n"
+"  vlc:quit                       quit VLC"
 msgstr ""
 "\n"
 "Abspielliste Elemente:\n"
-"  *.mpg, *.vob                   \tMPEG-1/2 Dateien\n"
+"  *.mpg, *.vob                   MPEG-1/2 Dateien\n"
 "  [dvd:][Gerät][@Raw_Gerät][@[title][,[Kapitel][,Winkel]]]\n"
-"                                 \tDVD Gerät\n"
+"                                 DVD Gerät\n"
 "  [vcd:][Gerät][@[Titel][,[Kapitel]]\n"
-"                                 \tVCD Gerät\n"
+"                                 VCD Gerät\n"
 "  udpstream:[@[<bind Adresse>][:<bind port>]]\n"
-"                                 \tUDP stream gesendet von VLS\n"
-"  vlc:loop                       \tAbspielen der Abspielliste endlos "
+"                                 UDP stream gesendet von VLS\n"
+"  vlc:loop                       Abspielen der Abspielliste endlos "
 "wiederholen\n"
-"  vlc:pause                      \tAbspielen von Abspiellistenelemten "
+"  vlc:pause                      Abspielen von Abspiellistenelemten "
 "pausieren\n"
 "  vlc:quit                       \tVLC beenden"
 
-#: src/interface/main.c:1015 src/interface/main.c:1064
-#: src/interface/main.c:1088
+#: src/interface/main.c:1048 src/interface/main.c:1097
+#: src/interface/main.c:1121
 msgid ""
 "\n"
 "Press the RETURN key to continue..."
@@ -526,11 +538,11 @@ msgstr ""
 "\n"
 "Drück die Eingabetaste um weiterzufahren..."
 
-#: src/interface/main.c:1041
+#: src/interface/main.c:1074
 msgid "[plugin]              [description]"
 msgstr "[Plugin]              [Beschreibung]"
 
-#: src/interface/main.c:1082
+#: src/interface/main.c:1115
 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"
@@ -538,15 +550,20 @@ msgid ""
 "Written by the VideoLAN team at Ecole Centrale, Paris."
 msgstr ""
 
-#: src/misc/configuration.c:612
+#: src/misc/configuration.c:680
 msgid "<boolean>"
 msgstr "<boolesch>"
 
-#: src/misc/configuration.c:613
+#: src/misc/configuration.c:680
 msgid "<integer>"
 msgstr "<zahl>"
 
-#: src/misc/configuration.c:620
+#: src/misc/configuration.c:687
+#, fuzzy, c-format
+msgid "# %s <float>\n"
+msgstr "# %s <text>\n"
+
+#: src/misc/configuration.c:694
 #, c-format
 msgid "# %s <string>\n"
 msgstr "# %s <text>\n"
@@ -1115,7 +1132,7 @@ msgstr ""
 #: plugins/gtk/gtk_interface.c:1387 plugins/gtk/gtk_interface.c:1610
 #: plugins/gtk/gtk_interface.c:1900 plugins/gtk/gtk_interface.c:2025
 #: plugins/gtk/gtk_interface.c:2256 plugins/gtk/gtk_interface.c:2362
-#: plugins/gtk/gtk_interface.c:2568 plugins/gtk/gtk_preferences.c:501
+#: plugins/gtk/gtk_interface.c:2568 plugins/gtk/gtk_preferences.c:522
 msgid "OK"
 msgstr "OK"
 
@@ -1165,7 +1182,7 @@ msgstr "Ger
 
 #: plugins/gtk/gtk_interface.c:1617 plugins/gtk/gtk_interface.c:1907
 #: plugins/gtk/gtk_interface.c:2032 plugins/gtk/gtk_interface.c:2263
-#: plugins/gtk/gtk_interface.c:2575 plugins/gtk/gtk_preferences.c:513
+#: plugins/gtk/gtk_interface.c:2575 plugins/gtk/gtk_preferences.c:534
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -1445,7 +1462,7 @@ msgstr "K
 msgid "Invert"
 msgstr "Umkehren"
 
-#: plugins/gtk/gnome_interface.c:1755 plugins/gtk/gtk_preferences.c:358
+#: plugins/gtk/gnome_interface.c:1755 plugins/gtk/gtk_preferences.c:360
 msgid "Select"
 msgstr "Auswählen"
 
@@ -1469,28 +1486,28 @@ msgstr "Kanal Server"
 msgid "6/7"
 msgstr ""
 
-#: plugins/gtk/gtk_preferences.c:304
+#: plugins/gtk/gtk_preferences.c:306
 msgid "Name"
 msgstr "Name"
 
-#: plugins/gtk/gtk_preferences.c:304
+#: plugins/gtk/gtk_preferences.c:306
 msgid "Description"
 msgstr "Beschreibung"
 
-#: plugins/gtk/gtk_preferences.c:347
+#: plugins/gtk/gtk_preferences.c:349
 msgid "Configure"
 msgstr "Konfigurieren"
 
 #. add new label
-#: plugins/gtk/gtk_preferences.c:370
+#: plugins/gtk/gtk_preferences.c:372
 msgid "Selected:"
 msgstr "Selektiert:"
 
-#: plugins/gtk/gtk_preferences.c:492 plugins/gtk/gtk_preferences.c:509
+#: plugins/gtk/gtk_preferences.c:513 plugins/gtk/gtk_preferences.c:530
 msgid "Save"
 msgstr "Speichern"
 
-#: plugins/gtk/gtk_preferences.c:505
+#: plugins/gtk/gtk_preferences.c:526
 msgid "Apply"
 msgstr "Übernehmen"
 

diff --git a/po/fr.po b/po/fr.po
index ff2512fa75880a8cfcd7dcc7be853b52bbbada34..f8ab18d59818aac54c33672b72670949225fabc9 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-04-21 12:23+0200\n"
+"POT-Creation-Date: 2002-04-21 20:27+0200\n"
 "PO-Revision-Date: 2001-12-10 13:32+0100\n"
 "Last-Translator: Samuel Hocevar <sam@zoy.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -213,10 +213,18 @@ msgstr ""
 "Notez que par défaut vlc s'adaptera aux propriétés de la vidéo."
 
 #: src/interface/main.c:186
+msgid "zoom video"
+msgstr ""
+
+#: src/interface/main.c:188
+msgid "You can zoom the video by the specified factor."
+msgstr ""
+
+#: src/interface/main.c:190
 msgid "grayscale video output"
 msgstr "sortie vidéo en niveaux de gris"
 
-#: src/interface/main.c:188
+#: src/interface/main.c:192
 msgid ""
 "Using this option, vlc will not decode the color information from the video "
 "(this can also allow you to save some processing power)."
@@ -224,22 +232,22 @@ msgstr ""
 "En activant cette option, vlc ne décodera pas l'information de couleur "
 "présente dans la vidéo, ce qui permet d'économiser du temps processeur."
 
-#: src/interface/main.c:191
+#: src/interface/main.c:195
 msgid "fullscreen video output"
 msgstr "sortie vidéo en plein écran"
 
-#: src/interface/main.c:193
+#: src/interface/main.c:197
 msgid ""
 "If this option is enabled, vlc will always start a video in fullscreen mode."
 msgstr ""
 "Lorsque cette option est activée, vlc lancera toujours la vidéo en mode "
 "plein écran."
 
-#: src/interface/main.c:196
+#: src/interface/main.c:200
 msgid "disable hardware acceleration for the video output"
 msgstr "désactiver l'accélération matérielle de l'affichage"
 
-#: src/interface/main.c:198
+#: src/interface/main.c:202
 msgid ""
 "By default vlc will try to take advantage of the overlay capabilities of you "
 "graphics card."
@@ -247,159 +255,159 @@ msgstr ""
 "Par défaut vlc tentera d'utiliser les capacités d'overlay de votre carte "
 "vidéo."
 
-#: src/interface/main.c:201
+#: src/interface/main.c:205
 msgid "force SPU position"
 msgstr "forcer la position des sous-titres"
 
-#: src/interface/main.c:204
+#: src/interface/main.c:208
 msgid "video filter module"
 msgstr "module de filtre vidéo"
 
-#: src/interface/main.c:207
+#: src/interface/main.c:211
 msgid "server port"
 msgstr "port serveur"
 
-#: src/interface/main.c:210
+#: src/interface/main.c:214
 msgid "enable network channel mode"
 msgstr "activer le mode canal réseau"
 
-#: src/interface/main.c:213
+#: src/interface/main.c:217
 msgid "channel server address"
 msgstr "adresse du serveur de canaux"
 
-#: src/interface/main.c:216
+#: src/interface/main.c:220
 msgid "channel server port"
 msgstr "port du serveur de canaux"
 
-#: src/interface/main.c:219
+#: src/interface/main.c:223
 msgid "network interface"
 msgstr "interface réseau"
 
-#: src/interface/main.c:222
+#: src/interface/main.c:226
 msgid "choose program (SID)"
 msgstr "choisir le programme (SID)"
 
-#: src/interface/main.c:224
+#: src/interface/main.c:228
 msgid "Choose the program to select by giving its Service ID."
 msgstr "Choisit le programme à sélectionner en fournissant son Service ID."
 
-#: src/interface/main.c:226
+#: src/interface/main.c:230
 msgid "choose audio"
 msgstr "choisir la piste audio"
 
-#: src/interface/main.c:229
+#: src/interface/main.c:233
 msgid "choose channel"
 msgstr "choisir le canal réseau"
 
-#: src/interface/main.c:232
+#: src/interface/main.c:236
 msgid "choose subtitles"
 msgstr "choisir la piste de sous-titres"
 
-#: src/interface/main.c:235
+#: src/interface/main.c:239
 msgid "DVD device"
 msgstr "périphérique DVD"
 
-#: src/interface/main.c:238
+#: src/interface/main.c:242
 msgid "VCD device"
 msgstr "périphérique VCD"
 
-#: src/interface/main.c:241
+#: src/interface/main.c:245
 msgid "satellite transponder frequency"
 msgstr "fréquence du transpondeur satellite"
 
-#: src/interface/main.c:244
+#: src/interface/main.c:248
 msgid "satellite transponder polarization"
 msgstr "polarisation du transpondeur satellite"
 
-#: src/interface/main.c:247
+#: src/interface/main.c:251
 msgid "satellite transponder FEC"
 msgstr "FEC du transpondeur satellite"
 
-#: src/interface/main.c:250
+#: src/interface/main.c:254
 msgid "satellite transponder symbol rate"
 msgstr "débit symbole du transpondeur satellite"
 
-#: src/interface/main.c:253
+#: src/interface/main.c:257
 msgid "use diseqc with antenna"
 msgstr "utiliser diseqc pour l'antenne"
 
-#: src/interface/main.c:256
+#: src/interface/main.c:260
 msgid "antenna lnb_lof1 (kHz)"
 msgstr "lnb_lof1 de l'antenne (kHz)"
 
-#: src/interface/main.c:259
+#: src/interface/main.c:263
 msgid "antenna lnb_lof2 (kHz)"
 msgstr "lnb_lof2 de l'antenne (kHz)"
 
-#: src/interface/main.c:262
+#: src/interface/main.c:266
 msgid "antenna lnb_slof (kHz)"
 msgstr "lnb_slof de l'antenne (kHz)"
 
-#: src/interface/main.c:265
+#: src/interface/main.c:269
 msgid "force IPv6"
 msgstr "forcer l'utilisation d'IPv6"
 
-#: src/interface/main.c:268
+#: src/interface/main.c:272
 msgid "force IPv4"
 msgstr "forcer l'utilisation d'IPv4"
 
-#: src/interface/main.c:271
+#: src/interface/main.c:275
 msgid "choose MPEG audio decoder"
 msgstr "choisir le décodeur MPEG audio"
 
-#: src/interface/main.c:274
+#: src/interface/main.c:278
 msgid "choose AC3 audio decoder"
 msgstr "choisir le décodeur AC3 audio"
 
-#: src/interface/main.c:277
+#: src/interface/main.c:281
 msgid "use additional processors"
 msgstr "utiliser des processeurs supplémentaires"
 
-#: src/interface/main.c:280
+#: src/interface/main.c:284
 msgid "force synchro algorithm {I|I+|IP|IP+|IPB}"
 msgstr "forcer l'algorithme de synchro {I|I+|IP|IP+|IPB}"
 
-#: src/interface/main.c:283
+#: src/interface/main.c:287
 msgid "disable CPU's MMX support"
 msgstr "désactiver le support MMX du processeur"
 
-#: src/interface/main.c:286
+#: src/interface/main.c:290
 msgid "disable CPU's 3D Now! support"
 msgstr "désactiver le support 3D Now! du processeur"
 
-#: src/interface/main.c:289
+#: src/interface/main.c:293
 msgid "disable CPU's MMX EXT support"
 msgstr "désactiver le support MMX EXT du processeur"
 
-#: src/interface/main.c:292
+#: src/interface/main.c:296
 msgid "disable CPU's SSE support"
 msgstr "désactiver le support SSE du processeur"
 
-#: src/interface/main.c:295
+#: src/interface/main.c:299
 msgid "disable CPU's AltiVec support"
 msgstr "désactiver le support AltiVec du processeur"
 
-#: src/interface/main.c:298
+#: src/interface/main.c:302
 msgid "launch playlist on startup"
 msgstr "lancer la playlist au démarrage"
 
-#: src/interface/main.c:301
+#: src/interface/main.c:305
 msgid "enqueue playlist as default"
 msgstr "ajouter les fichiers en fin de playlist"
 
-#: src/interface/main.c:304
+#: src/interface/main.c:308
 msgid "loop playlist on end"
 msgstr "boucler en fin de playlist"
 
-#: src/interface/main.c:307
+#: src/interface/main.c:311
 msgid "memory copy module"
 msgstr "module de copie mémoire"
 
-#: src/interface/main.c:310
+#: src/interface/main.c:314
 msgid "fast pthread on NT/2K/XP (developpers only)"
 msgstr "implémentation pthread rapide pour NT/2K/XP (développeurs uniquement)"
 
-#: src/interface/main.c:312
+#: src/interface/main.c:316
 msgid ""
 "On Windows NT/2K/XP we use a slow but correct pthread implementation, you "
 "can also use this faster implementation but you might experience problems "
@@ -410,39 +418,39 @@ msgstr ""
 "avec laquelle vous pouvez rencontrer des problèmes."
 
 #. Interface options
-#: src/interface/main.c:334
+#: src/interface/main.c:338
 msgid "Interface"
 msgstr "Interface"
 
 #. Audio options
-#: src/interface/main.c:341
+#: src/interface/main.c:345
 msgid "Audio"
 msgstr "Audio"
 
 #. Video options
-#: src/interface/main.c:352
+#: src/interface/main.c:356
 msgid "Video"
 msgstr "Vidéo"
 
 #. Input options
-#: src/interface/main.c:364
+#: src/interface/main.c:369
 msgid "Input"
 msgstr "Entrée"
 
 #. Decoder options
-#: src/interface/main.c:398
+#: src/interface/main.c:403
 msgid "Decoders"
 msgstr "Décodeurs"
 
 #. CPU options
-#: src/interface/main.c:405
+#: src/interface/main.c:410
 msgid "CPU"
 msgstr "Processeur"
 
 #. Playlist options
 #: plugins/gtk/gnome_interface.c:506 plugins/gtk/gnome_interface.c:1806
 #: plugins/gtk/gnome_interface.c:1830 plugins/gtk/gtk_interface.c:611
-#: plugins/gtk/gtk_interface.c:2084 src/interface/main.c:413
+#: plugins/gtk/gtk_interface.c:2084 src/interface/main.c:418
 msgid "Playlist"
 msgstr "Playlist"
 
@@ -450,82 +458,88 @@ msgstr "Playlist"
 #: plugins/ac3_adec/ac3_adec.c:77 plugins/dsp/dsp.c:42 plugins/fb/fb.c:72
 #: plugins/ggi/ggi.c:68 plugins/gtk/gnome.c:73 plugins/gtk/gtk.c:74
 #: plugins/mga/xmga.c:111 plugins/mpeg_vdec/video_parser.c:80
-#: plugins/x11/x11.c:55 plugins/x11/xvideo.c:60 src/interface/main.c:419
+#: plugins/x11/x11.c:55 plugins/x11/xvideo.c:60 src/interface/main.c:424
 msgid "Miscellaneous"
 msgstr "Divers"
 
-#: src/interface/main.c:429
+#: src/interface/main.c:434
 msgid "main program"
 msgstr "programme principal"
 
-#: src/interface/main.c:442
-msgid "print help (or use -h)"
-msgstr "afficher l'aide (ou sinon -h)"
+#: src/interface/main.c:448
+msgid "print help"
+msgstr "afficher l'aide"
 
-#: src/interface/main.c:444
-msgid "print detailed help (or use -H)"
-msgstr "afficher l'aide détaillée (ou sinon -H)"
+#: src/interface/main.c:450
+msgid "print detailed help"
+msgstr "afficher l'aide détaillée"
 
-#: src/interface/main.c:446
-msgid "print a list of available plugins (or use -l)"
-msgstr "afficher la liste des plugins disponibles (ou sinon -l)"
+#: src/interface/main.c:452
+msgid "print a list of available plugins"
+msgstr "afficher la liste des plugins disponibles"
 
-#: src/interface/main.c:448
-msgid "print help on plugin (or use -p)"
-msgstr "afficher l'aide d'un plugin (ou sinon -p)"
+#: src/interface/main.c:454
+msgid "print help on plugin <string>"
+msgstr "afficher l'aide du plugin <chaîne>"
 
-#: src/interface/main.c:450
+#: src/interface/main.c:457
 msgid "print version information"
 msgstr "afficher le nom et la version du logiciel"
 
 #. Usage
-#: src/interface/main.c:614 src/interface/main.c:1038
+#: src/interface/main.c:622 src/interface/main.c:1071
 #, c-format
 msgid "Usage: %s [options] [parameters] [file]...\n"
 msgstr "Utilisation: %s [options] [paramètres] [fichier]...\n"
 
 #. print module name
-#: src/interface/main.c:939
+#: src/interface/main.c:948
 #, c-format
 msgid "%s module options:\n"
 msgstr "options du module %s :\n"
 
-#: src/interface/main.c:959 src/interface/main.c:963
+#: src/interface/main.c:981 src/interface/main.c:985
 msgid " <string>"
 msgstr " <chaîne>"
 
-#: src/interface/main.c:970 src/interface/main.c:974
+#: src/interface/main.c:992 src/interface/main.c:996
 msgid " <integer>"
 msgstr " <entier>"
 
-#: src/interface/main.c:995
+#: src/interface/main.c:1003 src/interface/main.c:1007
+msgid " <float>"
+msgstr ""
+
+#: src/interface/main.c:1028
 msgid ""
 "\n"
 "Playlist items:\n"
-"  *.mpg, *.vob                   \tplain MPEG-1/2 files\n"
+"  *.mpg, *.vob                   plain MPEG-1/2 files\n"
 "  [dvd:][device][@raw_device][@[title][,[chapter][,angle]]]\n"
-"                                 \tDVD device\n"
+"                                 DVD device\n"
 "  [vcd:][device][@[title][,[chapter]]\n"
-"                                 \tVCD device\n"
+"                                 VCD device\n"
 "  udpstream:[@[<bind address>][:<bind port>]]\n"
-"                                 \tUDP stream sent by VLS\n"
-"  vlc:loop                       \tloop execution of the playlist\n"
-"  vlc:pause                      \tpause execution of playlist items\n"
-"  vlc:quit                       \tquit VLC"
+"                                 UDP stream sent by VLS\n"
+"  vlc:loop                       loop execution of the playlist\n"
+"  vlc:pause                      pause execution of playlist items\n"
+"  vlc:quit                       quit VLC"
 msgstr ""
 "\n"
 "Éléments d'une playlist :\n"
-"  *.mpg, *.vob                   \tfichiers MPEG-1/2 standards\n"
+"  *.mpg, *.vob                   fichiers MPEG-1/2 standards\n"
 "  [dvd:][device][@raw_device][@[titre][,[chapitre][,angle]]]\n"
-"                                 \tpériphérique DVD\n"
-"  [vcd:][device][@[titre][,[chapitre]]\tpériphérique VCD\n"
-"  udpstream:[@[<adresse>][:<port>]]\tflux UDP envoyé par VLS\n"
-"  vlc:loop                       \tfait boucler la playlist\n"
-"  vlc:pause                      \tfait une pause dans la playlist\n"
-"  vlc:quit                       \tquitter VLC"
-
-#: src/interface/main.c:1015 src/interface/main.c:1064
-#: src/interface/main.c:1088
+"                                 périphérique DVD\n"
+"  [vcd:][device][@[titre][,[chapitre]]\n"
+"                                 périphérique VCD\n"
+"  udpstream:[@[<adresse>][:<port>]]\n"
+"                                 flux UDP envoyé par VLS\n"
+"  vlc:loop                       fait boucler la playlist\n"
+"  vlc:pause                      fait une pause dans la playlist\n"
+"  vlc:quit                       quitter VLC"
+
+#: src/interface/main.c:1048 src/interface/main.c:1097
+#: src/interface/main.c:1121
 msgid ""
 "\n"
 "Press the RETURN key to continue..."
@@ -533,11 +547,11 @@ msgstr ""
 "\n"
 "Appuyez sur ENTRÉE pour continuer..."
 
-#: src/interface/main.c:1041
+#: src/interface/main.c:1074
 msgid "[plugin]              [description]"
 msgstr "[plugin]              [description]"
 
-#: src/interface/main.c:1082
+#: src/interface/main.c:1115
 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"
@@ -550,15 +564,20 @@ msgstr ""
 "voir le fichier COPYING pour plus de détails.\n"
 "Écrit par l'équipe VideoLAN à l'École Centrale, Paris."
 
-#: src/misc/configuration.c:612
+#: src/misc/configuration.c:680
 msgid "<boolean>"
 msgstr "<booléen>"
 
-#: src/misc/configuration.c:613
+#: src/misc/configuration.c:680
 msgid "<integer>"
 msgstr "<entier>"
 
-#: src/misc/configuration.c:620
+#: src/misc/configuration.c:687
+#, c-format
+msgid "# %s <float>\n"
+msgstr "# %s <flottant>\n"
+
+#: src/misc/configuration.c:694
 #, c-format
 msgid "# %s <string>\n"
 msgstr "# %s <chaîne>\n"
@@ -1131,7 +1150,7 @@ msgstr ""
 #: plugins/gtk/gtk_interface.c:1387 plugins/gtk/gtk_interface.c:1610
 #: plugins/gtk/gtk_interface.c:1900 plugins/gtk/gtk_interface.c:2025
 #: plugins/gtk/gtk_interface.c:2256 plugins/gtk/gtk_interface.c:2362
-#: plugins/gtk/gtk_interface.c:2568 plugins/gtk/gtk_preferences.c:501
+#: plugins/gtk/gtk_interface.c:2568 plugins/gtk/gtk_preferences.c:522
 msgid "OK"
 msgstr "Valider"
 
@@ -1181,7 +1200,7 @@ msgstr "Nom du device"
 
 #: plugins/gtk/gtk_interface.c:1617 plugins/gtk/gtk_interface.c:1907
 #: plugins/gtk/gtk_interface.c:2032 plugins/gtk/gtk_interface.c:2263
-#: plugins/gtk/gtk_interface.c:2575 plugins/gtk/gtk_preferences.c:513
+#: plugins/gtk/gtk_interface.c:2575 plugins/gtk/gtk_preferences.c:534
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -1461,7 +1480,7 @@ msgstr "Rogner"
 msgid "Invert"
 msgstr "Inverser"
 
-#: plugins/gtk/gnome_interface.c:1755 plugins/gtk/gtk_preferences.c:358
+#: plugins/gtk/gnome_interface.c:1755 plugins/gtk/gtk_preferences.c:360
 msgid "Select"
 msgstr "Sélectionner"
 
@@ -1485,28 +1504,28 @@ msgstr "Serveur de canaux"
 msgid "6/7"
 msgstr ""
 
-#: plugins/gtk/gtk_preferences.c:304
+#: plugins/gtk/gtk_preferences.c:306
 msgid "Name"
 msgstr "Nom"
 
-#: plugins/gtk/gtk_preferences.c:304
+#: plugins/gtk/gtk_preferences.c:306
 msgid "Description"
 msgstr "Description"
 
-#: plugins/gtk/gtk_preferences.c:347
+#: plugins/gtk/gtk_preferences.c:349
 msgid "Configure"
 msgstr "Configurer"
 
 #. add new label
-#: plugins/gtk/gtk_preferences.c:370
+#: plugins/gtk/gtk_preferences.c:372
 msgid "Selected:"
 msgstr "Sélectionné :"
 
-#: plugins/gtk/gtk_preferences.c:492 plugins/gtk/gtk_preferences.c:509
+#: plugins/gtk/gtk_preferences.c:513 plugins/gtk/gtk_preferences.c:530
 msgid "Save"
 msgstr "Enregistrer"
 
-#: plugins/gtk/gtk_preferences.c:505
+#: plugins/gtk/gtk_preferences.c:526
 msgid "Apply"
 msgstr "Appliquer"
 

diff --git a/po/ja.po b/po/ja.po
index 824ca651057c64c15aa4f00f04f4de570ff9bd5a..58b9f1011203e5c4c2e8705fb06ac1361a635cb4 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-04-21 12:23+0200\n"
+"POT-Creation-Date: 2002-04-21 20:27+0200\n"
 "PO-Revision-Date: 2002-04-02 03:22+0900\n"
 "Last-Translator: Fumio Nakayama <endymion@ca2.so-net.ne.jp>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -176,195 +176,203 @@ msgid ""
 msgstr ""
 
 #: src/interface/main.c:186
-msgid "grayscale video output"
+msgid "zoom video"
 msgstr ""
 
 #: src/interface/main.c:188
+msgid "You can zoom the video by the specified factor."
+msgstr ""
+
+#: src/interface/main.c:190
+msgid "grayscale video output"
+msgstr ""
+
+#: src/interface/main.c:192
 msgid ""
 "Using this option, vlc will not decode the color information from the video "
 "(this can also allow you to save some processing power)."
 msgstr ""
 
-#: src/interface/main.c:191
+#: src/interface/main.c:195
 msgid "fullscreen video output"
 msgstr ""
 
-#: src/interface/main.c:193
+#: src/interface/main.c:197
 msgid ""
 "If this option is enabled, vlc will always start a video in fullscreen mode."
 msgstr ""
 
-#: src/interface/main.c:196
+#: src/interface/main.c:200
 msgid "disable hardware acceleration for the video output"
 msgstr ""
 
-#: src/interface/main.c:198
+#: src/interface/main.c:202
 msgid ""
 "By default vlc will try to take advantage of the overlay capabilities of you "
 "graphics card."
 msgstr ""
 
-#: src/interface/main.c:201
+#: src/interface/main.c:205
 msgid "force SPU position"
 msgstr ""
 
-#: src/interface/main.c:204
+#: src/interface/main.c:208
 msgid "video filter module"
 msgstr ""
 
-#: src/interface/main.c:207
+#: src/interface/main.c:211
 #, fuzzy
 msgid "server port"
 msgstr "¥µ¡¼¥Ð¡¼¤¬¤¢¤ê¤Þ¤»¤ó!!"
 
-#: src/interface/main.c:210
+#: src/interface/main.c:214
 #, fuzzy
 msgid "enable network channel mode"
 msgstr "ÄÌ¿®¥Á¥ã¥ó¥Í¥ë:"
 
-#: src/interface/main.c:213
+#: src/interface/main.c:217
 #, fuzzy
 msgid "channel server address"
 msgstr "¥Á¥ã¥ó¥Í¥ë¥µ¡¼¥Ð¡¼"
 
-#: src/interface/main.c:216
+#: src/interface/main.c:220
 #, fuzzy
 msgid "channel server port"
 msgstr "¥Á¥ã¥ó¥Í¥ë¥µ¡¼¥Ð¡¼"
 
-#: src/interface/main.c:219
+#: src/interface/main.c:223
 #, fuzzy
 msgid "network interface"
 msgstr "¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ò±£¤¹(_H)"
 
-#: src/interface/main.c:222
+#: src/interface/main.c:226
 #, fuzzy
 msgid "choose program (SID)"
 msgstr "¥×¥í¥°¥é¥à¤ÎÁªÂò"
 
-#: src/interface/main.c:224
+#: src/interface/main.c:228
 msgid "Choose the program to select by giving its Service ID."
 msgstr ""
 
-#: src/interface/main.c:226
+#: src/interface/main.c:230
 msgid "choose audio"
 msgstr ""
 
-#: src/interface/main.c:229
+#: src/interface/main.c:233
 #, fuzzy
 msgid "choose channel"
 msgstr "¥Á¥ã¥×¥¿¡¼¤ÎÁªÂò"
 
-#: src/interface/main.c:232
+#: src/interface/main.c:236
 #, fuzzy
 msgid "choose subtitles"
 msgstr "¥¿¥¤¥È¥ë¤ÎÁªÂò"
 
-#: src/interface/main.c:235
+#: src/interface/main.c:239
 msgid "DVD device"
 msgstr ""
 
-#: src/interface/main.c:238
+#: src/interface/main.c:242
 msgid "VCD device"
 msgstr ""
 
-#: src/interface/main.c:241
+#: src/interface/main.c:245
 msgid "satellite transponder frequency"
 msgstr ""
 
-#: src/interface/main.c:244
+#: src/interface/main.c:248
 msgid "satellite transponder polarization"
 msgstr ""
 
-#: src/interface/main.c:247
+#: src/interface/main.c:251
 msgid "satellite transponder FEC"
 msgstr ""
 
-#: src/interface/main.c:250
+#: src/interface/main.c:254
 msgid "satellite transponder symbol rate"
 msgstr ""
 
-#: src/interface/main.c:253
+#: src/interface/main.c:257
 msgid "use diseqc with antenna"
 msgstr ""
 
-#: src/interface/main.c:256
+#: src/interface/main.c:260
 msgid "antenna lnb_lof1 (kHz)"
 msgstr ""
 
-#: src/interface/main.c:259
+#: src/interface/main.c:263
 msgid "antenna lnb_lof2 (kHz)"
 msgstr ""
 
-#: src/interface/main.c:262
+#: src/interface/main.c:266
 msgid "antenna lnb_slof (kHz)"
 msgstr ""
 
-#: src/interface/main.c:265
+#: src/interface/main.c:269
 msgid "force IPv6"
 msgstr ""
 
-#: src/interface/main.c:268
+#: src/interface/main.c:272
 msgid "force IPv4"
 msgstr ""
 
-#: src/interface/main.c:271
+#: src/interface/main.c:275
 msgid "choose MPEG audio decoder"
 msgstr ""
 
-#: src/interface/main.c:274
+#: src/interface/main.c:278
 msgid "choose AC3 audio decoder"
 msgstr ""
 
-#: src/interface/main.c:277
+#: src/interface/main.c:281
 msgid "use additional processors"
 msgstr ""
 
-#: src/interface/main.c:280
+#: src/interface/main.c:284
 msgid "force synchro algorithm {I|I+|IP|IP+|IPB}"
 msgstr ""
 
-#: src/interface/main.c:283
+#: src/interface/main.c:287
 msgid "disable CPU's MMX support"
 msgstr ""
 
-#: src/interface/main.c:286
+#: src/interface/main.c:290
 msgid "disable CPU's 3D Now! support"
 msgstr ""
 
-#: src/interface/main.c:289
+#: src/interface/main.c:293
 msgid "disable CPU's MMX EXT support"
 msgstr ""
 
-#: src/interface/main.c:292
+#: src/interface/main.c:296
 msgid "disable CPU's SSE support"
 msgstr ""
 
-#: src/interface/main.c:295
+#: src/interface/main.c:299
 msgid "disable CPU's AltiVec support"
 msgstr ""
 
-#: src/interface/main.c:298
+#: src/interface/main.c:302
 msgid "launch playlist on startup"
 msgstr ""
 
-#: src/interface/main.c:301
+#: src/interface/main.c:305
 msgid "enqueue playlist as default"
 msgstr ""
 
-#: src/interface/main.c:304
+#: src/interface/main.c:308
 msgid "loop playlist on end"
 msgstr ""
 
-#: src/interface/main.c:307
+#: src/interface/main.c:311
 msgid "memory copy module"
 msgstr ""
 
-#: src/interface/main.c:310
+#: src/interface/main.c:314
 msgid "fast pthread on NT/2K/XP (developpers only)"
 msgstr ""
 
-#: src/interface/main.c:312
+#: src/interface/main.c:316
 msgid ""
 "On Windows NT/2K/XP we use a slow but correct pthread implementation, you "
 "can also use this faster implementation but you might experience problems "
@@ -372,42 +380,42 @@ msgid ""
 msgstr ""
 
 #. Interface options
-#: src/interface/main.c:334
+#: src/interface/main.c:338
 #, fuzzy
 msgid "Interface"
 msgstr "¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Îɽ¼¨ÀÚÂؤ¨(_I)"
 
 #. Audio options
-#: src/interface/main.c:341
+#: src/interface/main.c:345
 #, fuzzy
 msgid "Audio"
 msgstr "½ÐÎϲ»À¼(_A)"
 
 #. Video options
-#: src/interface/main.c:352
+#: src/interface/main.c:356
 #, fuzzy
 msgid "Video"
 msgstr "ɽ¼¨(_V)"
 
 #. Input options
-#: src/interface/main.c:364
+#: src/interface/main.c:369
 msgid "Input"
 msgstr ""
 
 #. Decoder options
-#: src/interface/main.c:398
+#: src/interface/main.c:403
 msgid "Decoders"
 msgstr ""
 
 #. CPU options
-#: src/interface/main.c:405
+#: src/interface/main.c:410
 msgid "CPU"
 msgstr ""
 
 #. Playlist options
 #: plugins/gtk/gnome_interface.c:506 plugins/gtk/gnome_interface.c:1806
 #: plugins/gtk/gnome_interface.c:1830 plugins/gtk/gtk_interface.c:611
-#: plugins/gtk/gtk_interface.c:2084 src/interface/main.c:413
+#: plugins/gtk/gtk_interface.c:2084 src/interface/main.c:418
 msgid "Playlist"
 msgstr "¥ê¥¹¥È"
 
@@ -415,83 +423,87 @@ msgstr "
 #: plugins/ac3_adec/ac3_adec.c:77 plugins/dsp/dsp.c:42 plugins/fb/fb.c:72
 #: plugins/ggi/ggi.c:68 plugins/gtk/gnome.c:73 plugins/gtk/gtk.c:74
 #: plugins/mga/xmga.c:111 plugins/mpeg_vdec/video_parser.c:80
-#: plugins/x11/x11.c:55 plugins/x11/xvideo.c:60 src/interface/main.c:419
+#: plugins/x11/x11.c:55 plugins/x11/xvideo.c:60 src/interface/main.c:424
 msgid "Miscellaneous"
 msgstr ""
 
-#: src/interface/main.c:429
+#: src/interface/main.c:434
 #, fuzzy
 msgid "main program"
 msgstr "¥×¥í¥°¥é¥à¤ÎÀÚÂؤ¨"
 
-#: src/interface/main.c:442
-msgid "print help (or use -h)"
+#: src/interface/main.c:448
+msgid "print help"
 msgstr ""
 
-#: src/interface/main.c:444
-msgid "print detailed help (or use -H)"
+#: src/interface/main.c:450
+msgid "print detailed help"
 msgstr ""
 
-#: src/interface/main.c:446
-msgid "print a list of available plugins (or use -l)"
+#: src/interface/main.c:452
+msgid "print a list of available plugins"
 msgstr ""
 
-#: src/interface/main.c:448
-msgid "print help on plugin (or use -p)"
+#: src/interface/main.c:454
+msgid "print help on plugin <string>"
 msgstr ""
 
-#: src/interface/main.c:450
+#: src/interface/main.c:457
 msgid "print version information"
 msgstr ""
 
 #. Usage
-#: src/interface/main.c:614 src/interface/main.c:1038
+#: src/interface/main.c:622 src/interface/main.c:1071
 #, c-format
 msgid "Usage: %s [options] [parameters] [file]...\n"
 msgstr ""
 
 #. print module name
-#: src/interface/main.c:939
+#: src/interface/main.c:948
 #, c-format
 msgid "%s module options:\n"
 msgstr ""
 
-#: src/interface/main.c:959 src/interface/main.c:963
+#: src/interface/main.c:981 src/interface/main.c:985
 msgid " <string>"
 msgstr ""
 
-#: src/interface/main.c:970 src/interface/main.c:974
+#: src/interface/main.c:992 src/interface/main.c:996
 msgid " <integer>"
 msgstr ""
 
-#: src/interface/main.c:995
+#: src/interface/main.c:1003 src/interface/main.c:1007
+msgid " <float>"
+msgstr ""
+
+#: src/interface/main.c:1028
 msgid ""
 "\n"
 "Playlist items:\n"
-"  *.mpg, *.vob                   \tplain MPEG-1/2 files\n"
+"  *.mpg, *.vob                   plain MPEG-1/2 files\n"
 "  [dvd:][device][@raw_device][@[title][,[chapter][,angle]]]\n"
-"                                 \tDVD device\n"
+"                                 DVD device\n"
 "  [vcd:][device][@[title][,[chapter]]\n"
-"                                 \tVCD device\n"
+"                                 VCD device\n"
 "  udpstream:[@[<bind address>][:<bind port>]]\n"
-"                                 \tUDP stream sent by VLS\n"
-"  vlc:loop                       \tloop execution of the playlist\n"
-"  vlc:pause                      \tpause execution of playlist items\n"
-"  vlc:quit                       \tquit VLC"
+"                                 UDP stream sent by VLS\n"
+"  vlc:loop                       loop execution of the playlist\n"
+"  vlc:pause                      pause execution of playlist items\n"
+"  vlc:quit                       quit VLC"
 msgstr ""
 
-#: src/interface/main.c:1015 src/interface/main.c:1064
-#: src/interface/main.c:1088
+#: src/interface/main.c:1048 src/interface/main.c:1097
+#: src/interface/main.c:1121
 msgid ""
 "\n"
 "Press the RETURN key to continue..."
 msgstr ""
 
-#: src/interface/main.c:1041
+#: src/interface/main.c:1074
 msgid "[plugin]              [description]"
 msgstr ""
 
-#: src/interface/main.c:1082
+#: src/interface/main.c:1115
 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"
@@ -499,15 +511,20 @@ msgid ""
 "Written by the VideoLAN team at Ecole Centrale, Paris."
 msgstr ""
 
-#: src/misc/configuration.c:612
+#: src/misc/configuration.c:680
 msgid "<boolean>"
 msgstr ""
 
-#: src/misc/configuration.c:613
+#: src/misc/configuration.c:680
 msgid "<integer>"
 msgstr ""
 
-#: src/misc/configuration.c:620
+#: src/misc/configuration.c:687
+#, c-format
+msgid "# %s <float>\n"
+msgstr ""
+
+#: src/misc/configuration.c:694
 #, c-format
 msgid "# %s <string>\n"
 msgstr ""
@@ -1084,7 +1101,7 @@ msgstr ""
 #: plugins/gtk/gtk_interface.c:1387 plugins/gtk/gtk_interface.c:1610
 #: plugins/gtk/gtk_interface.c:1900 plugins/gtk/gtk_interface.c:2025
 #: plugins/gtk/gtk_interface.c:2256 plugins/gtk/gtk_interface.c:2362
-#: plugins/gtk/gtk_interface.c:2568 plugins/gtk/gtk_preferences.c:501
+#: plugins/gtk/gtk_interface.c:2568 plugins/gtk/gtk_preferences.c:522
 msgid "OK"
 msgstr ""
 
@@ -1134,7 +1151,7 @@ msgstr "
 
 #: plugins/gtk/gtk_interface.c:1617 plugins/gtk/gtk_interface.c:1907
 #: plugins/gtk/gtk_interface.c:2032 plugins/gtk/gtk_interface.c:2263
-#: plugins/gtk/gtk_interface.c:2575 plugins/gtk/gtk_preferences.c:513
+#: plugins/gtk/gtk_interface.c:2575 plugins/gtk/gtk_preferences.c:534
 msgid "Cancel"
 msgstr "¥­¥ã¥ó¥»¥ë"
 
@@ -1421,7 +1438,7 @@ msgstr ""
 msgid "Invert"
 msgstr ""
 
-#: plugins/gtk/gnome_interface.c:1755 plugins/gtk/gtk_preferences.c:358
+#: plugins/gtk/gnome_interface.c:1755 plugins/gtk/gtk_preferences.c:360
 msgid "Select"
 msgstr "ÁªÂò"
 
@@ -1447,31 +1464,31 @@ msgstr "
 msgid "6/7"
 msgstr ""
 
-#: plugins/gtk/gtk_preferences.c:304
+#: plugins/gtk/gtk_preferences.c:306
 msgid "Name"
 msgstr ""
 
-#: plugins/gtk/gtk_preferences.c:304
+#: plugins/gtk/gtk_preferences.c:306
 #, fuzzy
 msgid "Description"
 msgstr "¶ËÀ­"
 
-#: plugins/gtk/gtk_preferences.c:347
+#: plugins/gtk/gtk_preferences.c:349
 msgid "Configure"
 msgstr ""
 
 #. add new label
-#: plugins/gtk/gtk_preferences.c:370
+#: plugins/gtk/gtk_preferences.c:372
 #, fuzzy
 msgid "Selected:"
 msgstr "ÁªÂòºÑ¤ß"
 
-#: plugins/gtk/gtk_preferences.c:492 plugins/gtk/gtk_preferences.c:509
+#: plugins/gtk/gtk_preferences.c:513 plugins/gtk/gtk_preferences.c:530
 #, fuzzy
 msgid "Save"
 msgstr "¥µ¡¼¥Ð¡¼"
 
-#: plugins/gtk/gtk_preferences.c:505
+#: plugins/gtk/gtk_preferences.c:526
 msgid "Apply"
 msgstr ""
 

diff --git a/po/nl.po b/po/nl.po
index 8cddc3b0609ddba1a223f232b86a9b0207fbf2b3..ae033525f1760cc9ea7feeca2fd313503612d365 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-04-21 12:23+0200\n"
+"POT-Creation-Date: 2002-04-21 20:27+0200\n"
 "PO-Revision-Date: 2002-04-20 16:58GMT\n"
 "Last-Translator: Jean-Paul Saman <jpsaman@wxs.nl>\n"
 "Language-Team: Nederlands <nl@li.org>\n"
@@ -211,10 +211,18 @@ msgstr ""
 "Noot: Standaard zal vlc zich aan de video karakteristieken aan passen."
 
 #: src/interface/main.c:186
+msgid "zoom video"
+msgstr ""
+
+#: src/interface/main.c:188
+msgid "You can zoom the video by the specified factor."
+msgstr ""
+
+#: src/interface/main.c:190
 msgid "grayscale video output"
 msgstr "grijswaarden video output"
 
-#: src/interface/main.c:188
+#: src/interface/main.c:192
 msgid ""
 "Using this option, vlc will not decode the color information from the video "
 "(this can also allow you to save some processing power)."
@@ -222,23 +230,23 @@ msgstr ""
 "Het gebruiken van deze optie resulteert in de afwezigheid van kleuren. (Dit "
 "kan rekenkracht besparen.)"
 
-#: src/interface/main.c:191
+#: src/interface/main.c:195
 #, fuzzy
 msgid "fullscreen video output"
 msgstr "Volledig scherm kleur diepte:"
 
-#: src/interface/main.c:193
+#: src/interface/main.c:197
 msgid ""
 "If this option is enabled, vlc will always start a video in fullscreen mode."
 msgstr ""
 "Als deze optie gebruikt wordt, dan zal vlc een video altijd op volledige "
 "scherm grote afspelen."
 
-#: src/interface/main.c:196
+#: src/interface/main.c:200
 msgid "disable hardware acceleration for the video output"
 msgstr "schakel hardware versnelling voor video output uit."
 
-#: src/interface/main.c:198
+#: src/interface/main.c:202
 msgid ""
 "By default vlc will try to take advantage of the overlay capabilities of you "
 "graphics card."
@@ -246,159 +254,159 @@ msgstr ""
 "Standaard probeert vlc snelheids winst te halen uit het gebruik van overlay "
 "mogelijkheden van de aanwezige grafische kaart."
 
-#: src/interface/main.c:201
+#: src/interface/main.c:205
 msgid "force SPU position"
 msgstr "forceer SPU positie"
 
-#: src/interface/main.c:204
+#: src/interface/main.c:208
 msgid "video filter module"
 msgstr ""
 
-#: src/interface/main.c:207
+#: src/interface/main.c:211
 msgid "server port"
 msgstr "server poort:"
 
-#: src/interface/main.c:210
+#: src/interface/main.c:214
 msgid "enable network channel mode"
 msgstr "schakel netwerk kanaal mode in"
 
-#: src/interface/main.c:213
+#: src/interface/main.c:217
 msgid "channel server address"
 msgstr "Kanaal server adres:"
 
-#: src/interface/main.c:216
+#: src/interface/main.c:220
 msgid "channel server port"
 msgstr "Kanaal server poort:"
 
-#: src/interface/main.c:219
+#: src/interface/main.c:223
 msgid "network interface"
 msgstr "netwerk interface"
 
-#: src/interface/main.c:222
+#: src/interface/main.c:226
 msgid "choose program (SID)"
 msgstr "selecteer programma (SID)"
 
-#: src/interface/main.c:224
+#: src/interface/main.c:228
 msgid "Choose the program to select by giving its Service ID."
 msgstr "Selecteer een programma door middel van zijn bekende Service ID."
 
-#: src/interface/main.c:226
+#: src/interface/main.c:230
 msgid "choose audio"
 msgstr "selecteer audio"
 
-#: src/interface/main.c:229
+#: src/interface/main.c:233
 msgid "choose channel"
 msgstr "selecteer een kanaal"
 
-#: src/interface/main.c:232
+#: src/interface/main.c:236
 msgid "choose subtitles"
 msgstr "selecteer een ondertitel"
 
-#: src/interface/main.c:235
+#: src/interface/main.c:239
 msgid "DVD device"
 msgstr "DVD apparaat"
 
-#: src/interface/main.c:238
+#: src/interface/main.c:242
 msgid "VCD device"
 msgstr "VCD apparaat"
 
-#: src/interface/main.c:241
+#: src/interface/main.c:245
 msgid "satellite transponder frequency"
 msgstr "sateliet transponder frequentie"
 
-#: src/interface/main.c:244
+#: src/interface/main.c:248
 msgid "satellite transponder polarization"
 msgstr "sateliet transponder polarisatie"
 
-#: src/interface/main.c:247
+#: src/interface/main.c:251
 msgid "satellite transponder FEC"
 msgstr "sateliet transponder FEC"
 
-#: src/interface/main.c:250
+#: src/interface/main.c:254
 msgid "satellite transponder symbol rate"
 msgstr "sateliet transponder symbool snelheid"
 
-#: src/interface/main.c:253
+#: src/interface/main.c:257
 msgid "use diseqc with antenna"
 msgstr "gebruik disecq met antenne"
 
-#: src/interface/main.c:256
+#: src/interface/main.c:260
 msgid "antenna lnb_lof1 (kHz)"
 msgstr "antenne lnb_lof1 (kHz)"
 
-#: src/interface/main.c:259
+#: src/interface/main.c:263
 msgid "antenna lnb_lof2 (kHz)"
 msgstr "antenne lnb_lof2 (kHz)"
 
-#: src/interface/main.c:262
+#: src/interface/main.c:266
 msgid "antenna lnb_slof (kHz)"
 msgstr "antenne lnb_slof (kHz)"
 
-#: src/interface/main.c:265
+#: src/interface/main.c:269
 msgid "force IPv6"
 msgstr "forceer IPv6"
 
-#: src/interface/main.c:268
+#: src/interface/main.c:272
 msgid "force IPv4"
 msgstr "forceer IPv4"
 
-#: src/interface/main.c:271
+#: src/interface/main.c:275
 msgid "choose MPEG audio decoder"
 msgstr "selecteer MPEG audio decoder"
 
-#: src/interface/main.c:274
+#: src/interface/main.c:278
 msgid "choose AC3 audio decoder"
 msgstr "selecteer AC3 audio decoder"
 
-#: src/interface/main.c:277
+#: src/interface/main.c:281
 msgid "use additional processors"
 msgstr "gebruik extra processors"
 
-#: src/interface/main.c:280
+#: src/interface/main.c:284
 msgid "force synchro algorithm {I|I+|IP|IP+|IPB}"
 msgstr "forceer synchronisatie algorithme {I|I+|IP|IP+|IPB}"
 
-#: src/interface/main.c:283
+#: src/interface/main.c:287
 msgid "disable CPU's MMX support"
 msgstr "schakel CPU's MMU support uit"
 
-#: src/interface/main.c:286
+#: src/interface/main.c:290
 msgid "disable CPU's 3D Now! support"
 msgstr "schakel CPU's 3D Now! support uit"
 
-#: src/interface/main.c:289
+#: src/interface/main.c:293
 msgid "disable CPU's MMX EXT support"
 msgstr "schakel CPU's MMX EXT support uit"
 
-#: src/interface/main.c:292
+#: src/interface/main.c:296
 msgid "disable CPU's SSE support"
 msgstr "schakel CPU's SSE support uit"
 
-#: src/interface/main.c:295
+#: src/interface/main.c:299
 msgid "disable CPU's AltiVec support"
 msgstr "schakel CPU's AltiVec support uit"
 
-#: src/interface/main.c:298
+#: src/interface/main.c:302
 msgid "launch playlist on startup"
 msgstr "lanceer speellijst bij opstarten"
 
-#: src/interface/main.c:301
+#: src/interface/main.c:305
 msgid "enqueue playlist as default"
 msgstr "standaard in wachtrij plaatsen"
 
-#: src/interface/main.c:304
+#: src/interface/main.c:308
 msgid "loop playlist on end"
 msgstr "begin voor aan na einde speellijst"
 
-#: src/interface/main.c:307
+#: src/interface/main.c:311
 msgid "memory copy module"
 msgstr "geheugen kopieer module"
 
-#: src/interface/main.c:310
+#: src/interface/main.c:314
 msgid "fast pthread on NT/2K/XP (developpers only)"
 msgstr "snelle pthread op NT/2K/XP (alleen ontwikkelaars)"
 
-#: src/interface/main.c:312
+#: src/interface/main.c:316
 msgid ""
 "On Windows NT/2K/XP we use a slow but correct pthread implementation, you "
 "can also use this faster implementation but you might experience problems "
@@ -410,39 +418,39 @@ msgstr ""
 "optreden met deze snellere implementatie."
 
 #. Interface options
-#: src/interface/main.c:334
+#: src/interface/main.c:338
 msgid "Interface"
 msgstr ""
 
 #. Audio options
-#: src/interface/main.c:341
+#: src/interface/main.c:345
 msgid "Audio"
 msgstr ""
 
 #. Video options
-#: src/interface/main.c:352
+#: src/interface/main.c:356
 msgid "Video"
 msgstr ""
 
 #. Input options
-#: src/interface/main.c:364
+#: src/interface/main.c:369
 msgid "Input"
 msgstr ""
 
 #. Decoder options
-#: src/interface/main.c:398
+#: src/interface/main.c:403
 msgid "Decoders"
 msgstr ""
 
 #. CPU options
-#: src/interface/main.c:405
+#: src/interface/main.c:410
 msgid "CPU"
 msgstr ""
 
 #. Playlist options
 #: plugins/gtk/gnome_interface.c:506 plugins/gtk/gnome_interface.c:1806
 #: plugins/gtk/gnome_interface.c:1830 plugins/gtk/gtk_interface.c:611
-#: plugins/gtk/gtk_interface.c:2084 src/interface/main.c:413
+#: plugins/gtk/gtk_interface.c:2084 src/interface/main.c:418
 msgid "Playlist"
 msgstr "Speellijst"
 
@@ -450,68 +458,74 @@ msgstr "Speellijst"
 #: plugins/ac3_adec/ac3_adec.c:77 plugins/dsp/dsp.c:42 plugins/fb/fb.c:72
 #: plugins/ggi/ggi.c:68 plugins/gtk/gnome.c:73 plugins/gtk/gtk.c:74
 #: plugins/mga/xmga.c:111 plugins/mpeg_vdec/video_parser.c:80
-#: plugins/x11/x11.c:55 plugins/x11/xvideo.c:60 src/interface/main.c:419
+#: plugins/x11/x11.c:55 plugins/x11/xvideo.c:60 src/interface/main.c:424
 msgid "Miscellaneous"
 msgstr "Overige"
 
-#: src/interface/main.c:429
+#: src/interface/main.c:434
 msgid "main program"
 msgstr "hoofd programma"
 
-#: src/interface/main.c:442
-msgid "print help (or use -h)"
-msgstr "print help (of gebruik -h)"
+#: src/interface/main.c:448
+msgid "print help"
+msgstr "print help"
 
-#: src/interface/main.c:444
-msgid "print detailed help (or use -H)"
-msgstr "print gedetailleerde help (of gebruik -H)"
+#: src/interface/main.c:450
+msgid "print detailed help"
+msgstr "print gedetailleerde help"
 
-#: src/interface/main.c:446
-msgid "print a list of available plugins (or use -l)"
-msgstr "print een lijst van beschikbare plugins (of gebruik -l)"
+#: src/interface/main.c:452
+msgid "print a list of available plugins"
+msgstr "print een lijst van beschikbare plugins"
 
-#: src/interface/main.c:448
-msgid "print help on plugin (or use -p)"
-msgstr "print help over plugin (of gebruik -p)"
+#: src/interface/main.c:454
+#, fuzzy
+msgid "print help on plugin <string>"
+msgstr "print help over plugin <string>"
 
-#: src/interface/main.c:450
+#: src/interface/main.c:457
 msgid "print version information"
 msgstr "print versie informatie"
 
 #. Usage
-#: src/interface/main.c:614 src/interface/main.c:1038
+#: src/interface/main.c:622 src/interface/main.c:1071
 #, c-format
 msgid "Usage: %s [options] [parameters] [file]...\n"
 msgstr "Gebruik: %s [opties] [parameters] [file] ...\n"
 
 #. print module name
-#: src/interface/main.c:939
+#: src/interface/main.c:948
 #, c-format
 msgid "%s module options:\n"
 msgstr "%s module opties:\n"
 
-#: src/interface/main.c:959 src/interface/main.c:963
+#: src/interface/main.c:981 src/interface/main.c:985
 msgid " <string>"
 msgstr ""
 
-#: src/interface/main.c:970 src/interface/main.c:974
+#: src/interface/main.c:992 src/interface/main.c:996
 msgid " <integer>"
 msgstr ""
 
-#: src/interface/main.c:995
+#: src/interface/main.c:1003 src/interface/main.c:1007
+msgid " <float>"
+msgstr ""
+
+#: src/interface/main.c:1028
+#, fuzzy
 msgid ""
 "\n"
 "Playlist items:\n"
-"  *.mpg, *.vob                   \tplain MPEG-1/2 files\n"
+"  *.mpg, *.vob                   plain MPEG-1/2 files\n"
 "  [dvd:][device][@raw_device][@[title][,[chapter][,angle]]]\n"
-"                                 \tDVD device\n"
+"                                 DVD device\n"
 "  [vcd:][device][@[title][,[chapter]]\n"
-"                                 \tVCD device\n"
+"                                 VCD device\n"
 "  udpstream:[@[<bind address>][:<bind port>]]\n"
-"                                 \tUDP stream sent by VLS\n"
-"  vlc:loop                       \tloop execution of the playlist\n"
-"  vlc:pause                      \tpause execution of playlist items\n"
-"  vlc:quit                       \tquit VLC"
+"                                 UDP stream sent by VLS\n"
+"  vlc:loop                       loop execution of the playlist\n"
+"  vlc:pause                      pause execution of playlist items\n"
+"  vlc:quit                       quit VLC"
 msgstr ""
 "\n"
 "Speellijst items:\n"
@@ -526,8 +540,8 @@ msgstr ""
 "  vlc:pause                      \tpauzeer speellijst items\n"
 "  vlc:quit                       \tstop VLC"
 
-#: src/interface/main.c:1015 src/interface/main.c:1064
-#: src/interface/main.c:1088
+#: src/interface/main.c:1048 src/interface/main.c:1097
+#: src/interface/main.c:1121
 msgid ""
 "\n"
 "Press the RETURN key to continue..."
@@ -535,11 +549,11 @@ msgstr ""
 "\n"
 "Druk op RETURN om verder te gaan..."
 
-#: src/interface/main.c:1041
+#: src/interface/main.c:1074
 msgid "[plugin]              [description]"
 msgstr "[plugin]              [beschrijving]"
 
-#: src/interface/main.c:1082
+#: src/interface/main.c:1115
 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"
@@ -553,15 +567,20 @@ msgstr ""
 "zie het bestand COPYING voor details.\n"
 "Geschreven door het VideoLAN team at Ecole Centrale, Paris."
 
-#: src/misc/configuration.c:612
+#: src/misc/configuration.c:680
 msgid "<boolean>"
 msgstr ""
 
-#: src/misc/configuration.c:613
+#: src/misc/configuration.c:680
 msgid "<integer>"
 msgstr ""
 
-#: src/misc/configuration.c:620
+#: src/misc/configuration.c:687
+#, c-format
+msgid "# %s <float>\n"
+msgstr ""
+
+#: src/misc/configuration.c:694
 #, c-format
 msgid "# %s <string>\n"
 msgstr ""
@@ -1140,7 +1159,7 @@ msgstr ""
 #: plugins/gtk/gtk_interface.c:1387 plugins/gtk/gtk_interface.c:1610
 #: plugins/gtk/gtk_interface.c:1900 plugins/gtk/gtk_interface.c:2025
 #: plugins/gtk/gtk_interface.c:2256 plugins/gtk/gtk_interface.c:2362
-#: plugins/gtk/gtk_interface.c:2568 plugins/gtk/gtk_preferences.c:501
+#: plugins/gtk/gtk_interface.c:2568 plugins/gtk/gtk_preferences.c:522
 msgid "OK"
 msgstr ""
 
@@ -1190,7 +1209,7 @@ msgstr "Apparaat naam"
 
 #: plugins/gtk/gtk_interface.c:1617 plugins/gtk/gtk_interface.c:1907
 #: plugins/gtk/gtk_interface.c:2032 plugins/gtk/gtk_interface.c:2263
-#: plugins/gtk/gtk_interface.c:2575 plugins/gtk/gtk_preferences.c:513
+#: plugins/gtk/gtk_interface.c:2575 plugins/gtk/gtk_preferences.c:534
 msgid "Cancel"
 msgstr "Annuleer"
 
@@ -1470,7 +1489,7 @@ msgstr "Verklein"
 msgid "Invert"
 msgstr "Inverteer"
 
-#: plugins/gtk/gnome_interface.c:1755 plugins/gtk/gtk_preferences.c:358
+#: plugins/gtk/gnome_interface.c:1755 plugins/gtk/gtk_preferences.c:360
 msgid "Select"
 msgstr "Selecteer"
 
@@ -1495,28 +1514,28 @@ msgstr "Kanaal server"
 msgid "6/7"
 msgstr ""
 
-#: plugins/gtk/gtk_preferences.c:304
+#: plugins/gtk/gtk_preferences.c:306
 msgid "Name"
 msgstr "Naam"
 
-#: plugins/gtk/gtk_preferences.c:304
+#: plugins/gtk/gtk_preferences.c:306
 msgid "Description"
 msgstr "Beschrijving"
 
-#: plugins/gtk/gtk_preferences.c:347
+#: plugins/gtk/gtk_preferences.c:349
 msgid "Configure"
 msgstr "Configureer"
 
 #. add new label
-#: plugins/gtk/gtk_preferences.c:370
+#: plugins/gtk/gtk_preferences.c:372
 msgid "Selected:"
 msgstr "Geselecteerd:"
 
-#: plugins/gtk/gtk_preferences.c:492 plugins/gtk/gtk_preferences.c:509
+#: plugins/gtk/gtk_preferences.c:513 plugins/gtk/gtk_preferences.c:530
 msgid "Save"
 msgstr "Bewaar"
 
-#: plugins/gtk/gtk_preferences.c:505
+#: plugins/gtk/gtk_preferences.c:526
 msgid "Apply"
 msgstr "Voer uit"
 

diff --git a/po/no.po b/po/no.po
index d20102b48528e52ad185eca7b36ce0aa268c8d01..0449d73e898f9352eb1765cbb14b8e55e0f3f4e6 100644 (file)
--- a/po/no.po
+++ b/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vlc-cvs\n"
-"POT-Creation-Date: 2002-04-21 12:23+0200\n"
+"POT-Creation-Date: 2002-04-21 20:27+0200\n"
 "PO-Revision-Date: 2002-28-02 23.35+0100\n"
 "Last-Translator: Sigmund Augdal <sigmunau@idi.ntnu.no>.\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -178,200 +178,209 @@ msgid ""
 msgstr ""
 
 #: src/interface/main.c:186
+#, fuzzy
+msgid "zoom video"
+msgstr "xvideo"
+
+#: src/interface/main.c:188
+msgid "You can zoom the video by the specified factor."
+msgstr ""
+
+#: src/interface/main.c:190
 msgid "grayscale video output"
 msgstr ""
 
-#: src/interface/main.c:188
+#: src/interface/main.c:192
 msgid ""
 "Using this option, vlc will not decode the color information from the video "
 "(this can also allow you to save some processing power)."
 msgstr ""
 
-#: src/interface/main.c:191
+#: src/interface/main.c:195
 #, fuzzy
 msgid "fullscreen video output"
 msgstr "Fullskjermdybde:"
 
-#: src/interface/main.c:193
+#: src/interface/main.c:197
 msgid ""
 "If this option is enabled, vlc will always start a video in fullscreen mode."
 msgstr ""
 
-#: src/interface/main.c:196
+#: src/interface/main.c:200
 msgid "disable hardware acceleration for the video output"
 msgstr ""
 
-#: src/interface/main.c:198
+#: src/interface/main.c:202
 msgid ""
 "By default vlc will try to take advantage of the overlay capabilities of you "
 "graphics card."
 msgstr ""
 
-#: src/interface/main.c:201
+#: src/interface/main.c:205
 msgid "force SPU position"
 msgstr ""
 
-#: src/interface/main.c:204
+#: src/interface/main.c:208
 #, fuzzy
 msgid "video filter module"
 msgstr "Standard grensesnitt: "
 
-#: src/interface/main.c:207
+#: src/interface/main.c:211
 #, fuzzy
 msgid "server port"
 msgstr "Ingen tjener !"
 
-#: src/interface/main.c:210
+#: src/interface/main.c:214
 #, fuzzy
 msgid "enable network channel mode"
 msgstr "Nettverkskanal:"
 
-#: src/interface/main.c:213
+#: src/interface/main.c:217
 #, fuzzy
 msgid "channel server address"
 msgstr "Kanaltjener:"
 
-#: src/interface/main.c:216
+#: src/interface/main.c:220
 #, fuzzy
 msgid "channel server port"
 msgstr "Kanaltjener:"
 
-#: src/interface/main.c:219
+#: src/interface/main.c:223
 #, fuzzy
 msgid "network interface"
 msgstr "_Gjem grensesnitt"
 
-#: src/interface/main.c:222
+#: src/interface/main.c:226
 #, fuzzy
 msgid "choose program (SID)"
 msgstr "Avslutt programmet"
 
-#: src/interface/main.c:224
+#: src/interface/main.c:228
 msgid "Choose the program to select by giving its Service ID."
 msgstr ""
 
-#: src/interface/main.c:226
+#: src/interface/main.c:230
 msgid "choose audio"
 msgstr ""
 
-#: src/interface/main.c:229
+#: src/interface/main.c:233
 #, fuzzy
 msgid "choose channel"
 msgstr "Velg Kapittel"
 
-#: src/interface/main.c:232
+#: src/interface/main.c:236
 #, fuzzy
 msgid "choose subtitles"
 msgstr "Velg tittel"
 
-#: src/interface/main.c:235
+#: src/interface/main.c:239
 msgid "DVD device"
 msgstr ""
 
-#: src/interface/main.c:238
+#: src/interface/main.c:242
 msgid "VCD device"
 msgstr ""
 
-#: src/interface/main.c:241
+#: src/interface/main.c:245
 msgid "satellite transponder frequency"
 msgstr ""
 
-#: src/interface/main.c:244
+#: src/interface/main.c:248
 msgid "satellite transponder polarization"
 msgstr ""
 
-#: src/interface/main.c:247
+#: src/interface/main.c:251
 msgid "satellite transponder FEC"
 msgstr ""
 
-#: src/interface/main.c:250
+#: src/interface/main.c:254
 msgid "satellite transponder symbol rate"
 msgstr ""
 
-#: src/interface/main.c:253
+#: src/interface/main.c:257
 msgid "use diseqc with antenna"
 msgstr ""
 
-#: src/interface/main.c:256
+#: src/interface/main.c:260
 msgid "antenna lnb_lof1 (kHz)"
 msgstr ""
 
-#: src/interface/main.c:259
+#: src/interface/main.c:263
 msgid "antenna lnb_lof2 (kHz)"
 msgstr ""
 
-#: src/interface/main.c:262
+#: src/interface/main.c:266
 msgid "antenna lnb_slof (kHz)"
 msgstr ""
 
-#: src/interface/main.c:265
+#: src/interface/main.c:269
 msgid "force IPv6"
 msgstr ""
 
-#: src/interface/main.c:268
+#: src/interface/main.c:272
 msgid "force IPv4"
 msgstr ""
 
-#: src/interface/main.c:271
+#: src/interface/main.c:275
 msgid "choose MPEG audio decoder"
 msgstr ""
 
-#: src/interface/main.c:274
+#: src/interface/main.c:278
 msgid "choose AC3 audio decoder"
 msgstr ""
 
-#: src/interface/main.c:277
+#: src/interface/main.c:281
 msgid "use additional processors"
 msgstr ""
 
-#: src/interface/main.c:280
+#: src/interface/main.c:284
 msgid "force synchro algorithm {I|I+|IP|IP+|IPB}"
 msgstr ""
 
-#: src/interface/main.c:283
+#: src/interface/main.c:287
 msgid "disable CPU's MMX support"
 msgstr ""
 
-#: src/interface/main.c:286
+#: src/interface/main.c:290
 msgid "disable CPU's 3D Now! support"
 msgstr ""
 
-#: src/interface/main.c:289
+#: src/interface/main.c:293
 msgid "disable CPU's MMX EXT support"
 msgstr ""
 
-#: src/interface/main.c:292
+#: src/interface/main.c:296
 msgid "disable CPU's SSE support"
 msgstr ""
 
-#: src/interface/main.c:295
+#: src/interface/main.c:299
 msgid "disable CPU's AltiVec support"
 msgstr ""
 
-#: src/interface/main.c:298
+#: src/interface/main.c:302
 #, fuzzy
 msgid "launch playlist on startup"
 msgstr "Kjør ved oppstart"
 
-#: src/interface/main.c:301
+#: src/interface/main.c:305
 #, fuzzy
 msgid "enqueue playlist as default"
 msgstr "Legg til i kø som standard"
 
-#: src/interface/main.c:304
+#: src/interface/main.c:308
 #, fuzzy
 msgid "loop playlist on end"
 msgstr "Gå tilbake til start ved slutten av Spillelisten"
 
-#: src/interface/main.c:307
+#: src/interface/main.c:311
 msgid "memory copy module"
 msgstr ""
 
-#: src/interface/main.c:310
+#: src/interface/main.c:314
 msgid "fast pthread on NT/2K/XP (developpers only)"
 msgstr ""
 
-#: src/interface/main.c:312
+#: src/interface/main.c:316
 msgid ""
 "On Windows NT/2K/XP we use a slow but correct pthread implementation, you "
 "can also use this faster implementation but you might experience problems "
@@ -379,39 +388,39 @@ msgid ""
 msgstr ""
 
 #. Interface options
-#: src/interface/main.c:334
+#: src/interface/main.c:338
 msgid "Interface"
 msgstr "Grensesnitt"
 
 #. Audio options
-#: src/interface/main.c:341
+#: src/interface/main.c:345
 msgid "Audio"
 msgstr "Lyd"
 
 #. Video options
-#: src/interface/main.c:352
+#: src/interface/main.c:356
 msgid "Video"
 msgstr "Video"
 
 #. Input options
-#: src/interface/main.c:364
+#: src/interface/main.c:369
 msgid "Input"
 msgstr ""
 
 #. Decoder options
-#: src/interface/main.c:398
+#: src/interface/main.c:403
 msgid "Decoders"
 msgstr ""
 
 #. CPU options
-#: src/interface/main.c:405
+#: src/interface/main.c:410
 msgid "CPU"
 msgstr ""
 
 #. Playlist options
 #: plugins/gtk/gnome_interface.c:506 plugins/gtk/gnome_interface.c:1806
 #: plugins/gtk/gnome_interface.c:1830 plugins/gtk/gtk_interface.c:611
-#: plugins/gtk/gtk_interface.c:2084 src/interface/main.c:413
+#: plugins/gtk/gtk_interface.c:2084 src/interface/main.c:418
 msgid "Playlist"
 msgstr "Spilleliste"
 
@@ -419,83 +428,87 @@ msgstr "Spilleliste"
 #: plugins/ac3_adec/ac3_adec.c:77 plugins/dsp/dsp.c:42 plugins/fb/fb.c:72
 #: plugins/ggi/ggi.c:68 plugins/gtk/gnome.c:73 plugins/gtk/gtk.c:74
 #: plugins/mga/xmga.c:111 plugins/mpeg_vdec/video_parser.c:80
-#: plugins/x11/x11.c:55 plugins/x11/xvideo.c:60 src/interface/main.c:419
+#: plugins/x11/x11.c:55 plugins/x11/xvideo.c:60 src/interface/main.c:424
 msgid "Miscellaneous"
 msgstr ""
 
-#: src/interface/main.c:429
+#: src/interface/main.c:434
 #, fuzzy
 msgid "main program"
 msgstr "Avslutt programmet"
 
-#: src/interface/main.c:442
-msgid "print help (or use -h)"
+#: src/interface/main.c:448
+msgid "print help"
 msgstr ""
 
-#: src/interface/main.c:444
-msgid "print detailed help (or use -H)"
+#: src/interface/main.c:450
+msgid "print detailed help"
 msgstr ""
 
-#: src/interface/main.c:446
-msgid "print a list of available plugins (or use -l)"
+#: src/interface/main.c:452
+msgid "print a list of available plugins"
 msgstr ""
 
-#: src/interface/main.c:448
-msgid "print help on plugin (or use -p)"
+#: src/interface/main.c:454
+msgid "print help on plugin <string>"
 msgstr ""
 
-#: src/interface/main.c:450
+#: src/interface/main.c:457
 msgid "print version information"
 msgstr ""
 
 #. Usage
-#: src/interface/main.c:614 src/interface/main.c:1038
+#: src/interface/main.c:622 src/interface/main.c:1071
 #, c-format
 msgid "Usage: %s [options] [parameters] [file]...\n"
 msgstr ""
 
 #. print module name
-#: src/interface/main.c:939
+#: src/interface/main.c:948
 #, c-format
 msgid "%s module options:\n"
 msgstr ""
 
-#: src/interface/main.c:959 src/interface/main.c:963
+#: src/interface/main.c:981 src/interface/main.c:985
 msgid " <string>"
 msgstr ""
 
-#: src/interface/main.c:970 src/interface/main.c:974
+#: src/interface/main.c:992 src/interface/main.c:996
 msgid " <integer>"
 msgstr ""
 
-#: src/interface/main.c:995
+#: src/interface/main.c:1003 src/interface/main.c:1007
+msgid " <float>"
+msgstr ""
+
+#: src/interface/main.c:1028
 msgid ""
 "\n"
 "Playlist items:\n"
-"  *.mpg, *.vob                   \tplain MPEG-1/2 files\n"
+"  *.mpg, *.vob                   plain MPEG-1/2 files\n"
 "  [dvd:][device][@raw_device][@[title][,[chapter][,angle]]]\n"
-"                                 \tDVD device\n"
+"                                 DVD device\n"
 "  [vcd:][device][@[title][,[chapter]]\n"
-"                                 \tVCD device\n"
+"                                 VCD device\n"
 "  udpstream:[@[<bind address>][:<bind port>]]\n"
-"                                 \tUDP stream sent by VLS\n"
-"  vlc:loop                       \tloop execution of the playlist\n"
-"  vlc:pause                      \tpause execution of playlist items\n"
-"  vlc:quit                       \tquit VLC"
+"                                 UDP stream sent by VLS\n"
+"  vlc:loop                       loop execution of the playlist\n"
+"  vlc:pause                      pause execution of playlist items\n"
+"  vlc:quit                       quit VLC"
 msgstr ""
 
-#: src/interface/main.c:1015 src/interface/main.c:1064
-#: src/interface/main.c:1088
+#: src/interface/main.c:1048 src/interface/main.c:1097
+#: src/interface/main.c:1121
 msgid ""
 "\n"
 "Press the RETURN key to continue..."
 msgstr ""
 
-#: src/interface/main.c:1041
+#: src/interface/main.c:1074
 msgid "[plugin]              [description]"
 msgstr ""
 
-#: src/interface/main.c:1082
+#: src/interface/main.c:1115
 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"
@@ -503,15 +516,20 @@ msgid ""
 "Written by the VideoLAN team at Ecole Centrale, Paris."
 msgstr ""
 
-#: src/misc/configuration.c:612
+#: src/misc/configuration.c:680
 msgid "<boolean>"
 msgstr ""
 
-#: src/misc/configuration.c:613
+#: src/misc/configuration.c:680
 msgid "<integer>"
 msgstr ""
 
-#: src/misc/configuration.c:620
+#: src/misc/configuration.c:687
+#, c-format
+msgid "# %s <float>\n"
+msgstr ""
+
+#: src/misc/configuration.c:694
 #, c-format
 msgid "# %s <string>\n"
 msgstr ""
@@ -1098,7 +1116,7 @@ msgstr ""
 #: plugins/gtk/gtk_interface.c:1387 plugins/gtk/gtk_interface.c:1610
 #: plugins/gtk/gtk_interface.c:1900 plugins/gtk/gtk_interface.c:2025
 #: plugins/gtk/gtk_interface.c:2256 plugins/gtk/gtk_interface.c:2362
-#: plugins/gtk/gtk_interface.c:2568 plugins/gtk/gtk_preferences.c:501
+#: plugins/gtk/gtk_interface.c:2568 plugins/gtk/gtk_preferences.c:522
 msgid "OK"
 msgstr "OK"
 
@@ -1148,7 +1166,7 @@ msgstr "Navn p
 
 #: plugins/gtk/gtk_interface.c:1617 plugins/gtk/gtk_interface.c:1907
 #: plugins/gtk/gtk_interface.c:2032 plugins/gtk/gtk_interface.c:2263
-#: plugins/gtk/gtk_interface.c:2575 plugins/gtk/gtk_preferences.c:513
+#: plugins/gtk/gtk_interface.c:2575 plugins/gtk/gtk_preferences.c:534
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -1436,7 +1454,7 @@ msgstr "Crop?"
 msgid "Invert"
 msgstr "Inverter"
 
-#: plugins/gtk/gnome_interface.c:1755 plugins/gtk/gtk_preferences.c:358
+#: plugins/gtk/gnome_interface.c:1755 plugins/gtk/gtk_preferences.c:360
 msgid "Select"
 msgstr "Velg"
 
@@ -1464,31 +1482,31 @@ msgstr "Kanaltjener:"
 msgid "6/7"
 msgstr ""
 
-#: plugins/gtk/gtk_preferences.c:304
+#: plugins/gtk/gtk_preferences.c:306
 msgid "Name"
 msgstr ""
 
-#: plugins/gtk/gtk_preferences.c:304
+#: plugins/gtk/gtk_preferences.c:306
 #, fuzzy
 msgid "Description"
 msgstr "Varighet"
 
-#: plugins/gtk/gtk_preferences.c:347
+#: plugins/gtk/gtk_preferences.c:349
 msgid "Configure"
 msgstr ""
 
 #. add new label
-#: plugins/gtk/gtk_preferences.c:370
+#: plugins/gtk/gtk_preferences.c:372
 #, fuzzy
 msgid "Selected:"
 msgstr "Valgte"
 
-#: plugins/gtk/gtk_preferences.c:492 plugins/gtk/gtk_preferences.c:509
+#: plugins/gtk/gtk_preferences.c:513 plugins/gtk/gtk_preferences.c:530
 #, fuzzy
 msgid "Save"
 msgstr "Tjener"
 
-#: plugins/gtk/gtk_preferences.c:505
+#: plugins/gtk/gtk_preferences.c:526
 msgid "Apply"
 msgstr "Bruk"
 
@@ -1955,9 +1973,6 @@ msgstr ""
 #~ msgid "sdl"
 #~ msgstr "sdl"
 
-#~ msgid "xvideo"
-#~ msgstr "xvideo"
-
 #~ msgid "x11"
 #~ msgstr "x11"
 

diff --git a/po/ru.po b/po/ru.po
index c5cf1e1cc6198df11fc5ac67e5491fd72ecd38ba..d326b3dd2103bebda2e29e4180451c4db3027b27 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-vlc\n"
-"POT-Creation-Date: 2002-04-21 12:23+0200\n"
+"POT-Creation-Date: 2002-04-21 20:27+0200\n"
 "PO-Revision-Date: 2001-02-19 19:58+03:00\n"
 "Last-Translator: Valek Filippov <frob@df.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -177,187 +177,195 @@ msgid ""
 msgstr ""
 
 #: src/interface/main.c:186
-msgid "grayscale video output"
+msgid "zoom video"
 msgstr ""
 
 #: src/interface/main.c:188
+msgid "You can zoom the video by the specified factor."
+msgstr ""
+
+#: src/interface/main.c:190
+msgid "grayscale video output"
+msgstr ""
+
+#: src/interface/main.c:192
 msgid ""
 "Using this option, vlc will not decode the color information from the video "
 "(this can also allow you to save some processing power)."
 msgstr ""
 
-#: src/interface/main.c:191
+#: src/interface/main.c:195
 msgid "fullscreen video output"
 msgstr ""
 
-#: src/interface/main.c:193
+#: src/interface/main.c:197
 msgid ""
 "If this option is enabled, vlc will always start a video in fullscreen mode."
 msgstr ""
 
-#: src/interface/main.c:196
+#: src/interface/main.c:200
 msgid "disable hardware acceleration for the video output"
 msgstr ""
 
-#: src/interface/main.c:198
+#: src/interface/main.c:202
 msgid ""
 "By default vlc will try to take advantage of the overlay capabilities of you "
 "graphics card."
 msgstr ""
 
-#: src/interface/main.c:201
+#: src/interface/main.c:205
 msgid "force SPU position"
 msgstr ""
 
-#: src/interface/main.c:204
+#: src/interface/main.c:208
 msgid "video filter module"
 msgstr ""
 
-#: src/interface/main.c:207
+#: src/interface/main.c:211
 msgid "server port"
 msgstr ""
 
-#: src/interface/main.c:210
+#: src/interface/main.c:214
 msgid "enable network channel mode"
 msgstr ""
 
-#: src/interface/main.c:213
+#: src/interface/main.c:217
 msgid "channel server address"
 msgstr ""
 
-#: src/interface/main.c:216
+#: src/interface/main.c:220
 msgid "channel server port"
 msgstr ""
 
-#: src/interface/main.c:219
+#: src/interface/main.c:223
 msgid "network interface"
 msgstr ""
 
-#: src/interface/main.c:222
+#: src/interface/main.c:226
 msgid "choose program (SID)"
 msgstr ""
 
-#: src/interface/main.c:224
+#: src/interface/main.c:228
 msgid "Choose the program to select by giving its Service ID."
 msgstr ""
 
-#: src/interface/main.c:226
+#: src/interface/main.c:230
 msgid "choose audio"
 msgstr ""
 
-#: src/interface/main.c:229
+#: src/interface/main.c:233
 msgid "choose channel"
 msgstr ""
 
-#: src/interface/main.c:232
+#: src/interface/main.c:236
 msgid "choose subtitles"
 msgstr ""
 
-#: src/interface/main.c:235
+#: src/interface/main.c:239
 msgid "DVD device"
 msgstr ""
 
-#: src/interface/main.c:238
+#: src/interface/main.c:242
 msgid "VCD device"
 msgstr ""
 
-#: src/interface/main.c:241
+#: src/interface/main.c:245
 msgid "satellite transponder frequency"
 msgstr ""
 
-#: src/interface/main.c:244
+#: src/interface/main.c:248
 msgid "satellite transponder polarization"
 msgstr ""
 
-#: src/interface/main.c:247
+#: src/interface/main.c:251
 msgid "satellite transponder FEC"
 msgstr ""
 
-#: src/interface/main.c:250
+#: src/interface/main.c:254
 msgid "satellite transponder symbol rate"
 msgstr ""
 
-#: src/interface/main.c:253
+#: src/interface/main.c:257
 msgid "use diseqc with antenna"
 msgstr ""
 
-#: src/interface/main.c:256
+#: src/interface/main.c:260
 msgid "antenna lnb_lof1 (kHz)"
 msgstr ""
 
-#: src/interface/main.c:259
+#: src/interface/main.c:263
 msgid "antenna lnb_lof2 (kHz)"
 msgstr ""
 
-#: src/interface/main.c:262
+#: src/interface/main.c:266
 msgid "antenna lnb_slof (kHz)"
 msgstr ""
 
-#: src/interface/main.c:265
+#: src/interface/main.c:269
 msgid "force IPv6"
 msgstr ""
 
-#: src/interface/main.c:268
+#: src/interface/main.c:272
 msgid "force IPv4"
 msgstr ""
 
-#: src/interface/main.c:271
+#: src/interface/main.c:275
 msgid "choose MPEG audio decoder"
 msgstr ""
 
-#: src/interface/main.c:274
+#: src/interface/main.c:278
 msgid "choose AC3 audio decoder"
 msgstr ""
 
-#: src/interface/main.c:277
+#: src/interface/main.c:281
 msgid "use additional processors"
 msgstr ""
 
-#: src/interface/main.c:280
+#: src/interface/main.c:284
 msgid "force synchro algorithm {I|I+|IP|IP+|IPB}"
 msgstr ""
 
-#: src/interface/main.c:283
+#: src/interface/main.c:287
 msgid "disable CPU's MMX support"
 msgstr ""
 
-#: src/interface/main.c:286
+#: src/interface/main.c:290
 msgid "disable CPU's 3D Now! support"
 msgstr ""
 
-#: src/interface/main.c:289
+#: src/interface/main.c:293
 msgid "disable CPU's MMX EXT support"
 msgstr ""
 
-#: src/interface/main.c:292
+#: src/interface/main.c:296
 msgid "disable CPU's SSE support"
 msgstr ""
 
-#: src/interface/main.c:295
+#: src/interface/main.c:299
 msgid "disable CPU's AltiVec support"
 msgstr ""
 
-#: src/interface/main.c:298
+#: src/interface/main.c:302
 msgid "launch playlist on startup"
 msgstr ""
 
-#: src/interface/main.c:301
+#: src/interface/main.c:305
 msgid "enqueue playlist as default"
 msgstr ""
 
-#: src/interface/main.c:304
+#: src/interface/main.c:308
 msgid "loop playlist on end"
 msgstr ""
 
-#: src/interface/main.c:307
+#: src/interface/main.c:311
 msgid "memory copy module"
 msgstr ""
 
-#: src/interface/main.c:310
+#: src/interface/main.c:314
 msgid "fast pthread on NT/2K/XP (developpers only)"
 msgstr ""
 
-#: src/interface/main.c:312
+#: src/interface/main.c:316
 msgid ""
 "On Windows NT/2K/XP we use a slow but correct pthread implementation, you "
 "can also use this faster implementation but you might experience problems "
@@ -365,39 +373,39 @@ msgid ""
 msgstr ""
 
 #. Interface options
-#: src/interface/main.c:334
+#: src/interface/main.c:338
 msgid "Interface"
 msgstr ""
 
 #. Audio options
-#: src/interface/main.c:341
+#: src/interface/main.c:345
 msgid "Audio"
 msgstr ""
 
 #. Video options
-#: src/interface/main.c:352
+#: src/interface/main.c:356
 msgid "Video"
 msgstr ""
 
 #. Input options
-#: src/interface/main.c:364
+#: src/interface/main.c:369
 msgid "Input"
 msgstr ""
 
 #. Decoder options
-#: src/interface/main.c:398
+#: src/interface/main.c:403
 msgid "Decoders"
 msgstr ""
 
 #. CPU options
-#: src/interface/main.c:405
+#: src/interface/main.c:410
 msgid "CPU"
 msgstr ""
 
 #. Playlist options
 #: plugins/gtk/gnome_interface.c:506 plugins/gtk/gnome_interface.c:1806
 #: plugins/gtk/gnome_interface.c:1830 plugins/gtk/gtk_interface.c:611
-#: plugins/gtk/gtk_interface.c:2084 src/interface/main.c:413
+#: plugins/gtk/gtk_interface.c:2084 src/interface/main.c:418
 msgid "Playlist"
 msgstr "óÐÉÓÏË ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ"
 
@@ -405,82 +413,86 @@ msgstr "
 #: plugins/ac3_adec/ac3_adec.c:77 plugins/dsp/dsp.c:42 plugins/fb/fb.c:72
 #: plugins/ggi/ggi.c:68 plugins/gtk/gnome.c:73 plugins/gtk/gtk.c:74
 #: plugins/mga/xmga.c:111 plugins/mpeg_vdec/video_parser.c:80
-#: plugins/x11/x11.c:55 plugins/x11/xvideo.c:60 src/interface/main.c:419
+#: plugins/x11/x11.c:55 plugins/x11/xvideo.c:60 src/interface/main.c:424
 msgid "Miscellaneous"
 msgstr ""
 
-#: src/interface/main.c:429
+#: src/interface/main.c:434
 msgid "main program"
 msgstr ""
 
-#: src/interface/main.c:442
-msgid "print help (or use -h)"
+#: src/interface/main.c:448
+msgid "print help"
 msgstr ""
 
-#: src/interface/main.c:444
-msgid "print detailed help (or use -H)"
+#: src/interface/main.c:450
+msgid "print detailed help"
 msgstr ""
 
-#: src/interface/main.c:446
-msgid "print a list of available plugins (or use -l)"
+#: src/interface/main.c:452
+msgid "print a list of available plugins"
 msgstr ""
 
-#: src/interface/main.c:448
-msgid "print help on plugin (or use -p)"
+#: src/interface/main.c:454
+msgid "print help on plugin <string>"
 msgstr ""
 
-#: src/interface/main.c:450
+#: src/interface/main.c:457
 msgid "print version information"
 msgstr ""
 
 #. Usage
-#: src/interface/main.c:614 src/interface/main.c:1038
+#: src/interface/main.c:622 src/interface/main.c:1071
 #, c-format
 msgid "Usage: %s [options] [parameters] [file]...\n"
 msgstr ""
 
 #. print module name
-#: src/interface/main.c:939
+#: src/interface/main.c:948
 #, c-format
 msgid "%s module options:\n"
 msgstr ""
 
-#: src/interface/main.c:959 src/interface/main.c:963
+#: src/interface/main.c:981 src/interface/main.c:985
 msgid " <string>"
 msgstr ""
 
-#: src/interface/main.c:970 src/interface/main.c:974
+#: src/interface/main.c:992 src/interface/main.c:996
 msgid " <integer>"
 msgstr ""
 
-#: src/interface/main.c:995
+#: src/interface/main.c:1003 src/interface/main.c:1007
+msgid " <float>"
+msgstr ""
+
+#: src/interface/main.c:1028
 msgid ""
 "\n"
 "Playlist items:\n"
-"  *.mpg, *.vob                   \tplain MPEG-1/2 files\n"
+"  *.mpg, *.vob                   plain MPEG-1/2 files\n"
 "  [dvd:][device][@raw_device][@[title][,[chapter][,angle]]]\n"
-"                                 \tDVD device\n"
+"                                 DVD device\n"
 "  [vcd:][device][@[title][,[chapter]]\n"
-"                                 \tVCD device\n"
+"                                 VCD device\n"
 "  udpstream:[@[<bind address>][:<bind port>]]\n"
-"                                 \tUDP stream sent by VLS\n"
-"  vlc:loop                       \tloop execution of the playlist\n"
-"  vlc:pause                      \tpause execution of playlist items\n"
-"  vlc:quit                       \tquit VLC"
+"                                 UDP stream sent by VLS\n"
+"  vlc:loop                       loop execution of the playlist\n"
+"  vlc:pause                      pause execution of playlist items\n"
+"  vlc:quit                       quit VLC"
 msgstr ""
 
-#: src/interface/main.c:1015 src/interface/main.c:1064
-#: src/interface/main.c:1088
+#: src/interface/main.c:1048 src/interface/main.c:1097
+#: src/interface/main.c:1121
 msgid ""
 "\n"
 "Press the RETURN key to continue..."
 msgstr ""
 
-#: src/interface/main.c:1041
+#: src/interface/main.c:1074
 msgid "[plugin]              [description]"
 msgstr ""
 
-#: src/interface/main.c:1082
+#: src/interface/main.c:1115
 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"
@@ -488,15 +500,20 @@ msgid ""
 "Written by the VideoLAN team at Ecole Centrale, Paris."
 msgstr ""
 
-#: src/misc/configuration.c:612
+#: src/misc/configuration.c:680
 msgid "<boolean>"
 msgstr ""
 
-#: src/misc/configuration.c:613
+#: src/misc/configuration.c:680
 msgid "<integer>"
 msgstr ""
 
-#: src/misc/configuration.c:620
+#: src/misc/configuration.c:687
+#, c-format
+msgid "# %s <float>\n"
+msgstr ""
+
+#: src/misc/configuration.c:694
 #, c-format
 msgid "# %s <string>\n"
 msgstr ""
@@ -1074,7 +1091,7 @@ msgstr ""
 #: plugins/gtk/gtk_interface.c:1387 plugins/gtk/gtk_interface.c:1610
 #: plugins/gtk/gtk_interface.c:1900 plugins/gtk/gtk_interface.c:2025
 #: plugins/gtk/gtk_interface.c:2256 plugins/gtk/gtk_interface.c:2362
-#: plugins/gtk/gtk_interface.c:2568 plugins/gtk/gtk_preferences.c:501
+#: plugins/gtk/gtk_interface.c:2568 plugins/gtk/gtk_preferences.c:522
 msgid "OK"
 msgstr ""
 
@@ -1126,7 +1143,7 @@ msgstr ""
 
 #: plugins/gtk/gtk_interface.c:1617 plugins/gtk/gtk_interface.c:1907
 #: plugins/gtk/gtk_interface.c:2032 plugins/gtk/gtk_interface.c:2263
-#: plugins/gtk/gtk_interface.c:2575 plugins/gtk/gtk_preferences.c:513
+#: plugins/gtk/gtk_interface.c:2575 plugins/gtk/gtk_preferences.c:534
 msgid "Cancel"
 msgstr ""
 
@@ -1410,7 +1427,7 @@ msgstr ""
 msgid "Invert"
 msgstr ""
 
-#: plugins/gtk/gnome_interface.c:1755 plugins/gtk/gtk_preferences.c:358
+#: plugins/gtk/gnome_interface.c:1755 plugins/gtk/gtk_preferences.c:360
 msgid "Select"
 msgstr ""
 
@@ -1436,28 +1453,28 @@ msgstr ""
 msgid "6/7"
 msgstr ""
 
-#: plugins/gtk/gtk_preferences.c:304
+#: plugins/gtk/gtk_preferences.c:306
 msgid "Name"
 msgstr ""
 
-#: plugins/gtk/gtk_preferences.c:304
+#: plugins/gtk/gtk_preferences.c:306
 msgid "Description"
 msgstr ""
 
-#: plugins/gtk/gtk_preferences.c:347
+#: plugins/gtk/gtk_preferences.c:349
 msgid "Configure"
 msgstr ""
 
 #. add new label
-#: plugins/gtk/gtk_preferences.c:370
+#: plugins/gtk/gtk_preferences.c:372
 msgid "Selected:"
 msgstr ""
 
-#: plugins/gtk/gtk_preferences.c:492 plugins/gtk/gtk_preferences.c:509
+#: plugins/gtk/gtk_preferences.c:513 plugins/gtk/gtk_preferences.c:530
 msgid "Save"
 msgstr ""
 
-#: plugins/gtk/gtk_preferences.c:505
+#: plugins/gtk/gtk_preferences.c:526
 msgid "Apply"
 msgstr ""
 

diff --git a/po/vlc.pot b/po/vlc.pot
index 950ab214efdb71e0167c2170777308c96d8af137..7256c10d53fc135e53e832f265ef94c050c39628 100644 (file)
--- a/po/vlc.pot
+++ b/po/vlc.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-04-21 12:23+0200\n"
+"POT-Creation-Date: 2002-04-21 20:27+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -177,187 +177,195 @@ msgid ""
 msgstr ""
 
 #: src/interface/main.c:186
-msgid "grayscale video output"
+msgid "zoom video"
 msgstr ""
 
 #: src/interface/main.c:188
+msgid "You can zoom the video by the specified factor."
+msgstr ""
+
+#: src/interface/main.c:190
+msgid "grayscale video output"
+msgstr ""
+
+#: src/interface/main.c:192
 msgid ""
 "Using this option, vlc will not decode the color information from the video "
 "(this can also allow you to save some processing power)."
 msgstr ""
 
-#: src/interface/main.c:191
+#: src/interface/main.c:195
 msgid "fullscreen video output"
 msgstr ""
 
-#: src/interface/main.c:193
+#: src/interface/main.c:197
 msgid ""
 "If this option is enabled, vlc will always start a video in fullscreen mode."
 msgstr ""
 
-#: src/interface/main.c:196
+#: src/interface/main.c:200
 msgid "disable hardware acceleration for the video output"
 msgstr ""
 
-#: src/interface/main.c:198
+#: src/interface/main.c:202
 msgid ""
 "By default vlc will try to take advantage of the overlay capabilities of you "
 "graphics card."
 msgstr ""
 
-#: src/interface/main.c:201
+#: src/interface/main.c:205
 msgid "force SPU position"
 msgstr ""
 
-#: src/interface/main.c:204
+#: src/interface/main.c:208
 msgid "video filter module"
 msgstr ""
 
-#: src/interface/main.c:207
+#: src/interface/main.c:211
 msgid "server port"
 msgstr ""
 
-#: src/interface/main.c:210
+#: src/interface/main.c:214
 msgid "enable network channel mode"
 msgstr ""
 
-#: src/interface/main.c:213
+#: src/interface/main.c:217
 msgid "channel server address"
 msgstr ""
 
-#: src/interface/main.c:216
+#: src/interface/main.c:220
 msgid "channel server port"
 msgstr ""
 
-#: src/interface/main.c:219
+#: src/interface/main.c:223
 msgid "network interface"
 msgstr ""
 
-#: src/interface/main.c:222
+#: src/interface/main.c:226
 msgid "choose program (SID)"
 msgstr ""
 
-#: src/interface/main.c:224
+#: src/interface/main.c:228
 msgid "Choose the program to select by giving its Service ID."
 msgstr ""
 
-#: src/interface/main.c:226
+#: src/interface/main.c:230
 msgid "choose audio"
 msgstr ""
 
-#: src/interface/main.c:229
+#: src/interface/main.c:233
 msgid "choose channel"
 msgstr ""
 
-#: src/interface/main.c:232
+#: src/interface/main.c:236
 msgid "choose subtitles"
 msgstr ""
 
-#: src/interface/main.c:235
+#: src/interface/main.c:239
 msgid "DVD device"
 msgstr ""
 
-#: src/interface/main.c:238
+#: src/interface/main.c:242
 msgid "VCD device"
 msgstr ""
 
-#: src/interface/main.c:241
+#: src/interface/main.c:245
 msgid "satellite transponder frequency"
 msgstr ""
 
-#: src/interface/main.c:244
+#: src/interface/main.c:248
 msgid "satellite transponder polarization"
 msgstr ""
 
-#: src/interface/main.c:247
+#: src/interface/main.c:251
 msgid "satellite transponder FEC"
 msgstr ""
 
-#: src/interface/main.c:250
+#: src/interface/main.c:254
 msgid "satellite transponder symbol rate"
 msgstr ""
 
-#: src/interface/main.c:253
+#: src/interface/main.c:257
 msgid "use diseqc with antenna"
 msgstr ""
 
-#: src/interface/main.c:256
+#: src/interface/main.c:260
 msgid "antenna lnb_lof1 (kHz)"
 msgstr ""
 
-#: src/interface/main.c:259
+#: src/interface/main.c:263
 msgid "antenna lnb_lof2 (kHz)"
 msgstr ""
 
-#: src/interface/main.c:262
+#: src/interface/main.c:266
 msgid "antenna lnb_slof (kHz)"
 msgstr ""
 
-#: src/interface/main.c:265
+#: src/interface/main.c:269
 msgid "force IPv6"
 msgstr ""
 
-#: src/interface/main.c:268
+#: src/interface/main.c:272
 msgid "force IPv4"
 msgstr ""
 
-#: src/interface/main.c:271
+#: src/interface/main.c:275
 msgid "choose MPEG audio decoder"
 msgstr ""
 
-#: src/interface/main.c:274
+#: src/interface/main.c:278
 msgid "choose AC3 audio decoder"
 msgstr ""
 
-#: src/interface/main.c:277
+#: src/interface/main.c:281
 msgid "use additional processors"
 msgstr ""
 
-#: src/interface/main.c:280
+#: src/interface/main.c:284
 msgid "force synchro algorithm {I|I+|IP|IP+|IPB}"
 msgstr ""
 
-#: src/interface/main.c:283
+#: src/interface/main.c:287
 msgid "disable CPU's MMX support"
 msgstr ""
 
-#: src/interface/main.c:286
+#: src/interface/main.c:290
 msgid "disable CPU's 3D Now! support"
 msgstr ""
 
-#: src/interface/main.c:289
+#: src/interface/main.c:293
 msgid "disable CPU's MMX EXT support"
 msgstr ""
 
-#: src/interface/main.c:292
+#: src/interface/main.c:296
 msgid "disable CPU's SSE support"
 msgstr ""
 
-#: src/interface/main.c:295
+#: src/interface/main.c:299
 msgid "disable CPU's AltiVec support"
 msgstr ""
 
-#: src/interface/main.c:298
+#: src/interface/main.c:302
 msgid "launch playlist on startup"
 msgstr ""
 
-#: src/interface/main.c:301
+#: src/interface/main.c:305
 msgid "enqueue playlist as default"
 msgstr ""
 
-#: src/interface/main.c:304
+#: src/interface/main.c:308
 msgid "loop playlist on end"
 msgstr ""
 
-#: src/interface/main.c:307
+#: src/interface/main.c:311
 msgid "memory copy module"
 msgstr ""
 
-#: src/interface/main.c:310
+#: src/interface/main.c:314
 msgid "fast pthread on NT/2K/XP (developpers only)"
 msgstr ""
 
-#: src/interface/main.c:312
+#: src/interface/main.c:316
 msgid ""
 "On Windows NT/2K/XP we use a slow but correct pthread implementation, you "
 "can also use this faster implementation but you might experience problems "
@@ -365,39 +373,39 @@ msgid ""
 msgstr ""
 
 #. Interface options
-#: src/interface/main.c:334
+#: src/interface/main.c:338
 msgid "Interface"
 msgstr ""
 
 #. Audio options
-#: src/interface/main.c:341
+#: src/interface/main.c:345
 msgid "Audio"
 msgstr ""
 
 #. Video options
-#: src/interface/main.c:352
+#: src/interface/main.c:356
 msgid "Video"
 msgstr ""
 
 #. Input options
-#: src/interface/main.c:364
+#: src/interface/main.c:369
 msgid "Input"
 msgstr ""
 
 #. Decoder options
-#: src/interface/main.c:398
+#: src/interface/main.c:403
 msgid "Decoders"
 msgstr ""
 
 #. CPU options
-#: src/interface/main.c:405
+#: src/interface/main.c:410
 msgid "CPU"
 msgstr ""
 
 #. Playlist options
 #: plugins/gtk/gnome_interface.c:506 plugins/gtk/gnome_interface.c:1806
 #: plugins/gtk/gnome_interface.c:1830 plugins/gtk/gtk_interface.c:611
-#: plugins/gtk/gtk_interface.c:2084 src/interface/main.c:413
+#: plugins/gtk/gtk_interface.c:2084 src/interface/main.c:418
 msgid "Playlist"
 msgstr ""
 
@@ -405,82 +413,86 @@ msgstr ""
 #: plugins/ac3_adec/ac3_adec.c:77 plugins/dsp/dsp.c:42 plugins/fb/fb.c:72
 #: plugins/ggi/ggi.c:68 plugins/gtk/gnome.c:73 plugins/gtk/gtk.c:74
 #: plugins/mga/xmga.c:111 plugins/mpeg_vdec/video_parser.c:80
-#: plugins/x11/x11.c:55 plugins/x11/xvideo.c:60 src/interface/main.c:419
+#: plugins/x11/x11.c:55 plugins/x11/xvideo.c:60 src/interface/main.c:424
 msgid "Miscellaneous"
 msgstr ""
 
-#: src/interface/main.c:429
+#: src/interface/main.c:434
 msgid "main program"
 msgstr ""
 
-#: src/interface/main.c:442
-msgid "print help (or use -h)"
+#: src/interface/main.c:448
+msgid "print help"
 msgstr ""
 
-#: src/interface/main.c:444
-msgid "print detailed help (or use -H)"
+#: src/interface/main.c:450
+msgid "print detailed help"
 msgstr ""
 
-#: src/interface/main.c:446
-msgid "print a list of available plugins (or use -l)"
+#: src/interface/main.c:452
+msgid "print a list of available plugins"
 msgstr ""
 
-#: src/interface/main.c:448
-msgid "print help on plugin (or use -p)"
+#: src/interface/main.c:454
+msgid "print help on plugin <string>"
 msgstr ""
 
-#: src/interface/main.c:450
+#: src/interface/main.c:457
 msgid "print version information"
 msgstr ""
 
 #. Usage
-#: src/interface/main.c:614 src/interface/main.c:1038
+#: src/interface/main.c:622 src/interface/main.c:1071
 #, c-format
 msgid "Usage: %s [options] [parameters] [file]...\n"
 msgstr ""
 
 #. print module name
-#: src/interface/main.c:939
+#: src/interface/main.c:948
 #, c-format
 msgid "%s module options:\n"
 msgstr ""
 
-#: src/interface/main.c:959 src/interface/main.c:963
+#: src/interface/main.c:981 src/interface/main.c:985
 msgid " <string>"
 msgstr ""
 
-#: src/interface/main.c:970 src/interface/main.c:974
+#: src/interface/main.c:992 src/interface/main.c:996
 msgid " <integer>"
 msgstr ""
 
-#: src/interface/main.c:995
+#: src/interface/main.c:1003 src/interface/main.c:1007
+msgid " <float>"
+msgstr ""
+
+#: src/interface/main.c:1028
 msgid ""
 "\n"
 "Playlist items:\n"
-"  *.mpg, *.vob                   \tplain MPEG-1/2 files\n"
+"  *.mpg, *.vob                   plain MPEG-1/2 files\n"
 "  [dvd:][device][@raw_device][@[title][,[chapter][,angle]]]\n"
-"                                 \tDVD device\n"
+"                                 DVD device\n"
 "  [vcd:][device][@[title][,[chapter]]\n"
-"                                 \tVCD device\n"
+"                                 VCD device\n"
 "  udpstream:[@[<bind address>][:<bind port>]]\n"
-"                                 \tUDP stream sent by VLS\n"
-"  vlc:loop                       \tloop execution of the playlist\n"
-"  vlc:pause                      \tpause execution of playlist items\n"
-"  vlc:quit                       \tquit VLC"
+"                                 UDP stream sent by VLS\n"
+"  vlc:loop                       loop execution of the playlist\n"
+"  vlc:pause                      pause execution of playlist items\n"
+"  vlc:quit                       quit VLC"
 msgstr ""
 
-#: src/interface/main.c:1015 src/interface/main.c:1064
-#: src/interface/main.c:1088
+#: src/interface/main.c:1048 src/interface/main.c:1097
+#: src/interface/main.c:1121
 msgid ""
 "\n"
 "Press the RETURN key to continue..."
 msgstr ""
 
-#: src/interface/main.c:1041
+#: src/interface/main.c:1074
 msgid "[plugin]              [description]"
 msgstr ""
 
-#: src/interface/main.c:1082
+#: src/interface/main.c:1115
 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"
@@ -488,15 +500,20 @@ msgid ""
 "Written by the VideoLAN team at Ecole Centrale, Paris."
 msgstr ""
 
-#: src/misc/configuration.c:612
+#: src/misc/configuration.c:680
 msgid "<boolean>"
 msgstr ""
 
-#: src/misc/configuration.c:613
+#: src/misc/configuration.c:680
 msgid "<integer>"
 msgstr ""
 
-#: src/misc/configuration.c:620
+#: src/misc/configuration.c:687
+#, c-format
+msgid "# %s <float>\n"
+msgstr ""
+
+#: src/misc/configuration.c:694
 #, c-format
 msgid "# %s <string>\n"
 msgstr ""
@@ -1063,7 +1080,7 @@ msgstr ""
 #: plugins/gtk/gtk_interface.c:1387 plugins/gtk/gtk_interface.c:1610
 #: plugins/gtk/gtk_interface.c:1900 plugins/gtk/gtk_interface.c:2025
 #: plugins/gtk/gtk_interface.c:2256 plugins/gtk/gtk_interface.c:2362
-#: plugins/gtk/gtk_interface.c:2568 plugins/gtk/gtk_preferences.c:501
+#: plugins/gtk/gtk_interface.c:2568 plugins/gtk/gtk_preferences.c:522
 msgid "OK"
 msgstr ""
 
@@ -1113,7 +1130,7 @@ msgstr ""
 
 #: plugins/gtk/gtk_interface.c:1617 plugins/gtk/gtk_interface.c:1907
 #: plugins/gtk/gtk_interface.c:2032 plugins/gtk/gtk_interface.c:2263
-#: plugins/gtk/gtk_interface.c:2575 plugins/gtk/gtk_preferences.c:513
+#: plugins/gtk/gtk_interface.c:2575 plugins/gtk/gtk_preferences.c:534
 msgid "Cancel"
 msgstr ""
 
@@ -1391,7 +1408,7 @@ msgstr ""
 msgid "Invert"
 msgstr ""
 
-#: plugins/gtk/gnome_interface.c:1755 plugins/gtk/gtk_preferences.c:358
+#: plugins/gtk/gnome_interface.c:1755 plugins/gtk/gtk_preferences.c:360
 msgid "Select"
 msgstr ""
 
@@ -1415,28 +1432,28 @@ msgstr ""
 msgid "6/7"
 msgstr ""
 
-#: plugins/gtk/gtk_preferences.c:304
+#: plugins/gtk/gtk_preferences.c:306
 msgid "Name"
 msgstr ""
 
-#: plugins/gtk/gtk_preferences.c:304
+#: plugins/gtk/gtk_preferences.c:306
 msgid "Description"
 msgstr ""
 
-#: plugins/gtk/gtk_preferences.c:347
+#: plugins/gtk/gtk_preferences.c:349
 msgid "Configure"
 msgstr ""
 
 #. add new label
-#: plugins/gtk/gtk_preferences.c:370
+#: plugins/gtk/gtk_preferences.c:372
 msgid "Selected:"
 msgstr ""
 
-#: plugins/gtk/gtk_preferences.c:492 plugins/gtk/gtk_preferences.c:509
+#: plugins/gtk/gtk_preferences.c:513 plugins/gtk/gtk_preferences.c:530
 msgid "Save"
 msgstr ""
 
-#: plugins/gtk/gtk_preferences.c:505
+#: plugins/gtk/gtk_preferences.c:526
 msgid "Apply"
 msgstr ""
 

diff --git a/src/interface/main.c b/src/interface/main.c
index 349c664bb72410f7de44f46c3a1a93f882092b08..5d4279c0ff362bca42afb3d9d1be99017d60a29d 100644 (file)
--- a/src/interface/main.c
+++ b/src/interface/main.c
@@ -4,7 +4,7 @@
  * and spawn threads.
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: main.c,v 1.182 2002/04/21 11:23:03 gbazin Exp $
+ * $Id: main.c,v 1.183 2002/04/21 18:32:12 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -335,15 +335,15 @@
 MODULE_CONFIG_START
 
 /* Interface options */
-ADD_CATEGORY_HINT( N_("Interface"), NULL )
-ADD_PLUGIN  ( "intf", MODULE_CAPABILITY_INTF, NULL, NULL, INTF_TEXT, INTF_LONGTEXT )
+ADD_CATEGORY_HINT( N_("Interface"), NULL)
+ADD_PLUGIN_WITH_SHORT  ( "intf", 'I', MODULE_CAPABILITY_INTF, NULL, NULL, INTF_TEXT, INTF_LONGTEXT )
 ADD_INTEGER ( "warning", 0, NULL, WARNING_TEXT, WARNING_LONGTEXT )
 ADD_BOOL    ( "stats", NULL, STATS_TEXT, STATS_LONGTEXT )
 ADD_STRING  ( "search_path", NULL, NULL, INTF_PATH_TEXT, INTF_PATH_LONGTEXT )
 
 /* Audio options */
 ADD_CATEGORY_HINT( N_("Audio"), NULL)
-ADD_PLUGIN  ( "aout", MODULE_CAPABILITY_AOUT, NULL, NULL, AOUT_TEXT, AOUT_LONGTEXT )
+ADD_PLUGIN_WITH_SHORT  ( "aout", 'A', MODULE_CAPABILITY_AOUT, NULL, NULL, AOUT_TEXT, AOUT_LONGTEXT )
 ADD_BOOL    ( "noaudio", NULL, NOAUDIO_TEXT, NOAUDIO_LONGTEXT )
 ADD_BOOL    ( "mono", NULL, MONO_TEXT, MONO_LONGTEXT )
 ADD_INTEGER ( "volume", VOLUME_DEFAULT, NULL, VOLUME_TEXT, VOLUME_LONGTEXT )
@@ -354,7 +354,7 @@ ADD_INTEGER ( "aout_format", 0, NULL, FORMAT_TEXT,
 
 /* Video options */
 ADD_CATEGORY_HINT( N_("Video"), NULL )
-ADD_PLUGIN  ( "vout", MODULE_CAPABILITY_VOUT, NULL, NULL, VOUT_TEXT, VOUT_LONGTEXT )
+ADD_PLUGIN_WITH_SHORT  ( "vout", 'V', MODULE_CAPABILITY_VOUT, NULL, NULL, VOUT_TEXT, VOUT_LONGTEXT )
 ADD_BOOL    ( "novideo", NULL, NOVIDEO_TEXT, NOVIDEO_LONGTEXT )
 ADD_INTEGER ( "width", -1, NULL, WIDTH_TEXT, WIDTH_LONGTEXT )
 ADD_INTEGER ( "height", -1, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT )
@@ -396,8 +396,8 @@ ADD_INTEGER ( "sat_lnb_slof", 11700, NULL, SAT_LNB_SLOF_TEXT,
             SAT_LNB_SLOF_LONGTEXT )
 #endif
 
-ADD_BOOL    ( "ipv6", NULL, IPV6_TEXT, IPV6_LONGTEXT )
-ADD_BOOL    ( "ipv4", NULL, IPV4_TEXT, IPV4_LONGTEXT )
+ADD_BOOL_WITH_SHORT    ( "ipv6", '6', NULL, IPV6_TEXT, IPV6_LONGTEXT )
+ADD_BOOL_WITH_SHORT    ( "ipv4", '4', NULL, IPV4_TEXT, IPV4_LONGTEXT )
 
 /* Decoder options */
 ADD_CATEGORY_HINT( N_("Decoders"), NULL )
@@ -443,18 +443,21 @@ MODULE_DEACTIVATE_STOP
 
 /* Hack for help options */
 static module_t help_module;
-static module_config_t p_help_config[] = {
-    { MODULE_CONFIG_ITEM_BOOL, "help", N_("print help (or use -h)"),
-      NULL, NULL, 0, 0, NULL, NULL, 0 },
-    { MODULE_CONFIG_ITEM_BOOL, "longhelp", N_("print detailed help (or use -H)"),
+static module_config_t p_help_config[] =
+{
+    { MODULE_CONFIG_ITEM_BOOL, "help", 'h', N_("print help"),
       NULL, NULL, 0, 0, NULL, NULL, 0 },
-    { MODULE_CONFIG_ITEM_BOOL, "list", N_("print a list of available plugins "
-      "(or use -l)"), NULL, NULL, 0, 0, NULL, NULL, 0 },
-    { MODULE_CONFIG_ITEM_STRING, "plugin", N_("print help on plugin "
-      "(or use -p)"), NULL, NULL, 0, 0, NULL, &help_module.config_lock, 0 },
-    { MODULE_CONFIG_ITEM_BOOL, "version", N_("print version information"),
+    { MODULE_CONFIG_ITEM_BOOL, "longhelp", 'H', N_("print detailed help"),
       NULL, NULL, 0, 0, NULL, NULL, 0 },
-    { MODULE_CONFIG_HINT_END, NULL, NULL, NULL, NULL, 0, 0, NULL, NULL, 0 } };
+    { MODULE_CONFIG_ITEM_BOOL, "list", 'l', N_("print a list of available "
+      "plugins"), NULL, NULL, 0, 0, NULL, NULL, 0 },
+    { MODULE_CONFIG_ITEM_STRING, "plugin", 'p', N_("print help on plugin "
+      "<string>"), NULL, NULL, 0, 0, NULL, &help_module.config_lock, 0 },
+    { MODULE_CONFIG_ITEM_BOOL, "version", '\0',
+      N_("print version information"), NULL, NULL, 0, 0, NULL, NULL, 0 },
+    { MODULE_CONFIG_HINT_END, NULL, '\0', NULL, NULL, NULL, 0, 0,
+      NULL, NULL, 0 }
+};
 
 /*****************************************************************************
  * End configuration.
@@ -921,8 +924,10 @@ static void Usage( const char *psz_module_name )
     module_t *p_module;
     module_config_t *p_item;
     char psz_spaces[30];
+    char psz_format[sizeof("      --%s%s%s %s")];
 
-    memset( psz_spaces, 32, 30 );
+    memset( psz_spaces, ' ', 30 );
+    memcpy( psz_format, "      --%s%s%s %s", sizeof(psz_format) );
 
 #ifdef WIN32
     ShowConsole();
@@ -933,7 +938,6 @@ static void Usage( const char *psz_module_name )
          p_module != NULL ;
          p_module = p_module->next )
     {
-
         if( psz_module_name && strcmp( psz_module_name, p_module->psz_name ) )
             continue;
 
@@ -949,6 +953,19 @@ static void Usage( const char *psz_module_name )
         {
             int i;
 
+            if( p_item->i_short )
+            {
+                psz_format[2] = '-';
+                psz_format[3] = p_item->i_short;
+                psz_format[4] = ',';
+            }
+            else
+            {
+                psz_format[2] = ' ';
+                psz_format[3] = ' ';
+                psz_format[4] = ' ';
+            }
+
             switch( p_item->i_type )
             {
             case MODULE_CONFIG_HINT_CATEGORY:
@@ -964,9 +981,9 @@ static void Usage( const char *psz_module_name )
                     - strlen(_(" <string>")) - 1;
                 if( i < 0 ) i = 0; psz_spaces[i] = 0;
 
-                intf_Msg( "  --%s%s%s %s", p_item->psz_name,
+                intf_Msg( psz_format, p_item->psz_name,
                           _(" <string>"), psz_spaces, p_item->psz_text );
-                psz_spaces[i] = 32;
+                psz_spaces[i] = ' ';
                 break;
             case MODULE_CONFIG_ITEM_INTEGER:
                 /* Nasty hack, but right now I'm too tired to think about
@@ -975,9 +992,9 @@ static void Usage( const char *psz_module_name )
                     - strlen(_(" <integer>")) - 1;
                 if( i < 0 ) i = 0; psz_spaces[i] = 0;
 
-                intf_Msg( "  --%s%s%s %s", p_item->psz_name,
+                intf_Msg( psz_format, p_item->psz_name,
                           _(" <integer>"), psz_spaces, p_item->psz_text );
-                psz_spaces[i] = 32;
+                psz_spaces[i] = ' ';
                 break;
             case MODULE_CONFIG_ITEM_FLOAT:
                 /* Nasty hack, but right now I'm too tired to think about
@@ -986,9 +1003,9 @@ static void Usage( const char *psz_module_name )
                     - strlen(_(" <float>")) - 1;
                 if( i < 0 ) i = 0; psz_spaces[i] = 0;
 
-                intf_Msg( "  --%s%s%s %s", p_item->psz_name,
+                intf_Msg( psz_format, p_item->psz_name,
                           _(" <float>"), psz_spaces, p_item->psz_text );
-                psz_spaces[i] = 32;
+                psz_spaces[i] = ' ';
                 break;
             case MODULE_CONFIG_ITEM_BOOL:
                 /* Nasty hack, but right now I'm too tired to think about
@@ -996,9 +1013,9 @@ static void Usage( const char *psz_module_name )
                 i = 25 - strlen( p_item->psz_name ) - 1;
                 if( i < 0 ) i = 0; psz_spaces[i] = 0;
 
-                intf_Msg( "  --%s%s %s",
-                          p_item->psz_name, psz_spaces, p_item->psz_text );
-                psz_spaces[i] = 32;
+                intf_Msg( psz_format,
+                          p_item->psz_name, "", psz_spaces, p_item->psz_text );
+                psz_spaces[i] = ' ';
                 break;
             }
         }
@@ -1009,18 +1026,18 @@ static void Usage( const char *psz_module_name )
         if( !strcmp( "main", p_module->psz_name ) )
         {
             intf_Msg( _("\nPlaylist items:"
-                "\n  *.mpg, *.vob                   \tplain MPEG-1/2 files"
+                "\n  *.mpg, *.vob                   plain MPEG-1/2 files"
                 "\n  [dvd:][device][@raw_device][@[title][,[chapter][,angle]]]"
-                "\n                                 \tDVD device"
+                "\n                                 DVD device"
                 "\n  [vcd:][device][@[title][,[chapter]]"
-                "\n                                 \tVCD device"
+                "\n                                 VCD device"
                 "\n  udpstream:[@[<bind address>][:<bind port>]]"
-                "\n                                 \tUDP stream sent by VLS"
-                "\n  vlc:loop                       \tloop execution of the "
+                "\n                                 UDP stream sent by VLS"
+                "\n  vlc:loop                       loop execution of the "
                       "playlist"
-                "\n  vlc:pause                      \tpause execution of "
+                "\n  vlc:pause                      pause execution of "
                       "playlist items"
-                "\n  vlc:quit                       \tquit VLC") );
+                "\n  vlc:quit                       quit VLC") );
         }
 
         intf_Msg( "" );
@@ -1318,7 +1335,7 @@ static u32 CPUCapabilities( void )
         i_capabilities |= CPU_CAPABILITY_MMXEXT;
 
 #   ifdef CAN_COMPILE_SSE
-        /* We test if OS support the SSE instructions */
+        /* We test if OS supports the SSE instructions */
         psz_capability = "SSE";
         i_illegal = 0;
         if( setjmp( env ) == 0 )
@@ -1418,7 +1435,7 @@ static u32 CPUCapabilities( void )
 /*****************************************************************************
  * ShowConsole: On Win32, create an output console for debug messages
  *****************************************************************************
- * This function is usefull only on Win32.
+ * This function is useful only on Win32.
  *****************************************************************************/
 #ifdef WIN32 /*  */
 static void ShowConsole( void )

diff --git a/src/misc/configuration.c b/src/misc/configuration.c
index e4a27cb0f6b5afc77894c6b22248d6715121c2bf..1cc3b25457a98cee03d97f33364e53c52d0f0362 100644 (file)
--- a/src/misc/configuration.c
+++ b/src/misc/configuration.c
@@ -2,7 +2,7 @@
  * configuration.c management of the modules configuration
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: configuration.c,v 1.16 2002/04/21 11:23:03 gbazin Exp $
+ * $Id: configuration.c,v 1.17 2002/04/21 18:32:12 sam Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -304,6 +304,7 @@ module_config_t *config_Duplicate( module_config_t *p_orig )
     for( i = 0; i < i_lines ; i++ )
     {
         p_config[i].i_type = p_orig[i].i_type;
+        p_config[i].i_short = p_orig[i].i_short;
         p_config[i].i_value = p_orig[i].i_value;
         p_config[i].f_value = p_orig[i].f_value;
         p_config[i].b_dirty = p_orig[i].b_dirty;
@@ -725,13 +726,14 @@ int config_SaveConfigFile( const char *psz_module_name )
 int config_LoadCmdLine( int *pi_argc, char *ppsz_argv[],
                         boolean_t b_ignore_errors )
 {
-    int i_cmd, i_index, i_longopts_size;
+    int i_cmd, i_index, i_opts, i_shortopts;
     module_t *p_module;
     module_config_t *p_item;
     struct option *p_longopts;
 
     /* Short options */
-    const char *psz_shortopts = "hHvlp:";
+    module_config_t *pp_shortopts[256];
+    char *psz_shortopts;
 
     /* Set default configuration and copy arguments */
     p_main->i_argc    = *pi_argc;
@@ -759,28 +761,42 @@ int config_LoadCmdLine( int *pi_argc, char *ppsz_argv[],
     }
 #endif
 
-
     /*
-     * Generate the longopts structure used by getopt_long
+     * Generate the longopts and shortopts structure used by getopt_long
      */
-    i_longopts_size = 0;
+
+    i_opts = 0;
     for( p_module = p_module_bank->first;
          p_module != NULL ;
          p_module = p_module->next )
     {
         /* count the number of exported configuration options (to allocate
          * longopts). */
-        i_longopts_size += p_module->i_config_items;
+        i_opts += p_module->i_config_items;
     }
 
-    p_longopts = (struct option *)malloc( sizeof(struct option)
-                                          * (i_longopts_size + 1) );
+    p_longopts = malloc( sizeof(struct option) * (i_opts + 1) );
     if( p_longopts == NULL )
     {
         intf_ErrMsg( "config error: couldn't allocate p_longopts" );
         return( -1 );
     }
 
+    psz_shortopts = malloc( sizeof( char ) * (2 * i_opts + 1) );
+    if( psz_shortopts == NULL )
+    {
+        intf_ErrMsg( "config error: couldn't allocate psz_shortopts" );
+        free( p_longopts );
+        return( -1 );
+    }
+
+    psz_shortopts[0] = 'v';
+    i_shortopts = 1;
+    for( i_index = 0; i_index < 256; i_index++ )
+    {
+        pp_shortopts[i_index] = NULL;
+    }
+
     /* Fill the longopts structure */
     i_index = 0;
     for( p_module = p_module_bank->first ;
@@ -800,12 +816,24 @@ int config_LoadCmdLine( int *pi_argc, char *ppsz_argv[],
                                                no_argument : required_argument;
             p_longopts[i_index].flag = 0;
             p_longopts[i_index].val = 0;
+            if( p_item->i_short )
+            {
+                pp_shortopts[(int)p_item->i_short] = p_item;
+                psz_shortopts[i_shortopts] = p_item->i_short;
+                i_shortopts++;
+                if( p_item->i_type != MODULE_CONFIG_ITEM_BOOL )
+                {
+                    psz_shortopts[i_shortopts] = ':';
+                    i_shortopts++;
+                }
+            }
             i_index++;
         }
     }
-    /* Close the longopts structure */
-    memset( &p_longopts[i_index], 0, sizeof(struct option) );
 
+    /* Close the longopts and shortopts structures */
+    memset( &p_longopts[i_index], 0, sizeof(struct option) );
+    psz_shortopts[i_shortopts] = '\0';
 
     /*
      * Parse the command line options
@@ -815,11 +843,9 @@ int config_LoadCmdLine( int *pi_argc, char *ppsz_argv[],
     while( ( i_cmd = getopt_long( *pi_argc, ppsz_argv, psz_shortopts,
                                   p_longopts, &i_index ) ) != EOF )
     {
-
+        /* A long option has been recognized */
         if( i_cmd == 0 )
         {
-            /* A long option has been recognized */
-
             module_config_t *p_conf;
 
             /* Store the configuration option */
@@ -847,43 +873,47 @@ int config_LoadCmdLine( int *pi_argc, char *ppsz_argv[],
             continue;
         }
 
-        /* short options handled here for now */
-        switch( i_cmd )
+        /* A short option has been recognized */
+        if( pp_shortopts[i_cmd] != NULL )
         {
+            switch( pp_shortopts[i_cmd]->i_type )
+            {
+            case MODULE_CONFIG_ITEM_STRING:
+            case MODULE_CONFIG_ITEM_FILE:
+            case MODULE_CONFIG_ITEM_PLUGIN:
+                config_PutPszVariable( pp_shortopts[i_cmd]->psz_name, optarg );
+                break;
+            case MODULE_CONFIG_ITEM_INTEGER:
+                config_PutIntVariable( pp_shortopts[i_cmd]->psz_name,
+                                       atoi(optarg));
+                break;
+            case MODULE_CONFIG_ITEM_BOOL:
+                config_PutIntVariable( pp_shortopts[i_cmd]->psz_name, 1 );
+                break;
+            }
+
+            continue;
+        }
 
-        /* General/common options */
-        case 'h':                                              /* -h, --help */
-            config_PutIntVariable( "help", 1 );
-            break;
-        case 'H':                                          /* -H, --longhelp */
-            config_PutIntVariable( "longhelp", 1 );
-            break;
-        case 'l':                                              /* -l, --list */
-            config_PutIntVariable( "list", 1 );
-            break;
-        case 'p':                                            /* -p, --plugin */
-            config_PutPszVariable( "plugin", optarg );
-            break;
-        case 'v':                                           /* -v, --verbose */
+        /* Either it's a -v or it's an unknown short option */
+        if( i_cmd == 'v' )
+        {
             p_main->i_warning_level++;
-            break;
+            continue;
+        }
 
         /* Internal error: unknown option */
-        case '?':
-        default:
-
-            if( !b_ignore_errors )
-            {
-                intf_ErrMsg( "config error: unknown option `%s'",
-                             ppsz_argv[optind-1] );
-                intf_Msg( "Try `%s --help' for more information.\n",
-                          p_main->psz_arg0 );
-
-                free( p_longopts );
-                return( -1 );
-            }
+        if( !b_ignore_errors )
+        {
+            intf_ErrMsg( "config error: unknown option `%s'",
+                         ppsz_argv[optind-1] );
+            intf_Msg( "Try `%s --help' for more information.\n",
+                      p_main->psz_arg0 );
+
+            free( p_longopts );
+            free( psz_shortopts );
+            return( -1 );
         }
-
     }
 
     if( p_main->i_warning_level < 0 )
@@ -892,6 +922,7 @@ int config_LoadCmdLine( int *pi_argc, char *ppsz_argv[],
     }
 
     free( p_longopts );
+    free( psz_shortopts );
     return( 0 );
 }