Commit f70672fe authored by Christophe Massiot's avatar Christophe Massiot

* configure.ac: Worked around a bug in the OS X linker, with multiply

  defined symbols and libmp3lame
* Makefile.am: Build po before . because we need the po files to build
  VLC.app
* po/fr.po: French translation courtesy of Jean-Pierre Kuypers
* OS X interface: cosmetics
parent 913debaf
......@@ -7,7 +7,7 @@ NULL =
# SUBDIRS stores the directories where a "make" is required when building
# something. DIST_SUBDIRS stores the directories where nothing is built but
# which have makefiles with distribution information.
SUBDIRS = intl modules . mozilla share po m4
SUBDIRS = intl modules po mozilla share m4 .
DIST_SUBDIRS = $(SUBDIRS) src debian doc ipkg lib autotools
EXTRA_DIST = \
......
dnl Autoconf settings for vlc
dnl $Id: configure.ac,v 1.44 2003/07/27 21:35:50 jpsaman Exp $
dnl $Id: configure.ac,v 1.45 2003/07/28 21:41:20 massiot Exp $
AC_INIT(vlc,0.6.1-test1)
......@@ -1506,7 +1506,10 @@ if test "${enable_ffmpeg}" != "no"
then
AC_ARG_WITH(ffmpeg-mp3lame,
[ --with-ffmpeg-mp3lame if ffmpeg has been compiled with mp3lame support],
[ AX_ADD_LDFLAGS([stream_out_transcode],[-lmp3lame])
[
dnl XXX: we don't link with -lavcodec a 2nd time because the OS X
dnl linker would miserably barf on multiple definitions.
AX_ADD_LDFLAGS([stream_out_transcode],[])
AX_ADD_LDFLAGS([ffmpeg],[-lmp3lame]) ])
AC_ARG_WITH(ffmpeg-tree,
......
......@@ -2,7 +2,7 @@
* output.m: MacOS X Output Dialog
*****************************************************************************
* Copyright (C) 2002-2003 VideoLAN
* $Id: output.m,v 1.11 2003/07/27 23:05:41 hartman Exp $
* $Id: output.m,v 1.12 2003/07/28 21:41:20 massiot Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
......@@ -260,8 +260,8 @@
else if( [o_mode isEqualToString: _NS("RTP")] )
{
[o_stream_address setEnabled: YES];
[o_stream_ttl setEnabled: NO];
[o_stream_ttl_stp setEnabled: NO];
[o_stream_ttl setEnabled: YES];
[o_stream_ttl_stp setEnabled: YES];
[[o_mux_selector itemAtIndex: 1] setEnabled: NO];
[[o_mux_selector itemAtIndex: 2] setEnabled: NO];
[[o_mux_selector itemAtIndex: 3] setEnabled: NO];
......
......@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: vlc\n"
"POT-Creation-Date: 2003-07-24 00:53+0200\n"
"PO-Revision-Date: 2001-12-10 13:32+0100\n"
"Last-Translator: Jean-Pierre Kuypers <Kuypers@sri.ucl.ac.be>\n"
"Last-Translator: Jean-Pierre Kuypers <Kuypers@sri.ucl.ac.be> 2003-07-27\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
......@@ -279,7 +279,8 @@ msgid ""
msgstr ""
"Cette option permet de choisir des interfaces supplmentaires utiliser. "
"Elles seront lances en tche de fond en plus de l'interface prdfini. "
"Utilisez une liste de modules spars par des virgules."
"Utilisez une liste de modules spars par des virgules. "
"(Les valeurs courantes sont logger, gestures, sap, rc, http, screensaver.)"
#: src/libvlc.h:55
msgid "Verbosity (0,1,2)"
......@@ -453,17 +454,17 @@ msgstr ""
#: src/libvlc.h:130
#, fuzzy
msgid "Choose prefered audio output channels mode"
msgstr "Liste d'encodeurs audio prfrs"
msgstr "Slectionnez le mode des canaux de sortie audio prfr"
#: src/libvlc.h:132
#, fuzzy
msgid ""
"This option allows you to set the audio output channels mode that will be "
"used by default when possible (ie. if your hardware supports it as well as "
"the audio stream being played)"
msgstr ""
"Cette option permet d'utiliser a priori la sortie audio S/PDIF lorsque le "
"matriel la reconnat de mme que le flux audio en train d'tre jou."
"Cette option permet de fixer le mode des canaux de sortie audio utiliser "
"a priori si possible (i.e. si le matriel en est capable, de mme que le flux "
"audio jouer)."
#: src/libvlc.h:136
msgid "Use the S/PDIF audio output when available"
......@@ -1045,7 +1046,7 @@ msgstr ""
#: src/libvlc.h:402
msgid "Increase the priority of the process"
msgstr ""
msgstr "Augmente la priorit du processus"
#: src/libvlc.h:404
msgid ""
......@@ -2022,8 +2023,8 @@ msgid ""
"This video decoder can benefit from a multiprocessor computer. If you have "
"one, you can specify the number of processors here."
msgstr ""
"iCe dcodeur vido peut tirer partie d'un ordinateur multi-processeurs. Si "
"vous en avez un, vous pouvez indiquer le nombre de procsseurs ici."
"Ce dcodeur vido peut tirer partie d'un ordinateur multi-processeurs. Si "
"vous en avez un, vous pouvez indiquer le nombre de processeurs ici."
#: modules/codec/mpeg_video/parser.c:76
msgid "Force synchro algorithm {I|I+|IP|IP+|IPB}"
......@@ -2129,9 +2130,8 @@ msgid "mouse gestures control interface"
msgstr "Interface de contrle de mouvements de souris"
#: modules/control/http.c:131
#, fuzzy
msgid "Host address"
msgstr "Adresse"
msgstr "Adresse l'hte"
#: modules/control/http.c:133
#, fuzzy
......@@ -2139,9 +2139,8 @@ msgid "You can set the address and port on which the http interface will bind"
msgstr "Indiquez l'adresse laquelle l'interface HTPP est relie"
#: modules/control/http.c:134 modules/control/http.c:135
#, fuzzy
msgid "Source directory"
msgstr "Choisir un fichier ou un rpertoire"
msgstr "Rpertoire source"
#: modules/control/http.c:138
msgid "HTTP remote control interface"
......@@ -2152,9 +2151,8 @@ msgid "HTTP remote control"
msgstr "Commande HTTP distance"
#: modules/control/joystick.c:134
#, fuzzy
msgid "the amount of joystick movement required for a movement to berecorded"
msgstr "La quantit requise pour enregistrer un mouvement de souris"
msgstr "La quantit requise pour enregistrer un mouvement de joystick"
#: modules/control/joystick.c:137
msgid "Joystick device"
......@@ -2433,9 +2431,8 @@ msgid "FOURCC"
msgstr ""
#: modules/demux/avi/avi.c:1187
#, fuzzy
msgid "Audio Bitrate"
msgstr "Audio"
msgstr "Dbit audio"
#: modules/demux/avi/avi.c:1225 modules/demux/ogg.c:631
#: modules/demux/ogg.c:737 modules/demux/ogg.c:912
......@@ -3150,7 +3147,7 @@ msgstr "Tout s
#: modules/gui/beos/PlayListWindow.cpp:103
msgid "Select None"
msgstr ""
msgstr "Ne rien slectionner"
#: modules/gui/beos/PlayListWindow.cpp:108
msgid "Sort Reverse"
......@@ -4447,7 +4444,7 @@ msgstr "Lisez-moi..."
#: modules/gui/macosx/intf.m:417
msgid "Online Documentation"
msgstr ""
msgstr "Documentation en ligne"
#: modules/gui/macosx/intf.m:418
msgid "Report a Bug"
......@@ -4470,7 +4467,7 @@ msgid ""
"An error has occurred which probably prevented the execution of your request:"
msgstr ""
"Une erreur est survenue, qui a probablement empch le droulement normal du "
"programme:"
"programme :"
#: modules/gui/macosx/intf.m:431
msgid "If you believe that it is a bug, please follow the instructions at:"
......@@ -4545,7 +4542,7 @@ msgstr "Dossier VIDEO_TS"
#: modules/gui/macosx/open.m:157 modules/gui/macosx/open.m:389
#: modules/gui/macosx/open.m:480
msgid "Audio CD"
msgstr ""
msgstr "CD audio"
#: modules/gui/macosx/open.m:171
msgid "Load subtitles file:"
......@@ -4553,7 +4550,7 @@ msgstr "Fichier de sous-titres :"
#: modules/gui/macosx/open.m:174
msgid "Override"
msgstr "Ecraser"
msgstr "Remplacer"
#: modules/gui/macosx/open.m:333 modules/gui/macosx/open.m:527
#: modules/gui/macosx/open.m:631 modules/gui/macosx/open.m:678
......@@ -4571,7 +4568,7 @@ msgstr "Ouvrir un dossier VIDEO_TS"
#: modules/gui/macosx/output.m:132
msgid "Advanced output:"
msgstr ""
msgstr "Options de sortie avances :"
#: modules/gui/macosx/output.m:136
msgid "Output Options"
......@@ -4611,22 +4608,21 @@ msgstr ""
#: modules/gui/macosx/output.m:157
msgid "Transcode options"
msgstr ""
msgstr "Options de transcodage"
#: modules/gui/macosx/output.m:161 modules/gui/macosx/output.m:167
#: modules/gui/wxwindows/streamout.cpp:609
#: modules/gui/wxwindows/streamout.cpp:661
msgid "Bitrate (kb/s)"
msgstr ""
msgstr "Dbit (kbps)"
#: modules/gui/macosx/output.m:174 modules/gui/wxwindows/streamout.cpp:483
#, fuzzy
msgid "Miscellaneous Options"
msgstr "Divers"
msgstr "Options diverses"
#: modules/gui/macosx/output.m:175
msgid "Announce streams via SAP Channel:"
msgstr ""
msgstr "Annoncer le flux via un canal SAP :"
#: modules/gui/macosx/output.m:306 modules/gui/macosx/output.m:366
msgid "mp4"
......@@ -4650,11 +4646,11 @@ msgid ""
"Are you sure you want to continue?"
msgstr ""
"Attention, ceci va rinitialiser le fichier de configuration du VLC.\n"
"Voulez-vous vraiment continuer ?"
"Dsirez-vous vraiment continuer ?"
#: modules/gui/macosx/prefs.m:198
msgid "Select file or directory"
msgstr "Choisir un fichier ou un rpertoire"
msgstr "Slectionnez un fichier ou un rpertoire"
#: modules/gui/macosx/prefs.m:408 modules/gui/wxwindows/preferences.cpp:767
msgid "Default"
......@@ -4665,14 +4661,12 @@ msgid "ncurses interface"
msgstr "Interface ncurses"
#: modules/gui/pda/interface.c:396
#, fuzzy
msgid "UDP/RTP (Adress when Multicast)"
msgstr "Multidiffusion UDP/RTP"
#: modules/gui/pda/pda.c:72
#, fuzzy
msgid "PDA Linux Gtk2+ interface"
msgstr "Interface Gtk+ Familiar Linux"
msgstr "Interface Gtk2+ Linux pour PDA"
#: modules/gui/qnx/qnx.c:44
msgid "QNX RTOS video and audio output"
......@@ -4925,16 +4919,15 @@ msgstr "Entr
#: modules/gui/wxwindows/menus.cpp:197
msgid "Close Menu"
msgstr ""
msgstr "Fermer"
#: modules/gui/wxwindows/menus.cpp:358
msgid "Empty"
msgstr "Vide"
#: modules/gui/wxwindows/messages.cpp:116
#, fuzzy
msgid "Save As..."
msgstr "&Sauver la liste de lecture..."
msgstr "Enregistrer sous..."
#: modules/gui/wxwindows/messages.cpp:121
msgid "Verbose"
......@@ -4942,7 +4935,7 @@ msgstr "Verbeux"
#: modules/gui/wxwindows/messages.cpp:222
msgid "Save Messages As a file..."
msgstr ""
msgstr "Enregistrer les messages dans un document..."
#: modules/gui/wxwindows/open.cpp:181
msgid ""
......@@ -4953,7 +4946,7 @@ msgstr ""
#: modules/gui/wxwindows/open.cpp:198 modules/gui/wxwindows/subtitles.cpp:98
msgid "Subtitles file"
msgstr ""
msgstr "Fichier de sous-titres"
#: modules/gui/wxwindows/open.cpp:199
msgid "Load an additional subtitles file. Currently only works with AVI files."
......@@ -4977,7 +4970,7 @@ msgstr ""
#: modules/gui/wxwindows/open.cpp:386
msgid "CD Audio"
msgstr ""
msgstr "CD audio"
#: modules/gui/wxwindows/open.cpp:886 modules/gui/wxwindows/streamout.cpp:785
msgid "Save file"
......@@ -4994,11 +4987,11 @@ msgstr ""
#: modules/gui/wxwindows/playlist.cpp:118
msgid "&Open Playlist..."
msgstr "&Ouvre la liste de lecture"
msgstr "&Ouvrir la liste de lecture"
#: modules/gui/wxwindows/playlist.cpp:119
msgid "&Save Playlist..."
msgstr "&Sauver la liste de lecture..."
msgstr "&Enregistrer la liste de lecture..."
#: modules/gui/wxwindows/playlist.cpp:121
msgid "&Close"
......@@ -5030,7 +5023,7 @@ msgstr "Pas d'info"
#: modules/gui/wxwindows/playlist.cpp:332
msgid "Save playlist"
msgstr "Sauver la liste de lecture"
msgstr "Enregistrer la liste de lecture"
#: modules/gui/wxwindows/preferences.cpp:318
msgid "Reset config file"
......@@ -5073,20 +5066,19 @@ msgstr "Nom de fichier"
#: modules/gui/wxwindows/streamout.cpp:495
msgid "SAP Announce"
msgstr ""
msgstr "Annonce SAP"
#: modules/gui/wxwindows/streamout.cpp:497
#, fuzzy
msgid "Channel Name "
msgstr "Serveur de chanes"
msgstr "Nom du canal"
#: modules/gui/wxwindows/streamout.cpp:569
msgid "Transcoding options"
msgstr ""
msgstr "Options de transcodage"
#: modules/gui/wxwindows/streamout.cpp:602
msgid "Video codec"
msgstr "Codec video"
msgstr "Codec vido"
#: modules/gui/wxwindows/streamout.cpp:649
msgid "Audio codec"
......@@ -5098,7 +5090,7 @@ msgstr "Ouvrir un fichier de sous-titres"
#: modules/gui/wxwindows/subtitles.cpp:115
msgid "Subtitles options"
msgstr "Sous-titres"
msgstr "Options de sous-titres"
#: modules/gui/wxwindows/subtitles.cpp:119
msgid "Delay subtitles (in 1/10s)"
......@@ -5149,7 +5141,7 @@ msgstr ""
#: modules/misc/dummy/dummy.c:53
msgid "dummy interface function"
msgstr "fonctions d'interface qui ne fint rien"
msgstr "fonctions d'interface qui ne font rien"
#: modules/misc/dummy/dummy.c:62
msgid "dummy access function"
......@@ -5174,7 +5166,7 @@ msgstr "fonctions de sortie vid
#: modules/misc/dummy/dummy.c:84
#, fuzzy
msgid "dummy font renderer function"
msgstr "fonctions d'interface qui ne fint rien"
msgstr "fonctions d'interface qui ne font rien"
#: modules/misc/dummy/interface.c:52
msgid "Using the dummy interface plugin..."
......@@ -5197,9 +5189,8 @@ msgid "The size of the fonts used by the osd module"
msgstr "Taille de caractres utilise par le module osd"
#: modules/misc/freetype.c:71
#, fuzzy
msgid "Fonts"
msgstr "Police"
msgstr "Polices"
#: modules/misc/freetype.c:74
msgid "freetype2 font renderer"
......@@ -5283,7 +5274,7 @@ msgstr ""
#: modules/misc/sap.c:144 modules/misc/sap.c:145
msgid "SAP multicast address"
msgstr ""
msgstr "Adresse de multidiffusion SAP"
#: modules/misc/sap.c:146
msgid "No IPv4-SAP listening"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment