From: Gildas Bazin <gbazin@videolan.org>
Date: Mon, 11 Aug 2003 19:30:36 +0000 (+0000)
Subject: * ChangeLog, po/*: preparing for the 0.6.2 release
X-Git-Tag: 0.6.2~25
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=5e422b1ff9247e46387798e43076f9c185cde6f2;p=vlc

* ChangeLog, po/*: preparing for the 0.6.2 release
---

diff --git a/ChangeLog b/ChangeLog
index 39dde6bbd5..f678d85e94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,495 @@
+2003-08-11 Monday 18:52  gbazin
+
+ * modules/packetizer/mpegvideo.c: oops, fixed typo.
+
+2003-08-11 Monday 17:31  gbazin
+
+ * modules/packetizer/mpegvideo.c: small clarification.
+ * modules/gui/wxwindows/wxwindows.cpp: don't try to destroy wxWindows objects when wxWindows has already exited.
+
+2003-08-10 Sunday 22:13  fenrir
+
+  * mpegvideo.c: try to set a better value for length. (I am not sure it is
+  the good one but it give far better result). dts/pts/length computation
+  should be verified.
+
+2003-08-10 Sunday 21:26  gbazin
+
+ * ALL: preparing for a 0.6.2 release
+
+2003-08-10 Sunday 14:23  gbazin
+
+ * modules/mux/mpeg/ts.c: oops.
+
+2003-08-10 Sunday 14:21  gbazin
+
+ * modules/demux/mkv.cpp, modules/mux/avi.c, modules/mux/mpeg/ts.c, modules/packetizer/copy.c: thou shalt not use %lld which is not portable.
+
+2003-08-10 Sunday 13:35  gbazin
+
+ * modules/access/vcd/vcd.c: a few navigation fixes.
+
+2003-08-10 Sunday 12:45  zorglub
+
+ * modules/LIST: Updated all modules
+
+ * modules/list.sh: piggy list consistency checker
+  (should probably be added to toolbox or trashed)
+
+ * modules/access/slp.c : Fixed service detection
+ 	(findsrvtypes returns a comma-separated list of services)
+
+2003-08-10 Sunday 10:22  gbazin
+
+ * modules/codec/subsdec/subsdec.[c,h]: added --subsdec-align option to specify center, left or right alignment.
+ * include/osd.h, modules/misc/freetype.c: support for center alignment.
+ * modules/gui/wxwindows/subtitles.cpp: string change.
+
+2003-08-10 Sunday 09:22  gbazin
+
+ * include/configuration.h: bug fix for add_string_from_list()
+ * modules/gui/wxwindows/*: added a subtitles encoding combobox in the subtitles dialog.
+
+2003-08-09 Saturday 19:49  gbazin
+
+ * modules/codec/ffmpeg/video.c: temporary hack to work around demuxers that set the DTS value in p_pes->i_pts.
+ * modules/demux/ogg.c: don't try anymore to send interpolated pts to ffmpeg.
+
+2003-08-09 Saturday 19:39  gbazin
+
+ * modules/access/vcd/vcd.c: sanity check on the track requested by the user. This avoids nasty segfaults.
+
+2003-08-09 Saturday 19:14  gbazin
+
+ * modules/access/vcd/cdrom.c: switching to YellowMode2 for reading VCDs apparently created problems for some people so the reading is reverted to XAForm2 and only if this one fails we try YellowMode2. Hopefully that will still allow us to read the SVCD DATA track.
+
+2003-08-09 Saturday 14:59  gbazin
+
+ * src/stream_output/stream_output.c, include/stream_output.h: added an i_padding field to sout_instance_t so we can allocate sout_buffers with a bit more space than asked for (needed for ffmpeg decoding).
+ * modules/stream_out/transcode.c: proper pts/dts generation. This allows the transcoder module to finally generate proper streams.
+    Added support for b frames (bframe=x option) + couple of bug fixes.
+
+2003-08-08 Friday 17:08  gbazin
+
+ * modules/codec/ffmpeg/: proper generation of pts in the video decoder + couple of bug fixes + cleanup.
+    The ffmpeg video decoder can now be used to decode mpeg1/2 videos as well.
+ * modules/codec/libmpeg2.c: upped priority so it will be used to decode mpeg1/2 videos instead of ffmpeg.
+
+2003-08-08 Friday 16:50  gbazin
+
+ * src/input/input_clock.c: reverted the patch that caused the regression in 0.6.1
+ * modules/packetizer/copy.c: fixed segfault
+ * modules/gui/wxwindows/wxwindows.cpp: compilation fix for wxWindows 2.5 cvs
+
+2003-08-08 Friday 16:41  massiot
+
+ * modules/gui/macosx/prefs.m: Localized two strings.
+
+2003-08-06 Wednesday 12:01  jpsaman
+
+ Updated my entry.
+
+2003-08-05 Tuesday 11:54  jpsaman
+
+ The familiar interface is now officially removed from VLC. The interface is superseeded by the PDA interface for handhelds. It uses Gtk+2 and can be built using the configure option '--enable-pda'.
+
+2003-08-05 Tuesday 11:52  jpsaman
+
+ Added glade2 project file.
+
+2003-08-05 Tuesday 11:51  jpsaman
+
+ Removing file.
+
+2003-08-05 Tuesday 11:49  jpsaman
+
+ Removing files for Familiar interface (Gtk+1.2 and GPE).
+
+2003-08-05 Tuesday 10:39  jpsaman
+
+ Fixed superflous tuning ;-)
+
+2003-08-05 Tuesday 09:35  jpsaman
+
+ - Enabled tuning for DVB-C and DVB-T cards.
+ - Syncing with old satellite plugin.
+ - Cleanup of code.
+
+2003-08-05 Tuesday 08:02  asmax
+
+ * VLC_AddTarget had a new prototype
+
+2003-08-05 Tuesday 01:27  fenrir
+
+  * sdp: near implemented basic RTP reading (MPA payload type may work when
+ used without RTSP).
+
+2003-08-04 Monday 23:35  gbazin
+
+ * src/video_output/video_text.c: removed legacy code that has been rotting for ages.
+
+2003-08-04 Monday 23:31  gbazin
+
+ * modules/misc/freetype.c: don't assume input string is in utf8 when calculating its length (better alloc more space than necessary).
+    + cleanup.
+
+2003-08-04 Monday 22:49  fenrir
+
+  * ts: fixed a segfault when removing PCR stream.
+
+2003-08-04 Monday 18:50  fenrir
+
+  * sdp: begun to implement RTP code. (Not yet usefull)
+
+2003-08-04 Monday 12:40  jpsaman
+
+ Added a error message that the default values are used.
+
+2003-08-04 Monday 12:34  jpsaman
+
+ Tuning succeeds, but have no audio yet. Major cleanup of code.
+
+2003-08-04 Monday 12:34  jpsaman
+
+ Fixed missing headerfile.
+
+2003-08-04 Monday 00:48  fenrir
+
+  * sdp: - fixed loading of file > 1024 bytes.
+         - more processing -> now it should extract enough informations to
+         build RTP/RTSP session.
+         (Does not play anything yet)
+
+2003-08-03 Sunday 23:11  gbazin
+
+ * src/misc/configuration.c, include/configuration.h, src/audio_output/intf.c, include/audio_output.h, modules/gui/gtk/display.[ch]: configuration variables now use vlc_callback_t callbacks (same as the object variables).
+ * modules/video_output/x11/*: support for the _NET_WM_STATE_FULLSCREEN hint from the Extended Window Manager Hints spec.
+ * modules/audio_output/alsa.c: support for 4.0 and 5.1 audio channels. This time it has been tested ;)
+
+2003-08-03 Sunday 20:25  gbazin
+
+ * src/input/input_ext-plugins.c: fixed nasty segfault when pf_read() returns -1;
+
+2003-08-03 Sunday 16:36  bigben
+
+ * modules/access_out/http.c :
+
+ using ability to give parametters to a specific sout module to set user and password fot http access out.
+
+ new syntax is '#dst{access=http{user=foo,pass=bar}}
+
+ --sout-http-user and --sout-http-pwd parametters have been deleted.
+
+2003-08-03 Sunday 16:22  fenrir
+
+  * sdp: parse 'a=' field.
+
+2003-08-03 Sunday 15:25  fenrir
+
+  * sdp: begining of a SDP parser. It won't let you play anything for
+  now, it just does (incomplete) parsing.
+
+2003-08-03 Sunday 13:49  titer
+
+  configure.ac : added needed linking flags for BeOS/Zeta
+  Makefile.am : cleaned make packages-beos
+
+2003-08-03 Sunday 12:04  fenrir
+
+  * rtsp: mmmh, close the socket.
+
+2003-08-03 Sunday 02:00  fenrir
+
+  rtsp: connect  to an RTSP server,  issue a DESCRIBE command  and return
+ the  answer.  It  WON'T  let  you  do  rtsp  as  we  first  need  a  SDP
+ parser/demuxer, but it is on the way.
+
+  The idea is to have a generic  SDP demuxer that will work with SDP from
+ file, http or rtsp.
+
+2003-08-02 Saturday 19:30  bigben
+
+ * modules/access/http.c
+       - Didn't  take into consideration  a little change of  behavior between config_GetPsz and var_Get during my last commit, so that we were sending authentification information even if there wasn't any.
+
+2003-08-02 Saturday 19:16  fenrir
+
+  * ninput : a little developer documentation.
+
+2003-08-02 Saturday 16:43  fenrir
+
+  * all: some helpers functions for pf_demux_control.
+
+2003-08-02 Saturday 15:22  fenrir
+
+  * all: added a pf_demux_control member to input_thread_t. It is currently
+  unused.
+
+2003-08-02 Saturday 14:06  gbazin
+
+ * ALL: bumped version number to 0.6.2-cvs
+ * modules/video_output/x11/xcommon.c: closing the video window or using the escape key doesn't exit VLC anymore but stop the input instead.
+
+2003-08-02 Saturday 01:33  fenrir
+
+  * ps: clean up and dvd subtitles support.
+
+2003-08-01 Friday 20:06  gbazin
+
+ * modules/mux/mp4.c: support for mov muxing + cleanup.
+ * modules/codec/quicktime.c: small cleanup.
+
+2003-08-01 Friday 19:38  fenrir
+
+  * udp: clean up.
+
+2003-08-01 Friday 19:38  fenrir
+
+  ts: large rewrite of the TS muxer to produce better TS and support DVD
+      subtitle.
+      I have added some options:
+         - bmin : minimum bitrate (bits/s) of the TS. Padding is added in
+         case of insuffisant bitrate. (default: disabled).
+         - bmax : maximum bitrate (bit/s) of the TS. It just drops packets
+         to achieve the target. (default: disabled)
+         - pcr : minimum delay between two pcr equal to dts of the video
+         stream (default 100ms)
+         - pcr-soft : minimum delay between two pcr interpolated from the
+         pcr that are equal to dts. (default: none)
+  Remarks:
+   - bmin/bmax allow to create CBR stream.
+   - Bitrate is calculated on a PCR time.
+   - PCR delay cannot be less than length of a frame of the PCR stream.
+   - PCR soft is used to help when using big PCR delay. It is usefull to
+   produce stream with smoother bitrate variation.
+   - Big PCR delay introduce more latency.
+
+  TODO:
+   Test stability, bugs ...
+
+2003-08-01 Friday 18:49  fenrir
+
+  * ts.c: arggg, bad copy/past.
+
+2003-08-01 Friday 18:42  fenrir
+
+  * stream_output.c: fixed a segfault when muxer isn't specified.
+
+2003-08-01 Friday 18:02  fenrir
+
+  * ts: apply patch of Andy Lindsay (fix one memory leak and PMT handling)
+        converted all u8,u16,u32 into uint8_t, uint16_t, uint32_t
+
+2003-08-01 Friday 17:38  fenrir
+
+  * index.html,style.css : remove built-in css file. added link to info.html.
+
+2003-08-01 Friday 17:30  fenrir
+
+  * http: added mime type for .css file.
+
+2003-08-01 Friday 17:21  fenrir
+
+  * info: commit the good file...
+
+2003-08-01 Friday 09:45  sam
+
+   * modules/access/http.c:
+     + Coding style fixes.
+     + Removed a C99-ism.
+
+2003-08-01 Friday 08:24  sam
+
+   * debian/rules:
+     + Activated freetype support.
+   * debian/control:
+     + Added a build-dependency on freetype6-dev.
+     + Added a build-dependency on libdvbpsi2-dev.
+     + We now recommend gnome-vlc | wxvlc.
+     + We now suggest fortune-mod.
+
+2003-08-01 Friday 00:40  fenrir
+
+  * configure.ac: audio -> mpga
+  * demux/* : function name consistency.
+
+2003-08-01 Friday 00:37  fenrir
+
+  * mpga: mp3 demuxer written from scratch using ninput.h
+
+2003-08-01 Friday 00:26  fenrir
+
+  * configure.ac: remove old wav and aac directories.
+
+2003-08-01 Friday 00:16  fenrir
+
+  * Modules.am : added aac.c and wav.c
+  * asf/asf.c: better check for invalid header.
+
+2003-08-01 Friday 00:09  fenrir
+
+  * wav.c : big clean up and use ninput.h
+
+2003-08-01 Friday 00:08  fenrir
+
+  * aac.c : big clean up and use ninput.h
+
+2003-08-01 Friday 00:05  fenrir
+
+  au.c : cleaned up and use ninput.h
+
+2003-08-01 Friday 00:05  gbazin
+
+ * src/input/input_clock.c: fixed 2 regressions in 0.6.1. These fixes are actually there to make us more complacent with broken streams.
+ * modules/access/dvb/qpsk.c: gettext reserves the use of _("").
+ * modules/demux/mkv.cpp, modules/demux/avi/libavi.c, modules/demux/mp4/libmp4.c, modules/demux/mpeg/m4v.c: checks for input_SplitBuffer() > 0. (Thanks to Steve Li for pointing this out)
+
+2003-08-01 Friday 00:04  fenrir
+
+  a52sys.c: completely rewritten a52 stream demuxer. Now you should be able
+  to play such file.
+
+2003-08-01 Friday 00:00  fenrir
+
+  * modules.c : include ninput.h
+
+2003-08-01 Friday 00:00  fenrir
+
+  * vlc_common.h: include stdarg.h by default. Required by ninput.h
+  *  ninput.h :  extracted  duplicated  stream functions  from  a lot  of
+  demuxers and do a nice (?) API.
+  * stream.c: implement basic streams  manipulation. It is just a wrapper
+  but it is useful.
+  * all: added a i_ttl field in network_socket_t to allow per connection ttl
+ setting (in fact only used by access_out/udp.c.
+
+2003-07-31 Thursday 23:44  fenrir
+
+  * all: added a i_ttl field in network_socket_t to allow per connection ttl
+ setting (in fact only used by access_out/udp.c.
+
+2003-07-31 Thursday 23:14  massiot
+
+ Fixed a memory leak (thanks Andy Lindsay !).
+
+2003-07-31 Thursday 21:46  gbazin
+
+ * src/misc/win32_specific.c: change the mode of stdin to _O_BINARY so we can use stdin to read files (thanks to Steve Li).
+ * modules/control/http.c: allow directories of the form "x:\" on win32.
+
+2003-07-31 Thursday 21:18  bigben
+
+ * modules/access/http.c :
+ 	- using new var_Create/var_Get method to get parametters.
+
+2003-07-31 Thursday 20:47  reno
+
+ * Make vlc compiling !
+
+2003-07-31 Thursday 19:24  fenrir
+
+  * stream_output: * some clean and fixed a little memory leak.
+                   * give to access and muxers options. Now you can use:
+ --sout 'access{option1=value}/mux{a=value,b=value}:/path'. It should also
+ works with '#std{access=access{o=v}, mux=...}' (but untested). For now it's
+ not used.
+
+2003-07-31 Thursday 19:14  fenrir
+
+  * stream_output: * added some #define for private flags.
+                   * now muxer and access_out also receive options like
+                   stream_out.
+
+2003-07-31 Thursday 19:10  bigben
+
+ * modules/access_out/http.c
+        - httpd.c has support for Basic Authentification, so use it !
+          --sout-http-user user --sout-http-pwd password
+
+2003-07-31 Thursday 19:02  fenrir
+
+  * copy.c: Added DVD subtitle support. I still need to commit the TS
+ muxer.
+
+2003-07-31 Thursday 18:25  bigben
+
+ * Add support for basic authentification in http access.
+
+ use :
+
+ --http-user user --http-pwd password
+
+ or
+
+ http://user:password@server/path (2nd parameter overrides the first)
+
+2003-07-31 Thursday 17:03  sigmunau
+
+ modules/misc/freetype.c:
+   - calculate and store size information for each line independently.
+   - misc other fixes
+
+2003-07-31 Thursday 15:31  jpsaman
+
+ Updated LIST of modules and configuration options for building.
+
+2003-07-31 Thursday 15:30  jpsaman
+
+ Adding DVB module to support satellite, cable and terestrial DVB streaming. The status is that tuning works, but have had no success with video/audio yet. (Setting of filters does not seem to work perfectly yet.).
+
+2003-07-31 Thursday 13:06  sam
+
+   * toolbox: Export LC_ALL=C to avoid future cluttering of POTFILES.in.
+   * po/: Re-ran toolbox --update-po.
+
+2003-07-31 Thursday 12:08  sam
+
+   * Added and fixed .cvsignore files.
+
+2003-07-31 Thursday 11:02  sam
+
+   * Makefile.am: Really put po before ., not . after everything else. Fixed the
+     Mozilla plugin build while preserving the fix for VLC.app.
+
+2003-07-31 Thursday 08:18  zorglub
+
+ * modules/control/joystick.c
+ 	* Allow the user to remap the actions.
+ 	* Improved the strings (please check)
+ 	* Prevent 0 seconds seeks
+
+ * share/http/*.html
+ 	* partial HTML validation fixes
+ 	* Improved the look
+
+ * src/stream_output/announce.c
+ 	* minor fixes (thanks sam)
+
+2003-07-30 Wednesday 21:09  gbazin
+
+ * modules/control/http.c: on win32 we store the html interface in "http" not "share/http".
+ * src/input/input_programs.c: check for "" descriptions in AddES().
+
+2003-07-30 Wednesday 12:21  jpsaman
+
+ Updating design of PDA Gtk2 interface
+
+2003-07-30 Wednesday 12:20  jpsaman
+
+ Updating design of PDA Gtk2 interface.
+
+2003-07-30 Wednesday 02:00  fenrir
+
+  * transcode:
+     - added new HQ mode (recent ffmpeg only). hq now accept "simple",
+       "bits" and "rd" as paramters.
+     - automaticaly try stereo mode encoding when failed with more
+       than 2 channels. (eg a52 -> mpga)
+
+2003-07-29 Tuesday 23:55  gbazin
+
+ * ChangeLog: update.
+
 2003-07-29 Tuesday 23:50  gbazin
 
  * configure.ac: added the svlc shortcut for the skins.
@@ -2993,10 +3485,6 @@
 
  removed the --playlist option as it doesn't seem to be used
 
-2003-05-21 Wednesday 10:02  fenrir
-
- * wav: fix a parsing bug.
-
 2003-05-20 Tuesday 23:17  gbazin
 
  * modules/gui/wxwindows/*, modules/gui/skins/src/vlcproc.cpp: The open dialog box now handles multiple files selection.
@@ -3259,10 +3747,6 @@
    * ./debian/control: Debian packages now build with an mpeg2dec CVS tree in
      the extras/ directory.
 
-2003-05-14 Wednesday 14:58  fenrir
-
-  * aac: use extention based detection.
-
 2003-05-14 Wednesday 14:57  hartman
 
  * Forgot one
@@ -6072,10 +6556,6 @@
   * ffmpeg.h: added missing fourcc.
   * araw.c: fixed a warning.
 
-2003-03-11 Tuesday 06:45  fenrir
-
-  * wav: Support for alaw/ulaw data. (untested)
-
 2003-03-11 Tuesday 06:14  fenrir
 
   * Hugly hack: break huge block of samples into smaller ones else
@@ -6632,10 +7112,6 @@
 
   * asf: fix seek for http.
 
-2003-02-24 Monday 09:18  fenrir
-
-  * wav: proper seek handling. (wav file readable over http).
-
 2003-02-23 Sunday 22:35  fenrir
 
   * enable httpd(by default) and http.
@@ -8714,10 +9190,6 @@
 
   * asf : more msg_Err -> msg_Warn
 
-2003-01-20 Monday 13:03  fenrir
-
-  * aac: some msg_Err -> msg_Warn
-
 2003-01-20 Monday 13:01  fenrir
 
   * all: changed some msg_Err into msg_Warn.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 06352e8483..d548c3bc0c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -21,6 +21,7 @@ include/modules.h
 include/modules_inner.h
 include/mtime.h
 include/network.h
+include/ninput.h
 include/os_specific.h
 include/osd.h
 include/stream_control.h
@@ -60,6 +61,7 @@ src/extras/getopt.c
 src/extras/getopt.h
 src/extras/getopt1.c
 src/extras/libc.c
+src/input/demux.c
 src/input/input.c
 src/input/input_clock.c
 src/input/input_dec.c
@@ -68,6 +70,7 @@ src/input/input_ext-intf.c
 src/input/input_ext-plugins.c
 src/input/input_info.c
 src/input/input_programs.c
+src/input/stream.c
 src/interface/interface.c
 src/interface/intf_eject.c
 src/libvlc.c
@@ -101,6 +104,10 @@ src/vlc.c
 # modules
 modules/access/cdda.c
 modules/access/directory.c
+modules/access/dvb/access.c
+modules/access/dvb/dvb.c
+modules/access/dvb/dvb.h
+modules/access/dvb/qpsk.c
 modules/access/dvd/access.c
 modules/access/dvd/demux.c
 modules/access/dvd/dvd.c
@@ -146,6 +153,7 @@ modules/access/mms/mmstu.c
 modules/access/mms/mmstu.h
 modules/access/pvr/pvr.c
 modules/access/pvr/videodev2.h
+modules/access/rtsp.c
 modules/access/satellite/access.c
 modules/access/satellite/dvb.c
 modules/access/satellite/dvb.h
@@ -311,7 +319,7 @@ modules/control/joystick.c
 modules/control/lirc/lirc.c
 modules/control/rc/rc.c
 modules/demux/a52sys.c
-modules/demux/aac/demux.c
+modules/demux/aac.c
 modules/demux/asf/asf.c
 modules/demux/asf/asf.h
 modules/demux/asf/libasf.c
@@ -329,22 +337,22 @@ modules/demux/mp4/libmp4.c
 modules/demux/mp4/libmp4.h
 modules/demux/mp4/mp4.c
 modules/demux/mp4/mp4.h
-modules/demux/mpeg/audio.c
 modules/demux/mpeg/es.c
 modules/demux/mpeg/m4v.c
+modules/demux/mpeg/mpga.c
 modules/demux/mpeg/ps.c
 modules/demux/mpeg/system.c
 modules/demux/mpeg/system.h
 modules/demux/mpeg/ts.c
 modules/demux/ogg.c
 modules/demux/rawdv.c
+modules/demux/sdp.c
 modules/demux/util/id3.c
 modules/demux/util/id3genres.h
 modules/demux/util/id3tag.c
 modules/demux/util/sub.c
 modules/demux/util/sub.h
-modules/demux/wav/wav.c
-modules/demux/wav/wav.h
+modules/demux/wav.c
 modules/encoder/ffmpeg/audio.c
 modules/encoder/ffmpeg/encoder.c
 modules/encoder/ffmpeg/video.c
@@ -374,18 +382,6 @@ modules/gui/beos/VideoOutput.cpp
 modules/gui/beos/VideoWindow.h
 modules/gui/beos/VlcWrapper.cpp
 modules/gui/beos/VlcWrapper.h
-modules/gui/familiar/callbacks.c
-modules/gui/familiar/callbacks.h
-modules/gui/familiar/familiar.c
-modules/gui/familiar/familiar.h
-modules/gui/familiar/interface.c
-modules/gui/familiar/interface.h
-modules/gui/familiar/network.c
-modules/gui/familiar/network.h
-modules/gui/familiar/playlist.c
-modules/gui/familiar/playlist.h
-modules/gui/familiar/support.c
-modules/gui/familiar/support.h
 modules/gui/gtk/common.h
 modules/gui/gtk/control.c
 modules/gui/gtk/control.h
@@ -585,6 +581,7 @@ modules/gui/skins/x11/x11_timer.cpp
 modules/gui/skins/x11/x11_timer.h
 modules/gui/skins/x11/x11_window.cpp
 modules/gui/skins/x11/x11_window.h
+modules/gui/wxwindows/control.cpp
 modules/gui/wxwindows/dialogs.cpp
 modules/gui/wxwindows/fileinfo.cpp
 modules/gui/wxwindows/interface.cpp
diff --git a/po/de.po b/po/de.po
index c073189902..a0bd958daf 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vlc 0.73.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-07-31 15:04+0200\n"
+"POT-Creation-Date: 2003-08-11 21:05+0200\n"
 "PO-Revision-Date: 2002-04-18 23:38+0100\n"
 "Last-Translator: Felix Kühne <fk@aenneburghardt.de>\n"
 "Language-Team: \n"
@@ -34,7 +34,7 @@ msgid "Audio channels"
 msgstr "Tonkanäle"
 
 #: src/audio_output/output.c:107 src/audio_output/output.c:142
-#: modules/audio_output/alsa.c:179 modules/audio_output/directx.c:423
+#: modules/audio_output/alsa.c:177 modules/audio_output/directx.c:423
 #: modules/audio_output/oss.c:202 modules/audio_output/sdl.c:181
 #: modules/audio_output/sdl.c:198 modules/audio_output/waveout.c:386
 msgid "Stereo"
@@ -111,11 +111,11 @@ msgstr "%s: Option `-W %s' ist doppeldeutig\n"
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: Option `-W %s' erlaubt kein Argument\n"
 
-#: src/input/input.c:171
+#: src/input/input.c:174
 msgid "General"
 msgstr "Übersicht"
 
-#: src/input/input.c:172
+#: src/input/input.c:175
 msgid "Playlist Item"
 msgstr "Wiedergabelisten-Objekt"
 
@@ -126,9 +126,9 @@ msgid "Program"
 msgstr "Programm"
 
 #: src/input/input_programs.c:98 modules/demux/asf/libasf.c:696
-#: modules/demux/mkv.cpp:2394 modules/gui/beos/MediaControlView.cpp:1258
+#: modules/demux/mkv.cpp:2398 modules/gui/beos/MediaControlView.cpp:1258
 #: modules/gui/gtk/gnome_interface.c:1650 modules/gui/gtk/gtk_interface.c:1956
-#: modules/gui/gtk/menu.c:1402 modules/gui/gtk/menu.c:1423
+#: modules/gui/gtk/menu.c:1403 modules/gui/gtk/menu.c:1424
 #: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:373
 #: modules/gui/macosx/intf.m:374 modules/gui/macosx/open.m:150
 #: modules/gui/wxwindows/open.cpp:406
@@ -137,7 +137,7 @@ msgstr "Titel"
 
 #: src/input/input_programs.c:102 modules/gui/beos/MediaControlView.cpp:1259
 #: modules/gui/gtk/gnome_interface.c:1640 modules/gui/gtk/gtk_interface.c:1946
-#: modules/gui/gtk/menu.c:1019 modules/gui/gtk/menu.c:1432
+#: modules/gui/gtk/menu.c:1020 modules/gui/gtk/menu.c:1433
 #: modules/gui/kde/interface.cpp:146 modules/gui/macosx/intf.m:375
 #: modules/gui/macosx/intf.m:376 modules/gui/macosx/open.m:151
 #: modules/gui/wxwindows/open.cpp:412
@@ -211,15 +211,15 @@ msgstr ""
 "Usage: %s [Optionen] [Date]...\n"
 "\n"
 
-#: src/libvlc.c:1200 src/misc/configuration.c:1019
+#: src/libvlc.c:1200 src/misc/configuration.c:1040
 msgid "string"
 msgstr "Text"
 
-#: src/libvlc.c:1217 src/misc/configuration.c:1000
+#: src/libvlc.c:1217 src/misc/configuration.c:1021
 msgid "integer"
 msgstr "Ganzzahl"
 
-#: src/libvlc.c:1220 src/misc/configuration.c:1009
+#: src/libvlc.c:1220 src/misc/configuration.c:1030
 msgid "float"
 msgstr "Fließkommazahl"
 
@@ -1116,16 +1116,16 @@ msgstr "Oberfl
 
 #: src/libvlc.h:474 modules/audio_output/coreaudio.c:227
 #: modules/audio_output/file.c:108 modules/demux/asf/asf.c:228
-#: modules/demux/mkv.cpp:2445 modules/demux/ogg.c:557 modules/demux/ogg.c:829
-#: modules/demux/ogg.c:1002 modules/gui/beos/InterfaceWindow.cpp:259
+#: modules/demux/mkv.cpp:2449 modules/demux/ogg.c:558 modules/demux/ogg.c:830
+#: modules/demux/ogg.c:1003 modules/gui/beos/InterfaceWindow.cpp:259
 #: modules/gui/gtk/gnome_interface.c:1092 modules/gui/gtk/gtk_interface.c:1219
 #: modules/gui/macosx/intf.m:378 modules/gui/macosx/output.m:156
 msgid "Audio"
 msgstr "Ton"
 
-#: src/libvlc.h:493 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1217
-#: modules/demux/mkv.cpp:2461 modules/demux/ogg.c:629 modules/demux/ogg.c:669
-#: modules/demux/ogg.c:734 modules/demux/ogg.c:909
+#: src/libvlc.h:493 modules/demux/asf/asf.c:298 modules/demux/avi/avi.c:1217
+#: modules/demux/mkv.cpp:2465 modules/demux/ogg.c:630 modules/demux/ogg.c:670
+#: modules/demux/ogg.c:735 modules/demux/ogg.c:910
 #: modules/gui/gtk/gnome_interface.c:1099 modules/gui/gtk/gtk_interface.c:1296
 #: modules/gui/macosx/intf.m:389 modules/gui/macosx/macosx.m:68
 #: modules/gui/macosx/output.m:150 modules/misc/dummy/dummy.c:81
@@ -1133,7 +1133,8 @@ msgstr "Ton"
 msgid "Video"
 msgstr "Bild"
 
-#: src/libvlc.h:515 modules/access/satellite/satellite.c:66
+#: src/libvlc.h:515 modules/access/dvb/qpsk.c:101
+#: modules/access/satellite/satellite.c:66
 msgid "Input"
 msgstr "Input"
 
@@ -1156,7 +1157,7 @@ msgid "CPU"
 msgstr "Prozessor"
 
 #: src/libvlc.h:579 modules/gui/beos/InterfaceWindow.cpp:206
-#: modules/gui/familiar/interface.c:610 modules/gui/gtk/gnome_interface.c:643
+#: modules/gui/gtk/gnome_interface.c:643
 #: modules/gui/gtk/gnome_interface.c:2384
 #: modules/gui/gtk/gnome_interface.c:2409 modules/gui/gtk/gtk_interface.c:747
 #: modules/gui/gtk/gtk_interface.c:2697 modules/gui/macosx/intf.m:321
@@ -1169,11 +1170,10 @@ msgstr "Wiedergabeliste"
 #: src/libvlc.h:585 modules/audio_filter/converter/a52tofloat32.c:85
 #: modules/audio_filter/converter/mpgatofixed32.c:60
 #: modules/codec/a52old/a52old.c:59 modules/codec/mpeg_video/parser.c:84
-#: modules/demux/mpeg/ts.c:118 modules/gui/familiar/familiar.c:70
-#: modules/gui/pda/pda.c:70 modules/misc/logger/logger.c:89
-#: modules/video_filter/motionblur.c:58 modules/video_filter/transform.c:63
-#: modules/video_filter/wall.c:66 modules/video_output/ggi.c:62
-#: modules/video_output/mga/xmga.c:102
+#: modules/demux/mpeg/ts.c:118 modules/gui/pda/pda.c:70
+#: modules/misc/logger/logger.c:89 modules/video_filter/motionblur.c:58
+#: modules/video_filter/transform.c:63 modules/video_filter/wall.c:66
+#: modules/video_output/ggi.c:62 modules/video_output/mga/xmga.c:102
 msgid "Miscellaneous"
 msgstr "Sonstiges"
 
@@ -1201,7 +1201,7 @@ msgstr "Hilfe 
 msgid "print version information"
 msgstr "Versionsinformationen ausgeben."
 
-#: src/misc/configuration.c:1000
+#: src/misc/configuration.c:1021
 msgid "boolean"
 msgstr "boolesch"
 
@@ -1265,6 +1265,111 @@ msgstr "Audio-CD-Demux"
 msgid "Standard filesystem directory input"
 msgstr "Standard-Dateisystem für Ordner-Input"
 
+#: modules/access/dvb/qpsk.c:44
+msgid "adapter card to tune"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:45
+msgid "adapter cards have a device file named /dev/dvb/adapter[n] with n>=0"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:47
+msgid "device nummer to use on adapter"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:50
+#, fuzzy
+msgid "satellite default transponder frequency"
+msgstr "Standard-Satelliten-Transponder-Frequenz"
+
+#: modules/access/dvb/qpsk.c:53
+#, fuzzy
+msgid "satellite default transponder polarization"
+msgstr "Standard-Satelliten-Transponder-Polarisation"
+
+#: modules/access/dvb/qpsk.c:56
+#, fuzzy
+msgid "satellite default transponder FEC"
+msgstr "Standard-Satelliten-Transponder-FEC"
+
+#: modules/access/dvb/qpsk.c:57
+msgid "FEC=Forward Error Correction mode"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:59
+#, fuzzy
+msgid "satellite default transponder symbol rate"
+msgstr "Standard-Satelliten-Transponder-Symbolrate"
+
+#: modules/access/dvb/qpsk.c:62
+#, fuzzy
+msgid "use diseqc with antenna"
+msgstr "Verwende diseqc mit Antenne"
+
+#: modules/access/dvb/qpsk.c:65
+#, fuzzy
+msgid "antenna lnb_lof1 (kHz)"
+msgstr "Antenne lnb_lof1 (kHz)"
+
+#: modules/access/dvb/qpsk.c:68
+#, fuzzy
+msgid "antenna lnb_lof2 (kHz)"
+msgstr "Antenne lnb_lof2 (kHz)"
+
+#: modules/access/dvb/qpsk.c:71
+#, fuzzy
+msgid "antenna lnb_slof (kHz)"
+msgstr "Antenne lnb_slof (kHz)"
+
+#: modules/access/dvb/qpsk.c:74
+msgid "probe the dvb card for capabilities (default disabled)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:75
+msgid "some dvb cards do not like to be probed for their capabilities"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:78
+msgid "modulation type"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:79
+msgid "modulation type for frontend device "
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:82
+msgid "terrestrial high priority stream code rate (FEC)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:85
+msgid "terrestrial low priority stream code rate (FEC)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:88
+msgid "terrestrial bandwidth"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:89
+msgid "terrestrial bandwidth [0=auto,6,7,8 in MHz]"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:91
+msgid "terrestrial guard interval"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:94
+msgid "terrestrial transmission mode"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:97
+msgid "terrestrial hierarchy mode"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:123
+#, fuzzy
+msgid "DVB input module with v4l2 support"
+msgstr "DVD Input mit Menü-Unterstützung"
+
 #: modules/access/dvd/dvd.c:65
 msgid "Method to use by libdvdcss for key decryption"
 msgstr "Methode von libdvdcss zur Schlüssel-Decodierung"
@@ -1381,7 +1486,7 @@ msgstr ""
 msgid "http"
 msgstr "http"
 
-#: modules/access/http.c:89
+#: modules/access/http.c:91
 msgid "HTTP input"
 msgstr "HTTP-Input"
 
@@ -1401,6 +1506,10 @@ msgstr "Microsoft Media Server (MMS) Input"
 msgid "Hauppauge PVR cards input"
 msgstr "Hauppauge PVR-Karten Input"
 
+#: modules/access/rtsp.c:68
+msgid "RTSP SDP request"
+msgstr ""
+
 #: modules/access/satellite/satellite.c:41
 msgid "Satellite default transponder frequency"
 msgstr "Standard-Satelliten-Transponder-Frequenz"
@@ -1666,23 +1775,23 @@ msgstr "ALSA Tonausgabe"
 msgid "Audio device"
 msgstr "Tonausgang"
 
-#: modules/audio_output/alsa.c:173 modules/audio_output/directx.c:435
+#: modules/audio_output/alsa.c:171 modules/audio_output/directx.c:435
 #: modules/audio_output/oss.c:222 modules/audio_output/sdl.c:182
 #: modules/audio_output/sdl.c:201 modules/audio_output/waveout.c:399
 msgid "Mono"
 msgstr "Mono"
 
-#: modules/audio_output/alsa.c:186 modules/audio_output/directx.c:409
+#: modules/audio_output/alsa.c:184 modules/audio_output/directx.c:409
 #: modules/audio_output/oss.c:178 modules/audio_output/waveout.c:371
 msgid "2 Front 2 Rear"
 msgstr "2 Vorder- und 2 Rückseiten"
 
-#: modules/audio_output/alsa.c:192 modules/audio_output/directx.c:391
+#: modules/audio_output/alsa.c:190 modules/audio_output/directx.c:391
 #: modules/audio_output/oss.c:167 modules/audio_output/waveout.c:352
 msgid "5.1"
 msgstr "5.1"
 
-#: modules/audio_output/alsa.c:219 modules/audio_output/directx.c:478
+#: modules/audio_output/alsa.c:217 modules/audio_output/directx.c:478
 #: modules/audio_output/oss.c:246 modules/audio_output/waveout.c:415
 msgid "A/52 over S/PDIF"
 msgstr "A/52 über S/PDIF"
@@ -2075,20 +2184,29 @@ msgstr "Untertitel Dekoder"
 
 #: modules/codec/subsdec/subsdec.c:68
 #, fuzzy
-msgid "subtitle text encoding"
+msgid "Subtitles text encoding"
 msgstr "Untertitel Dekoder"
 
 #: modules/codec/subsdec/subsdec.c:69
 #, fuzzy
-msgid "change the encoding used in text subtitles"
+msgid "Change the encoding used in text subtitles"
 msgstr "Den aktuellen Untertitel-Stream wechseln"
 
-#: modules/codec/subsdec/subsdec.c:72
+#: modules/codec/subsdec/subsdec.c:70
+#, fuzzy
+msgid "Subtitles justification"
+msgstr "Untertitel-Optionen"
+
+#: modules/codec/subsdec/subsdec.c:71
+msgid "Change the justification of substitles (0=center, 1=left, 2=right)"
+msgstr ""
+
+#: modules/codec/subsdec/subsdec.c:74
 #, fuzzy
 msgid "file subtitles decoder"
 msgstr "Untertitel Dekoder"
 
-#: modules/codec/subsdec/subsdec.c:75 modules/gui/beos/InterfaceWindow.cpp:256
+#: modules/codec/subsdec/subsdec.c:77 modules/gui/beos/InterfaceWindow.cpp:256
 #: modules/gui/kde/interface.cpp:93
 msgid "Subtitles"
 msgstr "Untertitel"
@@ -2244,7 +2362,7 @@ msgid "Quit"
 msgstr "Beenden"
 
 #: modules/control/lirc/lirc.c:297 modules/control/lirc/lirc.c:323
-#: modules/gui/familiar/interface.c:177 modules/gui/gtk/gnome_interface.c:602
+#: modules/gui/gtk/gnome_interface.c:602
 #: modules/gui/gtk/gnome_interface.c:1020 modules/gui/gtk/gtk_interface.c:709
 #: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:921
 #: modules/gui/macosx/intf.m:922 modules/gui/macosx/intf.m:923
@@ -2252,8 +2370,7 @@ msgstr "Beenden"
 msgid "Pause"
 msgstr "Pause"
 
-#: modules/control/lirc/lirc.c:310 modules/gui/familiar/interface.c:190
-#: modules/gui/gtk/gnome_interface.c:590
+#: modules/control/lirc/lirc.c:310 modules/gui/gtk/gnome_interface.c:590
 #: modules/gui/gtk/gnome_interface.c:1013 modules/gui/gtk/gtk_interface.c:698
 #: modules/gui/macosx/intf.m:324 modules/gui/macosx/intf.m:362
 #: modules/gui/macosx/intf.m:423 modules/gui/macosx/intf.m:928
@@ -2289,68 +2406,71 @@ msgstr "Fernbedienung"
 msgid "remote control interface"
 msgstr "Fernbedienungsschnittstelle"
 
-#: modules/demux/a52sys.c:52
+#: modules/demux/a52sys.c:41
 msgid "A52 demuxer"
 msgstr "A52 Muxer"
 
-#: modules/demux/aac/demux.c:46
-msgid "AAC stream demuxer"
-msgstr "AAC Stream Bild/Ton-Trennung"
-
-#: modules/demux/aac/demux.c:555
-msgid "Aac"
-msgstr "Aac"
+#: modules/demux/a52sys.c:161
+msgid "A52"
+msgstr ""
 
-#: modules/demux/aac/demux.c:557 modules/demux/mpeg/audio.c:627
-#: modules/demux/mpeg/audio.c:644 modules/demux/mpeg/m4v.c:150
+#: modules/demux/a52sys.c:163 modules/demux/aac.c:175
+#: modules/demux/mpeg/m4v.c:150 modules/demux/mpeg/mpga.c:331
 msgid "Input Type"
 msgstr "Input-Typ"
 
-#: modules/demux/aac/demux.c:560 modules/demux/mpeg/audio.c:629
-msgid "Layer"
-msgstr "Layer"
-
-#: modules/demux/aac/demux.c:562 modules/demux/asf/asf.c:275
-#: modules/demux/avi/avi.c:1178 modules/demux/mkv.cpp:2449
-#: modules/demux/ogg.c:561 modules/demux/ogg.c:837 modules/demux/ogg.c:1010
-#: modules/gui/gtk/gnome_interface.c:148 modules/gui/gtk/gnome_interface.c:931
-#: modules/gui/gtk/gtk_interface.c:481 modules/gui/gtk/gtk_interface.c:1282
-#: modules/gui/macosx/output.m:162 modules/gui/wxwindows/streamout.cpp:668
+#: modules/demux/a52sys.c:164 modules/demux/aac.c:177
+#: modules/demux/asf/asf.c:275 modules/demux/avi/avi.c:1178
+#: modules/demux/mkv.cpp:2453 modules/demux/ogg.c:562 modules/demux/ogg.c:838
+#: modules/demux/ogg.c:1011 modules/gui/gtk/gnome_interface.c:148
+#: modules/gui/gtk/gnome_interface.c:931 modules/gui/gtk/gtk_interface.c:481
+#: modules/gui/gtk/gtk_interface.c:1282 modules/gui/macosx/output.m:162
+#: modules/gui/wxwindows/streamout.cpp:668
 msgid "Channels"
 msgstr "Kanäle"
 
-#: modules/demux/aac/demux.c:564 modules/demux/asf/asf.c:277
-#: modules/demux/avi/avi.c:1180 modules/demux/mkv.cpp:2453
-#: modules/demux/mpeg/audio.c:632 modules/demux/ogg.c:559
-#: modules/demux/ogg.c:671 modules/demux/ogg.c:832 modules/demux/ogg.c:1005
+#: modules/demux/a52sys.c:165 modules/demux/aac.c:179
+#: modules/demux/asf/asf.c:277 modules/demux/avi/avi.c:1180
+#: modules/demux/mkv.cpp:2457 modules/demux/mpeg/mpga.c:337
+#: modules/demux/ogg.c:560 modules/demux/ogg.c:672 modules/demux/ogg.c:833
+#: modules/demux/ogg.c:1006
 msgid "Sample Rate"
 msgstr "Daten-/Symbolrate"
 
+#: modules/demux/aac.c:41
+#, fuzzy
+msgid "AAC demuxer"
+msgstr "AU Muxer"
+
+#: modules/demux/aac.c:173
+msgid "Aac"
+msgstr "Aac"
+
 #: modules/demux/asf/asf.c:48
 msgid "ASF v1.0 demuxer (file only)"
 msgstr "ASF v1.0 Muxer (nur für Dateien)"
 
-#: modules/demux/asf/asf.c:165 modules/demux/mkv.cpp:2412
+#: modules/demux/asf/asf.c:165 modules/demux/mkv.cpp:2416
 msgid "Number of streams"
 msgstr "Anzahl der Streams"
 
-#: modules/demux/asf/asf.c:228 modules/demux/asf/asf.c:302
+#: modules/demux/asf/asf.c:228 modules/demux/asf/asf.c:298
 #: modules/demux/avi/avi.c:1172 modules/demux/avi/avi.c:1217
-#: modules/demux/avi/avi.c:1250 modules/demux/mkv.cpp:2445
-#: modules/demux/mkv.cpp:2461 modules/demux/mkv.cpp:2477
-#: modules/demux/ogg.c:557 modules/demux/ogg.c:629 modules/demux/ogg.c:669
-#: modules/demux/ogg.c:734 modules/demux/ogg.c:829 modules/demux/ogg.c:909
-#: modules/demux/ogg.c:1002 modules/gui/familiar/interface.c:370
-#: modules/gui/macosx/output.m:139 modules/gui/pda/interface.c:372
+#: modules/demux/avi/avi.c:1250 modules/demux/mkv.cpp:2449
+#: modules/demux/mkv.cpp:2465 modules/demux/mkv.cpp:2481
+#: modules/demux/ogg.c:558 modules/demux/ogg.c:630 modules/demux/ogg.c:670
+#: modules/demux/ogg.c:735 modules/demux/ogg.c:830 modules/demux/ogg.c:910
+#: modules/demux/ogg.c:1003 modules/gui/macosx/output.m:139
+#: modules/gui/pda/interface.c:372
 msgid "Type"
 msgstr "Typ"
 
-#: modules/demux/asf/asf.c:260 modules/demux/asf/asf.c:318
+#: modules/demux/asf/asf.c:260 modules/demux/asf/asf.c:314
 #: modules/demux/avi/avi.c:1174 modules/demux/avi/avi.c:1218
-#: modules/demux/mkv.cpp:2446 modules/demux/mkv.cpp:2462
-#: modules/demux/mkv.cpp:2478 modules/demux/ogg.c:558 modules/demux/ogg.c:630
-#: modules/demux/ogg.c:670 modules/demux/ogg.c:735 modules/demux/ogg.c:830
-#: modules/demux/ogg.c:910 modules/demux/ogg.c:1003
+#: modules/demux/mkv.cpp:2450 modules/demux/mkv.cpp:2466
+#: modules/demux/mkv.cpp:2482 modules/demux/ogg.c:559 modules/demux/ogg.c:631
+#: modules/demux/ogg.c:671 modules/demux/ogg.c:736 modules/demux/ogg.c:831
+#: modules/demux/ogg.c:911 modules/demux/ogg.c:1004
 msgid "Codec"
 msgstr "Codec"
 
@@ -2359,36 +2479,36 @@ msgid "Avg. byterate"
 msgstr "durchschnittliche Byte-Rate"
 
 #: modules/demux/asf/asf.c:282 modules/demux/avi/avi.c:1185
-#: modules/demux/mkv.cpp:2457
+#: modules/demux/mkv.cpp:2461
 msgid "Bits Per Sample"
 msgstr "Bits pro Sekunde"
 
-#: modules/demux/asf/asf.c:332
+#: modules/demux/asf/asf.c:328
 msgid "Size"
 msgstr "Größe"
 
-#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1222
-#: modules/demux/mkv.cpp:2465
+#: modules/demux/asf/asf.c:331 modules/demux/avi/avi.c:1222
+#: modules/demux/mkv.cpp:2469
 msgid "Resolution"
 msgstr "Auflösung"
 
-#: modules/demux/asf/asf.c:337
+#: modules/demux/asf/asf.c:333
 msgid "Planes"
 msgstr "Ebenen"
 
-#: modules/demux/asf/asf.c:339 modules/demux/avi/avi.c:1228
+#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1228
 msgid "Bits Per Pixel"
 msgstr "Bits pro Pixel"
 
-#: modules/demux/asf/asf.c:342
+#: modules/demux/asf/asf.c:338
 msgid "Image Size"
 msgstr "Bildgröße"
 
-#: modules/demux/asf/asf.c:344
+#: modules/demux/asf/asf.c:340
 msgid "X pixels per meter"
 msgstr "X-Pixel pro Meter"
 
-#: modules/demux/asf/asf.c:346
+#: modules/demux/asf/asf.c:342
 msgid "Y pixels per meter"
 msgstr "Y-Pixel pro Meter"
 
@@ -2421,7 +2541,7 @@ msgstr "Beschreibung"
 msgid "Rating"
 msgstr "Beurteilung"
 
-#: modules/demux/au.c:47
+#: modules/demux/au.c:42
 msgid "AU demuxer"
 msgstr "AU Muxer"
 
@@ -2467,8 +2587,8 @@ msgstr ""
 msgid "Audio Bitrate"
 msgstr "Tonspur"
 
-#: modules/demux/avi/avi.c:1225 modules/demux/ogg.c:631
-#: modules/demux/ogg.c:737 modules/demux/ogg.c:912
+#: modules/demux/avi/avi.c:1225 modules/demux/ogg.c:632
+#: modules/demux/ogg.c:738 modules/demux/ogg.c:913
 msgid "Frame Rate"
 msgstr "Frame-Rate"
 
@@ -2511,67 +2631,67 @@ msgstr ""
 msgid "mka/mkv stream demuxer"
 msgstr "AAC Stream Bild/Ton-Trennung"
 
-#: modules/demux/mkv.cpp:2389 modules/gui/gtk/gnome_interface.c:2436
+#: modules/demux/mkv.cpp:2393 modules/gui/gtk/gnome_interface.c:2436
 #: modules/gui/gtk/gtk_interface.c:2857 modules/gui/wxwindows/playlist.cpp:150
 msgid "Duration"
 msgstr "Dauer"
 
-#: modules/demux/mkv.cpp:2398
+#: modules/demux/mkv.cpp:2402
 msgid "Date UTC"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2402
+#: modules/demux/mkv.cpp:2406
 #, fuzzy
 msgid "Segment Filename"
 msgstr "Dateiname"
 
-#: modules/demux/mkv.cpp:2406
+#: modules/demux/mkv.cpp:2410
 #, fuzzy
 msgid "Muxing Application"
 msgstr "Über dieses Programm"
 
-#: modules/demux/mkv.cpp:2410
+#: modules/demux/mkv.cpp:2414
 #, fuzzy
 msgid "Writing Application"
 msgstr "Startposition"
 
-#: modules/demux/mkv.cpp:2423 modules/gui/beos/PlayListWindow.cpp:144
-#: modules/gui/familiar/interface.c:362 modules/gui/gtk/preferences.c:325
-#: modules/gui/kde/pluginsbox.cpp:45 modules/gui/pda/interface.c:364
+#: modules/demux/mkv.cpp:2427 modules/gui/beos/PlayListWindow.cpp:144
+#: modules/gui/gtk/preferences.c:325 modules/gui/kde/pluginsbox.cpp:45
+#: modules/gui/pda/interface.c:364
 msgid "Name"
 msgstr "Name"
 
-#: modules/demux/mkv.cpp:2427
+#: modules/demux/mkv.cpp:2431
 #, fuzzy
 msgid "Codec Name"
 msgstr "Codec-Name"
 
-#: modules/demux/mkv.cpp:2431
+#: modules/demux/mkv.cpp:2435
 #, fuzzy
 msgid "Codec Setting"
 msgstr "Einstellungen"
 
-#: modules/demux/mkv.cpp:2435
+#: modules/demux/mkv.cpp:2439
 #, fuzzy
 msgid "Codec Info"
 msgstr "Codec-Name"
 
-#: modules/demux/mkv.cpp:2439
+#: modules/demux/mkv.cpp:2443
 #, fuzzy
 msgid "Codec Download"
 msgstr "Codec-Name"
 
-#: modules/demux/mkv.cpp:2469
+#: modules/demux/mkv.cpp:2473
 #, fuzzy
 msgid "Display Resolution"
 msgstr "Auflösung"
 
-#: modules/demux/mkv.cpp:2473
+#: modules/demux/mkv.cpp:2477
 #, fuzzy
 msgid "Frame Per Second"
 msgstr "Bilder pro Sekunde"
 
-#: modules/demux/mkv.cpp:2477 modules/gui/gtk/gnome_interface.c:1963
+#: modules/demux/mkv.cpp:2481 modules/gui/gtk/gnome_interface.c:1963
 #: modules/gui/gtk/gtk_interface.c:2278
 msgid "Subtitle"
 msgstr "Untertitel"
@@ -2580,23 +2700,6 @@ msgstr "Untertitel"
 msgid "MP4 demuxer"
 msgstr "MP4 Bild/Ton-Trenner"
 
-#: modules/demux/mpeg/audio.c:47
-msgid "MPEG I/II audio stream demuxer"
-msgstr "MPEG I/II - Ton-Stream-Trenner"
-
-#: modules/demux/mpeg/audio.c:626 modules/demux/mpeg/audio.c:643
-#: modules/demux/mpeg/m4v.c:149
-msgid "mpeg"
-msgstr "mpeg"
-
-#: modules/demux/mpeg/audio.c:630
-msgid "Mode"
-msgstr "Modus"
-
-#: modules/demux/mpeg/audio.c:634
-msgid "Average Bitrate"
-msgstr "Durchschnittliche Bit-Rate"
-
 #: modules/demux/mpeg/es.c:49
 msgid "ISO 13818-1 MPEG Elementary Stream input"
 msgstr "ISO 13818-2 MPEG Elementary Stream Eingabe"
@@ -2605,10 +2708,36 @@ msgstr "ISO 13818-2 MPEG Elementary Stream Eingabe"
 msgid "MPEG-4 video elementary stream demuxer"
 msgstr "MPEG-4-Stream Bild-Demuxer"
 
+#: modules/demux/mpeg/m4v.c:149
+msgid "mpeg"
+msgstr "mpeg"
+
 #: modules/demux/mpeg/m4v.c:150
 msgid "Video MPEG-4 (raw ES)"
 msgstr "MPEG-4 Video (rohes ES)"
 
+#: modules/demux/mpeg/mpga.c:41
+#, fuzzy
+msgid "MPEG-I/II Audio demuxer"
+msgstr "MPEG I/II - Ton-Stream-Trenner"
+
+#: modules/demux/mpeg/mpga.c:330
+#, fuzzy
+msgid "MPEG"
+msgstr "MPEG TS"
+
+#: modules/demux/mpeg/mpga.c:333
+msgid "Layer"
+msgstr "Layer"
+
+#: modules/demux/mpeg/mpga.c:335
+msgid "Mode"
+msgstr "Modus"
+
+#: modules/demux/mpeg/mpga.c:339
+msgid "Average Bitrate"
+msgstr "Durchschnittliche Bit-Rate"
+
 #: modules/demux/mpeg/ps.c:60
 msgid "ISO 13818-1 MPEG Program Stream input"
 msgstr "ISO 13818-1 MPEG Program Stream Eingabe"
@@ -2655,36 +2784,36 @@ msgstr "ISO 13818-1 MPEG Transport Stream Eingabe (libdvbpsi)"
 msgid "ogg stream demuxer"
 msgstr "ogg-Stream Bild/Ton-Trennung"
 
-#: modules/demux/ogg.c:558
+#: modules/demux/ogg.c:559
 msgid "Vorbis"
 msgstr "Vorbis"
 
-#: modules/demux/ogg.c:563 modules/demux/ogg.c:633 modules/demux/ogg.c:673
-#: modules/demux/ogg.c:834 modules/demux/ogg.c:1007
+#: modules/demux/ogg.c:564 modules/demux/ogg.c:634 modules/demux/ogg.c:674
+#: modules/demux/ogg.c:835 modules/demux/ogg.c:1008
 msgid "Bit Rate"
 msgstr "Bit-Rate"
 
-#: modules/demux/ogg.c:630
+#: modules/demux/ogg.c:631
 msgid "Theora"
 msgstr "Theora"
 
-#: modules/demux/ogg.c:670
+#: modules/demux/ogg.c:671
 msgid "tarkin"
 msgstr "tarkin"
 
-#: modules/demux/ogg.c:739 modules/demux/ogg.c:914
+#: modules/demux/ogg.c:740 modules/demux/ogg.c:915
 msgid "Bit Count"
 msgstr "Bit-Menge"
 
-#: modules/demux/ogg.c:741 modules/demux/ogg.c:916
+#: modules/demux/ogg.c:742 modules/demux/ogg.c:917
 msgid "Width"
 msgstr "Breite"
 
-#: modules/demux/ogg.c:743 modules/demux/ogg.c:918
+#: modules/demux/ogg.c:744 modules/demux/ogg.c:919
 msgid "Height"
 msgstr "Höhe"
 
-#: modules/demux/ogg.c:839 modules/demux/ogg.c:1012
+#: modules/demux/ogg.c:840 modules/demux/ogg.c:1013
 msgid "Bits per Sample"
 msgstr "Bits pro Beispiel"
 
@@ -2692,6 +2821,10 @@ msgstr "Bits pro Beispiel"
 msgid "raw dv demuxer"
 msgstr "raw dv Bild/Ton-Trennung"
 
+#: modules/demux/sdp.c:64
+msgid "SDP demuxer + UDP/RTP/RTSP"
+msgstr ""
+
 #: modules/demux/util/id3.c:44
 msgid "Simple id3 tag skipper"
 msgstr "Einfache ID3-Tag Anzeige"
@@ -3024,7 +3157,7 @@ msgstr "ID3-Tag-Parser mit libid3tag benutzen"
 msgid "Text subtitles demux"
 msgstr "Untertitel-Datei-Demuxer"
 
-#: modules/demux/wav/wav.c:49
+#: modules/demux/wav.c:43
 msgid "WAV demuxer"
 msgstr "WAV Demuxer"
 
@@ -3057,11 +3190,9 @@ msgid "Yes"
 msgstr "Ja"
 
 #: modules/gui/beos/InterfaceWindow.cpp:201
-#: modules/gui/beos/InterfaceWindow.cpp:308
-#: modules/gui/familiar/interface.c:149 modules/gui/familiar/interface.c:150
-#: modules/gui/macosx/intf.m:328 modules/gui/macosx/prefs.m:77
-#: modules/gui/pda/interface.c:151 modules/gui/pda/interface.c:152
-#: modules/gui/wxwindows/preferences.cpp:233
+#: modules/gui/beos/InterfaceWindow.cpp:308 modules/gui/macosx/intf.m:328
+#: modules/gui/macosx/prefs.m:77 modules/gui/pda/interface.c:151
+#: modules/gui/pda/interface.c:152 modules/gui/wxwindows/preferences.cpp:233
 msgid "Preferences"
 msgstr "Einstellungen"
 
@@ -3076,7 +3207,7 @@ msgstr "Meldungen"
 
 #: modules/gui/beos/InterfaceWindow.cpp:238
 #: modules/gui/beos/MediaControlView.cpp:1257
-#: modules/gui/beos/PlayListWindow.cpp:82 modules/gui/familiar/interface.c:378
+#: modules/gui/beos/PlayListWindow.cpp:82
 #: modules/gui/gtk/gnome_interface.c:503
 #: modules/gui/gtk/gnome_interface.c:1569
 #: modules/gui/gtk/gnome_interface.c:2274
@@ -3109,10 +3240,8 @@ msgid "Open Subtitles"
 msgstr "Untertitel öffnen"
 
 #: modules/gui/beos/InterfaceWindow.cpp:249
-#: modules/gui/familiar/interface.c:231 modules/gui/familiar/interface.c:232
-#: modules/gui/familiar/interface.c:765 modules/gui/gtk/gtk_interface.c:1580
-#: modules/gui/pda/interface.c:233 modules/gui/pda/interface.c:234
-#: modules/gui/pda/interface.c:767
+#: modules/gui/gtk/gtk_interface.c:1580 modules/gui/pda/interface.c:233
+#: modules/gui/pda/interface.c:234 modules/gui/pda/interface.c:767
 msgid "About"
 msgstr "Über..."
 
@@ -3161,7 +3290,7 @@ msgstr "Wiedergabeliste"
 #: modules/gui/wxwindows/open.cpp:244
 #: modules/gui/wxwindows/preferences.cpp:253
 #: modules/gui/wxwindows/streamout.cpp:217
-#: modules/gui/wxwindows/subtitles.cpp:149
+#: modules/gui/wxwindows/subtitles.cpp:190
 msgid "OK"
 msgstr "OK"
 
@@ -3285,7 +3414,7 @@ msgstr "Im Vordergrund bleiben"
 msgid "Take Screen Shot"
 msgstr "Bildschirmfoto machen"
 
-#: modules/gui/beos/VlcWrapper.cpp:165 modules/gui/gtk/menu.c:733
+#: modules/gui/beos/VlcWrapper.cpp:165 modules/gui/gtk/menu.c:734
 msgid "None"
 msgstr "Kein"
 
@@ -3293,202 +3422,6 @@ msgstr "Kein"
 msgid "<unknown>"
 msgstr "<unbekannt>"
 
-#: modules/gui/familiar/familiar.c:62 modules/gui/pda/pda.c:62
-msgid "Autoplay selected file"
-msgstr "Ausgewählte Datei automatisch abspielen"
-
-#: modules/gui/familiar/familiar.c:63 modules/gui/pda/pda.c:63
-msgid "Automatically play a file when selected in the file selection list"
-msgstr ""
-"Automatisch die Datei abspielen, wenn sie in der Dateiliste ausgewählt wird"
-
-#: modules/gui/familiar/familiar.c:72
-msgid "Familiar Linux Gtk+ interface"
-msgstr "Familiar Linux Gtk+ Oberfläche"
-
-#: modules/gui/familiar/interface.c:99 modules/gui/familiar/interface.c:732
-#: modules/gui/gtk/gnome_interface.c:274 modules/gui/gtk/gtk_interface.c:121
-#: modules/gui/gtk/gtk_interface.c:1595 modules/gui/pda/interface.c:99
-#: modules/gui/pda/interface.c:734
-msgid "VLC media player"
-msgstr "VLC media Player"
-
-#: modules/gui/familiar/interface.c:124 modules/gui/pda/interface.c:126
-#: modules/gui/wxwindows/dialogs.cpp:268 modules/gui/wxwindows/open.cpp:709
-#: modules/gui/wxwindows/preferences.cpp:1029
-#: modules/gui/wxwindows/subtitles.cpp:196
-msgid "Open file"
-msgstr "Datei öffnen"
-
-#: modules/gui/familiar/interface.c:164 modules/gui/pda/interface.c:166
-msgid "Rewind"
-msgstr "Zurückspulen"
-
-#: modules/gui/familiar/interface.c:165 modules/gui/pda/interface.c:167
-msgid "Rewind stream"
-msgstr "Stream zurückspulen"
-
-#: modules/gui/familiar/interface.c:178 modules/gui/pda/interface.c:180
-msgid "Pause stream"
-msgstr "Stream anhalten"
-
-#: modules/gui/familiar/interface.c:191 modules/gui/pda/interface.c:193
-msgid "Play stream"
-msgstr "Stream abspielen"
-
-#: modules/gui/familiar/interface.c:203 modules/gui/gtk/gnome_interface.c:566
-#: modules/gui/gtk/gnome_interface.c:1027 modules/gui/gtk/gtk_interface.c:676
-#: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:639
-#: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
-#: modules/gui/macosx/intf.m:424 modules/gui/pda/interface.c:205
-#: modules/gui/wxwindows/interface.cpp:373
-msgid "Stop"
-msgstr "Stopp"
-
-#: modules/gui/familiar/interface.c:204 modules/gui/pda/interface.c:206
-msgid "Stop stream"
-msgstr "Stream stoppen"
-
-#: modules/gui/familiar/interface.c:216 modules/gui/pda/interface.c:218
-msgid "Forward"
-msgstr "Vorwärtsspulen"
-
-#: modules/gui/familiar/interface.c:217 modules/gui/pda/interface.c:219
-msgid "Forward stream"
-msgstr "Stream vorwärtsspulen"
-
-#: modules/gui/familiar/interface.c:285 modules/gui/gtk/gnome_interface.c:2345
-#: modules/gui/gtk/gtk_interface.c:2712 modules/gui/macosx/playlist.m:198
-#: modules/gui/pda/interface.c:287
-msgid "Add"
-msgstr "Hinzufügen"
-
-#: modules/gui/familiar/interface.c:293 modules/gui/pda/interface.c:295
-msgid "MRL :"
-msgstr "MRL:"
-
-#: modules/gui/familiar/interface.c:394
-#, fuzzy
-msgid "UDP/RTP (Address when Multicast)"
-msgstr "UDP/RTP (Adresse falls Multicast)"
-
-#: modules/gui/familiar/interface.c:412 modules/gui/gtk/gnome_interface.c:1747
-#: modules/gui/gtk/gtk_interface.c:2062 modules/gui/macosx/open.m:161
-#: modules/gui/macosx/output.m:133 modules/gui/pda/interface.c:414
-#: modules/gui/wxwindows/open.cpp:469 modules/gui/wxwindows/streamout.cpp:425
-msgid "Address"
-msgstr "Adresse"
-
-#: modules/gui/familiar/interface.c:423 modules/gui/gtk/gnome_interface.c:1737
-#: modules/gui/gtk/gnome_interface.c:1786
-#: modules/gui/gtk/gnome_interface.c:2912 modules/gui/gtk/gtk_interface.c:2052
-#: modules/gui/gtk/gtk_interface.c:2101 modules/gui/gtk/gtk_interface.c:3225
-#: modules/gui/macosx/open.m:160 modules/gui/macosx/open.m:162
-#: modules/gui/macosx/output.m:134 modules/gui/pda/interface.c:425
-#: modules/gui/wxwindows/open.cpp:454 modules/gui/wxwindows/open.cpp:477
-#: modules/gui/wxwindows/streamout.cpp:436
-msgid "Port"
-msgstr "Port"
-
-#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:136
-#: modules/gui/macosx/output.m:236 modules/gui/macosx/output.m:311
-#: modules/gui/pda/interface.c:480 modules/gui/wxwindows/streamout.cpp:386
-msgid "HTTP"
-msgstr "HTTP"
-
-#: modules/gui/familiar/interface.c:488 modules/gui/pda/interface.c:490
-msgid "FTP"
-msgstr "FTP"
-
-#: modules/gui/familiar/interface.c:498 modules/gui/pda/interface.c:500
-msgid "MMS"
-msgstr "MMS"
-
-#: modules/gui/familiar/interface.c:516 modules/gui/gtk/gnome_interface.c:1830
-#: modules/gui/gtk/gnome_interface.c:2281 modules/gui/gtk/gtk_interface.c:2145
-#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:144
-#: modules/gui/macosx/open.m:271 modules/gui/pda/interface.c:518
-#: modules/gui/wxwindows/open.cpp:257
-msgid "Network"
-msgstr "Netzwerk"
-
-#: modules/gui/familiar/interface.c:524 modules/gui/pda/interface.c:526
-msgid "Media"
-msgstr "Medium/Media"
-
-#: modules/gui/familiar/interface.c:560 modules/gui/pda/interface.c:562
-msgid "MRL"
-msgstr "MRL"
-
-#: modules/gui/familiar/interface.c:569 modules/gui/pda/interface.c:571
-msgid "Time"
-msgstr "Zeit"
-
-#: modules/gui/familiar/interface.c:586 modules/gui/pda/interface.c:588
-msgid "Update"
-msgstr "Aktualisierung"
-
-#: modules/gui/familiar/interface.c:594 modules/gui/pda/interface.c:596
-msgid " Del "
-msgstr " Del "
-
-#: modules/gui/familiar/interface.c:602 modules/gui/pda/interface.c:604
-msgid " Clear "
-msgstr " Löschen "
-
-#: modules/gui/familiar/interface.c:626 modules/gui/pda/interface.c:628
-msgid "Automatically play file"
-msgstr "Datei automatisch abspielen"
-
-#: modules/gui/familiar/interface.c:643 modules/gui/pda/interface.c:645
-msgid " Save "
-msgstr " Speichern "
-
-#: modules/gui/familiar/interface.c:651 modules/gui/pda/interface.c:653
-msgid " Apply "
-msgstr " Übernehmen "
-
-#: modules/gui/familiar/interface.c:659 modules/gui/pda/interface.c:661
-msgid " Cancel "
-msgstr " Abbrechen "
-
-#: modules/gui/familiar/interface.c:667 modules/gui/pda/interface.c:669
-msgid "Preference"
-msgstr "Einstellung"
-
-#: modules/gui/familiar/interface.c:711 modules/gui/gtk/gnome_interface.c:1361
-#: modules/gui/gtk/gtk_interface.c:1603 modules/gui/kde/kde.cpp:111
-#: modules/gui/pda/interface.c:713
-msgid "(c) 1996-2003 the VideoLAN team"
-msgstr "(c) 1996-2003 das VideoLAN Team"
-
-#: modules/gui/familiar/interface.c:721 modules/gui/pda/interface.c:723
-msgid "Authors: The VideoLAN Team, http://www.videolan.org"
-msgstr "Autoren: Das VideoLAN Team, http://www.videolan.org"
-
-#: modules/gui/familiar/interface.c:753 modules/gui/pda/interface.c:755
-msgid ""
-"The VideoLAN Client is a MPEG, MPEG 2, MP3, DivX player, that accepts input "
-"from local or network sources."
-msgstr ""
-"Der VideoLAN Client ist ein MPEG 1, MPEG 2, MP3 und DivX Player der sowohl "
-"lokale Dateien als auch Netzwerk-Quellen unterstützt."
-
-#: modules/gui/familiar/support.c:121 modules/gui/gtk/gnome_support.c:100
-#: modules/gui/gtk/gnome_support.c:138 modules/gui/gtk/gtk_support.c:121
-#: modules/gui/gtk2/gnome2_support.c:60 modules/gui/gtk2/gnome2_support.c:85
-#: modules/gui/gtk2/gtk2_support.c:90 modules/gui/gtk2/gtk2_support.c:114
-#: modules/gui/pda/support.c:121
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Konnte pixmap-Datei %s nicht finden"
-
-#: modules/gui/familiar/support.c:130 modules/gui/gtk/gtk_support.c:130
-#: modules/gui/pda/support.c:130
-#, c-format
-msgid "Error loading pixmap file: %s"
-msgstr "Fehler beim Laden der pixmap Datei %s"
-
 #: modules/gui/gtk/gnome.c:55 modules/gui/gtk/gtk.c:57
 msgid "Show tooltips"
 msgstr "Hilfetexte anzeigen"
@@ -3681,6 +3614,12 @@ msgstr "_Audio"
 msgid "_Video"
 msgstr "_Video"
 
+#: modules/gui/gtk/gnome_interface.c:274 modules/gui/gtk/gtk_interface.c:121
+#: modules/gui/gtk/gtk_interface.c:1595 modules/gui/pda/interface.c:99
+#: modules/gui/pda/interface.c:734
+msgid "VLC media player"
+msgstr "VLC media Player"
+
 #: modules/gui/gtk/gnome_interface.c:515 modules/gui/gtk/gnome_interface.c:718
 #: modules/gui/gtk/gnome_interface.c:1690
 #: modules/gui/gtk/gnome_interface.c:2267 modules/gui/gtk/gtk_interface.c:629
@@ -3715,6 +3654,15 @@ msgstr "Zur
 msgid "Go Backward"
 msgstr "Zurück gehen"
 
+#: modules/gui/gtk/gnome_interface.c:566
+#: modules/gui/gtk/gnome_interface.c:1027 modules/gui/gtk/gtk_interface.c:676
+#: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:639
+#: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
+#: modules/gui/macosx/intf.m:424 modules/gui/pda/interface.c:205
+#: modules/gui/wxwindows/interface.cpp:373
+msgid "Stop"
+msgstr "Stopp"
+
 #: modules/gui/gtk/gnome_interface.c:567 modules/gui/gtk/gtk_interface.c:677
 msgid "Stop Stream"
 msgstr "Stream stoppen"
@@ -3836,6 +3784,11 @@ msgstr "Oberfl
 msgid "Playlist..."
 msgstr "Wiedergabeliste..."
 
+#: modules/gui/gtk/gnome_interface.c:1361 modules/gui/gtk/gtk_interface.c:1603
+#: modules/gui/kde/kde.cpp:111 modules/gui/pda/interface.c:713
+msgid "(c) 1996-2003 the VideoLAN team"
+msgstr "(c) 1996-2003 das VideoLAN Team"
+
 #: modules/gui/gtk/gnome_interface.c:1363 modules/gui/gtk/gtk_interface.c:1646
 #: modules/gui/kde/kde.cpp:108
 msgid ""
@@ -3876,7 +3829,7 @@ msgstr ""
 #: modules/gui/wxwindows/open.cpp:223 modules/gui/wxwindows/open.cpp:341
 #: modules/gui/wxwindows/preferences.cpp:832
 #: modules/gui/wxwindows/streamout.cpp:412
-#: modules/gui/wxwindows/subtitles.cpp:107
+#: modules/gui/wxwindows/subtitles.cpp:109
 msgid "Browse..."
 msgstr "Durchsuchen..."
 
@@ -3925,11 +3878,37 @@ msgstr "UDP/RTP Multicast"
 msgid "HTTP/FTP/MMS"
 msgstr "HTTP/FTP/MMS"
 
+#: modules/gui/gtk/gnome_interface.c:1737
+#: modules/gui/gtk/gnome_interface.c:1786
+#: modules/gui/gtk/gnome_interface.c:2912 modules/gui/gtk/gtk_interface.c:2052
+#: modules/gui/gtk/gtk_interface.c:2101 modules/gui/gtk/gtk_interface.c:3225
+#: modules/gui/macosx/open.m:160 modules/gui/macosx/open.m:162
+#: modules/gui/macosx/output.m:134 modules/gui/pda/interface.c:425
+#: modules/gui/wxwindows/open.cpp:454 modules/gui/wxwindows/open.cpp:477
+#: modules/gui/wxwindows/streamout.cpp:436
+msgid "Port"
+msgstr "Port"
+
+#: modules/gui/gtk/gnome_interface.c:1747 modules/gui/gtk/gtk_interface.c:2062
+#: modules/gui/macosx/open.m:161 modules/gui/macosx/output.m:133
+#: modules/gui/pda/interface.c:414 modules/gui/wxwindows/open.cpp:469
+#: modules/gui/wxwindows/streamout.cpp:425
+msgid "Address"
+msgstr "Adresse"
+
 #: modules/gui/gtk/gnome_interface.c:1759 modules/gui/gtk/gtk_interface.c:2074
 #: modules/gui/macosx/open.m:163 modules/gui/wxwindows/open.cpp:492
 msgid "URL"
 msgstr "URL"
 
+#: modules/gui/gtk/gnome_interface.c:1830
+#: modules/gui/gtk/gnome_interface.c:2281 modules/gui/gtk/gtk_interface.c:2145
+#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:144
+#: modules/gui/macosx/open.m:271 modules/gui/pda/interface.c:518
+#: modules/gui/wxwindows/open.cpp:257
+msgid "Network"
+msgstr "Netzwerk"
+
 #: modules/gui/gtk/gnome_interface.c:1847 modules/gui/gtk/gtk_interface.c:2162
 msgid "Symbol Rate"
 msgstr "Daten-/Symbolrate"
@@ -4010,6 +3989,11 @@ msgstr "Invertieren"
 msgid "Select"
 msgstr "Auswählen"
 
+#: modules/gui/gtk/gnome_interface.c:2345 modules/gui/gtk/gtk_interface.c:2712
+#: modules/gui/macosx/playlist.m:198 modules/gui/pda/interface.c:287
+msgid "Add"
+msgstr "Hinzufügen"
+
 #: modules/gui/gtk/gnome_interface.c:2352 modules/gui/gtk/gtk_interface.c:2754
 #: modules/gui/macosx/playlist.m:195 modules/gui/macosx/playlist.m:199
 msgid "Delete"
@@ -4077,6 +4061,14 @@ msgstr "PS"
 msgid "AVI"
 msgstr "AVI"
 
+#: modules/gui/gtk/gnome_support.c:100 modules/gui/gtk/gnome_support.c:138
+#: modules/gui/gtk/gtk_support.c:121 modules/gui/gtk2/gnome2_support.c:60
+#: modules/gui/gtk2/gnome2_support.c:85 modules/gui/gtk2/gtk2_support.c:90
+#: modules/gui/gtk2/gtk2_support.c:114 modules/gui/pda/support.c:121
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Konnte pixmap-Datei %s nicht finden"
+
 #: modules/gui/gtk/gnome_support.c:116
 #, c-format
 msgid "Couldn't create pixmap from file: %s"
@@ -4190,10 +4182,11 @@ msgstr "Stream-Ausgaben-Einstellungen"
 #: modules/gui/gtk/gtk_interface.c:2403 modules/gui/gtk/gtk_interface.c:2645
 #: modules/gui/gtk/gtk_interface.c:2876 modules/gui/gtk/gtk_interface.c:3257
 #: modules/gui/gtk/preferences.c:618 modules/gui/macosx/open.m:140
-#: modules/gui/macosx/prefs.m:79 modules/gui/wxwindows/open.cpp:247
+#: modules/gui/macosx/prefs.m:79 modules/gui/macosx/prefs.m:170
+#: modules/gui/wxwindows/open.cpp:247
 #: modules/gui/wxwindows/preferences.cpp:256
 #: modules/gui/wxwindows/streamout.cpp:220
-#: modules/gui/wxwindows/subtitles.cpp:152
+#: modules/gui/wxwindows/subtitles.cpp:193
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -4225,12 +4218,17 @@ msgstr "_Invertieren"
 msgid "_Select"
 msgstr "_Auswählen"
 
-#: modules/gui/gtk/menu.c:900
+#: modules/gui/gtk/gtk_support.c:130 modules/gui/pda/support.c:130
+#, c-format
+msgid "Error loading pixmap file: %s"
+msgstr "Fehler beim Laden der pixmap Datei %s"
+
+#: modules/gui/gtk/menu.c:901
 #, c-format
 msgid "Title %d (%d)"
 msgstr "Titel %d (%d)"
 
-#: modules/gui/gtk/menu.c:967
+#: modules/gui/gtk/menu.c:968
 #, c-format
 msgid "Chapter %d"
 msgstr "Kapitel %d"
@@ -4382,8 +4380,9 @@ msgstr "Information"
 msgid "VLC - Controller"
 msgstr "VLC - Steuerung"
 
-#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/interface.cpp:904
-#: modules/gui/wxwindows/timer.cpp:131
+#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/control.cpp:160
+#: modules/gui/wxwindows/control.cpp:370
+#: modules/gui/wxwindows/interface.cpp:904 modules/gui/wxwindows/timer.cpp:131
 msgid "Volume"
 msgstr "Lautstärke"
 
@@ -4637,6 +4636,12 @@ msgstr "Stream"
 msgid "TTL"
 msgstr "TTL"
 
+#: modules/gui/macosx/output.m:136 modules/gui/macosx/output.m:236
+#: modules/gui/macosx/output.m:311 modules/gui/pda/interface.c:480
+#: modules/gui/wxwindows/streamout.cpp:386
+msgid "HTTP"
+msgstr "HTTP"
+
 #: modules/gui/macosx/output.m:141 modules/gui/wxwindows/streamout.cpp:531
 msgid "Encapsulation Method"
 msgstr "Verkapslungsmethode"
@@ -4696,6 +4701,11 @@ msgstr "Erweitert"
 msgid "Reset Preferences"
 msgstr "Voreinstellungen zurücksetzen"
 
+#: modules/gui/macosx/prefs.m:170
+#, fuzzy
+msgid "Continue"
+msgstr "Einstellen"
+
 #: modules/gui/macosx/prefs.m:172 modules/gui/wxwindows/preferences.cpp:316
 msgid ""
 "Beware this will reset your VLC Media Player config file.\n"
@@ -4716,11 +4726,123 @@ msgstr "Standard"
 msgid "ncurses interface"
 msgstr "ncurses Oberfläche"
 
+#: modules/gui/pda/interface.c:126 modules/gui/wxwindows/dialogs.cpp:268
+#: modules/gui/wxwindows/open.cpp:709
+#: modules/gui/wxwindows/preferences.cpp:1029
+#: modules/gui/wxwindows/subtitles.cpp:234
+msgid "Open file"
+msgstr "Datei öffnen"
+
+#: modules/gui/pda/interface.c:166
+msgid "Rewind"
+msgstr "Zurückspulen"
+
+#: modules/gui/pda/interface.c:167
+msgid "Rewind stream"
+msgstr "Stream zurückspulen"
+
+#: modules/gui/pda/interface.c:180
+msgid "Pause stream"
+msgstr "Stream anhalten"
+
+#: modules/gui/pda/interface.c:193
+msgid "Play stream"
+msgstr "Stream abspielen"
+
+#: modules/gui/pda/interface.c:206
+msgid "Stop stream"
+msgstr "Stream stoppen"
+
+#: modules/gui/pda/interface.c:218
+msgid "Forward"
+msgstr "Vorwärtsspulen"
+
+#: modules/gui/pda/interface.c:219
+msgid "Forward stream"
+msgstr "Stream vorwärtsspulen"
+
+#: modules/gui/pda/interface.c:295
+msgid "MRL :"
+msgstr "MRL:"
+
 #: modules/gui/pda/interface.c:396
 #, fuzzy
 msgid "UDP/RTP (Adress when Multicast)"
 msgstr "UDP/RTP (Adresse falls Multicast)"
 
+#: modules/gui/pda/interface.c:490
+msgid "FTP"
+msgstr "FTP"
+
+#: modules/gui/pda/interface.c:500
+msgid "MMS"
+msgstr "MMS"
+
+#: modules/gui/pda/interface.c:526
+msgid "Media"
+msgstr "Medium/Media"
+
+#: modules/gui/pda/interface.c:562
+msgid "MRL"
+msgstr "MRL"
+
+#: modules/gui/pda/interface.c:571
+msgid "Time"
+msgstr "Zeit"
+
+#: modules/gui/pda/interface.c:588
+msgid "Update"
+msgstr "Aktualisierung"
+
+#: modules/gui/pda/interface.c:596
+msgid " Del "
+msgstr " Del "
+
+#: modules/gui/pda/interface.c:604
+msgid " Clear "
+msgstr " Löschen "
+
+#: modules/gui/pda/interface.c:628
+msgid "Automatically play file"
+msgstr "Datei automatisch abspielen"
+
+#: modules/gui/pda/interface.c:645
+msgid " Save "
+msgstr " Speichern "
+
+#: modules/gui/pda/interface.c:653
+msgid " Apply "
+msgstr " Übernehmen "
+
+#: modules/gui/pda/interface.c:661
+msgid " Cancel "
+msgstr " Abbrechen "
+
+#: modules/gui/pda/interface.c:669
+msgid "Preference"
+msgstr "Einstellung"
+
+#: modules/gui/pda/interface.c:723
+msgid "Authors: The VideoLAN Team, http://www.videolan.org"
+msgstr "Autoren: Das VideoLAN Team, http://www.videolan.org"
+
+#: modules/gui/pda/interface.c:755
+msgid ""
+"The VideoLAN Client is a MPEG, MPEG 2, MP3, DivX player, that accepts input "
+"from local or network sources."
+msgstr ""
+"Der VideoLAN Client ist ein MPEG 1, MPEG 2, MP3 und DivX Player der sowohl "
+"lokale Dateien als auch Netzwerk-Quellen unterstützt."
+
+#: modules/gui/pda/pda.c:62
+msgid "Autoplay selected file"
+msgstr "Ausgewählte Datei automatisch abspielen"
+
+#: modules/gui/pda/pda.c:63
+msgid "Automatically play a file when selected in the file selection list"
+msgstr ""
+"Automatisch die Datei abspielen, wenn sie in der Dateiliste ausgewählt wird"
+
 #: modules/gui/pda/pda.c:72
 #, fuzzy
 msgid "PDA Linux Gtk2+ interface"
@@ -5020,7 +5142,7 @@ msgstr "Stream-Input festhalten"
 msgid "Capture the stream you are playing to a file"
 msgstr "Den Stream einfangen, die Sie in eine Datei abspielen"
 
-#: modules/gui/wxwindows/open.cpp:348 modules/gui/wxwindows/subtitles.cpp:98
+#: modules/gui/wxwindows/open.cpp:348 modules/gui/wxwindows/subtitles.cpp:100
 msgid "Subtitles file"
 msgstr "Untertitel-Datei"
 
@@ -5037,7 +5159,7 @@ msgstr "DVD (Men
 msgid "CD Audio"
 msgstr "Audio-CD"
 
-#: modules/gui/wxwindows/open.cpp:900 modules/gui/wxwindows/streamout.cpp:784
+#: modules/gui/wxwindows/open.cpp:903 modules/gui/wxwindows/streamout.cpp:784
 msgid "Save file"
 msgstr "Datei sichern"
 
@@ -5158,19 +5280,24 @@ msgstr "Ton-Codec"
 msgid "Open Subtitles File"
 msgstr "Untertitel-Datei öffnen"
 
-#: modules/gui/wxwindows/subtitles.cpp:115
+#: modules/gui/wxwindows/subtitles.cpp:123
+#, fuzzy
+msgid "Subtitles encoding"
+msgstr "Untertitel Dekoder"
+
+#: modules/gui/wxwindows/subtitles.cpp:155
 msgid "Subtitles options"
 msgstr "Untertitel-Optionen"
 
-#: modules/gui/wxwindows/subtitles.cpp:119
+#: modules/gui/wxwindows/subtitles.cpp:159
 msgid "Delay subtitles (in 1/10s)"
 msgstr "Untertitel verzögern (in 1/10s)"
 
-#: modules/gui/wxwindows/subtitles.cpp:130
+#: modules/gui/wxwindows/subtitles.cpp:170
 msgid "Frames per second"
 msgstr "Bilder pro Sekunde"
 
-#: modules/gui/wxwindows/subtitles.cpp:138
+#: modules/gui/wxwindows/subtitles.cpp:178
 msgid "Override frames per second. It will only work with MicroDVD subtitles."
 msgstr ""
 "Bilder pro Sekunde übergehen. Dies wird nur mit MicroDVD-Untertiteln laufen."
@@ -5244,28 +5371,28 @@ msgstr "Dummy Obefl
 msgid "Using the dummy interface plugin..."
 msgstr "Das Dummy-Benutzeroberflächen-PlugIn benutzen..."
 
-#: modules/misc/freetype.c:67 modules/visualization/xosd/xosd.c:71
+#: modules/misc/freetype.c:72 modules/visualization/xosd/xosd.c:71
 msgid "Font"
 msgstr "Schrift"
 
-#: modules/misc/freetype.c:68
+#: modules/misc/freetype.c:73
 msgid "Filename of Font"
 msgstr "Dateiname der Schrift"
 
-#: modules/misc/freetype.c:69
+#: modules/misc/freetype.c:74
 msgid "Font size"
 msgstr "Schriftgröße"
 
-#: modules/misc/freetype.c:70
+#: modules/misc/freetype.c:75
 msgid "The size of the fonts used by the osd module"
 msgstr "Die Schriftgröße, die vom osd-Modul benutzt wird"
 
-#: modules/misc/freetype.c:73
+#: modules/misc/freetype.c:78
 #, fuzzy
 msgid "Fonts"
 msgstr "Schrift"
 
-#: modules/misc/freetype.c:76
+#: modules/misc/freetype.c:81
 msgid "freetype2 font renderer"
 msgstr ""
 
@@ -5404,19 +5531,19 @@ msgstr "Avi Muxer"
 msgid "Dummy muxer"
 msgstr "Dummy Muxer"
 
-#: modules/mux/mp4.c:52
+#: modules/mux/mp4.c:56
 msgid "MP4/MOV muxer"
 msgstr "MP4/MOV Muxer"
 
-#: modules/mux/mpeg/ps.c:79
+#: modules/mux/mpeg/ps.c:53
 msgid "PS muxer"
 msgstr "PS Muxer"
 
-#: modules/mux/mpeg/ts.c:138
+#: modules/mux/mpeg/ts.c:78
 msgid "TS muxer"
 msgstr "TS Muxer"
 
-#: modules/mux/mpeg/ts.c:143
+#: modules/mux/mpeg/ts.c:83
 msgid "TS muxer (libdvbpsi)"
 msgstr "TS Muxer (libdvbpsi)"
 
@@ -5428,7 +5555,7 @@ msgstr "Ogg/ogm Muxer"
 msgid "A/52 audio packetizer"
 msgstr "A/52 Ton-Packetizer"
 
-#: modules/packetizer/copy.c:69
+#: modules/packetizer/copy.c:43
 msgid "Copy packetizer"
 msgstr "Kopier-Packetizer"
 
@@ -5473,7 +5600,7 @@ msgstr "ES Stream"
 msgid "Standard stream"
 msgstr "Standard Stream"
 
-#: modules/stream_out/transcode.c:71
+#: modules/stream_out/transcode.c:73
 msgid "Transcode stream"
 msgstr "Stream umkodieren"
 
@@ -5987,6 +6114,16 @@ msgstr "XOSD Modul"
 msgid "xosd interface"
 msgstr "xosd Oberfläche"
 
+#~ msgid "AAC stream demuxer"
+#~ msgstr "AAC Stream Bild/Ton-Trennung"
+
+#~ msgid "Familiar Linux Gtk+ interface"
+#~ msgstr "Familiar Linux Gtk+ Oberfläche"
+
+#, fuzzy
+#~ msgid "UDP/RTP (Address when Multicast)"
+#~ msgstr "UDP/RTP (Adresse falls Multicast)"
+
 #, fuzzy
 #~ msgid "Advanced open options"
 #~ msgstr "Erweiterte Optionen"
diff --git a/po/en_GB.po b/po/en_GB.po
index 20f25eff16..b92140d285 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vlc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-07-31 15:04+0200\n"
+"POT-Creation-Date: 2003-08-11 21:05+0200\n"
 "PO-Revision-Date: 2002-04-22 09:56+0200\n"
 "Last-Translator: Samuel Hocevar <sam@zoy.org>\n"
 "Language-Team: \n"
@@ -39,7 +39,7 @@ msgid "Audio channels"
 msgstr ""
 
 #: src/audio_output/output.c:107 src/audio_output/output.c:142
-#: modules/audio_output/alsa.c:179 modules/audio_output/directx.c:423
+#: modules/audio_output/alsa.c:177 modules/audio_output/directx.c:423
 #: modules/audio_output/oss.c:202 modules/audio_output/sdl.c:181
 #: modules/audio_output/sdl.c:198 modules/audio_output/waveout.c:386
 msgid "Stereo"
@@ -116,11 +116,11 @@ msgstr ""
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr ""
 
-#: src/input/input.c:171
+#: src/input/input.c:174
 msgid "General"
 msgstr ""
 
-#: src/input/input.c:172
+#: src/input/input.c:175
 msgid "Playlist Item"
 msgstr ""
 
@@ -131,9 +131,9 @@ msgid "Program"
 msgstr "Programme"
 
 #: src/input/input_programs.c:98 modules/demux/asf/libasf.c:696
-#: modules/demux/mkv.cpp:2394 modules/gui/beos/MediaControlView.cpp:1258
+#: modules/demux/mkv.cpp:2398 modules/gui/beos/MediaControlView.cpp:1258
 #: modules/gui/gtk/gnome_interface.c:1650 modules/gui/gtk/gtk_interface.c:1956
-#: modules/gui/gtk/menu.c:1402 modules/gui/gtk/menu.c:1423
+#: modules/gui/gtk/menu.c:1403 modules/gui/gtk/menu.c:1424
 #: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:373
 #: modules/gui/macosx/intf.m:374 modules/gui/macosx/open.m:150
 #: modules/gui/wxwindows/open.cpp:406
@@ -142,7 +142,7 @@ msgstr ""
 
 #: src/input/input_programs.c:102 modules/gui/beos/MediaControlView.cpp:1259
 #: modules/gui/gtk/gnome_interface.c:1640 modules/gui/gtk/gtk_interface.c:1946
-#: modules/gui/gtk/menu.c:1019 modules/gui/gtk/menu.c:1432
+#: modules/gui/gtk/menu.c:1020 modules/gui/gtk/menu.c:1433
 #: modules/gui/kde/interface.cpp:146 modules/gui/macosx/intf.m:375
 #: modules/gui/macosx/intf.m:376 modules/gui/macosx/open.m:151
 #: modules/gui/wxwindows/open.cpp:412
@@ -214,15 +214,15 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/libvlc.c:1200 src/misc/configuration.c:1019
+#: src/libvlc.c:1200 src/misc/configuration.c:1040
 msgid "string"
 msgstr ""
 
-#: src/libvlc.c:1217 src/misc/configuration.c:1000
+#: src/libvlc.c:1217 src/misc/configuration.c:1021
 msgid "integer"
 msgstr ""
 
-#: src/libvlc.c:1220 src/misc/configuration.c:1009
+#: src/libvlc.c:1220 src/misc/configuration.c:1030
 msgid "float"
 msgstr ""
 
@@ -988,16 +988,16 @@ msgstr ""
 
 #: src/libvlc.h:474 modules/audio_output/coreaudio.c:227
 #: modules/audio_output/file.c:108 modules/demux/asf/asf.c:228
-#: modules/demux/mkv.cpp:2445 modules/demux/ogg.c:557 modules/demux/ogg.c:829
-#: modules/demux/ogg.c:1002 modules/gui/beos/InterfaceWindow.cpp:259
+#: modules/demux/mkv.cpp:2449 modules/demux/ogg.c:558 modules/demux/ogg.c:830
+#: modules/demux/ogg.c:1003 modules/gui/beos/InterfaceWindow.cpp:259
 #: modules/gui/gtk/gnome_interface.c:1092 modules/gui/gtk/gtk_interface.c:1219
 #: modules/gui/macosx/intf.m:378 modules/gui/macosx/output.m:156
 msgid "Audio"
 msgstr ""
 
-#: src/libvlc.h:493 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1217
-#: modules/demux/mkv.cpp:2461 modules/demux/ogg.c:629 modules/demux/ogg.c:669
-#: modules/demux/ogg.c:734 modules/demux/ogg.c:909
+#: src/libvlc.h:493 modules/demux/asf/asf.c:298 modules/demux/avi/avi.c:1217
+#: modules/demux/mkv.cpp:2465 modules/demux/ogg.c:630 modules/demux/ogg.c:670
+#: modules/demux/ogg.c:735 modules/demux/ogg.c:910
 #: modules/gui/gtk/gnome_interface.c:1099 modules/gui/gtk/gtk_interface.c:1296
 #: modules/gui/macosx/intf.m:389 modules/gui/macosx/macosx.m:68
 #: modules/gui/macosx/output.m:150 modules/misc/dummy/dummy.c:81
@@ -1005,7 +1005,8 @@ msgstr ""
 msgid "Video"
 msgstr ""
 
-#: src/libvlc.h:515 modules/access/satellite/satellite.c:66
+#: src/libvlc.h:515 modules/access/dvb/qpsk.c:101
+#: modules/access/satellite/satellite.c:66
 msgid "Input"
 msgstr ""
 
@@ -1028,7 +1029,7 @@ msgid "CPU"
 msgstr ""
 
 #: src/libvlc.h:579 modules/gui/beos/InterfaceWindow.cpp:206
-#: modules/gui/familiar/interface.c:610 modules/gui/gtk/gnome_interface.c:643
+#: modules/gui/gtk/gnome_interface.c:643
 #: modules/gui/gtk/gnome_interface.c:2384
 #: modules/gui/gtk/gnome_interface.c:2409 modules/gui/gtk/gtk_interface.c:747
 #: modules/gui/gtk/gtk_interface.c:2697 modules/gui/macosx/intf.m:321
@@ -1041,11 +1042,10 @@ msgstr ""
 #: src/libvlc.h:585 modules/audio_filter/converter/a52tofloat32.c:85
 #: modules/audio_filter/converter/mpgatofixed32.c:60
 #: modules/codec/a52old/a52old.c:59 modules/codec/mpeg_video/parser.c:84
-#: modules/demux/mpeg/ts.c:118 modules/gui/familiar/familiar.c:70
-#: modules/gui/pda/pda.c:70 modules/misc/logger/logger.c:89
-#: modules/video_filter/motionblur.c:58 modules/video_filter/transform.c:63
-#: modules/video_filter/wall.c:66 modules/video_output/ggi.c:62
-#: modules/video_output/mga/xmga.c:102
+#: modules/demux/mpeg/ts.c:118 modules/gui/pda/pda.c:70
+#: modules/misc/logger/logger.c:89 modules/video_filter/motionblur.c:58
+#: modules/video_filter/transform.c:63 modules/video_filter/wall.c:66
+#: modules/video_output/ggi.c:62 modules/video_output/mga/xmga.c:102
 msgid "Miscellaneous"
 msgstr ""
 
@@ -1073,7 +1073,7 @@ msgstr ""
 msgid "print version information"
 msgstr ""
 
-#: src/misc/configuration.c:1000
+#: src/misc/configuration.c:1021
 msgid "boolean"
 msgstr ""
 
@@ -1135,6 +1135,102 @@ msgstr ""
 msgid "Standard filesystem directory input"
 msgstr ""
 
+#: modules/access/dvb/qpsk.c:44
+msgid "adapter card to tune"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:45
+msgid "adapter cards have a device file named /dev/dvb/adapter[n] with n>=0"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:47
+msgid "device nummer to use on adapter"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:50
+msgid "satellite default transponder frequency"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:53
+msgid "satellite default transponder polarization"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:56
+msgid "satellite default transponder FEC"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:57
+msgid "FEC=Forward Error Correction mode"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:59
+msgid "satellite default transponder symbol rate"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:62
+msgid "use diseqc with antenna"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:65
+msgid "antenna lnb_lof1 (kHz)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:68
+msgid "antenna lnb_lof2 (kHz)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:71
+msgid "antenna lnb_slof (kHz)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:74
+msgid "probe the dvb card for capabilities (default disabled)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:75
+msgid "some dvb cards do not like to be probed for their capabilities"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:78
+msgid "modulation type"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:79
+msgid "modulation type for frontend device "
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:82
+msgid "terrestrial high priority stream code rate (FEC)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:85
+msgid "terrestrial low priority stream code rate (FEC)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:88
+msgid "terrestrial bandwidth"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:89
+msgid "terrestrial bandwidth [0=auto,6,7,8 in MHz]"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:91
+msgid "terrestrial guard interval"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:94
+msgid "terrestrial transmission mode"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:97
+msgid "terrestrial hierarchy mode"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:123
+msgid "DVB input module with v4l2 support"
+msgstr ""
+
 #: modules/access/dvd/dvd.c:65
 msgid "Method to use by libdvdcss for key decryption"
 msgstr ""
@@ -1228,7 +1324,7 @@ msgstr ""
 msgid "http"
 msgstr ""
 
-#: modules/access/http.c:89
+#: modules/access/http.c:91
 msgid "HTTP input"
 msgstr ""
 
@@ -1246,6 +1342,10 @@ msgstr ""
 msgid "Hauppauge PVR cards input"
 msgstr ""
 
+#: modules/access/rtsp.c:68
+msgid "RTSP SDP request"
+msgstr ""
+
 #: modules/access/satellite/satellite.c:41
 msgid "Satellite default transponder frequency"
 msgstr ""
@@ -1500,23 +1600,23 @@ msgstr ""
 msgid "Audio device"
 msgstr ""
 
-#: modules/audio_output/alsa.c:173 modules/audio_output/directx.c:435
+#: modules/audio_output/alsa.c:171 modules/audio_output/directx.c:435
 #: modules/audio_output/oss.c:222 modules/audio_output/sdl.c:182
 #: modules/audio_output/sdl.c:201 modules/audio_output/waveout.c:399
 msgid "Mono"
 msgstr ""
 
-#: modules/audio_output/alsa.c:186 modules/audio_output/directx.c:409
+#: modules/audio_output/alsa.c:184 modules/audio_output/directx.c:409
 #: modules/audio_output/oss.c:178 modules/audio_output/waveout.c:371
 msgid "2 Front 2 Rear"
 msgstr ""
 
-#: modules/audio_output/alsa.c:192 modules/audio_output/directx.c:391
+#: modules/audio_output/alsa.c:190 modules/audio_output/directx.c:391
 #: modules/audio_output/oss.c:167 modules/audio_output/waveout.c:352
 msgid "5.1"
 msgstr ""
 
-#: modules/audio_output/alsa.c:219 modules/audio_output/directx.c:478
+#: modules/audio_output/alsa.c:217 modules/audio_output/directx.c:478
 #: modules/audio_output/oss.c:246 modules/audio_output/waveout.c:415
 msgid "A/52 over S/PDIF"
 msgstr ""
@@ -1880,18 +1980,26 @@ msgid "DVD subtitles decoder"
 msgstr ""
 
 #: modules/codec/subsdec/subsdec.c:68
-msgid "subtitle text encoding"
+msgid "Subtitles text encoding"
 msgstr ""
 
 #: modules/codec/subsdec/subsdec.c:69
-msgid "change the encoding used in text subtitles"
+msgid "Change the encoding used in text subtitles"
+msgstr ""
+
+#: modules/codec/subsdec/subsdec.c:70
+msgid "Subtitles justification"
+msgstr ""
+
+#: modules/codec/subsdec/subsdec.c:71
+msgid "Change the justification of substitles (0=center, 1=left, 2=right)"
 msgstr ""
 
-#: modules/codec/subsdec/subsdec.c:72
+#: modules/codec/subsdec/subsdec.c:74
 msgid "file subtitles decoder"
 msgstr ""
 
-#: modules/codec/subsdec/subsdec.c:75 modules/gui/beos/InterfaceWindow.cpp:256
+#: modules/codec/subsdec/subsdec.c:77 modules/gui/beos/InterfaceWindow.cpp:256
 #: modules/gui/kde/interface.cpp:93
 msgid "Subtitles"
 msgstr ""
@@ -2035,7 +2143,7 @@ msgid "Quit"
 msgstr ""
 
 #: modules/control/lirc/lirc.c:297 modules/control/lirc/lirc.c:323
-#: modules/gui/familiar/interface.c:177 modules/gui/gtk/gnome_interface.c:602
+#: modules/gui/gtk/gnome_interface.c:602
 #: modules/gui/gtk/gnome_interface.c:1020 modules/gui/gtk/gtk_interface.c:709
 #: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:921
 #: modules/gui/macosx/intf.m:922 modules/gui/macosx/intf.m:923
@@ -2043,8 +2151,7 @@ msgstr ""
 msgid "Pause"
 msgstr ""
 
-#: modules/control/lirc/lirc.c:310 modules/gui/familiar/interface.c:190
-#: modules/gui/gtk/gnome_interface.c:590
+#: modules/control/lirc/lirc.c:310 modules/gui/gtk/gnome_interface.c:590
 #: modules/gui/gtk/gnome_interface.c:1013 modules/gui/gtk/gtk_interface.c:698
 #: modules/gui/macosx/intf.m:324 modules/gui/macosx/intf.m:362
 #: modules/gui/macosx/intf.m:423 modules/gui/macosx/intf.m:928
@@ -2080,68 +2187,70 @@ msgstr ""
 msgid "remote control interface"
 msgstr ""
 
-#: modules/demux/a52sys.c:52
+#: modules/demux/a52sys.c:41
 msgid "A52 demuxer"
 msgstr ""
 
-#: modules/demux/aac/demux.c:46
-msgid "AAC stream demuxer"
+#: modules/demux/a52sys.c:161
+msgid "A52"
 msgstr ""
 
-#: modules/demux/aac/demux.c:555
-msgid "Aac"
+#: modules/demux/a52sys.c:163 modules/demux/aac.c:175
+#: modules/demux/mpeg/m4v.c:150 modules/demux/mpeg/mpga.c:331
+msgid "Input Type"
 msgstr ""
 
-#: modules/demux/aac/demux.c:557 modules/demux/mpeg/audio.c:627
-#: modules/demux/mpeg/audio.c:644 modules/demux/mpeg/m4v.c:150
-msgid "Input Type"
+#: modules/demux/a52sys.c:164 modules/demux/aac.c:177
+#: modules/demux/asf/asf.c:275 modules/demux/avi/avi.c:1178
+#: modules/demux/mkv.cpp:2453 modules/demux/ogg.c:562 modules/demux/ogg.c:838
+#: modules/demux/ogg.c:1011 modules/gui/gtk/gnome_interface.c:148
+#: modules/gui/gtk/gnome_interface.c:931 modules/gui/gtk/gtk_interface.c:481
+#: modules/gui/gtk/gtk_interface.c:1282 modules/gui/macosx/output.m:162
+#: modules/gui/wxwindows/streamout.cpp:668
+msgid "Channels"
 msgstr ""
 
-#: modules/demux/aac/demux.c:560 modules/demux/mpeg/audio.c:629
-msgid "Layer"
+#: modules/demux/a52sys.c:165 modules/demux/aac.c:179
+#: modules/demux/asf/asf.c:277 modules/demux/avi/avi.c:1180
+#: modules/demux/mkv.cpp:2457 modules/demux/mpeg/mpga.c:337
+#: modules/demux/ogg.c:560 modules/demux/ogg.c:672 modules/demux/ogg.c:833
+#: modules/demux/ogg.c:1006
+msgid "Sample Rate"
 msgstr ""
 
-#: modules/demux/aac/demux.c:562 modules/demux/asf/asf.c:275
-#: modules/demux/avi/avi.c:1178 modules/demux/mkv.cpp:2449
-#: modules/demux/ogg.c:561 modules/demux/ogg.c:837 modules/demux/ogg.c:1010
-#: modules/gui/gtk/gnome_interface.c:148 modules/gui/gtk/gnome_interface.c:931
-#: modules/gui/gtk/gtk_interface.c:481 modules/gui/gtk/gtk_interface.c:1282
-#: modules/gui/macosx/output.m:162 modules/gui/wxwindows/streamout.cpp:668
-msgid "Channels"
+#: modules/demux/aac.c:41
+msgid "AAC demuxer"
 msgstr ""
 
-#: modules/demux/aac/demux.c:564 modules/demux/asf/asf.c:277
-#: modules/demux/avi/avi.c:1180 modules/demux/mkv.cpp:2453
-#: modules/demux/mpeg/audio.c:632 modules/demux/ogg.c:559
-#: modules/demux/ogg.c:671 modules/demux/ogg.c:832 modules/demux/ogg.c:1005
-msgid "Sample Rate"
+#: modules/demux/aac.c:173
+msgid "Aac"
 msgstr ""
 
 #: modules/demux/asf/asf.c:48
 msgid "ASF v1.0 demuxer (file only)"
 msgstr ""
 
-#: modules/demux/asf/asf.c:165 modules/demux/mkv.cpp:2412
+#: modules/demux/asf/asf.c:165 modules/demux/mkv.cpp:2416
 msgid "Number of streams"
 msgstr ""
 
-#: modules/demux/asf/asf.c:228 modules/demux/asf/asf.c:302
+#: modules/demux/asf/asf.c:228 modules/demux/asf/asf.c:298
 #: modules/demux/avi/avi.c:1172 modules/demux/avi/avi.c:1217
-#: modules/demux/avi/avi.c:1250 modules/demux/mkv.cpp:2445
-#: modules/demux/mkv.cpp:2461 modules/demux/mkv.cpp:2477
-#: modules/demux/ogg.c:557 modules/demux/ogg.c:629 modules/demux/ogg.c:669
-#: modules/demux/ogg.c:734 modules/demux/ogg.c:829 modules/demux/ogg.c:909
-#: modules/demux/ogg.c:1002 modules/gui/familiar/interface.c:370
-#: modules/gui/macosx/output.m:139 modules/gui/pda/interface.c:372
+#: modules/demux/avi/avi.c:1250 modules/demux/mkv.cpp:2449
+#: modules/demux/mkv.cpp:2465 modules/demux/mkv.cpp:2481
+#: modules/demux/ogg.c:558 modules/demux/ogg.c:630 modules/demux/ogg.c:670
+#: modules/demux/ogg.c:735 modules/demux/ogg.c:830 modules/demux/ogg.c:910
+#: modules/demux/ogg.c:1003 modules/gui/macosx/output.m:139
+#: modules/gui/pda/interface.c:372
 msgid "Type"
 msgstr ""
 
-#: modules/demux/asf/asf.c:260 modules/demux/asf/asf.c:318
+#: modules/demux/asf/asf.c:260 modules/demux/asf/asf.c:314
 #: modules/demux/avi/avi.c:1174 modules/demux/avi/avi.c:1218
-#: modules/demux/mkv.cpp:2446 modules/demux/mkv.cpp:2462
-#: modules/demux/mkv.cpp:2478 modules/demux/ogg.c:558 modules/demux/ogg.c:630
-#: modules/demux/ogg.c:670 modules/demux/ogg.c:735 modules/demux/ogg.c:830
-#: modules/demux/ogg.c:910 modules/demux/ogg.c:1003
+#: modules/demux/mkv.cpp:2450 modules/demux/mkv.cpp:2466
+#: modules/demux/mkv.cpp:2482 modules/demux/ogg.c:559 modules/demux/ogg.c:631
+#: modules/demux/ogg.c:671 modules/demux/ogg.c:736 modules/demux/ogg.c:831
+#: modules/demux/ogg.c:911 modules/demux/ogg.c:1004
 msgid "Codec"
 msgstr ""
 
@@ -2150,36 +2259,36 @@ msgid "Avg. byterate"
 msgstr ""
 
 #: modules/demux/asf/asf.c:282 modules/demux/avi/avi.c:1185
-#: modules/demux/mkv.cpp:2457
+#: modules/demux/mkv.cpp:2461
 msgid "Bits Per Sample"
 msgstr ""
 
-#: modules/demux/asf/asf.c:332
+#: modules/demux/asf/asf.c:328
 msgid "Size"
 msgstr ""
 
-#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1222
-#: modules/demux/mkv.cpp:2465
+#: modules/demux/asf/asf.c:331 modules/demux/avi/avi.c:1222
+#: modules/demux/mkv.cpp:2469
 msgid "Resolution"
 msgstr ""
 
-#: modules/demux/asf/asf.c:337
+#: modules/demux/asf/asf.c:333
 msgid "Planes"
 msgstr ""
 
-#: modules/demux/asf/asf.c:339 modules/demux/avi/avi.c:1228
+#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1228
 msgid "Bits Per Pixel"
 msgstr ""
 
-#: modules/demux/asf/asf.c:342
+#: modules/demux/asf/asf.c:338
 msgid "Image Size"
 msgstr ""
 
-#: modules/demux/asf/asf.c:344
+#: modules/demux/asf/asf.c:340
 msgid "X pixels per meter"
 msgstr ""
 
-#: modules/demux/asf/asf.c:346
+#: modules/demux/asf/asf.c:342
 msgid "Y pixels per meter"
 msgstr ""
 
@@ -2212,7 +2321,7 @@ msgstr ""
 msgid "Rating"
 msgstr ""
 
-#: modules/demux/au.c:47
+#: modules/demux/au.c:42
 msgid "AU demuxer"
 msgstr ""
 
@@ -2257,8 +2366,8 @@ msgstr ""
 msgid "Audio Bitrate"
 msgstr ""
 
-#: modules/demux/avi/avi.c:1225 modules/demux/ogg.c:631
-#: modules/demux/ogg.c:737 modules/demux/ogg.c:912
+#: modules/demux/avi/avi.c:1225 modules/demux/ogg.c:632
+#: modules/demux/ogg.c:738 modules/demux/ogg.c:913
 msgid "Frame Rate"
 msgstr ""
 
@@ -2298,58 +2407,58 @@ msgstr ""
 msgid "mka/mkv stream demuxer"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2389 modules/gui/gtk/gnome_interface.c:2436
+#: modules/demux/mkv.cpp:2393 modules/gui/gtk/gnome_interface.c:2436
 #: modules/gui/gtk/gtk_interface.c:2857 modules/gui/wxwindows/playlist.cpp:150
 msgid "Duration"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2398
+#: modules/demux/mkv.cpp:2402
 msgid "Date UTC"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2402
+#: modules/demux/mkv.cpp:2406
 msgid "Segment Filename"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2406
+#: modules/demux/mkv.cpp:2410
 msgid "Muxing Application"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2410
+#: modules/demux/mkv.cpp:2414
 msgid "Writing Application"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2423 modules/gui/beos/PlayListWindow.cpp:144
-#: modules/gui/familiar/interface.c:362 modules/gui/gtk/preferences.c:325
-#: modules/gui/kde/pluginsbox.cpp:45 modules/gui/pda/interface.c:364
+#: modules/demux/mkv.cpp:2427 modules/gui/beos/PlayListWindow.cpp:144
+#: modules/gui/gtk/preferences.c:325 modules/gui/kde/pluginsbox.cpp:45
+#: modules/gui/pda/interface.c:364
 msgid "Name"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2427
+#: modules/demux/mkv.cpp:2431
 msgid "Codec Name"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2431
+#: modules/demux/mkv.cpp:2435
 msgid "Codec Setting"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2435
+#: modules/demux/mkv.cpp:2439
 msgid "Codec Info"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2439
+#: modules/demux/mkv.cpp:2443
 msgid "Codec Download"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2469
+#: modules/demux/mkv.cpp:2473
 msgid "Display Resolution"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2473
+#: modules/demux/mkv.cpp:2477
 msgid "Frame Per Second"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2477 modules/gui/gtk/gnome_interface.c:1963
+#: modules/demux/mkv.cpp:2481 modules/gui/gtk/gnome_interface.c:1963
 #: modules/gui/gtk/gtk_interface.c:2278
 msgid "Subtitle"
 msgstr ""
@@ -2358,33 +2467,41 @@ msgstr ""
 msgid "MP4 demuxer"
 msgstr ""
 
-#: modules/demux/mpeg/audio.c:47
-msgid "MPEG I/II audio stream demuxer"
+#: modules/demux/mpeg/es.c:49
+msgid "ISO 13818-1 MPEG Elementary Stream input"
+msgstr ""
+
+#: modules/demux/mpeg/m4v.c:43
+msgid "MPEG-4 video elementary stream demuxer"
 msgstr ""
 
-#: modules/demux/mpeg/audio.c:626 modules/demux/mpeg/audio.c:643
 #: modules/demux/mpeg/m4v.c:149
 msgid "mpeg"
 msgstr ""
 
-#: modules/demux/mpeg/audio.c:630
-msgid "Mode"
+#: modules/demux/mpeg/m4v.c:150
+msgid "Video MPEG-4 (raw ES)"
 msgstr ""
 
-#: modules/demux/mpeg/audio.c:634
-msgid "Average Bitrate"
+#: modules/demux/mpeg/mpga.c:41
+#, fuzzy
+msgid "MPEG-I/II Audio demuxer"
+msgstr "MPEG-I/II audio packetiser"
+
+#: modules/demux/mpeg/mpga.c:330
+msgid "MPEG"
 msgstr ""
 
-#: modules/demux/mpeg/es.c:49
-msgid "ISO 13818-1 MPEG Elementary Stream input"
+#: modules/demux/mpeg/mpga.c:333
+msgid "Layer"
 msgstr ""
 
-#: modules/demux/mpeg/m4v.c:43
-msgid "MPEG-4 video elementary stream demuxer"
+#: modules/demux/mpeg/mpga.c:335
+msgid "Mode"
 msgstr ""
 
-#: modules/demux/mpeg/m4v.c:150
-msgid "Video MPEG-4 (raw ES)"
+#: modules/demux/mpeg/mpga.c:339
+msgid "Average Bitrate"
 msgstr ""
 
 #: modules/demux/mpeg/ps.c:60
@@ -2428,36 +2545,36 @@ msgstr ""
 msgid "ogg stream demuxer"
 msgstr ""
 
-#: modules/demux/ogg.c:558
+#: modules/demux/ogg.c:559
 msgid "Vorbis"
 msgstr ""
 
-#: modules/demux/ogg.c:563 modules/demux/ogg.c:633 modules/demux/ogg.c:673
-#: modules/demux/ogg.c:834 modules/demux/ogg.c:1007
+#: modules/demux/ogg.c:564 modules/demux/ogg.c:634 modules/demux/ogg.c:674
+#: modules/demux/ogg.c:835 modules/demux/ogg.c:1008
 msgid "Bit Rate"
 msgstr ""
 
-#: modules/demux/ogg.c:630
+#: modules/demux/ogg.c:631
 msgid "Theora"
 msgstr ""
 
-#: modules/demux/ogg.c:670
+#: modules/demux/ogg.c:671
 msgid "tarkin"
 msgstr ""
 
-#: modules/demux/ogg.c:739 modules/demux/ogg.c:914
+#: modules/demux/ogg.c:740 modules/demux/ogg.c:915
 msgid "Bit Count"
 msgstr ""
 
-#: modules/demux/ogg.c:741 modules/demux/ogg.c:916
+#: modules/demux/ogg.c:742 modules/demux/ogg.c:917
 msgid "Width"
 msgstr ""
 
-#: modules/demux/ogg.c:743 modules/demux/ogg.c:918
+#: modules/demux/ogg.c:744 modules/demux/ogg.c:919
 msgid "Height"
 msgstr ""
 
-#: modules/demux/ogg.c:839 modules/demux/ogg.c:1012
+#: modules/demux/ogg.c:840 modules/demux/ogg.c:1013
 msgid "Bits per Sample"
 msgstr ""
 
@@ -2465,6 +2582,10 @@ msgstr ""
 msgid "raw dv demuxer"
 msgstr ""
 
+#: modules/demux/sdp.c:64
+msgid "SDP demuxer + UDP/RTP/RTSP"
+msgstr ""
+
 #: modules/demux/util/id3.c:44
 msgid "Simple id3 tag skipper"
 msgstr ""
@@ -2797,7 +2918,7 @@ msgstr ""
 msgid "Text subtitles demux"
 msgstr ""
 
-#: modules/demux/wav/wav.c:49
+#: modules/demux/wav.c:43
 msgid "WAV demuxer"
 msgstr ""
 
@@ -2830,11 +2951,9 @@ msgid "Yes"
 msgstr ""
 
 #: modules/gui/beos/InterfaceWindow.cpp:201
-#: modules/gui/beos/InterfaceWindow.cpp:308
-#: modules/gui/familiar/interface.c:149 modules/gui/familiar/interface.c:150
-#: modules/gui/macosx/intf.m:328 modules/gui/macosx/prefs.m:77
-#: modules/gui/pda/interface.c:151 modules/gui/pda/interface.c:152
-#: modules/gui/wxwindows/preferences.cpp:233
+#: modules/gui/beos/InterfaceWindow.cpp:308 modules/gui/macosx/intf.m:328
+#: modules/gui/macosx/prefs.m:77 modules/gui/pda/interface.c:151
+#: modules/gui/pda/interface.c:152 modules/gui/wxwindows/preferences.cpp:233
 msgid "Preferences"
 msgstr ""
 
@@ -2849,7 +2968,7 @@ msgstr ""
 
 #: modules/gui/beos/InterfaceWindow.cpp:238
 #: modules/gui/beos/MediaControlView.cpp:1257
-#: modules/gui/beos/PlayListWindow.cpp:82 modules/gui/familiar/interface.c:378
+#: modules/gui/beos/PlayListWindow.cpp:82
 #: modules/gui/gtk/gnome_interface.c:503
 #: modules/gui/gtk/gnome_interface.c:1569
 #: modules/gui/gtk/gnome_interface.c:2274
@@ -2882,10 +3001,8 @@ msgid "Open Subtitles"
 msgstr ""
 
 #: modules/gui/beos/InterfaceWindow.cpp:249
-#: modules/gui/familiar/interface.c:231 modules/gui/familiar/interface.c:232
-#: modules/gui/familiar/interface.c:765 modules/gui/gtk/gtk_interface.c:1580
-#: modules/gui/pda/interface.c:233 modules/gui/pda/interface.c:234
-#: modules/gui/pda/interface.c:767
+#: modules/gui/gtk/gtk_interface.c:1580 modules/gui/pda/interface.c:233
+#: modules/gui/pda/interface.c:234 modules/gui/pda/interface.c:767
 msgid "About"
 msgstr ""
 
@@ -2934,7 +3051,7 @@ msgstr ""
 #: modules/gui/wxwindows/open.cpp:244
 #: modules/gui/wxwindows/preferences.cpp:253
 #: modules/gui/wxwindows/streamout.cpp:217
-#: modules/gui/wxwindows/subtitles.cpp:149
+#: modules/gui/wxwindows/subtitles.cpp:190
 msgid "OK"
 msgstr ""
 
@@ -3058,7 +3175,7 @@ msgstr ""
 msgid "Take Screen Shot"
 msgstr ""
 
-#: modules/gui/beos/VlcWrapper.cpp:165 modules/gui/gtk/menu.c:733
+#: modules/gui/beos/VlcWrapper.cpp:165 modules/gui/gtk/menu.c:734
 msgid "None"
 msgstr ""
 
@@ -3066,198 +3183,6 @@ msgstr ""
 msgid "<unknown>"
 msgstr ""
 
-#: modules/gui/familiar/familiar.c:62 modules/gui/pda/pda.c:62
-msgid "Autoplay selected file"
-msgstr ""
-
-#: modules/gui/familiar/familiar.c:63 modules/gui/pda/pda.c:63
-msgid "Automatically play a file when selected in the file selection list"
-msgstr ""
-
-#: modules/gui/familiar/familiar.c:72
-msgid "Familiar Linux Gtk+ interface"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:99 modules/gui/familiar/interface.c:732
-#: modules/gui/gtk/gnome_interface.c:274 modules/gui/gtk/gtk_interface.c:121
-#: modules/gui/gtk/gtk_interface.c:1595 modules/gui/pda/interface.c:99
-#: modules/gui/pda/interface.c:734
-msgid "VLC media player"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:124 modules/gui/pda/interface.c:126
-#: modules/gui/wxwindows/dialogs.cpp:268 modules/gui/wxwindows/open.cpp:709
-#: modules/gui/wxwindows/preferences.cpp:1029
-#: modules/gui/wxwindows/subtitles.cpp:196
-msgid "Open file"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:164 modules/gui/pda/interface.c:166
-msgid "Rewind"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:165 modules/gui/pda/interface.c:167
-msgid "Rewind stream"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:178 modules/gui/pda/interface.c:180
-msgid "Pause stream"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:191 modules/gui/pda/interface.c:193
-msgid "Play stream"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:203 modules/gui/gtk/gnome_interface.c:566
-#: modules/gui/gtk/gnome_interface.c:1027 modules/gui/gtk/gtk_interface.c:676
-#: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:639
-#: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
-#: modules/gui/macosx/intf.m:424 modules/gui/pda/interface.c:205
-#: modules/gui/wxwindows/interface.cpp:373
-msgid "Stop"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:204 modules/gui/pda/interface.c:206
-msgid "Stop stream"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:216 modules/gui/pda/interface.c:218
-msgid "Forward"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:217 modules/gui/pda/interface.c:219
-msgid "Forward stream"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:285 modules/gui/gtk/gnome_interface.c:2345
-#: modules/gui/gtk/gtk_interface.c:2712 modules/gui/macosx/playlist.m:198
-#: modules/gui/pda/interface.c:287
-msgid "Add"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:293 modules/gui/pda/interface.c:295
-msgid "MRL :"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:394
-msgid "UDP/RTP (Address when Multicast)"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:412 modules/gui/gtk/gnome_interface.c:1747
-#: modules/gui/gtk/gtk_interface.c:2062 modules/gui/macosx/open.m:161
-#: modules/gui/macosx/output.m:133 modules/gui/pda/interface.c:414
-#: modules/gui/wxwindows/open.cpp:469 modules/gui/wxwindows/streamout.cpp:425
-msgid "Address"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:423 modules/gui/gtk/gnome_interface.c:1737
-#: modules/gui/gtk/gnome_interface.c:1786
-#: modules/gui/gtk/gnome_interface.c:2912 modules/gui/gtk/gtk_interface.c:2052
-#: modules/gui/gtk/gtk_interface.c:2101 modules/gui/gtk/gtk_interface.c:3225
-#: modules/gui/macosx/open.m:160 modules/gui/macosx/open.m:162
-#: modules/gui/macosx/output.m:134 modules/gui/pda/interface.c:425
-#: modules/gui/wxwindows/open.cpp:454 modules/gui/wxwindows/open.cpp:477
-#: modules/gui/wxwindows/streamout.cpp:436
-msgid "Port"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:136
-#: modules/gui/macosx/output.m:236 modules/gui/macosx/output.m:311
-#: modules/gui/pda/interface.c:480 modules/gui/wxwindows/streamout.cpp:386
-msgid "HTTP"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:488 modules/gui/pda/interface.c:490
-msgid "FTP"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:498 modules/gui/pda/interface.c:500
-msgid "MMS"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:516 modules/gui/gtk/gnome_interface.c:1830
-#: modules/gui/gtk/gnome_interface.c:2281 modules/gui/gtk/gtk_interface.c:2145
-#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:144
-#: modules/gui/macosx/open.m:271 modules/gui/pda/interface.c:518
-#: modules/gui/wxwindows/open.cpp:257
-msgid "Network"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:524 modules/gui/pda/interface.c:526
-msgid "Media"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:560 modules/gui/pda/interface.c:562
-msgid "MRL"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:569 modules/gui/pda/interface.c:571
-msgid "Time"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:586 modules/gui/pda/interface.c:588
-msgid "Update"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:594 modules/gui/pda/interface.c:596
-msgid " Del "
-msgstr ""
-
-#: modules/gui/familiar/interface.c:602 modules/gui/pda/interface.c:604
-msgid " Clear "
-msgstr ""
-
-#: modules/gui/familiar/interface.c:626 modules/gui/pda/interface.c:628
-msgid "Automatically play file"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:643 modules/gui/pda/interface.c:645
-msgid " Save "
-msgstr ""
-
-#: modules/gui/familiar/interface.c:651 modules/gui/pda/interface.c:653
-msgid " Apply "
-msgstr ""
-
-#: modules/gui/familiar/interface.c:659 modules/gui/pda/interface.c:661
-msgid " Cancel "
-msgstr ""
-
-#: modules/gui/familiar/interface.c:667 modules/gui/pda/interface.c:669
-msgid "Preference"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:711 modules/gui/gtk/gnome_interface.c:1361
-#: modules/gui/gtk/gtk_interface.c:1603 modules/gui/kde/kde.cpp:111
-#: modules/gui/pda/interface.c:713
-msgid "(c) 1996-2003 the VideoLAN team"
-msgstr "© 1996-2003 the VideoLAN team"
-
-#: modules/gui/familiar/interface.c:721 modules/gui/pda/interface.c:723
-msgid "Authors: The VideoLAN Team, http://www.videolan.org"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:753 modules/gui/pda/interface.c:755
-msgid ""
-"The VideoLAN Client is a MPEG, MPEG 2, MP3, DivX player, that accepts input "
-"from local or network sources."
-msgstr ""
-
-#: modules/gui/familiar/support.c:121 modules/gui/gtk/gnome_support.c:100
-#: modules/gui/gtk/gnome_support.c:138 modules/gui/gtk/gtk_support.c:121
-#: modules/gui/gtk2/gnome2_support.c:60 modules/gui/gtk2/gnome2_support.c:85
-#: modules/gui/gtk2/gtk2_support.c:90 modules/gui/gtk2/gtk2_support.c:114
-#: modules/gui/pda/support.c:121
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr ""
-
-#: modules/gui/familiar/support.c:130 modules/gui/gtk/gtk_support.c:130
-#: modules/gui/pda/support.c:130
-#, c-format
-msgid "Error loading pixmap file: %s"
-msgstr ""
-
 #: modules/gui/gtk/gnome.c:55 modules/gui/gtk/gtk.c:57
 msgid "Show tooltips"
 msgstr ""
@@ -3450,6 +3375,12 @@ msgstr ""
 msgid "_Video"
 msgstr ""
 
+#: modules/gui/gtk/gnome_interface.c:274 modules/gui/gtk/gtk_interface.c:121
+#: modules/gui/gtk/gtk_interface.c:1595 modules/gui/pda/interface.c:99
+#: modules/gui/pda/interface.c:734
+msgid "VLC media player"
+msgstr ""
+
 #: modules/gui/gtk/gnome_interface.c:515 modules/gui/gtk/gnome_interface.c:718
 #: modules/gui/gtk/gnome_interface.c:1690
 #: modules/gui/gtk/gnome_interface.c:2267 modules/gui/gtk/gtk_interface.c:629
@@ -3484,6 +3415,15 @@ msgstr ""
 msgid "Go Backward"
 msgstr "Go Backwards"
 
+#: modules/gui/gtk/gnome_interface.c:566
+#: modules/gui/gtk/gnome_interface.c:1027 modules/gui/gtk/gtk_interface.c:676
+#: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:639
+#: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
+#: modules/gui/macosx/intf.m:424 modules/gui/pda/interface.c:205
+#: modules/gui/wxwindows/interface.cpp:373
+msgid "Stop"
+msgstr ""
+
 #: modules/gui/gtk/gnome_interface.c:567 modules/gui/gtk/gtk_interface.c:677
 msgid "Stop Stream"
 msgstr ""
@@ -3605,6 +3545,11 @@ msgstr ""
 msgid "Playlist..."
 msgstr ""
 
+#: modules/gui/gtk/gnome_interface.c:1361 modules/gui/gtk/gtk_interface.c:1603
+#: modules/gui/kde/kde.cpp:111 modules/gui/pda/interface.c:713
+msgid "(c) 1996-2003 the VideoLAN team"
+msgstr "© 1996-2003 the VideoLAN team"
+
 #: modules/gui/gtk/gnome_interface.c:1363 modules/gui/gtk/gtk_interface.c:1646
 #: modules/gui/kde/kde.cpp:108
 msgid ""
@@ -3641,7 +3586,7 @@ msgstr ""
 #: modules/gui/wxwindows/open.cpp:223 modules/gui/wxwindows/open.cpp:341
 #: modules/gui/wxwindows/preferences.cpp:832
 #: modules/gui/wxwindows/streamout.cpp:412
-#: modules/gui/wxwindows/subtitles.cpp:107
+#: modules/gui/wxwindows/subtitles.cpp:109
 msgid "Browse..."
 msgstr ""
 
@@ -3690,11 +3635,37 @@ msgstr ""
 msgid "HTTP/FTP/MMS"
 msgstr ""
 
+#: modules/gui/gtk/gnome_interface.c:1737
+#: modules/gui/gtk/gnome_interface.c:1786
+#: modules/gui/gtk/gnome_interface.c:2912 modules/gui/gtk/gtk_interface.c:2052
+#: modules/gui/gtk/gtk_interface.c:2101 modules/gui/gtk/gtk_interface.c:3225
+#: modules/gui/macosx/open.m:160 modules/gui/macosx/open.m:162
+#: modules/gui/macosx/output.m:134 modules/gui/pda/interface.c:425
+#: modules/gui/wxwindows/open.cpp:454 modules/gui/wxwindows/open.cpp:477
+#: modules/gui/wxwindows/streamout.cpp:436
+msgid "Port"
+msgstr ""
+
+#: modules/gui/gtk/gnome_interface.c:1747 modules/gui/gtk/gtk_interface.c:2062
+#: modules/gui/macosx/open.m:161 modules/gui/macosx/output.m:133
+#: modules/gui/pda/interface.c:414 modules/gui/wxwindows/open.cpp:469
+#: modules/gui/wxwindows/streamout.cpp:425
+msgid "Address"
+msgstr ""
+
 #: modules/gui/gtk/gnome_interface.c:1759 modules/gui/gtk/gtk_interface.c:2074
 #: modules/gui/macosx/open.m:163 modules/gui/wxwindows/open.cpp:492
 msgid "URL"
 msgstr ""
 
+#: modules/gui/gtk/gnome_interface.c:1830
+#: modules/gui/gtk/gnome_interface.c:2281 modules/gui/gtk/gtk_interface.c:2145
+#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:144
+#: modules/gui/macosx/open.m:271 modules/gui/pda/interface.c:518
+#: modules/gui/wxwindows/open.cpp:257
+msgid "Network"
+msgstr ""
+
 #: modules/gui/gtk/gnome_interface.c:1847 modules/gui/gtk/gtk_interface.c:2162
 msgid "Symbol Rate"
 msgstr ""
@@ -3773,6 +3744,11 @@ msgstr ""
 msgid "Select"
 msgstr ""
 
+#: modules/gui/gtk/gnome_interface.c:2345 modules/gui/gtk/gtk_interface.c:2712
+#: modules/gui/macosx/playlist.m:198 modules/gui/pda/interface.c:287
+msgid "Add"
+msgstr ""
+
 #: modules/gui/gtk/gnome_interface.c:2352 modules/gui/gtk/gtk_interface.c:2754
 #: modules/gui/macosx/playlist.m:195 modules/gui/macosx/playlist.m:199
 msgid "Delete"
@@ -3840,6 +3816,14 @@ msgstr ""
 msgid "AVI"
 msgstr ""
 
+#: modules/gui/gtk/gnome_support.c:100 modules/gui/gtk/gnome_support.c:138
+#: modules/gui/gtk/gtk_support.c:121 modules/gui/gtk2/gnome2_support.c:60
+#: modules/gui/gtk2/gnome2_support.c:85 modules/gui/gtk2/gtk2_support.c:90
+#: modules/gui/gtk2/gtk2_support.c:114 modules/gui/pda/support.c:121
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr ""
+
 #: modules/gui/gtk/gnome_support.c:116
 #, c-format
 msgid "Couldn't create pixmap from file: %s"
@@ -3953,10 +3937,11 @@ msgstr ""
 #: modules/gui/gtk/gtk_interface.c:2403 modules/gui/gtk/gtk_interface.c:2645
 #: modules/gui/gtk/gtk_interface.c:2876 modules/gui/gtk/gtk_interface.c:3257
 #: modules/gui/gtk/preferences.c:618 modules/gui/macosx/open.m:140
-#: modules/gui/macosx/prefs.m:79 modules/gui/wxwindows/open.cpp:247
+#: modules/gui/macosx/prefs.m:79 modules/gui/macosx/prefs.m:170
+#: modules/gui/wxwindows/open.cpp:247
 #: modules/gui/wxwindows/preferences.cpp:256
 #: modules/gui/wxwindows/streamout.cpp:220
-#: modules/gui/wxwindows/subtitles.cpp:152
+#: modules/gui/wxwindows/subtitles.cpp:193
 msgid "Cancel"
 msgstr ""
 
@@ -3988,12 +3973,17 @@ msgstr ""
 msgid "_Select"
 msgstr ""
 
-#: modules/gui/gtk/menu.c:900
+#: modules/gui/gtk/gtk_support.c:130 modules/gui/pda/support.c:130
+#, c-format
+msgid "Error loading pixmap file: %s"
+msgstr ""
+
+#: modules/gui/gtk/menu.c:901
 #, c-format
 msgid "Title %d (%d)"
 msgstr ""
 
-#: modules/gui/gtk/menu.c:967
+#: modules/gui/gtk/menu.c:968
 #, c-format
 msgid "Chapter %d"
 msgstr ""
@@ -4145,8 +4135,9 @@ msgstr ""
 msgid "VLC - Controller"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/interface.cpp:904
-#: modules/gui/wxwindows/timer.cpp:131
+#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/control.cpp:160
+#: modules/gui/wxwindows/control.cpp:370
+#: modules/gui/wxwindows/interface.cpp:904 modules/gui/wxwindows/timer.cpp:131
 msgid "Volume"
 msgstr ""
 
@@ -4390,6 +4381,12 @@ msgstr ""
 msgid "TTL"
 msgstr ""
 
+#: modules/gui/macosx/output.m:136 modules/gui/macosx/output.m:236
+#: modules/gui/macosx/output.m:311 modules/gui/pda/interface.c:480
+#: modules/gui/wxwindows/streamout.cpp:386
+msgid "HTTP"
+msgstr ""
+
 #: modules/gui/macosx/output.m:141 modules/gui/wxwindows/streamout.cpp:531
 msgid "Encapsulation Method"
 msgstr ""
@@ -4447,6 +4444,10 @@ msgstr ""
 msgid "Reset Preferences"
 msgstr ""
 
+#: modules/gui/macosx/prefs.m:170
+msgid "Continue"
+msgstr ""
+
 #: modules/gui/macosx/prefs.m:172 modules/gui/wxwindows/preferences.cpp:316
 msgid ""
 "Beware this will reset your VLC Media Player config file.\n"
@@ -4465,10 +4466,119 @@ msgstr ""
 msgid "ncurses interface"
 msgstr ""
 
+#: modules/gui/pda/interface.c:126 modules/gui/wxwindows/dialogs.cpp:268
+#: modules/gui/wxwindows/open.cpp:709
+#: modules/gui/wxwindows/preferences.cpp:1029
+#: modules/gui/wxwindows/subtitles.cpp:234
+msgid "Open file"
+msgstr ""
+
+#: modules/gui/pda/interface.c:166
+msgid "Rewind"
+msgstr ""
+
+#: modules/gui/pda/interface.c:167
+msgid "Rewind stream"
+msgstr ""
+
+#: modules/gui/pda/interface.c:180
+msgid "Pause stream"
+msgstr ""
+
+#: modules/gui/pda/interface.c:193
+msgid "Play stream"
+msgstr ""
+
+#: modules/gui/pda/interface.c:206
+msgid "Stop stream"
+msgstr ""
+
+#: modules/gui/pda/interface.c:218
+msgid "Forward"
+msgstr ""
+
+#: modules/gui/pda/interface.c:219
+msgid "Forward stream"
+msgstr ""
+
+#: modules/gui/pda/interface.c:295
+msgid "MRL :"
+msgstr ""
+
 #: modules/gui/pda/interface.c:396
 msgid "UDP/RTP (Adress when Multicast)"
 msgstr ""
 
+#: modules/gui/pda/interface.c:490
+msgid "FTP"
+msgstr ""
+
+#: modules/gui/pda/interface.c:500
+msgid "MMS"
+msgstr ""
+
+#: modules/gui/pda/interface.c:526
+msgid "Media"
+msgstr ""
+
+#: modules/gui/pda/interface.c:562
+msgid "MRL"
+msgstr ""
+
+#: modules/gui/pda/interface.c:571
+msgid "Time"
+msgstr ""
+
+#: modules/gui/pda/interface.c:588
+msgid "Update"
+msgstr ""
+
+#: modules/gui/pda/interface.c:596
+msgid " Del "
+msgstr ""
+
+#: modules/gui/pda/interface.c:604
+msgid " Clear "
+msgstr ""
+
+#: modules/gui/pda/interface.c:628
+msgid "Automatically play file"
+msgstr ""
+
+#: modules/gui/pda/interface.c:645
+msgid " Save "
+msgstr ""
+
+#: modules/gui/pda/interface.c:653
+msgid " Apply "
+msgstr ""
+
+#: modules/gui/pda/interface.c:661
+msgid " Cancel "
+msgstr ""
+
+#: modules/gui/pda/interface.c:669
+msgid "Preference"
+msgstr ""
+
+#: modules/gui/pda/interface.c:723
+msgid "Authors: The VideoLAN Team, http://www.videolan.org"
+msgstr ""
+
+#: modules/gui/pda/interface.c:755
+msgid ""
+"The VideoLAN Client is a MPEG, MPEG 2, MP3, DivX player, that accepts input "
+"from local or network sources."
+msgstr ""
+
+#: modules/gui/pda/pda.c:62
+msgid "Autoplay selected file"
+msgstr ""
+
+#: modules/gui/pda/pda.c:63
+msgid "Automatically play a file when selected in the file selection list"
+msgstr ""
+
 #: modules/gui/pda/pda.c:72
 msgid "PDA Linux Gtk2+ interface"
 msgstr ""
@@ -4751,7 +4861,7 @@ msgstr ""
 msgid "Capture the stream you are playing to a file"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:348 modules/gui/wxwindows/subtitles.cpp:98
+#: modules/gui/wxwindows/open.cpp:348 modules/gui/wxwindows/subtitles.cpp:100
 msgid "Subtitles file"
 msgstr ""
 
@@ -4767,7 +4877,7 @@ msgstr ""
 msgid "CD Audio"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:900 modules/gui/wxwindows/streamout.cpp:784
+#: modules/gui/wxwindows/open.cpp:903 modules/gui/wxwindows/streamout.cpp:784
 msgid "Save file"
 msgstr ""
 
@@ -4882,19 +4992,23 @@ msgstr ""
 msgid "Open Subtitles File"
 msgstr ""
 
-#: modules/gui/wxwindows/subtitles.cpp:115
+#: modules/gui/wxwindows/subtitles.cpp:123
+msgid "Subtitles encoding"
+msgstr ""
+
+#: modules/gui/wxwindows/subtitles.cpp:155
 msgid "Subtitles options"
 msgstr ""
 
-#: modules/gui/wxwindows/subtitles.cpp:119
+#: modules/gui/wxwindows/subtitles.cpp:159
 msgid "Delay subtitles (in 1/10s)"
 msgstr ""
 
-#: modules/gui/wxwindows/subtitles.cpp:130
+#: modules/gui/wxwindows/subtitles.cpp:170
 msgid "Frames per second"
 msgstr ""
 
-#: modules/gui/wxwindows/subtitles.cpp:138
+#: modules/gui/wxwindows/subtitles.cpp:178
 msgid "Override frames per second. It will only work with MicroDVD subtitles."
 msgstr ""
 
@@ -4959,27 +5073,27 @@ msgstr ""
 msgid "Using the dummy interface plugin..."
 msgstr ""
 
-#: modules/misc/freetype.c:67 modules/visualization/xosd/xosd.c:71
+#: modules/misc/freetype.c:72 modules/visualization/xosd/xosd.c:71
 msgid "Font"
 msgstr ""
 
-#: modules/misc/freetype.c:68
+#: modules/misc/freetype.c:73
 msgid "Filename of Font"
 msgstr ""
 
-#: modules/misc/freetype.c:69
+#: modules/misc/freetype.c:74
 msgid "Font size"
 msgstr ""
 
-#: modules/misc/freetype.c:70
+#: modules/misc/freetype.c:75
 msgid "The size of the fonts used by the osd module"
 msgstr ""
 
-#: modules/misc/freetype.c:73
+#: modules/misc/freetype.c:78
 msgid "Fonts"
 msgstr ""
 
-#: modules/misc/freetype.c:76
+#: modules/misc/freetype.c:81
 msgid "freetype2 font renderer"
 msgstr ""
 
@@ -5114,19 +5228,19 @@ msgstr ""
 msgid "Dummy muxer"
 msgstr ""
 
-#: modules/mux/mp4.c:52
+#: modules/mux/mp4.c:56
 msgid "MP4/MOV muxer"
 msgstr ""
 
-#: modules/mux/mpeg/ps.c:79
+#: modules/mux/mpeg/ps.c:53
 msgid "PS muxer"
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:138
+#: modules/mux/mpeg/ts.c:78
 msgid "TS muxer"
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:143
+#: modules/mux/mpeg/ts.c:83
 msgid "TS muxer (libdvbpsi)"
 msgstr ""
 
@@ -5138,7 +5252,7 @@ msgstr ""
 msgid "A/52 audio packetizer"
 msgstr "A/52 audio packetiser"
 
-#: modules/packetizer/copy.c:69
+#: modules/packetizer/copy.c:43
 msgid "Copy packetizer"
 msgstr "Copy packetiser"
 
@@ -5182,7 +5296,7 @@ msgstr ""
 msgid "Standard stream"
 msgstr ""
 
-#: modules/stream_out/transcode.c:71
+#: modules/stream_out/transcode.c:73
 msgid "Transcode stream"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index 865b866a41..12debf7b63 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vlc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-07-31 15:04+0200\n"
+"POT-Creation-Date: 2003-08-11 21:05+0200\n"
 "PO-Revision-Date: 2001-12-10 13:32+0100\n"
 "Last-Translator: Jean-Pierre Kuypers <Kuypers@sri.ucl.ac.be> 2003-07-27\n"
 "Language-Team: \n"
@@ -32,7 +32,7 @@ msgid "Audio channels"
 msgstr "Sélectionner la piste audio"
 
 #: src/audio_output/output.c:107 src/audio_output/output.c:142
-#: modules/audio_output/alsa.c:179 modules/audio_output/directx.c:423
+#: modules/audio_output/alsa.c:177 modules/audio_output/directx.c:423
 #: modules/audio_output/oss.c:202 modules/audio_output/sdl.c:181
 #: modules/audio_output/sdl.c:198 modules/audio_output/waveout.c:386
 msgid "Stereo"
@@ -109,11 +109,11 @@ msgstr "%s: l'option `-W %s' est ambigu
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: l'option `-W %s' ne permet pas d'argument\n"
 
-#: src/input/input.c:171
+#: src/input/input.c:174
 msgid "General"
 msgstr "Général"
 
-#: src/input/input.c:172
+#: src/input/input.c:175
 msgid "Playlist Item"
 msgstr "Liste de lecture"
 
@@ -124,9 +124,9 @@ msgid "Program"
 msgstr "Programme"
 
 #: src/input/input_programs.c:98 modules/demux/asf/libasf.c:696
-#: modules/demux/mkv.cpp:2394 modules/gui/beos/MediaControlView.cpp:1258
+#: modules/demux/mkv.cpp:2398 modules/gui/beos/MediaControlView.cpp:1258
 #: modules/gui/gtk/gnome_interface.c:1650 modules/gui/gtk/gtk_interface.c:1956
-#: modules/gui/gtk/menu.c:1402 modules/gui/gtk/menu.c:1423
+#: modules/gui/gtk/menu.c:1403 modules/gui/gtk/menu.c:1424
 #: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:373
 #: modules/gui/macosx/intf.m:374 modules/gui/macosx/open.m:150
 #: modules/gui/wxwindows/open.cpp:406
@@ -135,7 +135,7 @@ msgstr "Titre"
 
 #: src/input/input_programs.c:102 modules/gui/beos/MediaControlView.cpp:1259
 #: modules/gui/gtk/gnome_interface.c:1640 modules/gui/gtk/gtk_interface.c:1946
-#: modules/gui/gtk/menu.c:1019 modules/gui/gtk/menu.c:1432
+#: modules/gui/gtk/menu.c:1020 modules/gui/gtk/menu.c:1433
 #: modules/gui/kde/interface.cpp:146 modules/gui/macosx/intf.m:375
 #: modules/gui/macosx/intf.m:376 modules/gui/macosx/open.m:151
 #: modules/gui/wxwindows/open.cpp:412
@@ -209,15 +209,15 @@ msgstr ""
 "Utilisation: %s [options] [fichier]...\n"
 "\n"
 
-#: src/libvlc.c:1200 src/misc/configuration.c:1019
+#: src/libvlc.c:1200 src/misc/configuration.c:1040
 msgid "string"
 msgstr "Chaîne"
 
-#: src/libvlc.c:1217 src/misc/configuration.c:1000
+#: src/libvlc.c:1217 src/misc/configuration.c:1021
 msgid "integer"
 msgstr "Entier"
 
-#: src/libvlc.c:1220 src/misc/configuration.c:1009
+#: src/libvlc.c:1220 src/misc/configuration.c:1030
 msgid "float"
 msgstr "Flottant"
 
@@ -1118,16 +1118,16 @@ msgstr "Interface"
 
 #: src/libvlc.h:474 modules/audio_output/coreaudio.c:227
 #: modules/audio_output/file.c:108 modules/demux/asf/asf.c:228
-#: modules/demux/mkv.cpp:2445 modules/demux/ogg.c:557 modules/demux/ogg.c:829
-#: modules/demux/ogg.c:1002 modules/gui/beos/InterfaceWindow.cpp:259
+#: modules/demux/mkv.cpp:2449 modules/demux/ogg.c:558 modules/demux/ogg.c:830
+#: modules/demux/ogg.c:1003 modules/gui/beos/InterfaceWindow.cpp:259
 #: modules/gui/gtk/gnome_interface.c:1092 modules/gui/gtk/gtk_interface.c:1219
 #: modules/gui/macosx/intf.m:378 modules/gui/macosx/output.m:156
 msgid "Audio"
 msgstr "Audio"
 
-#: src/libvlc.h:493 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1217
-#: modules/demux/mkv.cpp:2461 modules/demux/ogg.c:629 modules/demux/ogg.c:669
-#: modules/demux/ogg.c:734 modules/demux/ogg.c:909
+#: src/libvlc.h:493 modules/demux/asf/asf.c:298 modules/demux/avi/avi.c:1217
+#: modules/demux/mkv.cpp:2465 modules/demux/ogg.c:630 modules/demux/ogg.c:670
+#: modules/demux/ogg.c:735 modules/demux/ogg.c:910
 #: modules/gui/gtk/gnome_interface.c:1099 modules/gui/gtk/gtk_interface.c:1296
 #: modules/gui/macosx/intf.m:389 modules/gui/macosx/macosx.m:68
 #: modules/gui/macosx/output.m:150 modules/misc/dummy/dummy.c:81
@@ -1135,7 +1135,8 @@ msgstr "Audio"
 msgid "Video"
 msgstr "Vidéo"
 
-#: src/libvlc.h:515 modules/access/satellite/satellite.c:66
+#: src/libvlc.h:515 modules/access/dvb/qpsk.c:101
+#: modules/access/satellite/satellite.c:66
 msgid "Input"
 msgstr "Entrée"
 
@@ -1158,7 +1159,7 @@ msgid "CPU"
 msgstr "Processeur"
 
 #: src/libvlc.h:579 modules/gui/beos/InterfaceWindow.cpp:206
-#: modules/gui/familiar/interface.c:610 modules/gui/gtk/gnome_interface.c:643
+#: modules/gui/gtk/gnome_interface.c:643
 #: modules/gui/gtk/gnome_interface.c:2384
 #: modules/gui/gtk/gnome_interface.c:2409 modules/gui/gtk/gtk_interface.c:747
 #: modules/gui/gtk/gtk_interface.c:2697 modules/gui/macosx/intf.m:321
@@ -1171,11 +1172,10 @@ msgstr "Liste de lecture"
 #: src/libvlc.h:585 modules/audio_filter/converter/a52tofloat32.c:85
 #: modules/audio_filter/converter/mpgatofixed32.c:60
 #: modules/codec/a52old/a52old.c:59 modules/codec/mpeg_video/parser.c:84
-#: modules/demux/mpeg/ts.c:118 modules/gui/familiar/familiar.c:70
-#: modules/gui/pda/pda.c:70 modules/misc/logger/logger.c:89
-#: modules/video_filter/motionblur.c:58 modules/video_filter/transform.c:63
-#: modules/video_filter/wall.c:66 modules/video_output/ggi.c:62
-#: modules/video_output/mga/xmga.c:102
+#: modules/demux/mpeg/ts.c:118 modules/gui/pda/pda.c:70
+#: modules/misc/logger/logger.c:89 modules/video_filter/motionblur.c:58
+#: modules/video_filter/transform.c:63 modules/video_filter/wall.c:66
+#: modules/video_output/ggi.c:62 modules/video_output/mga/xmga.c:102
 msgid "Miscellaneous"
 msgstr "Divers"
 
@@ -1203,7 +1203,7 @@ msgstr "Afficher l'aide du module"
 msgid "print version information"
 msgstr "Afficher le nom et la version du logiciel"
 
-#: src/misc/configuration.c:1000
+#: src/misc/configuration.c:1021
 msgid "boolean"
 msgstr "Booléen"
 
@@ -1267,6 +1267,111 @@ msgstr "Param
 msgid "Standard filesystem directory input"
 msgstr "Lecture standard d'un répertoire"
 
+#: modules/access/dvb/qpsk.c:44
+msgid "adapter card to tune"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:45
+msgid "adapter cards have a device file named /dev/dvb/adapter[n] with n>=0"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:47
+msgid "device nummer to use on adapter"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:50
+#, fuzzy
+msgid "satellite default transponder frequency"
+msgstr "Fréquence prédéfinie du transpondeur satellite"
+
+#: modules/access/dvb/qpsk.c:53
+#, fuzzy
+msgid "satellite default transponder polarization"
+msgstr "Polarisation par défaut du transpondeur satellite"
+
+#: modules/access/dvb/qpsk.c:56
+#, fuzzy
+msgid "satellite default transponder FEC"
+msgstr "FEC prédéfini du transpondeur satellite"
+
+#: modules/access/dvb/qpsk.c:57
+msgid "FEC=Forward Error Correction mode"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:59
+#, fuzzy
+msgid "satellite default transponder symbol rate"
+msgstr "Débit symbole prédéfini du transpondeur satellite"
+
+#: modules/access/dvb/qpsk.c:62
+#, fuzzy
+msgid "use diseqc with antenna"
+msgstr "Utiliser diseqc pour l'antenne"
+
+#: modules/access/dvb/qpsk.c:65
+#, fuzzy
+msgid "antenna lnb_lof1 (kHz)"
+msgstr "lnb_lof1 de l'antenne (kHz)"
+
+#: modules/access/dvb/qpsk.c:68
+#, fuzzy
+msgid "antenna lnb_lof2 (kHz)"
+msgstr "lnb_lof2 de l'antenne (kHz)"
+
+#: modules/access/dvb/qpsk.c:71
+#, fuzzy
+msgid "antenna lnb_slof (kHz)"
+msgstr "lnb_slof de l'antenne (kHz)"
+
+#: modules/access/dvb/qpsk.c:74
+msgid "probe the dvb card for capabilities (default disabled)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:75
+msgid "some dvb cards do not like to be probed for their capabilities"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:78
+msgid "modulation type"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:79
+msgid "modulation type for frontend device "
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:82
+msgid "terrestrial high priority stream code rate (FEC)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:85
+msgid "terrestrial low priority stream code rate (FEC)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:88
+msgid "terrestrial bandwidth"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:89
+msgid "terrestrial bandwidth [0=auto,6,7,8 in MHz]"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:91
+msgid "terrestrial guard interval"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:94
+msgid "terrestrial transmission mode"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:97
+msgid "terrestrial hierarchy mode"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:123
+#, fuzzy
+msgid "DVB input module with v4l2 support"
+msgstr "Lecture DVD avec support pour les menus"
+
 #: modules/access/dvd/dvd.c:65
 msgid "Method to use by libdvdcss for key decryption"
 msgstr "Méthode utilisé par libdvdcss pour le déchiffrement"
@@ -1369,7 +1474,7 @@ msgstr ""
 msgid "http"
 msgstr ""
 
-#: modules/access/http.c:89
+#: modules/access/http.c:91
 msgid "HTTP input"
 msgstr "Lecture HTTP"
 
@@ -1389,6 +1494,10 @@ msgstr "Lecture Microsoft Media Server (MMS)"
 msgid "Hauppauge PVR cards input"
 msgstr ""
 
+#: modules/access/rtsp.c:68
+msgid "RTSP SDP request"
+msgstr ""
+
 #: modules/access/satellite/satellite.c:41
 msgid "Satellite default transponder frequency"
 msgstr "Fréquence prédéfinie du transpondeur satellite"
@@ -1654,23 +1763,23 @@ msgstr "Sortie audio ALSA"
 msgid "Audio device"
 msgstr "Périphérique audio"
 
-#: modules/audio_output/alsa.c:173 modules/audio_output/directx.c:435
+#: modules/audio_output/alsa.c:171 modules/audio_output/directx.c:435
 #: modules/audio_output/oss.c:222 modules/audio_output/sdl.c:182
 #: modules/audio_output/sdl.c:201 modules/audio_output/waveout.c:399
 msgid "Mono"
 msgstr ""
 
-#: modules/audio_output/alsa.c:186 modules/audio_output/directx.c:409
+#: modules/audio_output/alsa.c:184 modules/audio_output/directx.c:409
 #: modules/audio_output/oss.c:178 modules/audio_output/waveout.c:371
 msgid "2 Front 2 Rear"
 msgstr ""
 
-#: modules/audio_output/alsa.c:192 modules/audio_output/directx.c:391
+#: modules/audio_output/alsa.c:190 modules/audio_output/directx.c:391
 #: modules/audio_output/oss.c:167 modules/audio_output/waveout.c:352
 msgid "5.1"
 msgstr ""
 
-#: modules/audio_output/alsa.c:219 modules/audio_output/directx.c:478
+#: modules/audio_output/alsa.c:217 modules/audio_output/directx.c:478
 #: modules/audio_output/oss.c:246 modules/audio_output/waveout.c:415
 msgid "A/52 over S/PDIF"
 msgstr ""
@@ -2057,20 +2166,29 @@ msgstr "D
 
 #: modules/codec/subsdec/subsdec.c:68
 #, fuzzy
-msgid "subtitle text encoding"
+msgid "Subtitles text encoding"
 msgstr "Décodeur de sous-titres DVD"
 
 #: modules/codec/subsdec/subsdec.c:69
 #, fuzzy
-msgid "change the encoding used in text subtitles"
+msgid "Change the encoding used in text subtitles"
 msgstr "Police de caractères utilisée par le module de sous-titres texte"
 
-#: modules/codec/subsdec/subsdec.c:72
+#: modules/codec/subsdec/subsdec.c:70
+#, fuzzy
+msgid "Subtitles justification"
+msgstr "Options de sous-titres"
+
+#: modules/codec/subsdec/subsdec.c:71
+msgid "Change the justification of substitles (0=center, 1=left, 2=right)"
+msgstr ""
+
+#: modules/codec/subsdec/subsdec.c:74
 #, fuzzy
 msgid "file subtitles decoder"
 msgstr "Décodeur de sous-titres DVD"
 
-#: modules/codec/subsdec/subsdec.c:75 modules/gui/beos/InterfaceWindow.cpp:256
+#: modules/codec/subsdec/subsdec.c:77 modules/gui/beos/InterfaceWindow.cpp:256
 #: modules/gui/kde/interface.cpp:93
 msgid "Subtitles"
 msgstr "Sous-titres"
@@ -2222,7 +2340,7 @@ msgid "Quit"
 msgstr "Quitter VLC"
 
 #: modules/control/lirc/lirc.c:297 modules/control/lirc/lirc.c:323
-#: modules/gui/familiar/interface.c:177 modules/gui/gtk/gnome_interface.c:602
+#: modules/gui/gtk/gnome_interface.c:602
 #: modules/gui/gtk/gnome_interface.c:1020 modules/gui/gtk/gtk_interface.c:709
 #: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:921
 #: modules/gui/macosx/intf.m:922 modules/gui/macosx/intf.m:923
@@ -2230,8 +2348,7 @@ msgstr "Quitter VLC"
 msgid "Pause"
 msgstr "Suspendre"
 
-#: modules/control/lirc/lirc.c:310 modules/gui/familiar/interface.c:190
-#: modules/gui/gtk/gnome_interface.c:590
+#: modules/control/lirc/lirc.c:310 modules/gui/gtk/gnome_interface.c:590
 #: modules/gui/gtk/gnome_interface.c:1013 modules/gui/gtk/gtk_interface.c:698
 #: modules/gui/macosx/intf.m:324 modules/gui/macosx/intf.m:362
 #: modules/gui/macosx/intf.m:423 modules/gui/macosx/intf.m:928
@@ -2268,68 +2385,71 @@ msgstr "Commande 
 msgid "remote control interface"
 msgstr "Interface de commande à distance"
 
-#: modules/demux/a52sys.c:52
+#: modules/demux/a52sys.c:41
 msgid "A52 demuxer"
 msgstr "Démultiplexeur A52"
 
-#: modules/demux/aac/demux.c:46
-msgid "AAC stream demuxer"
-msgstr "Démultiplexeur de flux AAC"
-
-#: modules/demux/aac/demux.c:555
-msgid "Aac"
+#: modules/demux/a52sys.c:161
+msgid "A52"
 msgstr ""
 
-#: modules/demux/aac/demux.c:557 modules/demux/mpeg/audio.c:627
-#: modules/demux/mpeg/audio.c:644 modules/demux/mpeg/m4v.c:150
+#: modules/demux/a52sys.c:163 modules/demux/aac.c:175
+#: modules/demux/mpeg/m4v.c:150 modules/demux/mpeg/mpga.c:331
 msgid "Input Type"
 msgstr "Entrée"
 
-#: modules/demux/aac/demux.c:560 modules/demux/mpeg/audio.c:629
-msgid "Layer"
-msgstr "Couche"
-
-#: modules/demux/aac/demux.c:562 modules/demux/asf/asf.c:275
-#: modules/demux/avi/avi.c:1178 modules/demux/mkv.cpp:2449
-#: modules/demux/ogg.c:561 modules/demux/ogg.c:837 modules/demux/ogg.c:1010
-#: modules/gui/gtk/gnome_interface.c:148 modules/gui/gtk/gnome_interface.c:931
-#: modules/gui/gtk/gtk_interface.c:481 modules/gui/gtk/gtk_interface.c:1282
-#: modules/gui/macosx/output.m:162 modules/gui/wxwindows/streamout.cpp:668
+#: modules/demux/a52sys.c:164 modules/demux/aac.c:177
+#: modules/demux/asf/asf.c:275 modules/demux/avi/avi.c:1178
+#: modules/demux/mkv.cpp:2453 modules/demux/ogg.c:562 modules/demux/ogg.c:838
+#: modules/demux/ogg.c:1011 modules/gui/gtk/gnome_interface.c:148
+#: modules/gui/gtk/gnome_interface.c:931 modules/gui/gtk/gtk_interface.c:481
+#: modules/gui/gtk/gtk_interface.c:1282 modules/gui/macosx/output.m:162
+#: modules/gui/wxwindows/streamout.cpp:668
 msgid "Channels"
 msgstr "Canaux"
 
-#: modules/demux/aac/demux.c:564 modules/demux/asf/asf.c:277
-#: modules/demux/avi/avi.c:1180 modules/demux/mkv.cpp:2453
-#: modules/demux/mpeg/audio.c:632 modules/demux/ogg.c:559
-#: modules/demux/ogg.c:671 modules/demux/ogg.c:832 modules/demux/ogg.c:1005
+#: modules/demux/a52sys.c:165 modules/demux/aac.c:179
+#: modules/demux/asf/asf.c:277 modules/demux/avi/avi.c:1180
+#: modules/demux/mkv.cpp:2457 modules/demux/mpeg/mpga.c:337
+#: modules/demux/ogg.c:560 modules/demux/ogg.c:672 modules/demux/ogg.c:833
+#: modules/demux/ogg.c:1006
 msgid "Sample Rate"
 msgstr "Débit"
 
+#: modules/demux/aac.c:41
+#, fuzzy
+msgid "AAC demuxer"
+msgstr "Démultiplexeur AU"
+
+#: modules/demux/aac.c:173
+msgid "Aac"
+msgstr ""
+
 #: modules/demux/asf/asf.c:48
 msgid "ASF v1.0 demuxer (file only)"
 msgstr ""
 
-#: modules/demux/asf/asf.c:165 modules/demux/mkv.cpp:2412
+#: modules/demux/asf/asf.c:165 modules/demux/mkv.cpp:2416
 msgid "Number of streams"
 msgstr "Nombre de flux"
 
-#: modules/demux/asf/asf.c:228 modules/demux/asf/asf.c:302
+#: modules/demux/asf/asf.c:228 modules/demux/asf/asf.c:298
 #: modules/demux/avi/avi.c:1172 modules/demux/avi/avi.c:1217
-#: modules/demux/avi/avi.c:1250 modules/demux/mkv.cpp:2445
-#: modules/demux/mkv.cpp:2461 modules/demux/mkv.cpp:2477
-#: modules/demux/ogg.c:557 modules/demux/ogg.c:629 modules/demux/ogg.c:669
-#: modules/demux/ogg.c:734 modules/demux/ogg.c:829 modules/demux/ogg.c:909
-#: modules/demux/ogg.c:1002 modules/gui/familiar/interface.c:370
-#: modules/gui/macosx/output.m:139 modules/gui/pda/interface.c:372
+#: modules/demux/avi/avi.c:1250 modules/demux/mkv.cpp:2449
+#: modules/demux/mkv.cpp:2465 modules/demux/mkv.cpp:2481
+#: modules/demux/ogg.c:558 modules/demux/ogg.c:630 modules/demux/ogg.c:670
+#: modules/demux/ogg.c:735 modules/demux/ogg.c:830 modules/demux/ogg.c:910
+#: modules/demux/ogg.c:1003 modules/gui/macosx/output.m:139
+#: modules/gui/pda/interface.c:372
 msgid "Type"
 msgstr ""
 
-#: modules/demux/asf/asf.c:260 modules/demux/asf/asf.c:318
+#: modules/demux/asf/asf.c:260 modules/demux/asf/asf.c:314
 #: modules/demux/avi/avi.c:1174 modules/demux/avi/avi.c:1218
-#: modules/demux/mkv.cpp:2446 modules/demux/mkv.cpp:2462
-#: modules/demux/mkv.cpp:2478 modules/demux/ogg.c:558 modules/demux/ogg.c:630
-#: modules/demux/ogg.c:670 modules/demux/ogg.c:735 modules/demux/ogg.c:830
-#: modules/demux/ogg.c:910 modules/demux/ogg.c:1003
+#: modules/demux/mkv.cpp:2450 modules/demux/mkv.cpp:2466
+#: modules/demux/mkv.cpp:2482 modules/demux/ogg.c:559 modules/demux/ogg.c:631
+#: modules/demux/ogg.c:671 modules/demux/ogg.c:736 modules/demux/ogg.c:831
+#: modules/demux/ogg.c:911 modules/demux/ogg.c:1004
 msgid "Codec"
 msgstr ""
 
@@ -2338,36 +2458,36 @@ msgid "Avg. byterate"
 msgstr ""
 
 #: modules/demux/asf/asf.c:282 modules/demux/avi/avi.c:1185
-#: modules/demux/mkv.cpp:2457
+#: modules/demux/mkv.cpp:2461
 msgid "Bits Per Sample"
 msgstr ""
 
-#: modules/demux/asf/asf.c:332
+#: modules/demux/asf/asf.c:328
 msgid "Size"
 msgstr "Taille"
 
-#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1222
-#: modules/demux/mkv.cpp:2465
+#: modules/demux/asf/asf.c:331 modules/demux/avi/avi.c:1222
+#: modules/demux/mkv.cpp:2469
 msgid "Resolution"
 msgstr "Résolution"
 
-#: modules/demux/asf/asf.c:337
+#: modules/demux/asf/asf.c:333
 msgid "Planes"
 msgstr ""
 
-#: modules/demux/asf/asf.c:339 modules/demux/avi/avi.c:1228
+#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1228
 msgid "Bits Per Pixel"
 msgstr ""
 
-#: modules/demux/asf/asf.c:342
+#: modules/demux/asf/asf.c:338
 msgid "Image Size"
 msgstr "Taille d'image"
 
-#: modules/demux/asf/asf.c:344
+#: modules/demux/asf/asf.c:340
 msgid "X pixels per meter"
 msgstr ""
 
-#: modules/demux/asf/asf.c:346
+#: modules/demux/asf/asf.c:342
 msgid "Y pixels per meter"
 msgstr ""
 
@@ -2400,7 +2520,7 @@ msgstr "Description"
 msgid "Rating"
 msgstr ""
 
-#: modules/demux/au.c:47
+#: modules/demux/au.c:42
 msgid "AU demuxer"
 msgstr "Démultiplexeur AU"
 
@@ -2445,8 +2565,8 @@ msgstr ""
 msgid "Audio Bitrate"
 msgstr "Débit audio"
 
-#: modules/demux/avi/avi.c:1225 modules/demux/ogg.c:631
-#: modules/demux/ogg.c:737 modules/demux/ogg.c:912
+#: modules/demux/avi/avi.c:1225 modules/demux/ogg.c:632
+#: modules/demux/ogg.c:738 modules/demux/ogg.c:913
 msgid "Frame Rate"
 msgstr "Fréquence d'affichage"
 
@@ -2486,58 +2606,58 @@ msgstr ""
 msgid "mka/mkv stream demuxer"
 msgstr "Démultiplexeur de flux mka/mkv"
 
-#: modules/demux/mkv.cpp:2389 modules/gui/gtk/gnome_interface.c:2436
+#: modules/demux/mkv.cpp:2393 modules/gui/gtk/gnome_interface.c:2436
 #: modules/gui/gtk/gtk_interface.c:2857 modules/gui/wxwindows/playlist.cpp:150
 msgid "Duration"
 msgstr "Durée"
 
-#: modules/demux/mkv.cpp:2398
+#: modules/demux/mkv.cpp:2402
 msgid "Date UTC"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2402
+#: modules/demux/mkv.cpp:2406
 msgid "Segment Filename"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2406
+#: modules/demux/mkv.cpp:2410
 msgid "Muxing Application"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2410
+#: modules/demux/mkv.cpp:2414
 msgid "Writing Application"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2423 modules/gui/beos/PlayListWindow.cpp:144
-#: modules/gui/familiar/interface.c:362 modules/gui/gtk/preferences.c:325
-#: modules/gui/kde/pluginsbox.cpp:45 modules/gui/pda/interface.c:364
+#: modules/demux/mkv.cpp:2427 modules/gui/beos/PlayListWindow.cpp:144
+#: modules/gui/gtk/preferences.c:325 modules/gui/kde/pluginsbox.cpp:45
+#: modules/gui/pda/interface.c:364
 msgid "Name"
 msgstr "Nom"
 
-#: modules/demux/mkv.cpp:2427
+#: modules/demux/mkv.cpp:2431
 msgid "Codec Name"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2431
+#: modules/demux/mkv.cpp:2435
 msgid "Codec Setting"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2435
+#: modules/demux/mkv.cpp:2439
 msgid "Codec Info"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2439
+#: modules/demux/mkv.cpp:2443
 msgid "Codec Download"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2469
+#: modules/demux/mkv.cpp:2473
 msgid "Display Resolution"
 msgstr "Résolution d'affichage"
 
-#: modules/demux/mkv.cpp:2473
+#: modules/demux/mkv.cpp:2477
 msgid "Frame Per Second"
 msgstr "Images par seconde"
 
-#: modules/demux/mkv.cpp:2477 modules/gui/gtk/gnome_interface.c:1963
+#: modules/demux/mkv.cpp:2481 modules/gui/gtk/gnome_interface.c:1963
 #: modules/gui/gtk/gtk_interface.c:2278
 msgid "Subtitle"
 msgstr "Sous-titre"
@@ -2546,33 +2666,41 @@ msgstr "Sous-titre"
 msgid "MP4 demuxer"
 msgstr "MP4 démultiplexeur"
 
-#: modules/demux/mpeg/audio.c:47
-msgid "MPEG I/II audio stream demuxer"
-msgstr "Démultiplexeur de flux audio MPEG I/II"
+#: modules/demux/mpeg/es.c:49
+msgid "ISO 13818-1 MPEG Elementary Stream input"
+msgstr "Entrée ISO 13818-1 MPEG Elementary Stream"
+
+#: modules/demux/mpeg/m4v.c:43
+msgid "MPEG-4 video elementary stream demuxer"
+msgstr "Démultiplexeur de flux vidéo élémentaire MPEG-4"
 
-#: modules/demux/mpeg/audio.c:626 modules/demux/mpeg/audio.c:643
 #: modules/demux/mpeg/m4v.c:149
 msgid "mpeg"
 msgstr ""
 
-#: modules/demux/mpeg/audio.c:630
-msgid "Mode"
+#: modules/demux/mpeg/m4v.c:150
+msgid "Video MPEG-4 (raw ES)"
 msgstr ""
 
-#: modules/demux/mpeg/audio.c:634
-msgid "Average Bitrate"
+#: modules/demux/mpeg/mpga.c:41
+#, fuzzy
+msgid "MPEG-I/II Audio demuxer"
+msgstr "Démultiplexeur de flux audio MPEG I/II"
+
+#: modules/demux/mpeg/mpga.c:330
+msgid "MPEG"
 msgstr ""
 
-#: modules/demux/mpeg/es.c:49
-msgid "ISO 13818-1 MPEG Elementary Stream input"
-msgstr "Entrée ISO 13818-1 MPEG Elementary Stream"
+#: modules/demux/mpeg/mpga.c:333
+msgid "Layer"
+msgstr "Couche"
 
-#: modules/demux/mpeg/m4v.c:43
-msgid "MPEG-4 video elementary stream demuxer"
-msgstr "Démultiplexeur de flux vidéo élémentaire MPEG-4"
+#: modules/demux/mpeg/mpga.c:335
+msgid "Mode"
+msgstr ""
 
-#: modules/demux/mpeg/m4v.c:150
-msgid "Video MPEG-4 (raw ES)"
+#: modules/demux/mpeg/mpga.c:339
+msgid "Average Bitrate"
 msgstr ""
 
 #: modules/demux/mpeg/ps.c:60
@@ -2618,36 +2746,36 @@ msgstr "Entr
 msgid "ogg stream demuxer"
 msgstr "Démultiplexeur de flux Ogg"
 
-#: modules/demux/ogg.c:558
+#: modules/demux/ogg.c:559
 msgid "Vorbis"
 msgstr ""
 
-#: modules/demux/ogg.c:563 modules/demux/ogg.c:633 modules/demux/ogg.c:673
-#: modules/demux/ogg.c:834 modules/demux/ogg.c:1007
+#: modules/demux/ogg.c:564 modules/demux/ogg.c:634 modules/demux/ogg.c:674
+#: modules/demux/ogg.c:835 modules/demux/ogg.c:1008
 msgid "Bit Rate"
 msgstr "Débit"
 
-#: modules/demux/ogg.c:630
+#: modules/demux/ogg.c:631
 msgid "Theora"
 msgstr ""
 
-#: modules/demux/ogg.c:670
+#: modules/demux/ogg.c:671
 msgid "tarkin"
 msgstr ""
 
-#: modules/demux/ogg.c:739 modules/demux/ogg.c:914
+#: modules/demux/ogg.c:740 modules/demux/ogg.c:915
 msgid "Bit Count"
 msgstr ""
 
-#: modules/demux/ogg.c:741 modules/demux/ogg.c:916
+#: modules/demux/ogg.c:742 modules/demux/ogg.c:917
 msgid "Width"
 msgstr "Largeur"
 
-#: modules/demux/ogg.c:743 modules/demux/ogg.c:918
+#: modules/demux/ogg.c:744 modules/demux/ogg.c:919
 msgid "Height"
 msgstr "Hauteur"
 
-#: modules/demux/ogg.c:839 modules/demux/ogg.c:1012
+#: modules/demux/ogg.c:840 modules/demux/ogg.c:1013
 msgid "Bits per Sample"
 msgstr ""
 
@@ -2655,6 +2783,10 @@ msgstr ""
 msgid "raw dv demuxer"
 msgstr ""
 
+#: modules/demux/sdp.c:64
+msgid "SDP demuxer + UDP/RTP/RTSP"
+msgstr ""
+
 #: modules/demux/util/id3.c:44
 msgid "Simple id3 tag skipper"
 msgstr ""
@@ -2987,7 +3119,7 @@ msgstr ""
 msgid "Text subtitles demux"
 msgstr "Démultiplexeur de sous-titres texte"
 
-#: modules/demux/wav/wav.c:49
+#: modules/demux/wav.c:43
 msgid "WAV demuxer"
 msgstr "Démultiplexeur WAV"
 
@@ -3020,11 +3152,9 @@ msgid "Yes"
 msgstr "Oui"
 
 #: modules/gui/beos/InterfaceWindow.cpp:201
-#: modules/gui/beos/InterfaceWindow.cpp:308
-#: modules/gui/familiar/interface.c:149 modules/gui/familiar/interface.c:150
-#: modules/gui/macosx/intf.m:328 modules/gui/macosx/prefs.m:77
-#: modules/gui/pda/interface.c:151 modules/gui/pda/interface.c:152
-#: modules/gui/wxwindows/preferences.cpp:233
+#: modules/gui/beos/InterfaceWindow.cpp:308 modules/gui/macosx/intf.m:328
+#: modules/gui/macosx/prefs.m:77 modules/gui/pda/interface.c:151
+#: modules/gui/pda/interface.c:152 modules/gui/wxwindows/preferences.cpp:233
 msgid "Preferences"
 msgstr "Préférences"
 
@@ -3039,7 +3169,7 @@ msgstr "Messages"
 
 #: modules/gui/beos/InterfaceWindow.cpp:238
 #: modules/gui/beos/MediaControlView.cpp:1257
-#: modules/gui/beos/PlayListWindow.cpp:82 modules/gui/familiar/interface.c:378
+#: modules/gui/beos/PlayListWindow.cpp:82
 #: modules/gui/gtk/gnome_interface.c:503
 #: modules/gui/gtk/gnome_interface.c:1569
 #: modules/gui/gtk/gnome_interface.c:2274
@@ -3072,10 +3202,8 @@ msgid "Open Subtitles"
 msgstr ""
 
 #: modules/gui/beos/InterfaceWindow.cpp:249
-#: modules/gui/familiar/interface.c:231 modules/gui/familiar/interface.c:232
-#: modules/gui/familiar/interface.c:765 modules/gui/gtk/gtk_interface.c:1580
-#: modules/gui/pda/interface.c:233 modules/gui/pda/interface.c:234
-#: modules/gui/pda/interface.c:767
+#: modules/gui/gtk/gtk_interface.c:1580 modules/gui/pda/interface.c:233
+#: modules/gui/pda/interface.c:234 modules/gui/pda/interface.c:767
 msgid "About"
 msgstr "À propos"
 
@@ -3124,7 +3252,7 @@ msgstr "Liste de lecture"
 #: modules/gui/wxwindows/open.cpp:244
 #: modules/gui/wxwindows/preferences.cpp:253
 #: modules/gui/wxwindows/streamout.cpp:217
-#: modules/gui/wxwindows/subtitles.cpp:149
+#: modules/gui/wxwindows/subtitles.cpp:190
 msgid "OK"
 msgstr ""
 
@@ -3248,7 +3376,7 @@ msgstr ""
 msgid "Take Screen Shot"
 msgstr ""
 
-#: modules/gui/beos/VlcWrapper.cpp:165 modules/gui/gtk/menu.c:733
+#: modules/gui/beos/VlcWrapper.cpp:165 modules/gui/gtk/menu.c:734
 msgid "None"
 msgstr "Aucun"
 
@@ -3256,198 +3384,6 @@ msgstr "Aucun"
 msgid "<unknown>"
 msgstr ""
 
-#: modules/gui/familiar/familiar.c:62 modules/gui/pda/pda.c:62
-msgid "Autoplay selected file"
-msgstr ""
-
-#: modules/gui/familiar/familiar.c:63 modules/gui/pda/pda.c:63
-msgid "Automatically play a file when selected in the file selection list"
-msgstr ""
-
-#: modules/gui/familiar/familiar.c:72
-msgid "Familiar Linux Gtk+ interface"
-msgstr "Interface Gtk+ Familiar Linux"
-
-#: modules/gui/familiar/interface.c:99 modules/gui/familiar/interface.c:732
-#: modules/gui/gtk/gnome_interface.c:274 modules/gui/gtk/gtk_interface.c:121
-#: modules/gui/gtk/gtk_interface.c:1595 modules/gui/pda/interface.c:99
-#: modules/gui/pda/interface.c:734
-msgid "VLC media player"
-msgstr "Lecteur multimédia VLC"
-
-#: modules/gui/familiar/interface.c:124 modules/gui/pda/interface.c:126
-#: modules/gui/wxwindows/dialogs.cpp:268 modules/gui/wxwindows/open.cpp:709
-#: modules/gui/wxwindows/preferences.cpp:1029
-#: modules/gui/wxwindows/subtitles.cpp:196
-msgid "Open file"
-msgstr "Ouvrir un fichier"
-
-#: modules/gui/familiar/interface.c:164 modules/gui/pda/interface.c:166
-msgid "Rewind"
-msgstr "Retour arrière"
-
-#: modules/gui/familiar/interface.c:165 modules/gui/pda/interface.c:167
-msgid "Rewind stream"
-msgstr "Retourne en arrière dans le flux"
-
-#: modules/gui/familiar/interface.c:178 modules/gui/pda/interface.c:180
-msgid "Pause stream"
-msgstr "Suspendre le flux"
-
-#: modules/gui/familiar/interface.c:191 modules/gui/pda/interface.c:193
-msgid "Play stream"
-msgstr "Jouer le flux"
-
-#: modules/gui/familiar/interface.c:203 modules/gui/gtk/gnome_interface.c:566
-#: modules/gui/gtk/gnome_interface.c:1027 modules/gui/gtk/gtk_interface.c:676
-#: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:639
-#: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
-#: modules/gui/macosx/intf.m:424 modules/gui/pda/interface.c:205
-#: modules/gui/wxwindows/interface.cpp:373
-msgid "Stop"
-msgstr "Stop"
-
-#: modules/gui/familiar/interface.c:204 modules/gui/pda/interface.c:206
-msgid "Stop stream"
-msgstr "Arrêter le flux"
-
-#: modules/gui/familiar/interface.c:216 modules/gui/pda/interface.c:218
-msgid "Forward"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:217 modules/gui/pda/interface.c:219
-msgid "Forward stream"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:285 modules/gui/gtk/gnome_interface.c:2345
-#: modules/gui/gtk/gtk_interface.c:2712 modules/gui/macosx/playlist.m:198
-#: modules/gui/pda/interface.c:287
-msgid "Add"
-msgstr "Ajouter"
-
-#: modules/gui/familiar/interface.c:293 modules/gui/pda/interface.c:295
-msgid "MRL :"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:394
-msgid "UDP/RTP (Address when Multicast)"
-msgstr "Multidiffusion UDP/RTP"
-
-#: modules/gui/familiar/interface.c:412 modules/gui/gtk/gnome_interface.c:1747
-#: modules/gui/gtk/gtk_interface.c:2062 modules/gui/macosx/open.m:161
-#: modules/gui/macosx/output.m:133 modules/gui/pda/interface.c:414
-#: modules/gui/wxwindows/open.cpp:469 modules/gui/wxwindows/streamout.cpp:425
-msgid "Address"
-msgstr "Adresse"
-
-#: modules/gui/familiar/interface.c:423 modules/gui/gtk/gnome_interface.c:1737
-#: modules/gui/gtk/gnome_interface.c:1786
-#: modules/gui/gtk/gnome_interface.c:2912 modules/gui/gtk/gtk_interface.c:2052
-#: modules/gui/gtk/gtk_interface.c:2101 modules/gui/gtk/gtk_interface.c:3225
-#: modules/gui/macosx/open.m:160 modules/gui/macosx/open.m:162
-#: modules/gui/macosx/output.m:134 modules/gui/pda/interface.c:425
-#: modules/gui/wxwindows/open.cpp:454 modules/gui/wxwindows/open.cpp:477
-#: modules/gui/wxwindows/streamout.cpp:436
-msgid "Port"
-msgstr "Port"
-
-#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:136
-#: modules/gui/macosx/output.m:236 modules/gui/macosx/output.m:311
-#: modules/gui/pda/interface.c:480 modules/gui/wxwindows/streamout.cpp:386
-msgid "HTTP"
-msgstr "HTTP"
-
-#: modules/gui/familiar/interface.c:488 modules/gui/pda/interface.c:490
-msgid "FTP"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:498 modules/gui/pda/interface.c:500
-msgid "MMS"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:516 modules/gui/gtk/gnome_interface.c:1830
-#: modules/gui/gtk/gnome_interface.c:2281 modules/gui/gtk/gtk_interface.c:2145
-#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:144
-#: modules/gui/macosx/open.m:271 modules/gui/pda/interface.c:518
-#: modules/gui/wxwindows/open.cpp:257
-msgid "Network"
-msgstr "Réseau"
-
-#: modules/gui/familiar/interface.c:524 modules/gui/pda/interface.c:526
-msgid "Media"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:560 modules/gui/pda/interface.c:562
-msgid "MRL"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:569 modules/gui/pda/interface.c:571
-msgid "Time"
-msgstr "Temps"
-
-#: modules/gui/familiar/interface.c:586 modules/gui/pda/interface.c:588
-msgid "Update"
-msgstr "Mettre à jour"
-
-#: modules/gui/familiar/interface.c:594 modules/gui/pda/interface.c:596
-msgid " Del "
-msgstr ""
-
-#: modules/gui/familiar/interface.c:602 modules/gui/pda/interface.c:604
-msgid " Clear "
-msgstr "Effacer"
-
-#: modules/gui/familiar/interface.c:626 modules/gui/pda/interface.c:628
-msgid "Automatically play file"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:643 modules/gui/pda/interface.c:645
-msgid " Save "
-msgstr "Enregistrer"
-
-#: modules/gui/familiar/interface.c:651 modules/gui/pda/interface.c:653
-msgid " Apply "
-msgstr "Appliquer"
-
-#: modules/gui/familiar/interface.c:659 modules/gui/pda/interface.c:661
-msgid " Cancel "
-msgstr "Annuler"
-
-#: modules/gui/familiar/interface.c:667 modules/gui/pda/interface.c:669
-msgid "Preference"
-msgstr "Préférences"
-
-#: modules/gui/familiar/interface.c:711 modules/gui/gtk/gnome_interface.c:1361
-#: modules/gui/gtk/gtk_interface.c:1603 modules/gui/kde/kde.cpp:111
-#: modules/gui/pda/interface.c:713
-msgid "(c) 1996-2003 the VideoLAN team"
-msgstr "© 1996-2003 l'équipe VideoLAN"
-
-#: modules/gui/familiar/interface.c:721 modules/gui/pda/interface.c:723
-msgid "Authors: The VideoLAN Team, http://www.videolan.org"
-msgstr "Auteurs: l'équipe VideoLAN, http://www.videolan.org"
-
-#: modules/gui/familiar/interface.c:753 modules/gui/pda/interface.c:755
-msgid ""
-"The VideoLAN Client is a MPEG, MPEG 2, MP3, DivX player, that accepts input "
-"from local or network sources."
-msgstr ""
-
-#: modules/gui/familiar/support.c:121 modules/gui/gtk/gnome_support.c:100
-#: modules/gui/gtk/gnome_support.c:138 modules/gui/gtk/gtk_support.c:121
-#: modules/gui/gtk2/gnome2_support.c:60 modules/gui/gtk2/gnome2_support.c:85
-#: modules/gui/gtk2/gtk2_support.c:90 modules/gui/gtk2/gtk2_support.c:114
-#: modules/gui/pda/support.c:121
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr ""
-
-#: modules/gui/familiar/support.c:130 modules/gui/gtk/gtk_support.c:130
-#: modules/gui/pda/support.c:130
-#, c-format
-msgid "Error loading pixmap file: %s"
-msgstr ""
-
 #: modules/gui/gtk/gnome.c:55 modules/gui/gtk/gtk.c:57
 msgid "Show tooltips"
 msgstr "Afficher les bulles d'aide"
@@ -3642,6 +3578,12 @@ msgstr "_Audio"
 msgid "_Video"
 msgstr "_Vidéo"
 
+#: modules/gui/gtk/gnome_interface.c:274 modules/gui/gtk/gtk_interface.c:121
+#: modules/gui/gtk/gtk_interface.c:1595 modules/gui/pda/interface.c:99
+#: modules/gui/pda/interface.c:734
+msgid "VLC media player"
+msgstr "Lecteur multimédia VLC"
+
 #: modules/gui/gtk/gnome_interface.c:515 modules/gui/gtk/gnome_interface.c:718
 #: modules/gui/gtk/gnome_interface.c:1690
 #: modules/gui/gtk/gnome_interface.c:2267 modules/gui/gtk/gtk_interface.c:629
@@ -3676,6 +3618,15 @@ msgstr "Retour"
 msgid "Go Backward"
 msgstr "Retour arrière"
 
+#: modules/gui/gtk/gnome_interface.c:566
+#: modules/gui/gtk/gnome_interface.c:1027 modules/gui/gtk/gtk_interface.c:676
+#: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:639
+#: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
+#: modules/gui/macosx/intf.m:424 modules/gui/pda/interface.c:205
+#: modules/gui/wxwindows/interface.cpp:373
+msgid "Stop"
+msgstr "Stop"
+
 #: modules/gui/gtk/gnome_interface.c:567 modules/gui/gtk/gtk_interface.c:677
 msgid "Stop Stream"
 msgstr "Arrêter le flux"
@@ -3797,6 +3748,11 @@ msgstr "Masquer/afficher l'_interface"
 msgid "Playlist..."
 msgstr "Liste de lecture..."
 
+#: modules/gui/gtk/gnome_interface.c:1361 modules/gui/gtk/gtk_interface.c:1603
+#: modules/gui/kde/kde.cpp:111 modules/gui/pda/interface.c:713
+msgid "(c) 1996-2003 the VideoLAN team"
+msgstr "© 1996-2003 l'équipe VideoLAN"
+
 #: modules/gui/gtk/gnome_interface.c:1363 modules/gui/gtk/gtk_interface.c:1646
 #: modules/gui/kde/kde.cpp:108
 msgid ""
@@ -3837,7 +3793,7 @@ msgstr ""
 #: modules/gui/wxwindows/open.cpp:223 modules/gui/wxwindows/open.cpp:341
 #: modules/gui/wxwindows/preferences.cpp:832
 #: modules/gui/wxwindows/streamout.cpp:412
-#: modules/gui/wxwindows/subtitles.cpp:107
+#: modules/gui/wxwindows/subtitles.cpp:109
 msgid "Browse..."
 msgstr "Parcourir..."
 
@@ -3886,11 +3842,37 @@ msgstr "Multidiff. UDP/RTP"
 msgid "HTTP/FTP/MMS"
 msgstr ""
 
+#: modules/gui/gtk/gnome_interface.c:1737
+#: modules/gui/gtk/gnome_interface.c:1786
+#: modules/gui/gtk/gnome_interface.c:2912 modules/gui/gtk/gtk_interface.c:2052
+#: modules/gui/gtk/gtk_interface.c:2101 modules/gui/gtk/gtk_interface.c:3225
+#: modules/gui/macosx/open.m:160 modules/gui/macosx/open.m:162
+#: modules/gui/macosx/output.m:134 modules/gui/pda/interface.c:425
+#: modules/gui/wxwindows/open.cpp:454 modules/gui/wxwindows/open.cpp:477
+#: modules/gui/wxwindows/streamout.cpp:436
+msgid "Port"
+msgstr "Port"
+
+#: modules/gui/gtk/gnome_interface.c:1747 modules/gui/gtk/gtk_interface.c:2062
+#: modules/gui/macosx/open.m:161 modules/gui/macosx/output.m:133
+#: modules/gui/pda/interface.c:414 modules/gui/wxwindows/open.cpp:469
+#: modules/gui/wxwindows/streamout.cpp:425
+msgid "Address"
+msgstr "Adresse"
+
 #: modules/gui/gtk/gnome_interface.c:1759 modules/gui/gtk/gtk_interface.c:2074
 #: modules/gui/macosx/open.m:163 modules/gui/wxwindows/open.cpp:492
 msgid "URL"
 msgstr ""
 
+#: modules/gui/gtk/gnome_interface.c:1830
+#: modules/gui/gtk/gnome_interface.c:2281 modules/gui/gtk/gtk_interface.c:2145
+#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:144
+#: modules/gui/macosx/open.m:271 modules/gui/pda/interface.c:518
+#: modules/gui/wxwindows/open.cpp:257
+msgid "Network"
+msgstr "Réseau"
+
 #: modules/gui/gtk/gnome_interface.c:1847 modules/gui/gtk/gtk_interface.c:2162
 msgid "Symbol Rate"
 msgstr "Débit symbole"
@@ -3971,6 +3953,11 @@ msgstr "Inverser"
 msgid "Select"
 msgstr "Sélectionner"
 
+#: modules/gui/gtk/gnome_interface.c:2345 modules/gui/gtk/gtk_interface.c:2712
+#: modules/gui/macosx/playlist.m:198 modules/gui/pda/interface.c:287
+msgid "Add"
+msgstr "Ajouter"
+
 #: modules/gui/gtk/gnome_interface.c:2352 modules/gui/gtk/gtk_interface.c:2754
 #: modules/gui/macosx/playlist.m:195 modules/gui/macosx/playlist.m:199
 msgid "Delete"
@@ -4038,6 +4025,14 @@ msgstr ""
 msgid "AVI"
 msgstr ""
 
+#: modules/gui/gtk/gnome_support.c:100 modules/gui/gtk/gnome_support.c:138
+#: modules/gui/gtk/gtk_support.c:121 modules/gui/gtk2/gnome2_support.c:60
+#: modules/gui/gtk2/gnome2_support.c:85 modules/gui/gtk2/gtk2_support.c:90
+#: modules/gui/gtk2/gtk2_support.c:114 modules/gui/pda/support.c:121
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr ""
+
 #: modules/gui/gtk/gnome_support.c:116
 #, c-format
 msgid "Couldn't create pixmap from file: %s"
@@ -4151,10 +4146,11 @@ msgstr "Configuration du flux de sortie"
 #: modules/gui/gtk/gtk_interface.c:2403 modules/gui/gtk/gtk_interface.c:2645
 #: modules/gui/gtk/gtk_interface.c:2876 modules/gui/gtk/gtk_interface.c:3257
 #: modules/gui/gtk/preferences.c:618 modules/gui/macosx/open.m:140
-#: modules/gui/macosx/prefs.m:79 modules/gui/wxwindows/open.cpp:247
+#: modules/gui/macosx/prefs.m:79 modules/gui/macosx/prefs.m:170
+#: modules/gui/wxwindows/open.cpp:247
 #: modules/gui/wxwindows/preferences.cpp:256
 #: modules/gui/wxwindows/streamout.cpp:220
-#: modules/gui/wxwindows/subtitles.cpp:152
+#: modules/gui/wxwindows/subtitles.cpp:193
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -4186,12 +4182,17 @@ msgstr "_Inverser"
 msgid "_Select"
 msgstr "_Sélectionner"
 
-#: modules/gui/gtk/menu.c:900
+#: modules/gui/gtk/gtk_support.c:130 modules/gui/pda/support.c:130
+#, c-format
+msgid "Error loading pixmap file: %s"
+msgstr ""
+
+#: modules/gui/gtk/menu.c:901
 #, c-format
 msgid "Title %d (%d)"
 msgstr "Titre %d (%d)"
 
-#: modules/gui/gtk/menu.c:967
+#: modules/gui/gtk/menu.c:968
 #, c-format
 msgid "Chapter %d"
 msgstr "Chapitre %d"
@@ -4343,8 +4344,9 @@ msgstr ""
 msgid "VLC - Controller"
 msgstr "VLC - Contrôleur"
 
-#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/interface.cpp:904
-#: modules/gui/wxwindows/timer.cpp:131
+#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/control.cpp:160
+#: modules/gui/wxwindows/control.cpp:370
+#: modules/gui/wxwindows/interface.cpp:904 modules/gui/wxwindows/timer.cpp:131
 msgid "Volume"
 msgstr ""
 
@@ -4594,6 +4596,12 @@ msgstr "Flux"
 msgid "TTL"
 msgstr ""
 
+#: modules/gui/macosx/output.m:136 modules/gui/macosx/output.m:236
+#: modules/gui/macosx/output.m:311 modules/gui/pda/interface.c:480
+#: modules/gui/wxwindows/streamout.cpp:386
+msgid "HTTP"
+msgstr "HTTP"
+
 #: modules/gui/macosx/output.m:141 modules/gui/wxwindows/streamout.cpp:531
 msgid "Encapsulation Method"
 msgstr "Méthode d'encapsulation"
@@ -4651,6 +4659,11 @@ msgstr "Avanc
 msgid "Reset Preferences"
 msgstr "Rétablir"
 
+#: modules/gui/macosx/prefs.m:170
+#, fuzzy
+msgid "Continue"
+msgstr "Configurer"
+
 #: modules/gui/macosx/prefs.m:172 modules/gui/wxwindows/preferences.cpp:316
 msgid ""
 "Beware this will reset your VLC Media Player config file.\n"
@@ -4671,10 +4684,119 @@ msgstr "Pr
 msgid "ncurses interface"
 msgstr "Interface ncurses"
 
+#: modules/gui/pda/interface.c:126 modules/gui/wxwindows/dialogs.cpp:268
+#: modules/gui/wxwindows/open.cpp:709
+#: modules/gui/wxwindows/preferences.cpp:1029
+#: modules/gui/wxwindows/subtitles.cpp:234
+msgid "Open file"
+msgstr "Ouvrir un fichier"
+
+#: modules/gui/pda/interface.c:166
+msgid "Rewind"
+msgstr "Retour arrière"
+
+#: modules/gui/pda/interface.c:167
+msgid "Rewind stream"
+msgstr "Retourne en arrière dans le flux"
+
+#: modules/gui/pda/interface.c:180
+msgid "Pause stream"
+msgstr "Suspendre le flux"
+
+#: modules/gui/pda/interface.c:193
+msgid "Play stream"
+msgstr "Jouer le flux"
+
+#: modules/gui/pda/interface.c:206
+msgid "Stop stream"
+msgstr "Arrêter le flux"
+
+#: modules/gui/pda/interface.c:218
+msgid "Forward"
+msgstr ""
+
+#: modules/gui/pda/interface.c:219
+msgid "Forward stream"
+msgstr ""
+
+#: modules/gui/pda/interface.c:295
+msgid "MRL :"
+msgstr ""
+
 #: modules/gui/pda/interface.c:396
 msgid "UDP/RTP (Adress when Multicast)"
 msgstr "Multidiffusion UDP/RTP"
 
+#: modules/gui/pda/interface.c:490
+msgid "FTP"
+msgstr ""
+
+#: modules/gui/pda/interface.c:500
+msgid "MMS"
+msgstr ""
+
+#: modules/gui/pda/interface.c:526
+msgid "Media"
+msgstr ""
+
+#: modules/gui/pda/interface.c:562
+msgid "MRL"
+msgstr ""
+
+#: modules/gui/pda/interface.c:571
+msgid "Time"
+msgstr "Temps"
+
+#: modules/gui/pda/interface.c:588
+msgid "Update"
+msgstr "Mettre à jour"
+
+#: modules/gui/pda/interface.c:596
+msgid " Del "
+msgstr ""
+
+#: modules/gui/pda/interface.c:604
+msgid " Clear "
+msgstr "Effacer"
+
+#: modules/gui/pda/interface.c:628
+msgid "Automatically play file"
+msgstr ""
+
+#: modules/gui/pda/interface.c:645
+msgid " Save "
+msgstr "Enregistrer"
+
+#: modules/gui/pda/interface.c:653
+msgid " Apply "
+msgstr "Appliquer"
+
+#: modules/gui/pda/interface.c:661
+msgid " Cancel "
+msgstr "Annuler"
+
+#: modules/gui/pda/interface.c:669
+msgid "Preference"
+msgstr "Préférences"
+
+#: modules/gui/pda/interface.c:723
+msgid "Authors: The VideoLAN Team, http://www.videolan.org"
+msgstr "Auteurs: l'équipe VideoLAN, http://www.videolan.org"
+
+#: modules/gui/pda/interface.c:755
+msgid ""
+"The VideoLAN Client is a MPEG, MPEG 2, MP3, DivX player, that accepts input "
+"from local or network sources."
+msgstr ""
+
+#: modules/gui/pda/pda.c:62
+msgid "Autoplay selected file"
+msgstr ""
+
+#: modules/gui/pda/pda.c:63
+msgid "Automatically play a file when selected in the file selection list"
+msgstr ""
+
 #: modules/gui/pda/pda.c:72
 msgid "PDA Linux Gtk2+ interface"
 msgstr "Interface Gtk2+ Linux pour PDA"
@@ -4967,7 +5089,7 @@ msgstr "Capturer le flux entrant"
 msgid "Capture the stream you are playing to a file"
 msgstr "Capturer le flux joué dans un fichier"
 
-#: modules/gui/wxwindows/open.cpp:348 modules/gui/wxwindows/subtitles.cpp:98
+#: modules/gui/wxwindows/open.cpp:348 modules/gui/wxwindows/subtitles.cpp:100
 msgid "Subtitles file"
 msgstr "Fichier de sous-titres"
 
@@ -4983,7 +5105,7 @@ msgstr ""
 msgid "CD Audio"
 msgstr "CD audio"
 
-#: modules/gui/wxwindows/open.cpp:900 modules/gui/wxwindows/streamout.cpp:784
+#: modules/gui/wxwindows/open.cpp:903 modules/gui/wxwindows/streamout.cpp:784
 msgid "Save file"
 msgstr "Enregistrer le fichier"
 
@@ -5099,19 +5221,24 @@ msgstr "Codec audio"
 msgid "Open Subtitles File"
 msgstr "Ouvrir un fichier de sous-titres"
 
-#: modules/gui/wxwindows/subtitles.cpp:115
+#: modules/gui/wxwindows/subtitles.cpp:123
+#, fuzzy
+msgid "Subtitles encoding"
+msgstr "Décodeur de sous-titres DVD"
+
+#: modules/gui/wxwindows/subtitles.cpp:155
 msgid "Subtitles options"
 msgstr "Options de sous-titres"
 
-#: modules/gui/wxwindows/subtitles.cpp:119
+#: modules/gui/wxwindows/subtitles.cpp:159
 msgid "Delay subtitles (in 1/10s)"
 msgstr "Délai des sous-titres (en 1/10 s)"
 
-#: modules/gui/wxwindows/subtitles.cpp:130
+#: modules/gui/wxwindows/subtitles.cpp:170
 msgid "Frames per second"
 msgstr "Images par seconde"
 
-#: modules/gui/wxwindows/subtitles.cpp:138
+#: modules/gui/wxwindows/subtitles.cpp:178
 msgid "Override frames per second. It will only work with MicroDVD subtitles."
 msgstr ""
 "Images de remplacement par seconde. Ne fonctionne qu'avec les sous-titres "
@@ -5183,27 +5310,27 @@ msgstr "fonctions d'interface qui ne font rien"
 msgid "Using the dummy interface plugin..."
 msgstr "Utilisation du module d'interface qui ne fait rien..."
 
-#: modules/misc/freetype.c:67 modules/visualization/xosd/xosd.c:71
+#: modules/misc/freetype.c:72 modules/visualization/xosd/xosd.c:71
 msgid "Font"
 msgstr "Police"
 
-#: modules/misc/freetype.c:68
+#: modules/misc/freetype.c:73
 msgid "Filename of Font"
 msgstr "Nom de la police de caractères utilisée par le module osd"
 
-#: modules/misc/freetype.c:69
+#: modules/misc/freetype.c:74
 msgid "Font size"
 msgstr "Taille"
 
-#: modules/misc/freetype.c:70
+#: modules/misc/freetype.c:75
 msgid "The size of the fonts used by the osd module"
 msgstr "Taille de caractères utilisée par le module osd"
 
-#: modules/misc/freetype.c:73
+#: modules/misc/freetype.c:78
 msgid "Fonts"
 msgstr "Polices"
 
-#: modules/misc/freetype.c:76
+#: modules/misc/freetype.c:81
 msgid "freetype2 font renderer"
 msgstr ""
 
@@ -5339,19 +5466,19 @@ msgstr "Multiplexeur avi"
 msgid "Dummy muxer"
 msgstr ""
 
-#: modules/mux/mp4.c:52
+#: modules/mux/mp4.c:56
 msgid "MP4/MOV muxer"
 msgstr "Démultiplexeur MP4/MOV"
 
-#: modules/mux/mpeg/ps.c:79
+#: modules/mux/mpeg/ps.c:53
 msgid "PS muxer"
 msgstr "Multiplexeur PS"
 
-#: modules/mux/mpeg/ts.c:138
+#: modules/mux/mpeg/ts.c:78
 msgid "TS muxer"
 msgstr "Multiplexeur TS"
 
-#: modules/mux/mpeg/ts.c:143
+#: modules/mux/mpeg/ts.c:83
 msgid "TS muxer (libdvbpsi)"
 msgstr "Multiplexeur TS (libdvbpsi)"
 
@@ -5363,7 +5490,7 @@ msgstr "Multiplexeur ogg/ogm"
 msgid "A/52 audio packetizer"
 msgstr ""
 
-#: modules/packetizer/copy.c:69
+#: modules/packetizer/copy.c:43
 msgid "Copy packetizer"
 msgstr ""
 
@@ -5407,7 +5534,7 @@ msgstr ""
 msgid "Standard stream"
 msgstr ""
 
-#: modules/stream_out/transcode.c:71
+#: modules/stream_out/transcode.c:73
 msgid "Transcode stream"
 msgstr ""
 
@@ -5905,6 +6032,15 @@ msgstr "Module XOSD"
 msgid "xosd interface"
 msgstr "interface xosd"
 
+#~ msgid "AAC stream demuxer"
+#~ msgstr "Démultiplexeur de flux AAC"
+
+#~ msgid "Familiar Linux Gtk+ interface"
+#~ msgstr "Interface Gtk+ Familiar Linux"
+
+#~ msgid "UDP/RTP (Address when Multicast)"
+#~ msgstr "Multidiffusion UDP/RTP"
+
 #, fuzzy
 #~ msgid "Advanced open options"
 #~ msgstr "Options avancées"
diff --git a/po/it.po b/po/it.po
index f401a0ca8f..84121baa57 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vlc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-07-31 15:04+0200\n"
+"POT-Creation-Date: 2003-08-11 21:05+0200\n"
 "PO-Revision-Date: 2003-07-24 15:00+0100\n"
 "Last-Translator: Vella Bruno\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -28,7 +28,7 @@ msgid "Audio channels"
 msgstr "Canali audio"
 
 #: src/audio_output/output.c:107 src/audio_output/output.c:142
-#: modules/audio_output/alsa.c:179 modules/audio_output/directx.c:423
+#: modules/audio_output/alsa.c:177 modules/audio_output/directx.c:423
 #: modules/audio_output/oss.c:202 modules/audio_output/sdl.c:181
 #: modules/audio_output/sdl.c:198 modules/audio_output/waveout.c:386
 msgid "Stereo"
@@ -105,11 +105,11 @@ msgstr ""
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr ""
 
-#: src/input/input.c:171
+#: src/input/input.c:174
 msgid "General"
 msgstr "Generale"
 
-#: src/input/input.c:172
+#: src/input/input.c:175
 msgid "Playlist Item"
 msgstr "Elemento Playlist"
 
@@ -120,9 +120,9 @@ msgid "Program"
 msgstr "Programma"
 
 #: src/input/input_programs.c:98 modules/demux/asf/libasf.c:696
-#: modules/demux/mkv.cpp:2394 modules/gui/beos/MediaControlView.cpp:1258
+#: modules/demux/mkv.cpp:2398 modules/gui/beos/MediaControlView.cpp:1258
 #: modules/gui/gtk/gnome_interface.c:1650 modules/gui/gtk/gtk_interface.c:1956
-#: modules/gui/gtk/menu.c:1402 modules/gui/gtk/menu.c:1423
+#: modules/gui/gtk/menu.c:1403 modules/gui/gtk/menu.c:1424
 #: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:373
 #: modules/gui/macosx/intf.m:374 modules/gui/macosx/open.m:150
 #: modules/gui/wxwindows/open.cpp:406
@@ -131,7 +131,7 @@ msgstr "Titolo"
 
 #: src/input/input_programs.c:102 modules/gui/beos/MediaControlView.cpp:1259
 #: modules/gui/gtk/gnome_interface.c:1640 modules/gui/gtk/gtk_interface.c:1946
-#: modules/gui/gtk/menu.c:1019 modules/gui/gtk/menu.c:1432
+#: modules/gui/gtk/menu.c:1020 modules/gui/gtk/menu.c:1433
 #: modules/gui/kde/interface.cpp:146 modules/gui/macosx/intf.m:375
 #: modules/gui/macosx/intf.m:376 modules/gui/macosx/open.m:151
 #: modules/gui/wxwindows/open.cpp:412
@@ -203,15 +203,15 @@ msgid ""
 "\n"
 msgstr "Utilizzo: %s [opzioni] [elementi]...\n"
 
-#: src/libvlc.c:1200 src/misc/configuration.c:1019
+#: src/libvlc.c:1200 src/misc/configuration.c:1040
 msgid "string"
 msgstr "stringa"
 
-#: src/libvlc.c:1217 src/misc/configuration.c:1000
+#: src/libvlc.c:1217 src/misc/configuration.c:1021
 msgid "integer"
 msgstr "intero"
 
-#: src/libvlc.c:1220 src/misc/configuration.c:1009
+#: src/libvlc.c:1220 src/misc/configuration.c:1030
 msgid "float"
 msgstr "virgola mobile"
 
@@ -1085,16 +1085,16 @@ msgstr "Interfaccia"
 
 #: src/libvlc.h:474 modules/audio_output/coreaudio.c:227
 #: modules/audio_output/file.c:108 modules/demux/asf/asf.c:228
-#: modules/demux/mkv.cpp:2445 modules/demux/ogg.c:557 modules/demux/ogg.c:829
-#: modules/demux/ogg.c:1002 modules/gui/beos/InterfaceWindow.cpp:259
+#: modules/demux/mkv.cpp:2449 modules/demux/ogg.c:558 modules/demux/ogg.c:830
+#: modules/demux/ogg.c:1003 modules/gui/beos/InterfaceWindow.cpp:259
 #: modules/gui/gtk/gnome_interface.c:1092 modules/gui/gtk/gtk_interface.c:1219
 #: modules/gui/macosx/intf.m:378 modules/gui/macosx/output.m:156
 msgid "Audio"
 msgstr "Audio"
 
-#: src/libvlc.h:493 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1217
-#: modules/demux/mkv.cpp:2461 modules/demux/ogg.c:629 modules/demux/ogg.c:669
-#: modules/demux/ogg.c:734 modules/demux/ogg.c:909
+#: src/libvlc.h:493 modules/demux/asf/asf.c:298 modules/demux/avi/avi.c:1217
+#: modules/demux/mkv.cpp:2465 modules/demux/ogg.c:630 modules/demux/ogg.c:670
+#: modules/demux/ogg.c:735 modules/demux/ogg.c:910
 #: modules/gui/gtk/gnome_interface.c:1099 modules/gui/gtk/gtk_interface.c:1296
 #: modules/gui/macosx/intf.m:389 modules/gui/macosx/macosx.m:68
 #: modules/gui/macosx/output.m:150 modules/misc/dummy/dummy.c:81
@@ -1102,7 +1102,8 @@ msgstr "Audio"
 msgid "Video"
 msgstr "Video"
 
-#: src/libvlc.h:515 modules/access/satellite/satellite.c:66
+#: src/libvlc.h:515 modules/access/dvb/qpsk.c:101
+#: modules/access/satellite/satellite.c:66
 msgid "Input"
 msgstr "Ingresso"
 
@@ -1125,7 +1126,7 @@ msgid "CPU"
 msgstr "CPU"
 
 #: src/libvlc.h:579 modules/gui/beos/InterfaceWindow.cpp:206
-#: modules/gui/familiar/interface.c:610 modules/gui/gtk/gnome_interface.c:643
+#: modules/gui/gtk/gnome_interface.c:643
 #: modules/gui/gtk/gnome_interface.c:2384
 #: modules/gui/gtk/gnome_interface.c:2409 modules/gui/gtk/gtk_interface.c:747
 #: modules/gui/gtk/gtk_interface.c:2697 modules/gui/macosx/intf.m:321
@@ -1138,11 +1139,10 @@ msgstr "Playlist"
 #: src/libvlc.h:585 modules/audio_filter/converter/a52tofloat32.c:85
 #: modules/audio_filter/converter/mpgatofixed32.c:60
 #: modules/codec/a52old/a52old.c:59 modules/codec/mpeg_video/parser.c:84
-#: modules/demux/mpeg/ts.c:118 modules/gui/familiar/familiar.c:70
-#: modules/gui/pda/pda.c:70 modules/misc/logger/logger.c:89
-#: modules/video_filter/motionblur.c:58 modules/video_filter/transform.c:63
-#: modules/video_filter/wall.c:66 modules/video_output/ggi.c:62
-#: modules/video_output/mga/xmga.c:102
+#: modules/demux/mpeg/ts.c:118 modules/gui/pda/pda.c:70
+#: modules/misc/logger/logger.c:89 modules/video_filter/motionblur.c:58
+#: modules/video_filter/transform.c:63 modules/video_filter/wall.c:66
+#: modules/video_output/ggi.c:62 modules/video_output/mga/xmga.c:102
 msgid "Miscellaneous"
 msgstr "Varie"
 
@@ -1170,7 +1170,7 @@ msgstr "stampa aiuto sul modulo"
 msgid "print version information"
 msgstr "stampa informazioni versione"
 
-#: src/misc/configuration.c:1000
+#: src/misc/configuration.c:1021
 msgid "boolean"
 msgstr "booleana"
 
@@ -1234,6 +1234,103 @@ msgstr ""
 msgid "Standard filesystem directory input"
 msgstr ""
 
+#: modules/access/dvb/qpsk.c:44
+msgid "adapter card to tune"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:45
+msgid "adapter cards have a device file named /dev/dvb/adapter[n] with n>=0"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:47
+msgid "device nummer to use on adapter"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:50
+msgid "satellite default transponder frequency"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:53
+msgid "satellite default transponder polarization"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:56
+msgid "satellite default transponder FEC"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:57
+msgid "FEC=Forward Error Correction mode"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:59
+msgid "satellite default transponder symbol rate"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:62
+msgid "use diseqc with antenna"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:65
+msgid "antenna lnb_lof1 (kHz)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:68
+msgid "antenna lnb_lof2 (kHz)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:71
+msgid "antenna lnb_slof (kHz)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:74
+msgid "probe the dvb card for capabilities (default disabled)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:75
+msgid "some dvb cards do not like to be probed for their capabilities"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:78
+msgid "modulation type"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:79
+msgid "modulation type for frontend device "
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:82
+msgid "terrestrial high priority stream code rate (FEC)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:85
+msgid "terrestrial low priority stream code rate (FEC)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:88
+msgid "terrestrial bandwidth"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:89
+msgid "terrestrial bandwidth [0=auto,6,7,8 in MHz]"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:91
+msgid "terrestrial guard interval"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:94
+msgid "terrestrial transmission mode"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:97
+msgid "terrestrial hierarchy mode"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:123
+#, fuzzy
+msgid "DVB input module with v4l2 support"
+msgstr "ingresso DVD con supporto menu"
+
 #: modules/access/dvd/dvd.c:65
 msgid "Method to use by libdvdcss for key decryption"
 msgstr ""
@@ -1333,7 +1430,7 @@ msgstr ""
 msgid "http"
 msgstr "http"
 
-#: modules/access/http.c:89
+#: modules/access/http.c:91
 msgid "HTTP input"
 msgstr "ingresso HTTP"
 
@@ -1353,6 +1450,10 @@ msgstr ""
 msgid "Hauppauge PVR cards input"
 msgstr ""
 
+#: modules/access/rtsp.c:68
+msgid "RTSP SDP request"
+msgstr ""
+
 #: modules/access/satellite/satellite.c:41
 msgid "Satellite default transponder frequency"
 msgstr ""
@@ -1613,23 +1714,23 @@ msgstr "uscita audio ALSA"
 msgid "Audio device"
 msgstr "Periferica audio"
 
-#: modules/audio_output/alsa.c:173 modules/audio_output/directx.c:435
+#: modules/audio_output/alsa.c:171 modules/audio_output/directx.c:435
 #: modules/audio_output/oss.c:222 modules/audio_output/sdl.c:182
 #: modules/audio_output/sdl.c:201 modules/audio_output/waveout.c:399
 msgid "Mono"
 msgstr "Mono"
 
-#: modules/audio_output/alsa.c:186 modules/audio_output/directx.c:409
+#: modules/audio_output/alsa.c:184 modules/audio_output/directx.c:409
 #: modules/audio_output/oss.c:178 modules/audio_output/waveout.c:371
 msgid "2 Front 2 Rear"
 msgstr "2 Anteriori 2 Posteriori"
 
-#: modules/audio_output/alsa.c:192 modules/audio_output/directx.c:391
+#: modules/audio_output/alsa.c:190 modules/audio_output/directx.c:391
 #: modules/audio_output/oss.c:167 modules/audio_output/waveout.c:352
 msgid "5.1"
 msgstr "5.1"
 
-#: modules/audio_output/alsa.c:219 modules/audio_output/directx.c:478
+#: modules/audio_output/alsa.c:217 modules/audio_output/directx.c:478
 #: modules/audio_output/oss.c:246 modules/audio_output/waveout.c:415
 msgid "A/52 over S/PDIF"
 msgstr ""
@@ -1988,18 +2089,29 @@ msgid "DVD subtitles decoder"
 msgstr "decodificatore sottotitoli DVD"
 
 #: modules/codec/subsdec/subsdec.c:68
-msgid "subtitle text encoding"
+#, fuzzy
+msgid "Subtitles text encoding"
 msgstr "codifica testo sottotitoli"
 
 #: modules/codec/subsdec/subsdec.c:69
-msgid "change the encoding used in text subtitles"
+#, fuzzy
+msgid "Change the encoding used in text subtitles"
 msgstr "cambia la codifica usata nel testo sottotitoli"
 
-#: modules/codec/subsdec/subsdec.c:72
+#: modules/codec/subsdec/subsdec.c:70
+#, fuzzy
+msgid "Subtitles justification"
+msgstr "Opzioni sottotitoli"
+
+#: modules/codec/subsdec/subsdec.c:71
+msgid "Change the justification of substitles (0=center, 1=left, 2=right)"
+msgstr ""
+
+#: modules/codec/subsdec/subsdec.c:74
 msgid "file subtitles decoder"
 msgstr "decodificatore file sottotitoli"
 
-#: modules/codec/subsdec/subsdec.c:75 modules/gui/beos/InterfaceWindow.cpp:256
+#: modules/codec/subsdec/subsdec.c:77 modules/gui/beos/InterfaceWindow.cpp:256
 #: modules/gui/kde/interface.cpp:93
 msgid "Subtitles"
 msgstr "Sottotitoli"
@@ -2144,7 +2256,7 @@ msgid "Quit"
 msgstr "Esci"
 
 #: modules/control/lirc/lirc.c:297 modules/control/lirc/lirc.c:323
-#: modules/gui/familiar/interface.c:177 modules/gui/gtk/gnome_interface.c:602
+#: modules/gui/gtk/gnome_interface.c:602
 #: modules/gui/gtk/gnome_interface.c:1020 modules/gui/gtk/gtk_interface.c:709
 #: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:921
 #: modules/gui/macosx/intf.m:922 modules/gui/macosx/intf.m:923
@@ -2152,8 +2264,7 @@ msgstr "Esci"
 msgid "Pause"
 msgstr "Pausa"
 
-#: modules/control/lirc/lirc.c:310 modules/gui/familiar/interface.c:190
-#: modules/gui/gtk/gnome_interface.c:590
+#: modules/control/lirc/lirc.c:310 modules/gui/gtk/gnome_interface.c:590
 #: modules/gui/gtk/gnome_interface.c:1013 modules/gui/gtk/gtk_interface.c:698
 #: modules/gui/macosx/intf.m:324 modules/gui/macosx/intf.m:362
 #: modules/gui/macosx/intf.m:423 modules/gui/macosx/intf.m:928
@@ -2189,68 +2300,70 @@ msgstr "Controllo remoto"
 msgid "remote control interface"
 msgstr "interfaccia controllo remoto"
 
-#: modules/demux/a52sys.c:52
+#: modules/demux/a52sys.c:41
 msgid "A52 demuxer"
 msgstr ""
 
-#: modules/demux/aac/demux.c:46
-msgid "AAC stream demuxer"
+#: modules/demux/a52sys.c:161
+msgid "A52"
 msgstr ""
 
-#: modules/demux/aac/demux.c:555
-msgid "Aac"
-msgstr ""
-
-#: modules/demux/aac/demux.c:557 modules/demux/mpeg/audio.c:627
-#: modules/demux/mpeg/audio.c:644 modules/demux/mpeg/m4v.c:150
+#: modules/demux/a52sys.c:163 modules/demux/aac.c:175
+#: modules/demux/mpeg/m4v.c:150 modules/demux/mpeg/mpga.c:331
 msgid "Input Type"
 msgstr "Tipo Ingresso"
 
-#: modules/demux/aac/demux.c:560 modules/demux/mpeg/audio.c:629
-msgid "Layer"
-msgstr "Livello"
-
-#: modules/demux/aac/demux.c:562 modules/demux/asf/asf.c:275
-#: modules/demux/avi/avi.c:1178 modules/demux/mkv.cpp:2449
-#: modules/demux/ogg.c:561 modules/demux/ogg.c:837 modules/demux/ogg.c:1010
-#: modules/gui/gtk/gnome_interface.c:148 modules/gui/gtk/gnome_interface.c:931
-#: modules/gui/gtk/gtk_interface.c:481 modules/gui/gtk/gtk_interface.c:1282
-#: modules/gui/macosx/output.m:162 modules/gui/wxwindows/streamout.cpp:668
+#: modules/demux/a52sys.c:164 modules/demux/aac.c:177
+#: modules/demux/asf/asf.c:275 modules/demux/avi/avi.c:1178
+#: modules/demux/mkv.cpp:2453 modules/demux/ogg.c:562 modules/demux/ogg.c:838
+#: modules/demux/ogg.c:1011 modules/gui/gtk/gnome_interface.c:148
+#: modules/gui/gtk/gnome_interface.c:931 modules/gui/gtk/gtk_interface.c:481
+#: modules/gui/gtk/gtk_interface.c:1282 modules/gui/macosx/output.m:162
+#: modules/gui/wxwindows/streamout.cpp:668
 msgid "Channels"
 msgstr "Canali"
 
-#: modules/demux/aac/demux.c:564 modules/demux/asf/asf.c:277
-#: modules/demux/avi/avi.c:1180 modules/demux/mkv.cpp:2453
-#: modules/demux/mpeg/audio.c:632 modules/demux/ogg.c:559
-#: modules/demux/ogg.c:671 modules/demux/ogg.c:832 modules/demux/ogg.c:1005
+#: modules/demux/a52sys.c:165 modules/demux/aac.c:179
+#: modules/demux/asf/asf.c:277 modules/demux/avi/avi.c:1180
+#: modules/demux/mkv.cpp:2457 modules/demux/mpeg/mpga.c:337
+#: modules/demux/ogg.c:560 modules/demux/ogg.c:672 modules/demux/ogg.c:833
+#: modules/demux/ogg.c:1006
 msgid "Sample Rate"
 msgstr ""
 
+#: modules/demux/aac.c:41
+msgid "AAC demuxer"
+msgstr ""
+
+#: modules/demux/aac.c:173
+msgid "Aac"
+msgstr ""
+
 #: modules/demux/asf/asf.c:48
 msgid "ASF v1.0 demuxer (file only)"
 msgstr ""
 
-#: modules/demux/asf/asf.c:165 modules/demux/mkv.cpp:2412
+#: modules/demux/asf/asf.c:165 modules/demux/mkv.cpp:2416
 msgid "Number of streams"
 msgstr "Numero di sorgenti"
 
-#: modules/demux/asf/asf.c:228 modules/demux/asf/asf.c:302
+#: modules/demux/asf/asf.c:228 modules/demux/asf/asf.c:298
 #: modules/demux/avi/avi.c:1172 modules/demux/avi/avi.c:1217
-#: modules/demux/avi/avi.c:1250 modules/demux/mkv.cpp:2445
-#: modules/demux/mkv.cpp:2461 modules/demux/mkv.cpp:2477
-#: modules/demux/ogg.c:557 modules/demux/ogg.c:629 modules/demux/ogg.c:669
-#: modules/demux/ogg.c:734 modules/demux/ogg.c:829 modules/demux/ogg.c:909
-#: modules/demux/ogg.c:1002 modules/gui/familiar/interface.c:370
-#: modules/gui/macosx/output.m:139 modules/gui/pda/interface.c:372
+#: modules/demux/avi/avi.c:1250 modules/demux/mkv.cpp:2449
+#: modules/demux/mkv.cpp:2465 modules/demux/mkv.cpp:2481
+#: modules/demux/ogg.c:558 modules/demux/ogg.c:630 modules/demux/ogg.c:670
+#: modules/demux/ogg.c:735 modules/demux/ogg.c:830 modules/demux/ogg.c:910
+#: modules/demux/ogg.c:1003 modules/gui/macosx/output.m:139
+#: modules/gui/pda/interface.c:372
 msgid "Type"
 msgstr "Tipo"
 
-#: modules/demux/asf/asf.c:260 modules/demux/asf/asf.c:318
+#: modules/demux/asf/asf.c:260 modules/demux/asf/asf.c:314
 #: modules/demux/avi/avi.c:1174 modules/demux/avi/avi.c:1218
-#: modules/demux/mkv.cpp:2446 modules/demux/mkv.cpp:2462
-#: modules/demux/mkv.cpp:2478 modules/demux/ogg.c:558 modules/demux/ogg.c:630
-#: modules/demux/ogg.c:670 modules/demux/ogg.c:735 modules/demux/ogg.c:830
-#: modules/demux/ogg.c:910 modules/demux/ogg.c:1003
+#: modules/demux/mkv.cpp:2450 modules/demux/mkv.cpp:2466
+#: modules/demux/mkv.cpp:2482 modules/demux/ogg.c:559 modules/demux/ogg.c:631
+#: modules/demux/ogg.c:671 modules/demux/ogg.c:736 modules/demux/ogg.c:831
+#: modules/demux/ogg.c:911 modules/demux/ogg.c:1004
 msgid "Codec"
 msgstr "Codifica"
 
@@ -2259,36 +2372,36 @@ msgid "Avg. byterate"
 msgstr ""
 
 #: modules/demux/asf/asf.c:282 modules/demux/avi/avi.c:1185
-#: modules/demux/mkv.cpp:2457
+#: modules/demux/mkv.cpp:2461
 msgid "Bits Per Sample"
 msgstr ""
 
-#: modules/demux/asf/asf.c:332
+#: modules/demux/asf/asf.c:328
 msgid "Size"
 msgstr "Dimensione"
 
-#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1222
-#: modules/demux/mkv.cpp:2465
+#: modules/demux/asf/asf.c:331 modules/demux/avi/avi.c:1222
+#: modules/demux/mkv.cpp:2469
 msgid "Resolution"
 msgstr "Risoluzione"
 
-#: modules/demux/asf/asf.c:337
+#: modules/demux/asf/asf.c:333
 msgid "Planes"
 msgstr "Piani"
 
-#: modules/demux/asf/asf.c:339 modules/demux/avi/avi.c:1228
+#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1228
 msgid "Bits Per Pixel"
 msgstr ""
 
-#: modules/demux/asf/asf.c:342
+#: modules/demux/asf/asf.c:338
 msgid "Image Size"
 msgstr "Dimensione Immagine"
 
-#: modules/demux/asf/asf.c:344
+#: modules/demux/asf/asf.c:340
 msgid "X pixels per meter"
 msgstr ""
 
-#: modules/demux/asf/asf.c:346
+#: modules/demux/asf/asf.c:342
 msgid "Y pixels per meter"
 msgstr ""
 
@@ -2321,7 +2434,7 @@ msgstr "Descrizione"
 msgid "Rating"
 msgstr ""
 
-#: modules/demux/au.c:47
+#: modules/demux/au.c:42
 msgid "AU demuxer"
 msgstr ""
 
@@ -2366,8 +2479,8 @@ msgstr ""
 msgid "Audio Bitrate"
 msgstr "Bitrate Audio"
 
-#: modules/demux/avi/avi.c:1225 modules/demux/ogg.c:631
-#: modules/demux/ogg.c:737 modules/demux/ogg.c:912
+#: modules/demux/avi/avi.c:1225 modules/demux/ogg.c:632
+#: modules/demux/ogg.c:738 modules/demux/ogg.c:913
 msgid "Frame Rate"
 msgstr ""
 
@@ -2407,58 +2520,58 @@ msgstr ""
 msgid "mka/mkv stream demuxer"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2389 modules/gui/gtk/gnome_interface.c:2436
+#: modules/demux/mkv.cpp:2393 modules/gui/gtk/gnome_interface.c:2436
 #: modules/gui/gtk/gtk_interface.c:2857 modules/gui/wxwindows/playlist.cpp:150
 msgid "Duration"
 msgstr "Durata"
 
-#: modules/demux/mkv.cpp:2398
+#: modules/demux/mkv.cpp:2402
 msgid "Date UTC"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2402
+#: modules/demux/mkv.cpp:2406
 msgid "Segment Filename"
 msgstr "Nome file segmento"
 
-#: modules/demux/mkv.cpp:2406
+#: modules/demux/mkv.cpp:2410
 msgid "Muxing Application"
 msgstr "Applicazione Muxing"
 
-#: modules/demux/mkv.cpp:2410
+#: modules/demux/mkv.cpp:2414
 msgid "Writing Application"
 msgstr "Applicazione Scrittura"
 
-#: modules/demux/mkv.cpp:2423 modules/gui/beos/PlayListWindow.cpp:144
-#: modules/gui/familiar/interface.c:362 modules/gui/gtk/preferences.c:325
-#: modules/gui/kde/pluginsbox.cpp:45 modules/gui/pda/interface.c:364
+#: modules/demux/mkv.cpp:2427 modules/gui/beos/PlayListWindow.cpp:144
+#: modules/gui/gtk/preferences.c:325 modules/gui/kde/pluginsbox.cpp:45
+#: modules/gui/pda/interface.c:364
 msgid "Name"
 msgstr "Nome"
 
-#: modules/demux/mkv.cpp:2427
+#: modules/demux/mkv.cpp:2431
 msgid "Codec Name"
 msgstr "Nome Codifica"
 
-#: modules/demux/mkv.cpp:2431
+#: modules/demux/mkv.cpp:2435
 msgid "Codec Setting"
 msgstr "Impostazioni Codifica"
 
-#: modules/demux/mkv.cpp:2435
+#: modules/demux/mkv.cpp:2439
 msgid "Codec Info"
 msgstr "Info Codifica"
 
-#: modules/demux/mkv.cpp:2439
+#: modules/demux/mkv.cpp:2443
 msgid "Codec Download"
 msgstr "Scarica Codifica"
 
-#: modules/demux/mkv.cpp:2469
+#: modules/demux/mkv.cpp:2473
 msgid "Display Resolution"
 msgstr "Risoluzione Video"
 
-#: modules/demux/mkv.cpp:2473
+#: modules/demux/mkv.cpp:2477
 msgid "Frame Per Second"
 msgstr "Fotogrammi Al Secondo"
 
-#: modules/demux/mkv.cpp:2477 modules/gui/gtk/gnome_interface.c:1963
+#: modules/demux/mkv.cpp:2481 modules/gui/gtk/gnome_interface.c:1963
 #: modules/gui/gtk/gtk_interface.c:2278
 msgid "Subtitle"
 msgstr "Sottotitolo"
@@ -2467,23 +2580,6 @@ msgstr "Sottotitolo"
 msgid "MP4 demuxer"
 msgstr ""
 
-#: modules/demux/mpeg/audio.c:47
-msgid "MPEG I/II audio stream demuxer"
-msgstr ""
-
-#: modules/demux/mpeg/audio.c:626 modules/demux/mpeg/audio.c:643
-#: modules/demux/mpeg/m4v.c:149
-msgid "mpeg"
-msgstr ""
-
-#: modules/demux/mpeg/audio.c:630
-msgid "Mode"
-msgstr "Modo"
-
-#: modules/demux/mpeg/audio.c:634
-msgid "Average Bitrate"
-msgstr ""
-
 #: modules/demux/mpeg/es.c:49
 msgid "ISO 13818-1 MPEG Elementary Stream input"
 msgstr ""
@@ -2492,10 +2588,36 @@ msgstr ""
 msgid "MPEG-4 video elementary stream demuxer"
 msgstr ""
 
+#: modules/demux/mpeg/m4v.c:149
+msgid "mpeg"
+msgstr ""
+
 #: modules/demux/mpeg/m4v.c:150
 msgid "Video MPEG-4 (raw ES)"
 msgstr ""
 
+#: modules/demux/mpeg/mpga.c:41
+#, fuzzy
+msgid "MPEG-I/II Audio demuxer"
+msgstr "decodifica video MPEG I/II"
+
+#: modules/demux/mpeg/mpga.c:330
+#, fuzzy
+msgid "MPEG"
+msgstr "MPEG1"
+
+#: modules/demux/mpeg/mpga.c:333
+msgid "Layer"
+msgstr "Livello"
+
+#: modules/demux/mpeg/mpga.c:335
+msgid "Mode"
+msgstr "Modo"
+
+#: modules/demux/mpeg/mpga.c:339
+msgid "Average Bitrate"
+msgstr ""
+
 #: modules/demux/mpeg/ps.c:60
 msgid "ISO 13818-1 MPEG Program Stream input"
 msgstr ""
@@ -2537,36 +2659,36 @@ msgstr ""
 msgid "ogg stream demuxer"
 msgstr ""
 
-#: modules/demux/ogg.c:558
+#: modules/demux/ogg.c:559
 msgid "Vorbis"
 msgstr ""
 
-#: modules/demux/ogg.c:563 modules/demux/ogg.c:633 modules/demux/ogg.c:673
-#: modules/demux/ogg.c:834 modules/demux/ogg.c:1007
+#: modules/demux/ogg.c:564 modules/demux/ogg.c:634 modules/demux/ogg.c:674
+#: modules/demux/ogg.c:835 modules/demux/ogg.c:1008
 msgid "Bit Rate"
 msgstr ""
 
-#: modules/demux/ogg.c:630
+#: modules/demux/ogg.c:631
 msgid "Theora"
 msgstr ""
 
-#: modules/demux/ogg.c:670
+#: modules/demux/ogg.c:671
 msgid "tarkin"
 msgstr "tarkin"
 
-#: modules/demux/ogg.c:739 modules/demux/ogg.c:914
+#: modules/demux/ogg.c:740 modules/demux/ogg.c:915
 msgid "Bit Count"
 msgstr ""
 
-#: modules/demux/ogg.c:741 modules/demux/ogg.c:916
+#: modules/demux/ogg.c:742 modules/demux/ogg.c:917
 msgid "Width"
 msgstr "Ampiezza"
 
-#: modules/demux/ogg.c:743 modules/demux/ogg.c:918
+#: modules/demux/ogg.c:744 modules/demux/ogg.c:919
 msgid "Height"
 msgstr "Altezza"
 
-#: modules/demux/ogg.c:839 modules/demux/ogg.c:1012
+#: modules/demux/ogg.c:840 modules/demux/ogg.c:1013
 msgid "Bits per Sample"
 msgstr ""
 
@@ -2574,6 +2696,10 @@ msgstr ""
 msgid "raw dv demuxer"
 msgstr ""
 
+#: modules/demux/sdp.c:64
+msgid "SDP demuxer + UDP/RTP/RTSP"
+msgstr ""
+
 #: modules/demux/util/id3.c:44
 msgid "Simple id3 tag skipper"
 msgstr ""
@@ -2906,7 +3032,7 @@ msgstr ""
 msgid "Text subtitles demux"
 msgstr "Demux testo sottotitoli"
 
-#: modules/demux/wav/wav.c:49
+#: modules/demux/wav.c:43
 msgid "WAV demuxer"
 msgstr ""
 
@@ -2939,11 +3065,9 @@ msgid "Yes"
 msgstr "Si"
 
 #: modules/gui/beos/InterfaceWindow.cpp:201
-#: modules/gui/beos/InterfaceWindow.cpp:308
-#: modules/gui/familiar/interface.c:149 modules/gui/familiar/interface.c:150
-#: modules/gui/macosx/intf.m:328 modules/gui/macosx/prefs.m:77
-#: modules/gui/pda/interface.c:151 modules/gui/pda/interface.c:152
-#: modules/gui/wxwindows/preferences.cpp:233
+#: modules/gui/beos/InterfaceWindow.cpp:308 modules/gui/macosx/intf.m:328
+#: modules/gui/macosx/prefs.m:77 modules/gui/pda/interface.c:151
+#: modules/gui/pda/interface.c:152 modules/gui/wxwindows/preferences.cpp:233
 msgid "Preferences"
 msgstr "Preferenze"
 
@@ -2958,7 +3082,7 @@ msgstr "Messaggi"
 
 #: modules/gui/beos/InterfaceWindow.cpp:238
 #: modules/gui/beos/MediaControlView.cpp:1257
-#: modules/gui/beos/PlayListWindow.cpp:82 modules/gui/familiar/interface.c:378
+#: modules/gui/beos/PlayListWindow.cpp:82
 #: modules/gui/gtk/gnome_interface.c:503
 #: modules/gui/gtk/gnome_interface.c:1569
 #: modules/gui/gtk/gnome_interface.c:2274
@@ -2991,10 +3115,8 @@ msgid "Open Subtitles"
 msgstr "Apri Sottotitoli"
 
 #: modules/gui/beos/InterfaceWindow.cpp:249
-#: modules/gui/familiar/interface.c:231 modules/gui/familiar/interface.c:232
-#: modules/gui/familiar/interface.c:765 modules/gui/gtk/gtk_interface.c:1580
-#: modules/gui/pda/interface.c:233 modules/gui/pda/interface.c:234
-#: modules/gui/pda/interface.c:767
+#: modules/gui/gtk/gtk_interface.c:1580 modules/gui/pda/interface.c:233
+#: modules/gui/pda/interface.c:234 modules/gui/pda/interface.c:767
 msgid "About"
 msgstr "Info su"
 
@@ -3043,7 +3165,7 @@ msgstr "Riproduci Lista"
 #: modules/gui/wxwindows/open.cpp:244
 #: modules/gui/wxwindows/preferences.cpp:253
 #: modules/gui/wxwindows/streamout.cpp:217
-#: modules/gui/wxwindows/subtitles.cpp:149
+#: modules/gui/wxwindows/subtitles.cpp:190
 msgid "OK"
 msgstr "OK"
 
@@ -3167,7 +3289,7 @@ msgstr "Stai in primo piano"
 msgid "Take Screen Shot"
 msgstr "Fai Foto Schermo"
 
-#: modules/gui/beos/VlcWrapper.cpp:165 modules/gui/gtk/menu.c:733
+#: modules/gui/beos/VlcWrapper.cpp:165 modules/gui/gtk/menu.c:734
 msgid "None"
 msgstr "Nessuno"
 
@@ -3175,200 +3297,6 @@ msgstr "Nessuno"
 msgid "<unknown>"
 msgstr "<sconosciuto>"
 
-#: modules/gui/familiar/familiar.c:62 modules/gui/pda/pda.c:62
-msgid "Autoplay selected file"
-msgstr "Autoriproduci file selezionato"
-
-#: modules/gui/familiar/familiar.c:63 modules/gui/pda/pda.c:63
-msgid "Automatically play a file when selected in the file selection list"
-msgstr ""
-"Riproduce automaticamente un file quando selezionato nella lista di "
-"selezione file"
-
-#: modules/gui/familiar/familiar.c:72
-msgid "Familiar Linux Gtk+ interface"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:99 modules/gui/familiar/interface.c:732
-#: modules/gui/gtk/gnome_interface.c:274 modules/gui/gtk/gtk_interface.c:121
-#: modules/gui/gtk/gtk_interface.c:1595 modules/gui/pda/interface.c:99
-#: modules/gui/pda/interface.c:734
-msgid "VLC media player"
-msgstr "VLC media player"
-
-#: modules/gui/familiar/interface.c:124 modules/gui/pda/interface.c:126
-#: modules/gui/wxwindows/dialogs.cpp:268 modules/gui/wxwindows/open.cpp:709
-#: modules/gui/wxwindows/preferences.cpp:1029
-#: modules/gui/wxwindows/subtitles.cpp:196
-msgid "Open file"
-msgstr "Apri file"
-
-#: modules/gui/familiar/interface.c:164 modules/gui/pda/interface.c:166
-msgid "Rewind"
-msgstr "Riavvolgi"
-
-#: modules/gui/familiar/interface.c:165 modules/gui/pda/interface.c:167
-msgid "Rewind stream"
-msgstr "Riavvolgi sorgente"
-
-#: modules/gui/familiar/interface.c:178 modules/gui/pda/interface.c:180
-msgid "Pause stream"
-msgstr "Pausa sorgente"
-
-#: modules/gui/familiar/interface.c:191 modules/gui/pda/interface.c:193
-msgid "Play stream"
-msgstr "Riproduci sorgente"
-
-#: modules/gui/familiar/interface.c:203 modules/gui/gtk/gnome_interface.c:566
-#: modules/gui/gtk/gnome_interface.c:1027 modules/gui/gtk/gtk_interface.c:676
-#: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:639
-#: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
-#: modules/gui/macosx/intf.m:424 modules/gui/pda/interface.c:205
-#: modules/gui/wxwindows/interface.cpp:373
-msgid "Stop"
-msgstr "Interrompi"
-
-#: modules/gui/familiar/interface.c:204 modules/gui/pda/interface.c:206
-msgid "Stop stream"
-msgstr "Interrompi sorgente"
-
-#: modules/gui/familiar/interface.c:216 modules/gui/pda/interface.c:218
-msgid "Forward"
-msgstr "Avanza"
-
-#: modules/gui/familiar/interface.c:217 modules/gui/pda/interface.c:219
-msgid "Forward stream"
-msgstr "Avanza sorgente"
-
-#: modules/gui/familiar/interface.c:285 modules/gui/gtk/gnome_interface.c:2345
-#: modules/gui/gtk/gtk_interface.c:2712 modules/gui/macosx/playlist.m:198
-#: modules/gui/pda/interface.c:287
-msgid "Add"
-msgstr "Aggiungi"
-
-#: modules/gui/familiar/interface.c:293 modules/gui/pda/interface.c:295
-msgid "MRL :"
-msgstr "MRL :"
-
-#: modules/gui/familiar/interface.c:394
-msgid "UDP/RTP (Address when Multicast)"
-msgstr "UDP/RTP (Indirizzo quando Multicast)"
-
-#: modules/gui/familiar/interface.c:412 modules/gui/gtk/gnome_interface.c:1747
-#: modules/gui/gtk/gtk_interface.c:2062 modules/gui/macosx/open.m:161
-#: modules/gui/macosx/output.m:133 modules/gui/pda/interface.c:414
-#: modules/gui/wxwindows/open.cpp:469 modules/gui/wxwindows/streamout.cpp:425
-msgid "Address"
-msgstr "Indirizzo"
-
-#: modules/gui/familiar/interface.c:423 modules/gui/gtk/gnome_interface.c:1737
-#: modules/gui/gtk/gnome_interface.c:1786
-#: modules/gui/gtk/gnome_interface.c:2912 modules/gui/gtk/gtk_interface.c:2052
-#: modules/gui/gtk/gtk_interface.c:2101 modules/gui/gtk/gtk_interface.c:3225
-#: modules/gui/macosx/open.m:160 modules/gui/macosx/open.m:162
-#: modules/gui/macosx/output.m:134 modules/gui/pda/interface.c:425
-#: modules/gui/wxwindows/open.cpp:454 modules/gui/wxwindows/open.cpp:477
-#: modules/gui/wxwindows/streamout.cpp:436
-msgid "Port"
-msgstr "Porta"
-
-#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:136
-#: modules/gui/macosx/output.m:236 modules/gui/macosx/output.m:311
-#: modules/gui/pda/interface.c:480 modules/gui/wxwindows/streamout.cpp:386
-msgid "HTTP"
-msgstr "HTTP"
-
-#: modules/gui/familiar/interface.c:488 modules/gui/pda/interface.c:490
-msgid "FTP"
-msgstr "FTP"
-
-#: modules/gui/familiar/interface.c:498 modules/gui/pda/interface.c:500
-msgid "MMS"
-msgstr "MMS"
-
-#: modules/gui/familiar/interface.c:516 modules/gui/gtk/gnome_interface.c:1830
-#: modules/gui/gtk/gnome_interface.c:2281 modules/gui/gtk/gtk_interface.c:2145
-#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:144
-#: modules/gui/macosx/open.m:271 modules/gui/pda/interface.c:518
-#: modules/gui/wxwindows/open.cpp:257
-msgid "Network"
-msgstr "Rete"
-
-#: modules/gui/familiar/interface.c:524 modules/gui/pda/interface.c:526
-msgid "Media"
-msgstr "Supporto"
-
-#: modules/gui/familiar/interface.c:560 modules/gui/pda/interface.c:562
-msgid "MRL"
-msgstr "MRL"
-
-#: modules/gui/familiar/interface.c:569 modules/gui/pda/interface.c:571
-msgid "Time"
-msgstr "Tempo"
-
-#: modules/gui/familiar/interface.c:586 modules/gui/pda/interface.c:588
-msgid "Update"
-msgstr "Aggiorna"
-
-#: modules/gui/familiar/interface.c:594 modules/gui/pda/interface.c:596
-msgid " Del "
-msgstr " Canc "
-
-#: modules/gui/familiar/interface.c:602 modules/gui/pda/interface.c:604
-msgid " Clear "
-msgstr " Pulisci "
-
-#: modules/gui/familiar/interface.c:626 modules/gui/pda/interface.c:628
-msgid "Automatically play file"
-msgstr "Riproduci file automaticamente"
-
-#: modules/gui/familiar/interface.c:643 modules/gui/pda/interface.c:645
-msgid " Save "
-msgstr " Registra "
-
-#: modules/gui/familiar/interface.c:651 modules/gui/pda/interface.c:653
-msgid " Apply "
-msgstr " Applica "
-
-#: modules/gui/familiar/interface.c:659 modules/gui/pda/interface.c:661
-msgid " Cancel "
-msgstr " Annulla "
-
-#: modules/gui/familiar/interface.c:667 modules/gui/pda/interface.c:669
-msgid "Preference"
-msgstr "Preferenze"
-
-#: modules/gui/familiar/interface.c:711 modules/gui/gtk/gnome_interface.c:1361
-#: modules/gui/gtk/gtk_interface.c:1603 modules/gui/kde/kde.cpp:111
-#: modules/gui/pda/interface.c:713
-msgid "(c) 1996-2003 the VideoLAN team"
-msgstr "(c) 1996-2003 il team VideoLAN"
-
-#: modules/gui/familiar/interface.c:721 modules/gui/pda/interface.c:723
-msgid "Authors: The VideoLAN Team, http://www.videolan.org"
-msgstr "Autori: Il Team VideoLAN, http://www.videolan.org"
-
-#: modules/gui/familiar/interface.c:753 modules/gui/pda/interface.c:755
-msgid ""
-"The VideoLAN Client is a MPEG, MPEG 2, MP3, DivX player, that accepts input "
-"from local or network sources."
-msgstr ""
-
-#: modules/gui/familiar/support.c:121 modules/gui/gtk/gnome_support.c:100
-#: modules/gui/gtk/gnome_support.c:138 modules/gui/gtk/gtk_support.c:121
-#: modules/gui/gtk2/gnome2_support.c:60 modules/gui/gtk2/gnome2_support.c:85
-#: modules/gui/gtk2/gtk2_support.c:90 modules/gui/gtk2/gtk2_support.c:114
-#: modules/gui/pda/support.c:121
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Non riesco a trovare il file pixmap: %s"
-
-#: modules/gui/familiar/support.c:130 modules/gui/gtk/gtk_support.c:130
-#: modules/gui/pda/support.c:130
-#, c-format
-msgid "Error loading pixmap file: %s"
-msgstr "Errore caricamento file pixmap: %s"
-
 #: modules/gui/gtk/gnome.c:55 modules/gui/gtk/gtk.c:57
 msgid "Show tooltips"
 msgstr "Mostra suggerimenti"
@@ -3561,6 +3489,12 @@ msgstr "_Audio"
 msgid "_Video"
 msgstr "_Video"
 
+#: modules/gui/gtk/gnome_interface.c:274 modules/gui/gtk/gtk_interface.c:121
+#: modules/gui/gtk/gtk_interface.c:1595 modules/gui/pda/interface.c:99
+#: modules/gui/pda/interface.c:734
+msgid "VLC media player"
+msgstr "VLC media player"
+
 #: modules/gui/gtk/gnome_interface.c:515 modules/gui/gtk/gnome_interface.c:718
 #: modules/gui/gtk/gnome_interface.c:1690
 #: modules/gui/gtk/gnome_interface.c:2267 modules/gui/gtk/gtk_interface.c:629
@@ -3595,6 +3529,15 @@ msgstr "Indietro"
 msgid "Go Backward"
 msgstr "Vai Indietro"
 
+#: modules/gui/gtk/gnome_interface.c:566
+#: modules/gui/gtk/gnome_interface.c:1027 modules/gui/gtk/gtk_interface.c:676
+#: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:639
+#: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
+#: modules/gui/macosx/intf.m:424 modules/gui/pda/interface.c:205
+#: modules/gui/wxwindows/interface.cpp:373
+msgid "Stop"
+msgstr "Interrompi"
+
 #: modules/gui/gtk/gnome_interface.c:567 modules/gui/gtk/gtk_interface.c:677
 msgid "Stop Stream"
 msgstr "Interrompi Sorgente"
@@ -3716,6 +3659,11 @@ msgstr "Inverti _Interfaccia"
 msgid "Playlist..."
 msgstr "Playlist..."
 
+#: modules/gui/gtk/gnome_interface.c:1361 modules/gui/gtk/gtk_interface.c:1603
+#: modules/gui/kde/kde.cpp:111 modules/gui/pda/interface.c:713
+msgid "(c) 1996-2003 the VideoLAN team"
+msgstr "(c) 1996-2003 il team VideoLAN"
+
 #: modules/gui/gtk/gnome_interface.c:1363 modules/gui/gtk/gtk_interface.c:1646
 #: modules/gui/kde/kde.cpp:108
 msgid ""
@@ -3752,7 +3700,7 @@ msgstr ""
 #: modules/gui/wxwindows/open.cpp:223 modules/gui/wxwindows/open.cpp:341
 #: modules/gui/wxwindows/preferences.cpp:832
 #: modules/gui/wxwindows/streamout.cpp:412
-#: modules/gui/wxwindows/subtitles.cpp:107
+#: modules/gui/wxwindows/subtitles.cpp:109
 msgid "Browse..."
 msgstr "Sfoglia..."
 
@@ -3801,11 +3749,37 @@ msgstr "UDP/RTP Multicast"
 msgid "HTTP/FTP/MMS"
 msgstr "HTTP/FTP/MMS"
 
+#: modules/gui/gtk/gnome_interface.c:1737
+#: modules/gui/gtk/gnome_interface.c:1786
+#: modules/gui/gtk/gnome_interface.c:2912 modules/gui/gtk/gtk_interface.c:2052
+#: modules/gui/gtk/gtk_interface.c:2101 modules/gui/gtk/gtk_interface.c:3225
+#: modules/gui/macosx/open.m:160 modules/gui/macosx/open.m:162
+#: modules/gui/macosx/output.m:134 modules/gui/pda/interface.c:425
+#: modules/gui/wxwindows/open.cpp:454 modules/gui/wxwindows/open.cpp:477
+#: modules/gui/wxwindows/streamout.cpp:436
+msgid "Port"
+msgstr "Porta"
+
+#: modules/gui/gtk/gnome_interface.c:1747 modules/gui/gtk/gtk_interface.c:2062
+#: modules/gui/macosx/open.m:161 modules/gui/macosx/output.m:133
+#: modules/gui/pda/interface.c:414 modules/gui/wxwindows/open.cpp:469
+#: modules/gui/wxwindows/streamout.cpp:425
+msgid "Address"
+msgstr "Indirizzo"
+
 #: modules/gui/gtk/gnome_interface.c:1759 modules/gui/gtk/gtk_interface.c:2074
 #: modules/gui/macosx/open.m:163 modules/gui/wxwindows/open.cpp:492
 msgid "URL"
 msgstr "URL"
 
+#: modules/gui/gtk/gnome_interface.c:1830
+#: modules/gui/gtk/gnome_interface.c:2281 modules/gui/gtk/gtk_interface.c:2145
+#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:144
+#: modules/gui/macosx/open.m:271 modules/gui/pda/interface.c:518
+#: modules/gui/wxwindows/open.cpp:257
+msgid "Network"
+msgstr "Rete"
+
 #: modules/gui/gtk/gnome_interface.c:1847 modules/gui/gtk/gtk_interface.c:2162
 msgid "Symbol Rate"
 msgstr ""
@@ -3884,6 +3858,11 @@ msgstr "Inverti"
 msgid "Select"
 msgstr "Seleziona"
 
+#: modules/gui/gtk/gnome_interface.c:2345 modules/gui/gtk/gtk_interface.c:2712
+#: modules/gui/macosx/playlist.m:198 modules/gui/pda/interface.c:287
+msgid "Add"
+msgstr "Aggiungi"
+
 #: modules/gui/gtk/gnome_interface.c:2352 modules/gui/gtk/gtk_interface.c:2754
 #: modules/gui/macosx/playlist.m:195 modules/gui/macosx/playlist.m:199
 msgid "Delete"
@@ -3951,6 +3930,14 @@ msgstr "PS"
 msgid "AVI"
 msgstr "AVI"
 
+#: modules/gui/gtk/gnome_support.c:100 modules/gui/gtk/gnome_support.c:138
+#: modules/gui/gtk/gtk_support.c:121 modules/gui/gtk2/gnome2_support.c:60
+#: modules/gui/gtk2/gnome2_support.c:85 modules/gui/gtk2/gtk2_support.c:90
+#: modules/gui/gtk2/gtk2_support.c:114 modules/gui/pda/support.c:121
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Non riesco a trovare il file pixmap: %s"
+
 #: modules/gui/gtk/gnome_support.c:116
 #, c-format
 msgid "Couldn't create pixmap from file: %s"
@@ -4064,10 +4051,11 @@ msgstr "Configurazione uscita sorgente "
 #: modules/gui/gtk/gtk_interface.c:2403 modules/gui/gtk/gtk_interface.c:2645
 #: modules/gui/gtk/gtk_interface.c:2876 modules/gui/gtk/gtk_interface.c:3257
 #: modules/gui/gtk/preferences.c:618 modules/gui/macosx/open.m:140
-#: modules/gui/macosx/prefs.m:79 modules/gui/wxwindows/open.cpp:247
+#: modules/gui/macosx/prefs.m:79 modules/gui/macosx/prefs.m:170
+#: modules/gui/wxwindows/open.cpp:247
 #: modules/gui/wxwindows/preferences.cpp:256
 #: modules/gui/wxwindows/streamout.cpp:220
-#: modules/gui/wxwindows/subtitles.cpp:152
+#: modules/gui/wxwindows/subtitles.cpp:193
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -4099,12 +4087,17 @@ msgstr "_Inverti"
 msgid "_Select"
 msgstr "_Seleziona"
 
-#: modules/gui/gtk/menu.c:900
+#: modules/gui/gtk/gtk_support.c:130 modules/gui/pda/support.c:130
+#, c-format
+msgid "Error loading pixmap file: %s"
+msgstr "Errore caricamento file pixmap: %s"
+
+#: modules/gui/gtk/menu.c:901
 #, c-format
 msgid "Title %d (%d)"
 msgstr "Titolo %d (%d)"
 
-#: modules/gui/gtk/menu.c:967
+#: modules/gui/gtk/menu.c:968
 #, c-format
 msgid "Chapter %d"
 msgstr "Capitolo %d"
@@ -4256,8 +4249,9 @@ msgstr "Informazioni"
 msgid "VLC - Controller"
 msgstr "Pannello - VLC"
 
-#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/interface.cpp:904
-#: modules/gui/wxwindows/timer.cpp:131
+#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/control.cpp:160
+#: modules/gui/wxwindows/control.cpp:370
+#: modules/gui/wxwindows/interface.cpp:904 modules/gui/wxwindows/timer.cpp:131
 msgid "Volume"
 msgstr "Volume"
 
@@ -4503,6 +4497,12 @@ msgstr "Sorgente"
 msgid "TTL"
 msgstr ""
 
+#: modules/gui/macosx/output.m:136 modules/gui/macosx/output.m:236
+#: modules/gui/macosx/output.m:311 modules/gui/pda/interface.c:480
+#: modules/gui/wxwindows/streamout.cpp:386
+msgid "HTTP"
+msgstr "HTTP"
+
 #: modules/gui/macosx/output.m:141 modules/gui/wxwindows/streamout.cpp:531
 msgid "Encapsulation Method"
 msgstr "Metodo Incapsulazione"
@@ -4560,6 +4560,11 @@ msgstr "Avanzate"
 msgid "Reset Preferences"
 msgstr "Azzera Preferenze"
 
+#: modules/gui/macosx/prefs.m:170
+#, fuzzy
+msgid "Continue"
+msgstr "Configura"
+
 #: modules/gui/macosx/prefs.m:172 modules/gui/wxwindows/preferences.cpp:316
 msgid ""
 "Beware this will reset your VLC Media Player config file.\n"
@@ -4580,10 +4585,121 @@ msgstr "Preimpostato"
 msgid "ncurses interface"
 msgstr "interfaccia ncurses"
 
+#: modules/gui/pda/interface.c:126 modules/gui/wxwindows/dialogs.cpp:268
+#: modules/gui/wxwindows/open.cpp:709
+#: modules/gui/wxwindows/preferences.cpp:1029
+#: modules/gui/wxwindows/subtitles.cpp:234
+msgid "Open file"
+msgstr "Apri file"
+
+#: modules/gui/pda/interface.c:166
+msgid "Rewind"
+msgstr "Riavvolgi"
+
+#: modules/gui/pda/interface.c:167
+msgid "Rewind stream"
+msgstr "Riavvolgi sorgente"
+
+#: modules/gui/pda/interface.c:180
+msgid "Pause stream"
+msgstr "Pausa sorgente"
+
+#: modules/gui/pda/interface.c:193
+msgid "Play stream"
+msgstr "Riproduci sorgente"
+
+#: modules/gui/pda/interface.c:206
+msgid "Stop stream"
+msgstr "Interrompi sorgente"
+
+#: modules/gui/pda/interface.c:218
+msgid "Forward"
+msgstr "Avanza"
+
+#: modules/gui/pda/interface.c:219
+msgid "Forward stream"
+msgstr "Avanza sorgente"
+
+#: modules/gui/pda/interface.c:295
+msgid "MRL :"
+msgstr "MRL :"
+
 #: modules/gui/pda/interface.c:396
 msgid "UDP/RTP (Adress when Multicast)"
 msgstr "UDP/RTP (Indirizzo quando Multicast)"
 
+#: modules/gui/pda/interface.c:490
+msgid "FTP"
+msgstr "FTP"
+
+#: modules/gui/pda/interface.c:500
+msgid "MMS"
+msgstr "MMS"
+
+#: modules/gui/pda/interface.c:526
+msgid "Media"
+msgstr "Supporto"
+
+#: modules/gui/pda/interface.c:562
+msgid "MRL"
+msgstr "MRL"
+
+#: modules/gui/pda/interface.c:571
+msgid "Time"
+msgstr "Tempo"
+
+#: modules/gui/pda/interface.c:588
+msgid "Update"
+msgstr "Aggiorna"
+
+#: modules/gui/pda/interface.c:596
+msgid " Del "
+msgstr " Canc "
+
+#: modules/gui/pda/interface.c:604
+msgid " Clear "
+msgstr " Pulisci "
+
+#: modules/gui/pda/interface.c:628
+msgid "Automatically play file"
+msgstr "Riproduci file automaticamente"
+
+#: modules/gui/pda/interface.c:645
+msgid " Save "
+msgstr " Registra "
+
+#: modules/gui/pda/interface.c:653
+msgid " Apply "
+msgstr " Applica "
+
+#: modules/gui/pda/interface.c:661
+msgid " Cancel "
+msgstr " Annulla "
+
+#: modules/gui/pda/interface.c:669
+msgid "Preference"
+msgstr "Preferenze"
+
+#: modules/gui/pda/interface.c:723
+msgid "Authors: The VideoLAN Team, http://www.videolan.org"
+msgstr "Autori: Il Team VideoLAN, http://www.videolan.org"
+
+#: modules/gui/pda/interface.c:755
+msgid ""
+"The VideoLAN Client is a MPEG, MPEG 2, MP3, DivX player, that accepts input "
+"from local or network sources."
+msgstr ""
+
+#: modules/gui/pda/pda.c:62
+msgid "Autoplay selected file"
+msgstr "Autoriproduci file selezionato"
+
+#: modules/gui/pda/pda.c:63
+msgid "Automatically play a file when selected in the file selection list"
+msgstr ""
+"Riproduce automaticamente un file quando selezionato nella lista di "
+"selezione file"
+
 #: modules/gui/pda/pda.c:72
 msgid "PDA Linux Gtk2+ interface"
 msgstr "interfaccia PDA Linux Gtk2+"
@@ -4869,7 +4985,7 @@ msgstr "Cattura ingresso sorgente"
 msgid "Capture the stream you are playing to a file"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:348 modules/gui/wxwindows/subtitles.cpp:98
+#: modules/gui/wxwindows/open.cpp:348 modules/gui/wxwindows/subtitles.cpp:100
 msgid "Subtitles file"
 msgstr "File sottotitoli"
 
@@ -4885,7 +5001,7 @@ msgstr "DVD (supporto menu)"
 msgid "CD Audio"
 msgstr "CD Audio"
 
-#: modules/gui/wxwindows/open.cpp:900 modules/gui/wxwindows/streamout.cpp:784
+#: modules/gui/wxwindows/open.cpp:903 modules/gui/wxwindows/streamout.cpp:784
 msgid "Save file"
 msgstr "Registra file"
 
@@ -5000,19 +5116,24 @@ msgstr "Codifica audio"
 msgid "Open Subtitles File"
 msgstr "Apri File Sottotitoli"
 
-#: modules/gui/wxwindows/subtitles.cpp:115
+#: modules/gui/wxwindows/subtitles.cpp:123
+#, fuzzy
+msgid "Subtitles encoding"
+msgstr "codifica testo sottotitoli"
+
+#: modules/gui/wxwindows/subtitles.cpp:155
 msgid "Subtitles options"
 msgstr "Opzioni sottotitoli"
 
-#: modules/gui/wxwindows/subtitles.cpp:119
+#: modules/gui/wxwindows/subtitles.cpp:159
 msgid "Delay subtitles (in 1/10s)"
 msgstr "Ritardo sottotitoli (in 1/10s)"
 
-#: modules/gui/wxwindows/subtitles.cpp:130
+#: modules/gui/wxwindows/subtitles.cpp:170
 msgid "Frames per second"
 msgstr "Fotogrammi al secondo"
 
-#: modules/gui/wxwindows/subtitles.cpp:138
+#: modules/gui/wxwindows/subtitles.cpp:178
 msgid "Override frames per second. It will only work with MicroDVD subtitles."
 msgstr ""
 
@@ -5077,27 +5198,27 @@ msgstr "funzione generatore font dummy"
 msgid "Using the dummy interface plugin..."
 msgstr ""
 
-#: modules/misc/freetype.c:67 modules/visualization/xosd/xosd.c:71
+#: modules/misc/freetype.c:72 modules/visualization/xosd/xosd.c:71
 msgid "Font"
 msgstr "Carattere"
 
-#: modules/misc/freetype.c:68
+#: modules/misc/freetype.c:73
 msgid "Filename of Font"
 msgstr "Nome file Carattere"
 
-#: modules/misc/freetype.c:69
+#: modules/misc/freetype.c:74
 msgid "Font size"
 msgstr "Dimensione carattere"
 
-#: modules/misc/freetype.c:70
+#: modules/misc/freetype.c:75
 msgid "The size of the fonts used by the osd module"
 msgstr ""
 
-#: modules/misc/freetype.c:73
+#: modules/misc/freetype.c:78
 msgid "Fonts"
 msgstr "Caratteri"
 
-#: modules/misc/freetype.c:76
+#: modules/misc/freetype.c:81
 msgid "freetype2 font renderer"
 msgstr ""
 
@@ -5232,19 +5353,19 @@ msgstr ""
 msgid "Dummy muxer"
 msgstr ""
 
-#: modules/mux/mp4.c:52
+#: modules/mux/mp4.c:56
 msgid "MP4/MOV muxer"
 msgstr ""
 
-#: modules/mux/mpeg/ps.c:79
+#: modules/mux/mpeg/ps.c:53
 msgid "PS muxer"
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:138
+#: modules/mux/mpeg/ts.c:78
 msgid "TS muxer"
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:143
+#: modules/mux/mpeg/ts.c:83
 msgid "TS muxer (libdvbpsi)"
 msgstr ""
 
@@ -5256,7 +5377,7 @@ msgstr ""
 msgid "A/52 audio packetizer"
 msgstr ""
 
-#: modules/packetizer/copy.c:69
+#: modules/packetizer/copy.c:43
 msgid "Copy packetizer"
 msgstr ""
 
@@ -5300,7 +5421,7 @@ msgstr "Sorgente ES"
 msgid "Standard stream"
 msgstr "Sorgente standard"
 
-#: modules/stream_out/transcode.c:71
+#: modules/stream_out/transcode.c:73
 msgid "Transcode stream"
 msgstr "Sorgente transcodifica"
 
@@ -5770,6 +5891,9 @@ msgstr "modulo XOSD"
 msgid "xosd interface"
 msgstr "interfaccia xosd"
 
+#~ msgid "UDP/RTP (Address when Multicast)"
+#~ msgstr "UDP/RTP (Indirizzo quando Multicast)"
+
 #, fuzzy
 #~ msgid "Advanced open options"
 #~ msgstr "Opzioni avanzate"
diff --git a/po/ja.po b/po/ja.po
index ccf3f7e401..c411935be6 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vlc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-07-31 15:04+0200\n"
+"POT-Creation-Date: 2003-08-11 21:05+0200\n"
 "PO-Revision-Date: 2003-01-09 02:37+0900\n"
 "Last-Translator: Fumio Nakayama <endymion@ca2.so-net.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -32,7 +32,7 @@ msgid "Audio channels"
 msgstr "¥ª¡¼¥Ç¥£¥ª¡¦¥Á¥ã¥ó¥Í¥ë¤ÎÁªÂò"
 
 #: src/audio_output/output.c:107 src/audio_output/output.c:142
-#: modules/audio_output/alsa.c:179 modules/audio_output/directx.c:423
+#: modules/audio_output/alsa.c:177 modules/audio_output/directx.c:423
 #: modules/audio_output/oss.c:202 modules/audio_output/sdl.c:181
 #: modules/audio_output/sdl.c:198 modules/audio_output/waveout.c:386
 msgid "Stereo"
@@ -109,11 +109,11 @@ msgstr ""
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr ""
 
-#: src/input/input.c:171
+#: src/input/input.c:174
 msgid "General"
 msgstr ""
 
-#: src/input/input.c:172
+#: src/input/input.c:175
 #, fuzzy
 msgid "Playlist Item"
 msgstr "¥ê¥¹¥È"
@@ -125,9 +125,9 @@ msgid "Program"
 msgstr "¥×¥í¥°¥é¥à"
 
 #: src/input/input_programs.c:98 modules/demux/asf/libasf.c:696
-#: modules/demux/mkv.cpp:2394 modules/gui/beos/MediaControlView.cpp:1258
+#: modules/demux/mkv.cpp:2398 modules/gui/beos/MediaControlView.cpp:1258
 #: modules/gui/gtk/gnome_interface.c:1650 modules/gui/gtk/gtk_interface.c:1956
-#: modules/gui/gtk/menu.c:1402 modules/gui/gtk/menu.c:1423
+#: modules/gui/gtk/menu.c:1403 modules/gui/gtk/menu.c:1424
 #: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:373
 #: modules/gui/macosx/intf.m:374 modules/gui/macosx/open.m:150
 #: modules/gui/wxwindows/open.cpp:406
@@ -136,7 +136,7 @@ msgstr "
 
 #: src/input/input_programs.c:102 modules/gui/beos/MediaControlView.cpp:1259
 #: modules/gui/gtk/gnome_interface.c:1640 modules/gui/gtk/gtk_interface.c:1946
-#: modules/gui/gtk/menu.c:1019 modules/gui/gtk/menu.c:1432
+#: modules/gui/gtk/menu.c:1020 modules/gui/gtk/menu.c:1433
 #: modules/gui/kde/interface.cpp:146 modules/gui/macosx/intf.m:375
 #: modules/gui/macosx/intf.m:376 modules/gui/macosx/open.m:151
 #: modules/gui/wxwindows/open.cpp:412
@@ -216,15 +216,15 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/libvlc.c:1200 src/misc/configuration.c:1019
+#: src/libvlc.c:1200 src/misc/configuration.c:1040
 msgid "string"
 msgstr "ʸ»úÎó"
 
-#: src/libvlc.c:1217 src/misc/configuration.c:1000
+#: src/libvlc.c:1217 src/misc/configuration.c:1021
 msgid "integer"
 msgstr "À°¿ô"
 
-#: src/libvlc.c:1220 src/misc/configuration.c:1009
+#: src/libvlc.c:1220 src/misc/configuration.c:1030
 msgid "float"
 msgstr "ÉâÆ°¾®¿ôÅÀ"
 
@@ -1158,16 +1158,16 @@ msgstr "
 
 #: src/libvlc.h:474 modules/audio_output/coreaudio.c:227
 #: modules/audio_output/file.c:108 modules/demux/asf/asf.c:228
-#: modules/demux/mkv.cpp:2445 modules/demux/ogg.c:557 modules/demux/ogg.c:829
-#: modules/demux/ogg.c:1002 modules/gui/beos/InterfaceWindow.cpp:259
+#: modules/demux/mkv.cpp:2449 modules/demux/ogg.c:558 modules/demux/ogg.c:830
+#: modules/demux/ogg.c:1003 modules/gui/beos/InterfaceWindow.cpp:259
 #: modules/gui/gtk/gnome_interface.c:1092 modules/gui/gtk/gtk_interface.c:1219
 #: modules/gui/macosx/intf.m:378 modules/gui/macosx/output.m:156
 msgid "Audio"
 msgstr "¥ª¡¼¥Ç¥£¥ª"
 
-#: src/libvlc.h:493 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1217
-#: modules/demux/mkv.cpp:2461 modules/demux/ogg.c:629 modules/demux/ogg.c:669
-#: modules/demux/ogg.c:734 modules/demux/ogg.c:909
+#: src/libvlc.h:493 modules/demux/asf/asf.c:298 modules/demux/avi/avi.c:1217
+#: modules/demux/mkv.cpp:2465 modules/demux/ogg.c:630 modules/demux/ogg.c:670
+#: modules/demux/ogg.c:735 modules/demux/ogg.c:910
 #: modules/gui/gtk/gnome_interface.c:1099 modules/gui/gtk/gtk_interface.c:1296
 #: modules/gui/macosx/intf.m:389 modules/gui/macosx/macosx.m:68
 #: modules/gui/macosx/output.m:150 modules/misc/dummy/dummy.c:81
@@ -1175,7 +1175,8 @@ msgstr "
 msgid "Video"
 msgstr "¥Ó¥Ç¥ª"
 
-#: src/libvlc.h:515 modules/access/satellite/satellite.c:66
+#: src/libvlc.h:515 modules/access/dvb/qpsk.c:101
+#: modules/access/satellite/satellite.c:66
 msgid "Input"
 msgstr "ÆþÎÏ"
 
@@ -1199,7 +1200,7 @@ msgid "CPU"
 msgstr ""
 
 #: src/libvlc.h:579 modules/gui/beos/InterfaceWindow.cpp:206
-#: modules/gui/familiar/interface.c:610 modules/gui/gtk/gnome_interface.c:643
+#: modules/gui/gtk/gnome_interface.c:643
 #: modules/gui/gtk/gnome_interface.c:2384
 #: modules/gui/gtk/gnome_interface.c:2409 modules/gui/gtk/gtk_interface.c:747
 #: modules/gui/gtk/gtk_interface.c:2697 modules/gui/macosx/intf.m:321
@@ -1212,11 +1213,10 @@ msgstr "
 #: src/libvlc.h:585 modules/audio_filter/converter/a52tofloat32.c:85
 #: modules/audio_filter/converter/mpgatofixed32.c:60
 #: modules/codec/a52old/a52old.c:59 modules/codec/mpeg_video/parser.c:84
-#: modules/demux/mpeg/ts.c:118 modules/gui/familiar/familiar.c:70
-#: modules/gui/pda/pda.c:70 modules/misc/logger/logger.c:89
-#: modules/video_filter/motionblur.c:58 modules/video_filter/transform.c:63
-#: modules/video_filter/wall.c:66 modules/video_output/ggi.c:62
-#: modules/video_output/mga/xmga.c:102
+#: modules/demux/mpeg/ts.c:118 modules/gui/pda/pda.c:70
+#: modules/misc/logger/logger.c:89 modules/video_filter/motionblur.c:58
+#: modules/video_filter/transform.c:63 modules/video_filter/wall.c:66
+#: modules/video_output/ggi.c:62 modules/video_output/mga/xmga.c:102
 msgid "Miscellaneous"
 msgstr "¤½¤Î¾"
 
@@ -1244,7 +1244,7 @@ msgstr "
 msgid "print version information"
 msgstr "¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤Î°õºþ"
 
-#: src/misc/configuration.c:1000
+#: src/misc/configuration.c:1021
 msgid "boolean"
 msgstr "¿¿µ¶ÃÍ"
 
@@ -1316,6 +1316,110 @@ msgstr "
 msgid "Standard filesystem directory input"
 msgstr "ɸ½àŪ¤Ê¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥Õ¥¡¥¤¥ë¤òÆɤà"
 
+#: modules/access/dvb/qpsk.c:44
+msgid "adapter card to tune"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:45
+msgid "adapter cards have a device file named /dev/dvb/adapter[n] with n>=0"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:47
+msgid "device nummer to use on adapter"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:50
+#, fuzzy
+msgid "satellite default transponder frequency"
+msgstr "±ÒÀ± ´ûÄêžÁ÷¼þÇÈ¿ô"
+
+#: modules/access/dvb/qpsk.c:53
+#, fuzzy
+msgid "satellite default transponder polarization"
+msgstr "±ÒÀ± ´ûÄêžÁ÷¶Ë"
+
+#: modules/access/dvb/qpsk.c:56
+#, fuzzy
+msgid "satellite default transponder FEC"
+msgstr "±ÒÀ± ´ûÄêžÁ÷FEC"
+
+#: modules/access/dvb/qpsk.c:57
+msgid "FEC=Forward Error Correction mode"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:59
+#, fuzzy
+msgid "satellite default transponder symbol rate"
+msgstr "±ÒÀ± ´ûÄêžÁ÷¥·¥ó¥Ü¥ë¡¦¥ì¡¼¥È"
+
+#: modules/access/dvb/qpsk.c:62
+#, fuzzy
+msgid "use diseqc with antenna"
+msgstr "¥¢¥ó¥Æ¥Ê¤Èdiseqc¤ò»ÈÍÑ"
+
+#: modules/access/dvb/qpsk.c:65
+#, fuzzy
+msgid "antenna lnb_lof1 (kHz)"
+msgstr "¥¢¥ó¥Æ¥Ê lnb_lof1 (kHz)"
+
+#: modules/access/dvb/qpsk.c:68
+#, fuzzy
+msgid "antenna lnb_lof2 (kHz)"
+msgstr "¥¢¥ó¥Æ¥Ê lnb_lof2 (kHz)"
+
+#: modules/access/dvb/qpsk.c:71
+#, fuzzy
+msgid "antenna lnb_slof (kHz)"
+msgstr "¥¢¥ó¥Æ¥Ê lnb_slof (kHz)"
+
+#: modules/access/dvb/qpsk.c:74
+msgid "probe the dvb card for capabilities (default disabled)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:75
+msgid "some dvb cards do not like to be probed for their capabilities"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:78
+msgid "modulation type"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:79
+msgid "modulation type for frontend device "
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:82
+msgid "terrestrial high priority stream code rate (FEC)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:85
+msgid "terrestrial low priority stream code rate (FEC)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:88
+msgid "terrestrial bandwidth"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:89
+msgid "terrestrial bandwidth [0=auto,6,7,8 in MHz]"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:91
+msgid "terrestrial guard interval"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:94
+msgid "terrestrial transmission mode"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:97
+msgid "terrestrial hierarchy mode"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:123
+msgid "DVB input module with v4l2 support"
+msgstr ""
+
 #: modules/access/dvd/dvd.c:65
 #, fuzzy
 msgid "Method to use by libdvdcss for key decryption"
@@ -1436,7 +1540,7 @@ msgstr ""
 msgid "http"
 msgstr ""
 
-#: modules/access/http.c:89
+#: modules/access/http.c:91
 msgid "HTTP input"
 msgstr ""
 
@@ -1457,6 +1561,10 @@ msgstr ""
 msgid "Hauppauge PVR cards input"
 msgstr ""
 
+#: modules/access/rtsp.c:68
+msgid "RTSP SDP request"
+msgstr ""
+
 #: modules/access/satellite/satellite.c:41
 #, fuzzy
 msgid "Satellite default transponder frequency"
@@ -1756,23 +1864,23 @@ msgstr "ALSA
 msgid "Audio device"
 msgstr "DVD¥Ç¥Ð¥¤¥¹"
 
-#: modules/audio_output/alsa.c:173 modules/audio_output/directx.c:435
+#: modules/audio_output/alsa.c:171 modules/audio_output/directx.c:435
 #: modules/audio_output/oss.c:222 modules/audio_output/sdl.c:182
 #: modules/audio_output/sdl.c:201 modules/audio_output/waveout.c:399
 msgid "Mono"
 msgstr "¥â¥Î¥é¥ë"
 
-#: modules/audio_output/alsa.c:186 modules/audio_output/directx.c:409
+#: modules/audio_output/alsa.c:184 modules/audio_output/directx.c:409
 #: modules/audio_output/oss.c:178 modules/audio_output/waveout.c:371
 msgid "2 Front 2 Rear"
 msgstr "¥Õ¥í¥ó¥È 2, ¥ê¥¢ 2"
 
-#: modules/audio_output/alsa.c:192 modules/audio_output/directx.c:391
+#: modules/audio_output/alsa.c:190 modules/audio_output/directx.c:391
 #: modules/audio_output/oss.c:167 modules/audio_output/waveout.c:352
 msgid "5.1"
 msgstr ""
 
-#: modules/audio_output/alsa.c:219 modules/audio_output/directx.c:478
+#: modules/audio_output/alsa.c:217 modules/audio_output/directx.c:478
 #: modules/audio_output/oss.c:246 modules/audio_output/waveout.c:415
 msgid "A/52 over S/PDIF"
 msgstr ""
@@ -2185,20 +2293,29 @@ msgstr "
 
 #: modules/codec/subsdec/subsdec.c:68
 #, fuzzy
-msgid "subtitle text encoding"
+msgid "Subtitles text encoding"
 msgstr "»úË롦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
 
 #: modules/codec/subsdec/subsdec.c:69
 #, fuzzy
-msgid "change the encoding used in text subtitles"
+msgid "Change the encoding used in text subtitles"
 msgstr "ʸ»ú»úËë¤Ç»ÈÍѤµ¤ì¤ë¥Õ¥©¥ó¥È"
 
-#: modules/codec/subsdec/subsdec.c:72
+#: modules/codec/subsdec/subsdec.c:70
+#, fuzzy
+msgid "Subtitles justification"
+msgstr "»úËë"
+
+#: modules/codec/subsdec/subsdec.c:71
+msgid "Change the justification of substitles (0=center, 1=left, 2=right)"
+msgstr ""
+
+#: modules/codec/subsdec/subsdec.c:74
 #, fuzzy
 msgid "file subtitles decoder"
 msgstr "»úË롦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/codec/subsdec/subsdec.c:75 modules/gui/beos/InterfaceWindow.cpp:256
+#: modules/codec/subsdec/subsdec.c:77 modules/gui/beos/InterfaceWindow.cpp:256
 #: modules/gui/kde/interface.cpp:93
 msgid "Subtitles"
 msgstr "»úËë"
@@ -2359,7 +2476,7 @@ msgid "Quit"
 msgstr "VLC¤ò½ªÎ»"
 
 #: modules/control/lirc/lirc.c:297 modules/control/lirc/lirc.c:323
-#: modules/gui/familiar/interface.c:177 modules/gui/gtk/gnome_interface.c:602
+#: modules/gui/gtk/gnome_interface.c:602
 #: modules/gui/gtk/gnome_interface.c:1020 modules/gui/gtk/gtk_interface.c:709
 #: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:921
 #: modules/gui/macosx/intf.m:922 modules/gui/macosx/intf.m:923
@@ -2367,8 +2484,7 @@ msgstr "VLC
 msgid "Pause"
 msgstr "°ì»þÄä»ß"
 
-#: modules/control/lirc/lirc.c:310 modules/gui/familiar/interface.c:190
-#: modules/gui/gtk/gnome_interface.c:590
+#: modules/control/lirc/lirc.c:310 modules/gui/gtk/gnome_interface.c:590
 #: modules/gui/gtk/gnome_interface.c:1013 modules/gui/gtk/gtk_interface.c:698
 #: modules/gui/macosx/intf.m:324 modules/gui/macosx/intf.m:362
 #: modules/gui/macosx/intf.m:423 modules/gui/macosx/intf.m:928
@@ -2407,72 +2523,74 @@ msgstr "
 msgid "remote control interface"
 msgstr "¥ê¥â¡¼¥È¡¦¥³¥ó¥È¥í¡¼¥ë¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/demux/a52sys.c:52
+#: modules/demux/a52sys.c:41
 msgid "A52 demuxer"
 msgstr ""
 
-#: modules/demux/aac/demux.c:46
-#, fuzzy
-msgid "AAC stream demuxer"
-msgstr "MPEG 1/2¥ì¥¤¥ä1/2¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
-
-#: modules/demux/aac/demux.c:555
-msgid "Aac"
+#: modules/demux/a52sys.c:161
+msgid "A52"
 msgstr ""
 
-#: modules/demux/aac/demux.c:557 modules/demux/mpeg/audio.c:627
-#: modules/demux/mpeg/audio.c:644 modules/demux/mpeg/m4v.c:150
+#: modules/demux/a52sys.c:163 modules/demux/aac.c:175
+#: modules/demux/mpeg/m4v.c:150 modules/demux/mpeg/mpga.c:331
 #, fuzzy
 msgid "Input Type"
 msgstr "ÆþÎÏ"
 
-#: modules/demux/aac/demux.c:560 modules/demux/mpeg/audio.c:629
-msgid "Layer"
-msgstr ""
-
-#: modules/demux/aac/demux.c:562 modules/demux/asf/asf.c:275
-#: modules/demux/avi/avi.c:1178 modules/demux/mkv.cpp:2449
-#: modules/demux/ogg.c:561 modules/demux/ogg.c:837 modules/demux/ogg.c:1010
-#: modules/gui/gtk/gnome_interface.c:148 modules/gui/gtk/gnome_interface.c:931
-#: modules/gui/gtk/gtk_interface.c:481 modules/gui/gtk/gtk_interface.c:1282
-#: modules/gui/macosx/output.m:162 modules/gui/wxwindows/streamout.cpp:668
+#: modules/demux/a52sys.c:164 modules/demux/aac.c:177
+#: modules/demux/asf/asf.c:275 modules/demux/avi/avi.c:1178
+#: modules/demux/mkv.cpp:2453 modules/demux/ogg.c:562 modules/demux/ogg.c:838
+#: modules/demux/ogg.c:1011 modules/gui/gtk/gnome_interface.c:148
+#: modules/gui/gtk/gnome_interface.c:931 modules/gui/gtk/gtk_interface.c:481
+#: modules/gui/gtk/gtk_interface.c:1282 modules/gui/macosx/output.m:162
+#: modules/gui/wxwindows/streamout.cpp:668
 msgid "Channels"
 msgstr "¥Á¥ã¥ó¥Í¥ë"
 
-#: modules/demux/aac/demux.c:564 modules/demux/asf/asf.c:277
-#: modules/demux/avi/avi.c:1180 modules/demux/mkv.cpp:2453
-#: modules/demux/mpeg/audio.c:632 modules/demux/ogg.c:559
-#: modules/demux/ogg.c:671 modules/demux/ogg.c:832 modules/demux/ogg.c:1005
+#: modules/demux/a52sys.c:165 modules/demux/aac.c:179
+#: modules/demux/asf/asf.c:277 modules/demux/avi/avi.c:1180
+#: modules/demux/mkv.cpp:2457 modules/demux/mpeg/mpga.c:337
+#: modules/demux/ogg.c:560 modules/demux/ogg.c:672 modules/demux/ogg.c:833
+#: modules/demux/ogg.c:1006
 #, fuzzy
 msgid "Sample Rate"
 msgstr "¥·¥ó¥Ü¥ë¡¦¥ì¡¼¥È"
 
+#: modules/demux/aac.c:41
+#, fuzzy
+msgid "AAC demuxer"
+msgstr "MPEG 1/2¥ì¥¤¥ä1/2¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
+
+#: modules/demux/aac.c:173
+msgid "Aac"
+msgstr ""
+
 #: modules/demux/asf/asf.c:48
 msgid "ASF v1.0 demuxer (file only)"
 msgstr ""
 
-#: modules/demux/asf/asf.c:165 modules/demux/mkv.cpp:2412
+#: modules/demux/asf/asf.c:165 modules/demux/mkv.cpp:2416
 #, fuzzy
 msgid "Number of streams"
 msgstr "¹Ô¿ô"
 
-#: modules/demux/asf/asf.c:228 modules/demux/asf/asf.c:302
+#: modules/demux/asf/asf.c:228 modules/demux/asf/asf.c:298
 #: modules/demux/avi/avi.c:1172 modules/demux/avi/avi.c:1217
-#: modules/demux/avi/avi.c:1250 modules/demux/mkv.cpp:2445
-#: modules/demux/mkv.cpp:2461 modules/demux/mkv.cpp:2477
-#: modules/demux/ogg.c:557 modules/demux/ogg.c:629 modules/demux/ogg.c:669
-#: modules/demux/ogg.c:734 modules/demux/ogg.c:829 modules/demux/ogg.c:909
-#: modules/demux/ogg.c:1002 modules/gui/familiar/interface.c:370
-#: modules/gui/macosx/output.m:139 modules/gui/pda/interface.c:372
+#: modules/demux/avi/avi.c:1250 modules/demux/mkv.cpp:2449
+#: modules/demux/mkv.cpp:2465 modules/demux/mkv.cpp:2481
+#: modules/demux/ogg.c:558 modules/demux/ogg.c:630 modules/demux/ogg.c:670
+#: modules/demux/ogg.c:735 modules/demux/ogg.c:830 modules/demux/ogg.c:910
+#: modules/demux/ogg.c:1003 modules/gui/macosx/output.m:139
+#: modules/gui/pda/interface.c:372
 msgid "Type"
 msgstr "¥¿¥¤¥×"
 
-#: modules/demux/asf/asf.c:260 modules/demux/asf/asf.c:318
+#: modules/demux/asf/asf.c:260 modules/demux/asf/asf.c:314
 #: modules/demux/avi/avi.c:1174 modules/demux/avi/avi.c:1218
-#: modules/demux/mkv.cpp:2446 modules/demux/mkv.cpp:2462
-#: modules/demux/mkv.cpp:2478 modules/demux/ogg.c:558 modules/demux/ogg.c:630
-#: modules/demux/ogg.c:670 modules/demux/ogg.c:735 modules/demux/ogg.c:830
-#: modules/demux/ogg.c:910 modules/demux/ogg.c:1003
+#: modules/demux/mkv.cpp:2450 modules/demux/mkv.cpp:2466
+#: modules/demux/mkv.cpp:2482 modules/demux/ogg.c:559 modules/demux/ogg.c:631
+#: modules/demux/ogg.c:671 modules/demux/ogg.c:736 modules/demux/ogg.c:831
+#: modules/demux/ogg.c:911 modules/demux/ogg.c:1004
 #, fuzzy
 msgid "Codec"
 msgstr "ÊĤ¸¤ë"
@@ -2482,39 +2600,39 @@ msgid "Avg. byterate"
 msgstr ""
 
 #: modules/demux/asf/asf.c:282 modules/demux/avi/avi.c:1185
-#: modules/demux/mkv.cpp:2457
+#: modules/demux/mkv.cpp:2461
 msgid "Bits Per Sample"
 msgstr ""
 
-#: modules/demux/asf/asf.c:332
+#: modules/demux/asf/asf.c:328
 msgid "Size"
 msgstr "¥µ¥¤¥º"
 
-#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1222
-#: modules/demux/mkv.cpp:2465
+#: modules/demux/asf/asf.c:331 modules/demux/avi/avi.c:1222
+#: modules/demux/mkv.cpp:2469
 #, fuzzy
 msgid "Resolution"
 msgstr "ÁªÂò"
 
-#: modules/demux/asf/asf.c:337
+#: modules/demux/asf/asf.c:333
 #, fuzzy
 msgid "Planes"
 msgstr "ºÆÀ¸"
 
-#: modules/demux/asf/asf.c:339 modules/demux/avi/avi.c:1228
+#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1228
 msgid "Bits Per Pixel"
 msgstr ""
 
-#: modules/demux/asf/asf.c:342
+#: modules/demux/asf/asf.c:338
 #, fuzzy
 msgid "Image Size"
 msgstr "¥µ¥¤¥º"
 
-#: modules/demux/asf/asf.c:344
+#: modules/demux/asf/asf.c:340
 msgid "X pixels per meter"
 msgstr ""
 
-#: modules/demux/asf/asf.c:346
+#: modules/demux/asf/asf.c:342
 msgid "Y pixels per meter"
 msgstr ""
 
@@ -2552,7 +2670,7 @@ msgstr "
 msgid "Rating"
 msgstr "ʸ»úÎó"
 
-#: modules/demux/au.c:47
+#: modules/demux/au.c:42
 msgid "AU demuxer"
 msgstr ""
 
@@ -2602,8 +2720,8 @@ msgstr ""
 msgid "Audio Bitrate"
 msgstr "¥ª¡¼¥Ç¥£¥ª"
 
-#: modules/demux/avi/avi.c:1225 modules/demux/ogg.c:631
-#: modules/demux/ogg.c:737 modules/demux/ogg.c:912
+#: modules/demux/avi/avi.c:1225 modules/demux/ogg.c:632
+#: modules/demux/ogg.c:738 modules/demux/ogg.c:913
 msgid "Frame Rate"
 msgstr ""
 
@@ -2646,66 +2764,66 @@ msgstr ""
 msgid "mka/mkv stream demuxer"
 msgstr "MPEG 1/2¥ì¥¤¥ä1/2¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
 
-#: modules/demux/mkv.cpp:2389 modules/gui/gtk/gnome_interface.c:2436
+#: modules/demux/mkv.cpp:2393 modules/gui/gtk/gnome_interface.c:2436
 #: modules/gui/gtk/gtk_interface.c:2857 modules/gui/wxwindows/playlist.cpp:150
 msgid "Duration"
 msgstr "»ý³´ü´Ö"
 
-#: modules/demux/mkv.cpp:2398
+#: modules/demux/mkv.cpp:2402
 msgid "Date UTC"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2402
+#: modules/demux/mkv.cpp:2406
 #, fuzzy
 msgid "Segment Filename"
 msgstr "¥í¥°¡¦¥Õ¥¡¥¤¥ë̾"
 
-#: modules/demux/mkv.cpp:2406
+#: modules/demux/mkv.cpp:2410
 #, fuzzy
 msgid "Muxing Application"
 msgstr "¤³¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ë¤Ä¤¤¤Æ"
 
-#: modules/demux/mkv.cpp:2410
+#: modules/demux/mkv.cpp:2414
 #, fuzzy
 msgid "Writing Application"
 msgstr "¿âľÊý¸þ°ÌÃÖ"
 
-#: modules/demux/mkv.cpp:2423 modules/gui/beos/PlayListWindow.cpp:144
-#: modules/gui/familiar/interface.c:362 modules/gui/gtk/preferences.c:325
-#: modules/gui/kde/pluginsbox.cpp:45 modules/gui/pda/interface.c:364
+#: modules/demux/mkv.cpp:2427 modules/gui/beos/PlayListWindow.cpp:144
+#: modules/gui/gtk/preferences.c:325 modules/gui/kde/pluginsbox.cpp:45
+#: modules/gui/pda/interface.c:364
 msgid "Name"
 msgstr "̾Á°"
 
-#: modules/demux/mkv.cpp:2427
+#: modules/demux/mkv.cpp:2431
 #, fuzzy
 msgid "Codec Name"
 msgstr "¥Ç¥Ð¥¤¥¹Ì¾"
 
-#: modules/demux/mkv.cpp:2431
+#: modules/demux/mkv.cpp:2435
 #, fuzzy
 msgid "Codec Setting"
 msgstr "ÀßÄê(_S)"
 
-#: modules/demux/mkv.cpp:2435
+#: modules/demux/mkv.cpp:2439
 #, fuzzy
 msgid "Codec Info"
 msgstr "¥Ç¥Ð¥¤¥¹Ì¾"
 
-#: modules/demux/mkv.cpp:2439
+#: modules/demux/mkv.cpp:2443
 #, fuzzy
 msgid "Codec Download"
 msgstr "¥Ç¥Ð¥¤¥¹Ì¾"
 
-#: modules/demux/mkv.cpp:2469
+#: modules/demux/mkv.cpp:2473
 #, fuzzy
 msgid "Display Resolution"
 msgstr "ÁªÂò"
 
-#: modules/demux/mkv.cpp:2473
+#: modules/demux/mkv.cpp:2477
 msgid "Frame Per Second"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2477 modules/gui/gtk/gnome_interface.c:1963
+#: modules/demux/mkv.cpp:2481 modules/gui/gtk/gnome_interface.c:1963
 #: modules/gui/gtk/gtk_interface.c:2278
 #, fuzzy
 msgid "Subtitle"
@@ -2715,36 +2833,43 @@ msgstr "
 msgid "MP4 demuxer"
 msgstr ""
 
-#: modules/demux/mpeg/audio.c:47
+#: modules/demux/mpeg/es.c:49
+msgid "ISO 13818-1 MPEG Elementary Stream input"
+msgstr "ISO 13818-1 MPEG´ðËÜ¥¹¥È¥ê¡¼¥àÆþÎÏ"
+
+#: modules/demux/mpeg/m4v.c:43
 #, fuzzy
-msgid "MPEG I/II audio stream demuxer"
+msgid "MPEG-4 video elementary stream demuxer"
 msgstr "MPEG 1/2¥ì¥¤¥ä1/2¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
 
-#: modules/demux/mpeg/audio.c:626 modules/demux/mpeg/audio.c:643
 #: modules/demux/mpeg/m4v.c:149
 msgid "mpeg"
 msgstr ""
 
-#: modules/demux/mpeg/audio.c:630
+#: modules/demux/mpeg/m4v.c:150
+msgid "Video MPEG-4 (raw ES)"
+msgstr ""
+
+#: modules/demux/mpeg/mpga.c:41
 #, fuzzy
-msgid "Mode"
-msgstr "¥â¥¸¥å¡¼¥ë"
+msgid "MPEG-I/II Audio demuxer"
+msgstr "MPEG 1/2¥ì¥¤¥ä1/2¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
 
-#: modules/demux/mpeg/audio.c:634
-msgid "Average Bitrate"
+#: modules/demux/mpeg/mpga.c:330
+msgid "MPEG"
 msgstr ""
 
-#: modules/demux/mpeg/es.c:49
-msgid "ISO 13818-1 MPEG Elementary Stream input"
-msgstr "ISO 13818-1 MPEG´ðËÜ¥¹¥È¥ê¡¼¥àÆþÎÏ"
+#: modules/demux/mpeg/mpga.c:333
+msgid "Layer"
+msgstr ""
 
-#: modules/demux/mpeg/m4v.c:43
+#: modules/demux/mpeg/mpga.c:335
 #, fuzzy
-msgid "MPEG-4 video elementary stream demuxer"
-msgstr "MPEG 1/2¥ì¥¤¥ä1/2¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
+msgid "Mode"
+msgstr "¥â¥¸¥å¡¼¥ë"
 
-#: modules/demux/mpeg/m4v.c:150
-msgid "Video MPEG-4 (raw ES)"
+#: modules/demux/mpeg/mpga.c:339
+msgid "Average Bitrate"
 msgstr ""
 
 #: modules/demux/mpeg/ps.c:60
@@ -2793,37 +2918,37 @@ msgstr "ISO 13818-1 MPEGž
 msgid "ogg stream demuxer"
 msgstr "MPEG 1/2¥ì¥¤¥ä1/2¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
 
-#: modules/demux/ogg.c:558
+#: modules/demux/ogg.c:559
 msgid "Vorbis"
 msgstr ""
 
-#: modules/demux/ogg.c:563 modules/demux/ogg.c:633 modules/demux/ogg.c:673
-#: modules/demux/ogg.c:834 modules/demux/ogg.c:1007
+#: modules/demux/ogg.c:564 modules/demux/ogg.c:634 modules/demux/ogg.c:674
+#: modules/demux/ogg.c:835 modules/demux/ogg.c:1008
 msgid "Bit Rate"
 msgstr ""
 
-#: modules/demux/ogg.c:630
+#: modules/demux/ogg.c:631
 msgid "Theora"
 msgstr ""
 
-#: modules/demux/ogg.c:670
+#: modules/demux/ogg.c:671
 #, fuzzy
 msgid "tarkin"
 msgstr "ʸ»úÎó"
 
-#: modules/demux/ogg.c:739 modules/demux/ogg.c:914
+#: modules/demux/ogg.c:740 modules/demux/ogg.c:915
 msgid "Bit Count"
 msgstr ""
 
-#: modules/demux/ogg.c:741 modules/demux/ogg.c:916
+#: modules/demux/ogg.c:742 modules/demux/ogg.c:917
 msgid "Width"
 msgstr ""
 
-#: modules/demux/ogg.c:743 modules/demux/ogg.c:918
+#: modules/demux/ogg.c:744 modules/demux/ogg.c:919
 msgid "Height"
 msgstr ""
 
-#: modules/demux/ogg.c:839 modules/demux/ogg.c:1012
+#: modules/demux/ogg.c:840 modules/demux/ogg.c:1013
 msgid "Bits per Sample"
 msgstr ""
 
@@ -2831,6 +2956,10 @@ msgstr ""
 msgid "raw dv demuxer"
 msgstr ""
 
+#: modules/demux/sdp.c:64
+msgid "SDP demuxer + UDP/RTP/RTSP"
+msgstr ""
+
 #: modules/demux/util/id3.c:44
 msgid "Simple id3 tag skipper"
 msgstr "¥·¥ó¥×¥ë¤Êid3¥¿¥°¡¦¥¹¥­¥Ã¥Ñ"
@@ -3186,7 +3315,7 @@ msgstr "id3
 msgid "Text subtitles demux"
 msgstr "»úËë¤ÎÁªÂò"
 
-#: modules/demux/wav/wav.c:49
+#: modules/demux/wav.c:43
 msgid "WAV demuxer"
 msgstr ""
 
@@ -3224,11 +3353,9 @@ msgid "Yes"
 msgstr ""
 
 #: modules/gui/beos/InterfaceWindow.cpp:201
-#: modules/gui/beos/InterfaceWindow.cpp:308
-#: modules/gui/familiar/interface.c:149 modules/gui/familiar/interface.c:150
-#: modules/gui/macosx/intf.m:328 modules/gui/macosx/prefs.m:77
-#: modules/gui/pda/interface.c:151 modules/gui/pda/interface.c:152
-#: modules/gui/wxwindows/preferences.cpp:233
+#: modules/gui/beos/InterfaceWindow.cpp:308 modules/gui/macosx/intf.m:328
+#: modules/gui/macosx/prefs.m:77 modules/gui/pda/interface.c:151
+#: modules/gui/pda/interface.c:152 modules/gui/wxwindows/preferences.cpp:233
 msgid "Preferences"
 msgstr "ÀßÄê..."
 
@@ -3243,7 +3370,7 @@ msgstr "
 
 #: modules/gui/beos/InterfaceWindow.cpp:238
 #: modules/gui/beos/MediaControlView.cpp:1257
-#: modules/gui/beos/PlayListWindow.cpp:82 modules/gui/familiar/interface.c:378
+#: modules/gui/beos/PlayListWindow.cpp:82
 #: modules/gui/gtk/gnome_interface.c:503
 #: modules/gui/gtk/gnome_interface.c:1569
 #: modules/gui/gtk/gnome_interface.c:2274
@@ -3278,10 +3405,8 @@ msgid "Open Subtitles"
 msgstr "»úËë"
 
 #: modules/gui/beos/InterfaceWindow.cpp:249
-#: modules/gui/familiar/interface.c:231 modules/gui/familiar/interface.c:232
-#: modules/gui/familiar/interface.c:765 modules/gui/gtk/gtk_interface.c:1580
-#: modules/gui/pda/interface.c:233 modules/gui/pda/interface.c:234
-#: modules/gui/pda/interface.c:767
+#: modules/gui/gtk/gtk_interface.c:1580 modules/gui/pda/interface.c:233
+#: modules/gui/pda/interface.c:234 modules/gui/pda/interface.c:767
 msgid "About"
 msgstr "VideoLAN¤Ë¤Ä¤¤¤Æ"
 
@@ -3337,7 +3462,7 @@ msgstr "
 #: modules/gui/wxwindows/open.cpp:244
 #: modules/gui/wxwindows/preferences.cpp:253
 #: modules/gui/wxwindows/streamout.cpp:217
-#: modules/gui/wxwindows/subtitles.cpp:149
+#: modules/gui/wxwindows/subtitles.cpp:190
 msgid "OK"
 msgstr ""
 
@@ -3469,7 +3594,7 @@ msgstr ""
 msgid "Take Screen Shot"
 msgstr ""
 
-#: modules/gui/beos/VlcWrapper.cpp:165 modules/gui/gtk/menu.c:733
+#: modules/gui/beos/VlcWrapper.cpp:165 modules/gui/gtk/menu.c:734
 msgid "None"
 msgstr "¤Ê¤·"
 
@@ -3477,210 +3602,6 @@ msgstr "
 msgid "<unknown>"
 msgstr ""
 
-#: modules/gui/familiar/familiar.c:62 modules/gui/pda/pda.c:62
-#, fuzzy
-msgid "Autoplay selected file"
-msgstr "ÁªÂò¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤ò¼«Æ°ºÆÀ¸"
-
-#: modules/gui/familiar/familiar.c:63 modules/gui/pda/pda.c:63
-#, fuzzy
-msgid "Automatically play a file when selected in the file selection list"
-msgstr "ÁªÂò¥ê¥¹¥È¤ÇÁªÂò¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤ò¼«Æ°Åª¤ËºÆÀ¸¤·¤Þ¤¹¡£"
-
-#: modules/gui/familiar/familiar.c:72
-#, fuzzy
-msgid "Familiar Linux Gtk+ interface"
-msgstr "Gtk+¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
-
-#: modules/gui/familiar/interface.c:99 modules/gui/familiar/interface.c:732
-#: modules/gui/gtk/gnome_interface.c:274 modules/gui/gtk/gtk_interface.c:121
-#: modules/gui/gtk/gtk_interface.c:1595 modules/gui/pda/interface.c:99
-#: modules/gui/pda/interface.c:734
-msgid "VLC media player"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:124 modules/gui/pda/interface.c:126
-#: modules/gui/wxwindows/dialogs.cpp:268 modules/gui/wxwindows/open.cpp:709
-#: modules/gui/wxwindows/preferences.cpp:1029
-#: modules/gui/wxwindows/subtitles.cpp:196
-msgid "Open file"
-msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯"
-
-#: modules/gui/familiar/interface.c:164 modules/gui/pda/interface.c:166
-msgid "Rewind"
-msgstr "´¬¤­Ì᤹"
-
-#: modules/gui/familiar/interface.c:165 modules/gui/pda/interface.c:167
-msgid "Rewind stream"
-msgstr "¥¹¥È¥ê¡¼¥à¤ò³«¤¯"
-
-#: modules/gui/familiar/interface.c:178 modules/gui/pda/interface.c:180
-msgid "Pause stream"
-msgstr "¥¹¥È¥ê¡¼¥à¤Î°ì»þÄä»ß"
-
-#: modules/gui/familiar/interface.c:191 modules/gui/pda/interface.c:193
-msgid "Play stream"
-msgstr "¥¹¥È¥ê¡¼¥à¤ÎºÆÀ¸"
-
-#: modules/gui/familiar/interface.c:203 modules/gui/gtk/gnome_interface.c:566
-#: modules/gui/gtk/gnome_interface.c:1027 modules/gui/gtk/gtk_interface.c:676
-#: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:639
-#: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
-#: modules/gui/macosx/intf.m:424 modules/gui/pda/interface.c:205
-#: modules/gui/wxwindows/interface.cpp:373
-msgid "Stop"
-msgstr "Ää»ß"
-
-#: modules/gui/familiar/interface.c:204 modules/gui/pda/interface.c:206
-msgid "Stop stream"
-msgstr "¥¹¥È¥ê¡¼¥à¤ÎÄä»ß"
-
-#: modules/gui/familiar/interface.c:216 modules/gui/pda/interface.c:218
-msgid "Forward"
-msgstr "žÁ÷"
-
-#: modules/gui/familiar/interface.c:217 modules/gui/pda/interface.c:219
-msgid "Forward stream"
-msgstr "¥¹¥È¥ê¡¼¥à¤ÎžÁ÷"
-
-#: modules/gui/familiar/interface.c:285 modules/gui/gtk/gnome_interface.c:2345
-#: modules/gui/gtk/gtk_interface.c:2712 modules/gui/macosx/playlist.m:198
-#: modules/gui/pda/interface.c:287
-msgid "Add"
-msgstr "ÄɲÃ"
-
-#: modules/gui/familiar/interface.c:293 modules/gui/pda/interface.c:295
-msgid "MRL :"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:394
-#, fuzzy
-msgid "UDP/RTP (Address when Multicast)"
-msgstr "UDP¥Þ¥ë¥Á¥­¥ã¥¹¥È"
-
-#: modules/gui/familiar/interface.c:412 modules/gui/gtk/gnome_interface.c:1747
-#: modules/gui/gtk/gtk_interface.c:2062 modules/gui/macosx/open.m:161
-#: modules/gui/macosx/output.m:133 modules/gui/pda/interface.c:414
-#: modules/gui/wxwindows/open.cpp:469 modules/gui/wxwindows/streamout.cpp:425
-msgid "Address"
-msgstr "¥Û¥¹¥È̾/¥¢¥É¥ì¥¹"
-
-#: modules/gui/familiar/interface.c:423 modules/gui/gtk/gnome_interface.c:1737
-#: modules/gui/gtk/gnome_interface.c:1786
-#: modules/gui/gtk/gnome_interface.c:2912 modules/gui/gtk/gtk_interface.c:2052
-#: modules/gui/gtk/gtk_interface.c:2101 modules/gui/gtk/gtk_interface.c:3225
-#: modules/gui/macosx/open.m:160 modules/gui/macosx/open.m:162
-#: modules/gui/macosx/output.m:134 modules/gui/pda/interface.c:425
-#: modules/gui/wxwindows/open.cpp:454 modules/gui/wxwindows/open.cpp:477
-#: modules/gui/wxwindows/streamout.cpp:436
-msgid "Port"
-msgstr "¥Ý¡¼¥ÈÈÖ¹æ"
-
-#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:136
-#: modules/gui/macosx/output.m:236 modules/gui/macosx/output.m:311
-#: modules/gui/pda/interface.c:480 modules/gui/wxwindows/streamout.cpp:386
-msgid "HTTP"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:488 modules/gui/pda/interface.c:490
-msgid "FTP"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:498 modules/gui/pda/interface.c:500
-msgid "MMS"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:516 modules/gui/gtk/gnome_interface.c:1830
-#: modules/gui/gtk/gnome_interface.c:2281 modules/gui/gtk/gtk_interface.c:2145
-#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:144
-#: modules/gui/macosx/open.m:271 modules/gui/pda/interface.c:518
-#: modules/gui/wxwindows/open.cpp:257
-msgid "Network"
-msgstr "¥Í¥Ã¥È¥ï¡¼¥¯"
-
-#: modules/gui/familiar/interface.c:524 modules/gui/pda/interface.c:526
-msgid "Media"
-msgstr "¥á¥Ç¥£¥¢"
-
-#: modules/gui/familiar/interface.c:560 modules/gui/pda/interface.c:562
-msgid "MRL"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:569 modules/gui/pda/interface.c:571
-#, fuzzy
-msgid "Time"
-msgstr "¥¿¥¤¥È¥ë"
-
-#: modules/gui/familiar/interface.c:586 modules/gui/pda/interface.c:588
-msgid "Update"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:594 modules/gui/pda/interface.c:596
-msgid " Del "
-msgstr ""
-
-#: modules/gui/familiar/interface.c:602 modules/gui/pda/interface.c:604
-#, fuzzy
-msgid " Clear "
-msgstr "¥¯¥ê¥¢"
-
-#: modules/gui/familiar/interface.c:626 modules/gui/pda/interface.c:628
-#, fuzzy
-msgid "Automatically play file"
-msgstr "¥Õ¥¡¥¤¥ë¤Î¼«Æ°ºÆÀ¸"
-
-#: modules/gui/familiar/interface.c:643 modules/gui/pda/interface.c:645
-#, fuzzy
-msgid " Save "
-msgstr "Êݸ"
-
-#: modules/gui/familiar/interface.c:651 modules/gui/pda/interface.c:653
-#, fuzzy
-msgid " Apply "
-msgstr "ŬÍÑ"
-
-#: modules/gui/familiar/interface.c:659 modules/gui/pda/interface.c:661
-#, fuzzy
-msgid " Cancel "
-msgstr "¥­¥ã¥ó¥»¥ë"
-
-#: modules/gui/familiar/interface.c:667 modules/gui/pda/interface.c:669
-msgid "Preference"
-msgstr "ÀßÄê(_P)..."
-
-#: modules/gui/familiar/interface.c:711 modules/gui/gtk/gnome_interface.c:1361
-#: modules/gui/gtk/gtk_interface.c:1603 modules/gui/kde/kde.cpp:111
-#: modules/gui/pda/interface.c:713
-msgid "(c) 1996-2003 the VideoLAN team"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:721 modules/gui/pda/interface.c:723
-msgid "Authors: The VideoLAN Team, http://www.videolan.org"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:753 modules/gui/pda/interface.c:755
-msgid ""
-"The VideoLAN Client is a MPEG, MPEG 2, MP3, DivX player, that accepts input "
-"from local or network sources."
-msgstr ""
-"VideoLAN Client¤Ï¡¢MPEG, MPEG 2, MP3 DivX¤ò¥í¡¼¥«¥ë¤ª¤è¤Ó¡¢¥Í¥Ã¥È¥ï¡¼¥¯¾å¤Î"
-"¥½¡¼¥¹¤«¤éºÆÀ¸¤Ç¤­¤ë¥×¥ì¥¤¥ä¡¼¤Ç¤¹¡£"
-
-#: modules/gui/familiar/support.c:121 modules/gui/gtk/gnome_support.c:100
-#: modules/gui/gtk/gnome_support.c:138 modules/gui/gtk/gtk_support.c:121
-#: modules/gui/gtk2/gnome2_support.c:60 modules/gui/gtk2/gnome2_support.c:85
-#: modules/gui/gtk2/gtk2_support.c:90 modules/gui/gtk2/gtk2_support.c:114
-#: modules/gui/pda/support.c:121
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "¥Ô¥Ã¥¯¥¹¥Þ¥Ã¥×¡¦¥Õ¥¡¥¤¥ë %s ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£"
-
-#: modules/gui/familiar/support.c:130 modules/gui/gtk/gtk_support.c:130
-#: modules/gui/pda/support.c:130
-#, c-format
-msgid "Error loading pixmap file: %s"
-msgstr "¥Ô¥Ã¥¯¥¹¥Þ¥Ã¥×¡¦¥Õ¥¡¥¤¥ë %s ¤Î¥í¡¼¥É¤Ç¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£"
-
 #: modules/gui/gtk/gnome.c:55 modules/gui/gtk/gtk.c:57
 #, fuzzy
 msgid "Show tooltips"
@@ -3883,6 +3804,12 @@ msgstr "
 msgid "_Video"
 msgstr "¥Ó¥Ç¥ª"
 
+#: modules/gui/gtk/gnome_interface.c:274 modules/gui/gtk/gtk_interface.c:121
+#: modules/gui/gtk/gtk_interface.c:1595 modules/gui/pda/interface.c:99
+#: modules/gui/pda/interface.c:734
+msgid "VLC media player"
+msgstr ""
+
 #: modules/gui/gtk/gnome_interface.c:515 modules/gui/gtk/gnome_interface.c:718
 #: modules/gui/gtk/gnome_interface.c:1690
 #: modules/gui/gtk/gnome_interface.c:2267 modules/gui/gtk/gtk_interface.c:629
@@ -3917,6 +3844,15 @@ msgstr "
 msgid "Go Backward"
 msgstr "µÕžºÆÀ¸"
 
+#: modules/gui/gtk/gnome_interface.c:566
+#: modules/gui/gtk/gnome_interface.c:1027 modules/gui/gtk/gtk_interface.c:676
+#: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:639
+#: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
+#: modules/gui/macosx/intf.m:424 modules/gui/pda/interface.c:205
+#: modules/gui/wxwindows/interface.cpp:373
+msgid "Stop"
+msgstr "Ää»ß"
+
 #: modules/gui/gtk/gnome_interface.c:567 modules/gui/gtk/gtk_interface.c:677
 msgid "Stop Stream"
 msgstr "¥¹¥È¥ê¡¼¥à¤ÎÄä»ß"
@@ -4039,6 +3975,11 @@ msgstr "
 msgid "Playlist..."
 msgstr "¥×¥ì¥¤¥ê¥¹¥È..."
 
+#: modules/gui/gtk/gnome_interface.c:1361 modules/gui/gtk/gtk_interface.c:1603
+#: modules/gui/kde/kde.cpp:111 modules/gui/pda/interface.c:713
+msgid "(c) 1996-2003 the VideoLAN team"
+msgstr ""
+
 #: modules/gui/gtk/gnome_interface.c:1363 modules/gui/gtk/gtk_interface.c:1646
 #: modules/gui/kde/kde.cpp:108
 #, fuzzy
@@ -4080,7 +4021,7 @@ msgstr ""
 #: modules/gui/wxwindows/open.cpp:223 modules/gui/wxwindows/open.cpp:341
 #: modules/gui/wxwindows/preferences.cpp:832
 #: modules/gui/wxwindows/streamout.cpp:412
-#: modules/gui/wxwindows/subtitles.cpp:107
+#: modules/gui/wxwindows/subtitles.cpp:109
 msgid "Browse..."
 msgstr "¥Ö¥é¥¦¥º..."
 
@@ -4129,11 +4070,37 @@ msgstr "UDP
 msgid "HTTP/FTP/MMS"
 msgstr ""
 
+#: modules/gui/gtk/gnome_interface.c:1737
+#: modules/gui/gtk/gnome_interface.c:1786
+#: modules/gui/gtk/gnome_interface.c:2912 modules/gui/gtk/gtk_interface.c:2052
+#: modules/gui/gtk/gtk_interface.c:2101 modules/gui/gtk/gtk_interface.c:3225
+#: modules/gui/macosx/open.m:160 modules/gui/macosx/open.m:162
+#: modules/gui/macosx/output.m:134 modules/gui/pda/interface.c:425
+#: modules/gui/wxwindows/open.cpp:454 modules/gui/wxwindows/open.cpp:477
+#: modules/gui/wxwindows/streamout.cpp:436
+msgid "Port"
+msgstr "¥Ý¡¼¥ÈÈÖ¹æ"
+
+#: modules/gui/gtk/gnome_interface.c:1747 modules/gui/gtk/gtk_interface.c:2062
+#: modules/gui/macosx/open.m:161 modules/gui/macosx/output.m:133
+#: modules/gui/pda/interface.c:414 modules/gui/wxwindows/open.cpp:469
+#: modules/gui/wxwindows/streamout.cpp:425
+msgid "Address"
+msgstr "¥Û¥¹¥È̾/¥¢¥É¥ì¥¹"
+
 #: modules/gui/gtk/gnome_interface.c:1759 modules/gui/gtk/gtk_interface.c:2074
 #: modules/gui/macosx/open.m:163 modules/gui/wxwindows/open.cpp:492
 msgid "URL"
 msgstr ""
 
+#: modules/gui/gtk/gnome_interface.c:1830
+#: modules/gui/gtk/gnome_interface.c:2281 modules/gui/gtk/gtk_interface.c:2145
+#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:144
+#: modules/gui/macosx/open.m:271 modules/gui/pda/interface.c:518
+#: modules/gui/wxwindows/open.cpp:257
+msgid "Network"
+msgstr "¥Í¥Ã¥È¥ï¡¼¥¯"
+
 #: modules/gui/gtk/gnome_interface.c:1847 modules/gui/gtk/gtk_interface.c:2162
 msgid "Symbol Rate"
 msgstr "¥·¥ó¥Ü¥ë¡¦¥ì¡¼¥È"
@@ -4216,6 +4183,11 @@ msgstr "
 msgid "Select"
 msgstr "ÁªÂò"
 
+#: modules/gui/gtk/gnome_interface.c:2345 modules/gui/gtk/gtk_interface.c:2712
+#: modules/gui/macosx/playlist.m:198 modules/gui/pda/interface.c:287
+msgid "Add"
+msgstr "ÄɲÃ"
+
 #: modules/gui/gtk/gnome_interface.c:2352 modules/gui/gtk/gtk_interface.c:2754
 #: modules/gui/macosx/playlist.m:195 modules/gui/macosx/playlist.m:199
 msgid "Delete"
@@ -4287,6 +4259,14 @@ msgstr ""
 msgid "AVI"
 msgstr ""
 
+#: modules/gui/gtk/gnome_support.c:100 modules/gui/gtk/gnome_support.c:138
+#: modules/gui/gtk/gtk_support.c:121 modules/gui/gtk2/gnome2_support.c:60
+#: modules/gui/gtk2/gnome2_support.c:85 modules/gui/gtk2/gtk2_support.c:90
+#: modules/gui/gtk2/gtk2_support.c:114 modules/gui/pda/support.c:121
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "¥Ô¥Ã¥¯¥¹¥Þ¥Ã¥×¡¦¥Õ¥¡¥¤¥ë %s ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£"
+
 #: modules/gui/gtk/gnome_support.c:116
 #, c-format
 msgid "Couldn't create pixmap from file: %s"
@@ -4405,10 +4385,11 @@ msgstr "
 #: modules/gui/gtk/gtk_interface.c:2403 modules/gui/gtk/gtk_interface.c:2645
 #: modules/gui/gtk/gtk_interface.c:2876 modules/gui/gtk/gtk_interface.c:3257
 #: modules/gui/gtk/preferences.c:618 modules/gui/macosx/open.m:140
-#: modules/gui/macosx/prefs.m:79 modules/gui/wxwindows/open.cpp:247
+#: modules/gui/macosx/prefs.m:79 modules/gui/macosx/prefs.m:170
+#: modules/gui/wxwindows/open.cpp:247
 #: modules/gui/wxwindows/preferences.cpp:256
 #: modules/gui/wxwindows/streamout.cpp:220
-#: modules/gui/wxwindows/subtitles.cpp:152
+#: modules/gui/wxwindows/subtitles.cpp:193
 msgid "Cancel"
 msgstr "¥­¥ã¥ó¥»¥ë"
 
@@ -4440,12 +4421,17 @@ msgstr "
 msgid "_Select"
 msgstr "ÁªÂò(_S)"
 
-#: modules/gui/gtk/menu.c:900
+#: modules/gui/gtk/gtk_support.c:130 modules/gui/pda/support.c:130
+#, c-format
+msgid "Error loading pixmap file: %s"
+msgstr "¥Ô¥Ã¥¯¥¹¥Þ¥Ã¥×¡¦¥Õ¥¡¥¤¥ë %s ¤Î¥í¡¼¥É¤Ç¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£"
+
+#: modules/gui/gtk/menu.c:901
 #, c-format
 msgid "Title %d (%d)"
 msgstr "¥¿¥¤¥È¥ë %d (%d)"
 
-#: modules/gui/gtk/menu.c:967
+#: modules/gui/gtk/menu.c:968
 #, c-format
 msgid "Chapter %d"
 msgstr "¥Á¥ã¥×¥¿¡¼ %d"
@@ -4610,8 +4596,9 @@ msgstr ""
 msgid "VLC - Controller"
 msgstr "¥³¥ó¥È¥í¡¼¥ë"
 
-#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/interface.cpp:904
-#: modules/gui/wxwindows/timer.cpp:131
+#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/control.cpp:160
+#: modules/gui/wxwindows/control.cpp:370
+#: modules/gui/wxwindows/interface.cpp:904 modules/gui/wxwindows/timer.cpp:131
 #, fuzzy
 msgid "Volume"
 msgstr "¥Ü¥ê¥å¡¼¥à¤ò¾å¤²¤ë"
@@ -4873,6 +4860,12 @@ msgstr "
 msgid "TTL"
 msgstr ""
 
+#: modules/gui/macosx/output.m:136 modules/gui/macosx/output.m:236
+#: modules/gui/macosx/output.m:311 modules/gui/pda/interface.c:480
+#: modules/gui/wxwindows/streamout.cpp:386
+msgid "HTTP"
+msgstr ""
+
 #: modules/gui/macosx/output.m:141 modules/gui/wxwindows/streamout.cpp:531
 msgid "Encapsulation Method"
 msgstr ""
@@ -4934,6 +4927,11 @@ msgstr ""
 msgid "Reset Preferences"
 msgstr "ÀßÄê..."
 
+#: modules/gui/macosx/prefs.m:170
+#, fuzzy
+msgid "Continue"
+msgstr "ÀßÄê"
+
 #: modules/gui/macosx/prefs.m:172 modules/gui/wxwindows/preferences.cpp:316
 msgid ""
 "Beware this will reset your VLC Media Player config file.\n"
@@ -4954,11 +4952,130 @@ msgstr "
 msgid "ncurses interface"
 msgstr "ncurses¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
 
+#: modules/gui/pda/interface.c:126 modules/gui/wxwindows/dialogs.cpp:268
+#: modules/gui/wxwindows/open.cpp:709
+#: modules/gui/wxwindows/preferences.cpp:1029
+#: modules/gui/wxwindows/subtitles.cpp:234
+msgid "Open file"
+msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯"
+
+#: modules/gui/pda/interface.c:166
+msgid "Rewind"
+msgstr "´¬¤­Ì᤹"
+
+#: modules/gui/pda/interface.c:167
+msgid "Rewind stream"
+msgstr "¥¹¥È¥ê¡¼¥à¤ò³«¤¯"
+
+#: modules/gui/pda/interface.c:180
+msgid "Pause stream"
+msgstr "¥¹¥È¥ê¡¼¥à¤Î°ì»þÄä»ß"
+
+#: modules/gui/pda/interface.c:193
+msgid "Play stream"
+msgstr "¥¹¥È¥ê¡¼¥à¤ÎºÆÀ¸"
+
+#: modules/gui/pda/interface.c:206
+msgid "Stop stream"
+msgstr "¥¹¥È¥ê¡¼¥à¤ÎÄä»ß"
+
+#: modules/gui/pda/interface.c:218
+msgid "Forward"
+msgstr "žÁ÷"
+
+#: modules/gui/pda/interface.c:219
+msgid "Forward stream"
+msgstr "¥¹¥È¥ê¡¼¥à¤ÎžÁ÷"
+
+#: modules/gui/pda/interface.c:295
+msgid "MRL :"
+msgstr ""
+
 #: modules/gui/pda/interface.c:396
 #, fuzzy
 msgid "UDP/RTP (Adress when Multicast)"
 msgstr "UDP¥Þ¥ë¥Á¥­¥ã¥¹¥È"
 
+#: modules/gui/pda/interface.c:490
+msgid "FTP"
+msgstr ""
+
+#: modules/gui/pda/interface.c:500
+msgid "MMS"
+msgstr ""
+
+#: modules/gui/pda/interface.c:526
+msgid "Media"
+msgstr "¥á¥Ç¥£¥¢"
+
+#: modules/gui/pda/interface.c:562
+msgid "MRL"
+msgstr ""
+
+#: modules/gui/pda/interface.c:571
+#, fuzzy
+msgid "Time"
+msgstr "¥¿¥¤¥È¥ë"
+
+#: modules/gui/pda/interface.c:588
+msgid "Update"
+msgstr ""
+
+#: modules/gui/pda/interface.c:596
+msgid " Del "
+msgstr ""
+
+#: modules/gui/pda/interface.c:604
+#, fuzzy
+msgid " Clear "
+msgstr "¥¯¥ê¥¢"
+
+#: modules/gui/pda/interface.c:628
+#, fuzzy
+msgid "Automatically play file"
+msgstr "¥Õ¥¡¥¤¥ë¤Î¼«Æ°ºÆÀ¸"
+
+#: modules/gui/pda/interface.c:645
+#, fuzzy
+msgid " Save "
+msgstr "Êݸ"
+
+#: modules/gui/pda/interface.c:653
+#, fuzzy
+msgid " Apply "
+msgstr "ŬÍÑ"
+
+#: modules/gui/pda/interface.c:661
+#, fuzzy
+msgid " Cancel "
+msgstr "¥­¥ã¥ó¥»¥ë"
+
+#: modules/gui/pda/interface.c:669
+msgid "Preference"
+msgstr "ÀßÄê(_P)..."
+
+#: modules/gui/pda/interface.c:723
+msgid "Authors: The VideoLAN Team, http://www.videolan.org"
+msgstr ""
+
+#: modules/gui/pda/interface.c:755
+msgid ""
+"The VideoLAN Client is a MPEG, MPEG 2, MP3, DivX player, that accepts input "
+"from local or network sources."
+msgstr ""
+"VideoLAN Client¤Ï¡¢MPEG, MPEG 2, MP3 DivX¤ò¥í¡¼¥«¥ë¤ª¤è¤Ó¡¢¥Í¥Ã¥È¥ï¡¼¥¯¾å¤Î"
+"¥½¡¼¥¹¤«¤éºÆÀ¸¤Ç¤­¤ë¥×¥ì¥¤¥ä¡¼¤Ç¤¹¡£"
+
+#: modules/gui/pda/pda.c:62
+#, fuzzy
+msgid "Autoplay selected file"
+msgstr "ÁªÂò¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤ò¼«Æ°ºÆÀ¸"
+
+#: modules/gui/pda/pda.c:63
+#, fuzzy
+msgid "Automatically play a file when selected in the file selection list"
+msgstr "ÁªÂò¥ê¥¹¥È¤ÇÁªÂò¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤ò¼«Æ°Åª¤ËºÆÀ¸¤·¤Þ¤¹¡£"
+
 #: modules/gui/pda/pda.c:72
 #, fuzzy
 msgid "PDA Linux Gtk2+ interface"
@@ -5287,7 +5404,7 @@ msgstr "
 msgid "Capture the stream you are playing to a file"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:348 modules/gui/wxwindows/subtitles.cpp:98
+#: modules/gui/wxwindows/open.cpp:348 modules/gui/wxwindows/subtitles.cpp:100
 #, fuzzy
 msgid "Subtitles file"
 msgstr "»úËë"
@@ -5305,7 +5422,7 @@ msgstr ""
 msgid "CD Audio"
 msgstr "¥ª¡¼¥Ç¥£¥ª"
 
-#: modules/gui/wxwindows/open.cpp:900 modules/gui/wxwindows/streamout.cpp:784
+#: modules/gui/wxwindows/open.cpp:903 modules/gui/wxwindows/streamout.cpp:784
 #, fuzzy
 msgid "Save file"
 msgstr "¥Õ¥¡¥¤¥ë¤ÎÊݸ"
@@ -5441,21 +5558,26 @@ msgstr "DVD
 msgid "Open Subtitles File"
 msgstr "»úËë¤ÎÁªÂò"
 
-#: modules/gui/wxwindows/subtitles.cpp:115
+#: modules/gui/wxwindows/subtitles.cpp:123
+#, fuzzy
+msgid "Subtitles encoding"
+msgstr "»úË롦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
+
+#: modules/gui/wxwindows/subtitles.cpp:155
 #, fuzzy
 msgid "Subtitles options"
 msgstr "»úËë"
 
-#: modules/gui/wxwindows/subtitles.cpp:119
+#: modules/gui/wxwindows/subtitles.cpp:159
 #, fuzzy
 msgid "Delay subtitles (in 1/10s)"
 msgstr "»úËë¤ÎÁªÂò"
 
-#: modules/gui/wxwindows/subtitles.cpp:130
+#: modules/gui/wxwindows/subtitles.cpp:170
 msgid "Frames per second"
 msgstr ""
 
-#: modules/gui/wxwindows/subtitles.cpp:138
+#: modules/gui/wxwindows/subtitles.cpp:178
 msgid "Override frames per second. It will only work with MicroDVD subtitles."
 msgstr ""
 
@@ -5533,30 +5655,30 @@ msgstr "
 msgid "Using the dummy interface plugin..."
 msgstr "¥À¥ß¡¼¤Î¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥×¥é¥°¥¤¥ó¤ò»ÈÍѤ·¤Þ¤¹¡£"
 
-#: modules/misc/freetype.c:67 modules/visualization/xosd/xosd.c:71
+#: modules/misc/freetype.c:72 modules/visualization/xosd/xosd.c:71
 #, fuzzy
 msgid "Font"
 msgstr "¥Õ¥©¥ó¥È"
 
-#: modules/misc/freetype.c:68
+#: modules/misc/freetype.c:73
 #, fuzzy
 msgid "Filename of Font"
 msgstr "¥í¥°¡¦¥Õ¥¡¥¤¥ë̾"
 
-#: modules/misc/freetype.c:69
+#: modules/misc/freetype.c:74
 msgid "Font size"
 msgstr ""
 
-#: modules/misc/freetype.c:70
+#: modules/misc/freetype.c:75
 msgid "The size of the fonts used by the osd module"
 msgstr ""
 
-#: modules/misc/freetype.c:73
+#: modules/misc/freetype.c:78
 #, fuzzy
 msgid "Fonts"
 msgstr "¥Õ¥©¥ó¥È"
 
-#: modules/misc/freetype.c:76
+#: modules/misc/freetype.c:81
 msgid "freetype2 font renderer"
 msgstr ""
 
@@ -5704,19 +5826,19 @@ msgstr ""
 msgid "Dummy muxer"
 msgstr ""
 
-#: modules/mux/mp4.c:52
+#: modules/mux/mp4.c:56
 msgid "MP4/MOV muxer"
 msgstr ""
 
-#: modules/mux/mpeg/ps.c:79
+#: modules/mux/mpeg/ps.c:53
 msgid "PS muxer"
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:138
+#: modules/mux/mpeg/ts.c:78
 msgid "TS muxer"
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:143
+#: modules/mux/mpeg/ts.c:83
 msgid "TS muxer (libdvbpsi)"
 msgstr ""
 
@@ -5728,7 +5850,7 @@ msgstr ""
 msgid "A/52 audio packetizer"
 msgstr ""
 
-#: modules/packetizer/copy.c:69
+#: modules/packetizer/copy.c:43
 msgid "Copy packetizer"
 msgstr ""
 
@@ -5780,7 +5902,7 @@ msgstr "
 msgid "Standard stream"
 msgstr "¥¹¥È¥ê¡¼¥à¤ÎÄä»ß"
 
-#: modules/stream_out/transcode.c:71
+#: modules/stream_out/transcode.c:73
 #, fuzzy
 msgid "Transcode stream"
 msgstr "¥¹¥È¥ê¡¼¥à¤Î°ì»þÄä»ß"
@@ -6314,6 +6436,14 @@ msgstr "XOSD
 msgid "xosd interface"
 msgstr "xosd¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
 
+#, fuzzy
+#~ msgid "Familiar Linux Gtk+ interface"
+#~ msgstr "Gtk+¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
+
+#, fuzzy
+#~ msgid "UDP/RTP (Address when Multicast)"
+#~ msgstr "UDP¥Þ¥ë¥Á¥­¥ã¥¹¥È"
+
 #, fuzzy
 #~ msgid "Advanced open options"
 #~ msgstr "ALSA¥ª¡¼¥Ç¥£¥ª¡¦¥â¥¸¥å¡¼¥ë"
diff --git a/po/nl.po b/po/nl.po
index b0436ccab5..c2c1d6b306 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vlc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-07-31 15:04+0200\n"
+"POT-Creation-Date: 2003-08-11 21:05+0200\n"
 "PO-Revision-Date: 2002-04-20 16:58GMT\n"
 "Last-Translator: Derk-Jan Hartman <thedj at sf.net>\n"
 "Language-Team: Nederlands <nl@li.org>\n"
@@ -34,7 +34,7 @@ msgid "Audio channels"
 msgstr "Audio kanalen"
 
 #: src/audio_output/output.c:107 src/audio_output/output.c:142
-#: modules/audio_output/alsa.c:179 modules/audio_output/directx.c:423
+#: modules/audio_output/alsa.c:177 modules/audio_output/directx.c:423
 #: modules/audio_output/oss.c:202 modules/audio_output/sdl.c:181
 #: modules/audio_output/sdl.c:198 modules/audio_output/waveout.c:386
 msgid "Stereo"
@@ -111,11 +111,11 @@ msgstr ""
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr ""
 
-#: src/input/input.c:171
+#: src/input/input.c:174
 msgid "General"
 msgstr "Algemeen"
 
-#: src/input/input.c:172
+#: src/input/input.c:175
 msgid "Playlist Item"
 msgstr "Afspeellijst element"
 
@@ -126,9 +126,9 @@ msgid "Program"
 msgstr "Programma"
 
 #: src/input/input_programs.c:98 modules/demux/asf/libasf.c:696
-#: modules/demux/mkv.cpp:2394 modules/gui/beos/MediaControlView.cpp:1258
+#: modules/demux/mkv.cpp:2398 modules/gui/beos/MediaControlView.cpp:1258
 #: modules/gui/gtk/gnome_interface.c:1650 modules/gui/gtk/gtk_interface.c:1956
-#: modules/gui/gtk/menu.c:1402 modules/gui/gtk/menu.c:1423
+#: modules/gui/gtk/menu.c:1403 modules/gui/gtk/menu.c:1424
 #: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:373
 #: modules/gui/macosx/intf.m:374 modules/gui/macosx/open.m:150
 #: modules/gui/wxwindows/open.cpp:406
@@ -137,7 +137,7 @@ msgstr "Titel"
 
 #: src/input/input_programs.c:102 modules/gui/beos/MediaControlView.cpp:1259
 #: modules/gui/gtk/gnome_interface.c:1640 modules/gui/gtk/gtk_interface.c:1946
-#: modules/gui/gtk/menu.c:1019 modules/gui/gtk/menu.c:1432
+#: modules/gui/gtk/menu.c:1020 modules/gui/gtk/menu.c:1433
 #: modules/gui/kde/interface.cpp:146 modules/gui/macosx/intf.m:375
 #: modules/gui/macosx/intf.m:376 modules/gui/macosx/open.m:151
 #: modules/gui/wxwindows/open.cpp:412
@@ -211,15 +211,15 @@ msgstr ""
 "Gebruik: %s [opties] [parameters] ...\n"
 "\n"
 
-#: src/libvlc.c:1200 src/misc/configuration.c:1019
+#: src/libvlc.c:1200 src/misc/configuration.c:1040
 msgid "string"
 msgstr "tekst"
 
-#: src/libvlc.c:1217 src/misc/configuration.c:1000
+#: src/libvlc.c:1217 src/misc/configuration.c:1021
 msgid "integer"
 msgstr "heel getal"
 
-#: src/libvlc.c:1220 src/misc/configuration.c:1009
+#: src/libvlc.c:1220 src/misc/configuration.c:1030
 msgid "float"
 msgstr "gebroken getal"
 
@@ -1118,16 +1118,16 @@ msgstr "Interface"
 
 #: src/libvlc.h:474 modules/audio_output/coreaudio.c:227
 #: modules/audio_output/file.c:108 modules/demux/asf/asf.c:228
-#: modules/demux/mkv.cpp:2445 modules/demux/ogg.c:557 modules/demux/ogg.c:829
-#: modules/demux/ogg.c:1002 modules/gui/beos/InterfaceWindow.cpp:259
+#: modules/demux/mkv.cpp:2449 modules/demux/ogg.c:558 modules/demux/ogg.c:830
+#: modules/demux/ogg.c:1003 modules/gui/beos/InterfaceWindow.cpp:259
 #: modules/gui/gtk/gnome_interface.c:1092 modules/gui/gtk/gtk_interface.c:1219
 #: modules/gui/macosx/intf.m:378 modules/gui/macosx/output.m:156
 msgid "Audio"
 msgstr "Audio"
 
-#: src/libvlc.h:493 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1217
-#: modules/demux/mkv.cpp:2461 modules/demux/ogg.c:629 modules/demux/ogg.c:669
-#: modules/demux/ogg.c:734 modules/demux/ogg.c:909
+#: src/libvlc.h:493 modules/demux/asf/asf.c:298 modules/demux/avi/avi.c:1217
+#: modules/demux/mkv.cpp:2465 modules/demux/ogg.c:630 modules/demux/ogg.c:670
+#: modules/demux/ogg.c:735 modules/demux/ogg.c:910
 #: modules/gui/gtk/gnome_interface.c:1099 modules/gui/gtk/gtk_interface.c:1296
 #: modules/gui/macosx/intf.m:389 modules/gui/macosx/macosx.m:68
 #: modules/gui/macosx/output.m:150 modules/misc/dummy/dummy.c:81
@@ -1135,7 +1135,8 @@ msgstr "Audio"
 msgid "Video"
 msgstr "Video"
 
-#: src/libvlc.h:515 modules/access/satellite/satellite.c:66
+#: src/libvlc.h:515 modules/access/dvb/qpsk.c:101
+#: modules/access/satellite/satellite.c:66
 msgid "Input"
 msgstr "Input"
 
@@ -1158,7 +1159,7 @@ msgid "CPU"
 msgstr "CPU"
 
 #: src/libvlc.h:579 modules/gui/beos/InterfaceWindow.cpp:206
-#: modules/gui/familiar/interface.c:610 modules/gui/gtk/gnome_interface.c:643
+#: modules/gui/gtk/gnome_interface.c:643
 #: modules/gui/gtk/gnome_interface.c:2384
 #: modules/gui/gtk/gnome_interface.c:2409 modules/gui/gtk/gtk_interface.c:747
 #: modules/gui/gtk/gtk_interface.c:2697 modules/gui/macosx/intf.m:321
@@ -1171,11 +1172,10 @@ msgstr "Afspeellijst"
 #: src/libvlc.h:585 modules/audio_filter/converter/a52tofloat32.c:85
 #: modules/audio_filter/converter/mpgatofixed32.c:60
 #: modules/codec/a52old/a52old.c:59 modules/codec/mpeg_video/parser.c:84
-#: modules/demux/mpeg/ts.c:118 modules/gui/familiar/familiar.c:70
-#: modules/gui/pda/pda.c:70 modules/misc/logger/logger.c:89
-#: modules/video_filter/motionblur.c:58 modules/video_filter/transform.c:63
-#: modules/video_filter/wall.c:66 modules/video_output/ggi.c:62
-#: modules/video_output/mga/xmga.c:102
+#: modules/demux/mpeg/ts.c:118 modules/gui/pda/pda.c:70
+#: modules/misc/logger/logger.c:89 modules/video_filter/motionblur.c:58
+#: modules/video_filter/transform.c:63 modules/video_filter/wall.c:66
+#: modules/video_output/ggi.c:62 modules/video_output/mga/xmga.c:102
 msgid "Miscellaneous"
 msgstr "Overige"
 
@@ -1203,7 +1203,7 @@ msgstr "print help van een module"
 msgid "print version information"
 msgstr "print versie informatie"
 
-#: src/misc/configuration.c:1000
+#: src/misc/configuration.c:1021
 msgid "boolean"
 msgstr "boolean"
 
@@ -1267,6 +1267,111 @@ msgstr "CD Audio demux"
 msgid "Standard filesystem directory input"
 msgstr "Map uitlezen van standaard filesysteem"
 
+#: modules/access/dvb/qpsk.c:44
+msgid "adapter card to tune"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:45
+msgid "adapter cards have a device file named /dev/dvb/adapter[n] with n>=0"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:47
+msgid "device nummer to use on adapter"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:50
+#, fuzzy
+msgid "satellite default transponder frequency"
+msgstr "Standaard satelliet transponder frequentie"
+
+#: modules/access/dvb/qpsk.c:53
+#, fuzzy
+msgid "satellite default transponder polarization"
+msgstr "Standaard satelliet transponder polarisatie"
+
+#: modules/access/dvb/qpsk.c:56
+#, fuzzy
+msgid "satellite default transponder FEC"
+msgstr "Satelliet standaard transponder FEC"
+
+#: modules/access/dvb/qpsk.c:57
+msgid "FEC=Forward Error Correction mode"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:59
+#, fuzzy
+msgid "satellite default transponder symbol rate"
+msgstr "Standaard satelliet transponder symbool snelheid"
+
+#: modules/access/dvb/qpsk.c:62
+#, fuzzy
+msgid "use diseqc with antenna"
+msgstr "Gebruik disecq met antenne"
+
+#: modules/access/dvb/qpsk.c:65
+#, fuzzy
+msgid "antenna lnb_lof1 (kHz)"
+msgstr "Antenne lnb_lof1 (kHz)"
+
+#: modules/access/dvb/qpsk.c:68
+#, fuzzy
+msgid "antenna lnb_lof2 (kHz)"
+msgstr "Antenne lnb_lof2 (kHz)"
+
+#: modules/access/dvb/qpsk.c:71
+#, fuzzy
+msgid "antenna lnb_slof (kHz)"
+msgstr "Antenne lnb_slof (kHz)"
+
+#: modules/access/dvb/qpsk.c:74
+msgid "probe the dvb card for capabilities (default disabled)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:75
+msgid "some dvb cards do not like to be probed for their capabilities"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:78
+msgid "modulation type"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:79
+msgid "modulation type for frontend device "
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:82
+msgid "terrestrial high priority stream code rate (FEC)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:85
+msgid "terrestrial low priority stream code rate (FEC)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:88
+msgid "terrestrial bandwidth"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:89
+msgid "terrestrial bandwidth [0=auto,6,7,8 in MHz]"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:91
+msgid "terrestrial guard interval"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:94
+msgid "terrestrial transmission mode"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:97
+msgid "terrestrial hierarchy mode"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:123
+#, fuzzy
+msgid "DVB input module with v4l2 support"
+msgstr "DVD met ondersteuning voor DVD menu's"
+
 #: modules/access/dvd/dvd.c:65
 msgid "Method to use by libdvdcss for key decryption"
 msgstr "Methode die libdvdcss moet gebruiken voor de ontcijfering"
@@ -1384,7 +1489,7 @@ msgstr ""
 msgid "http"
 msgstr "http"
 
-#: modules/access/http.c:89
+#: modules/access/http.c:91
 msgid "HTTP input"
 msgstr "HTTP invoer"
 
@@ -1404,6 +1509,10 @@ msgstr "Microsoft Media Server (MMS) invoer"
 msgid "Hauppauge PVR cards input"
 msgstr "Invoer van Hauppage PVR kaarten"
 
+#: modules/access/rtsp.c:68
+msgid "RTSP SDP request"
+msgstr ""
+
 #: modules/access/satellite/satellite.c:41
 msgid "Satellite default transponder frequency"
 msgstr "Standaard satelliet transponder frequentie"
@@ -1668,23 +1777,23 @@ msgstr "ALSA audio uitvoer"
 msgid "Audio device"
 msgstr "Audio apparaat"
 
-#: modules/audio_output/alsa.c:173 modules/audio_output/directx.c:435
+#: modules/audio_output/alsa.c:171 modules/audio_output/directx.c:435
 #: modules/audio_output/oss.c:222 modules/audio_output/sdl.c:182
 #: modules/audio_output/sdl.c:201 modules/audio_output/waveout.c:399
 msgid "Mono"
 msgstr "Mono"
 
-#: modules/audio_output/alsa.c:186 modules/audio_output/directx.c:409
+#: modules/audio_output/alsa.c:184 modules/audio_output/directx.c:409
 #: modules/audio_output/oss.c:178 modules/audio_output/waveout.c:371
 msgid "2 Front 2 Rear"
 msgstr "2 Voor 2 Achter"
 
-#: modules/audio_output/alsa.c:192 modules/audio_output/directx.c:391
+#: modules/audio_output/alsa.c:190 modules/audio_output/directx.c:391
 #: modules/audio_output/oss.c:167 modules/audio_output/waveout.c:352
 msgid "5.1"
 msgstr "5.1"
 
-#: modules/audio_output/alsa.c:219 modules/audio_output/directx.c:478
+#: modules/audio_output/alsa.c:217 modules/audio_output/directx.c:478
 #: modules/audio_output/oss.c:246 modules/audio_output/waveout.c:415
 msgid "A/52 over S/PDIF"
 msgstr "A/52 over S/PDIF"
@@ -2079,18 +2188,29 @@ msgid "DVD subtitles decoder"
 msgstr "DVD ondertiteling decoder"
 
 #: modules/codec/subsdec/subsdec.c:68
-msgid "subtitle text encoding"
+#, fuzzy
+msgid "Subtitles text encoding"
 msgstr "tekstcodering van de ondertiteling"
 
 #: modules/codec/subsdec/subsdec.c:69
-msgid "change the encoding used in text subtitles"
+#, fuzzy
+msgid "Change the encoding used in text subtitles"
 msgstr "Wijzig de tekstcodering die door de ondertiteling wordt gebruikt"
 
-#: modules/codec/subsdec/subsdec.c:72
+#: modules/codec/subsdec/subsdec.c:70
+#, fuzzy
+msgid "Subtitles justification"
+msgstr "Ondertiteling opties"
+
+#: modules/codec/subsdec/subsdec.c:71
+msgid "Change the justification of substitles (0=center, 1=left, 2=right)"
+msgstr ""
+
+#: modules/codec/subsdec/subsdec.c:74
 msgid "file subtitles decoder"
 msgstr "ondertitelingsbestanden decoder"
 
-#: modules/codec/subsdec/subsdec.c:75 modules/gui/beos/InterfaceWindow.cpp:256
+#: modules/codec/subsdec/subsdec.c:77 modules/gui/beos/InterfaceWindow.cpp:256
 #: modules/gui/kde/interface.cpp:93
 msgid "Subtitles"
 msgstr "Ondertiteling"
@@ -2246,7 +2366,7 @@ msgid "Quit"
 msgstr "Afsluiten"
 
 #: modules/control/lirc/lirc.c:297 modules/control/lirc/lirc.c:323
-#: modules/gui/familiar/interface.c:177 modules/gui/gtk/gnome_interface.c:602
+#: modules/gui/gtk/gnome_interface.c:602
 #: modules/gui/gtk/gnome_interface.c:1020 modules/gui/gtk/gtk_interface.c:709
 #: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:921
 #: modules/gui/macosx/intf.m:922 modules/gui/macosx/intf.m:923
@@ -2254,8 +2374,7 @@ msgstr "Afsluiten"
 msgid "Pause"
 msgstr "Pauze"
 
-#: modules/control/lirc/lirc.c:310 modules/gui/familiar/interface.c:190
-#: modules/gui/gtk/gnome_interface.c:590
+#: modules/control/lirc/lirc.c:310 modules/gui/gtk/gnome_interface.c:590
 #: modules/gui/gtk/gnome_interface.c:1013 modules/gui/gtk/gtk_interface.c:698
 #: modules/gui/macosx/intf.m:324 modules/gui/macosx/intf.m:362
 #: modules/gui/macosx/intf.m:423 modules/gui/macosx/intf.m:928
@@ -2291,68 +2410,71 @@ msgstr "Afstandsbediening"
 msgid "remote control interface"
 msgstr "afstandsbediening interface"
 
-#: modules/demux/a52sys.c:52
+#: modules/demux/a52sys.c:41
 msgid "A52 demuxer"
 msgstr "A52 demuxer"
 
-#: modules/demux/aac/demux.c:46
-msgid "AAC stream demuxer"
-msgstr "AAC stream demuxer"
-
-#: modules/demux/aac/demux.c:555
-msgid "Aac"
-msgstr "Aac"
+#: modules/demux/a52sys.c:161
+msgid "A52"
+msgstr ""
 
-#: modules/demux/aac/demux.c:557 modules/demux/mpeg/audio.c:627
-#: modules/demux/mpeg/audio.c:644 modules/demux/mpeg/m4v.c:150
+#: modules/demux/a52sys.c:163 modules/demux/aac.c:175
+#: modules/demux/mpeg/m4v.c:150 modules/demux/mpeg/mpga.c:331
 msgid "Input Type"
 msgstr "Soort Input"
 
-#: modules/demux/aac/demux.c:560 modules/demux/mpeg/audio.c:629
-msgid "Layer"
-msgstr "Laag"
-
-#: modules/demux/aac/demux.c:562 modules/demux/asf/asf.c:275
-#: modules/demux/avi/avi.c:1178 modules/demux/mkv.cpp:2449
-#: modules/demux/ogg.c:561 modules/demux/ogg.c:837 modules/demux/ogg.c:1010
-#: modules/gui/gtk/gnome_interface.c:148 modules/gui/gtk/gnome_interface.c:931
-#: modules/gui/gtk/gtk_interface.c:481 modules/gui/gtk/gtk_interface.c:1282
-#: modules/gui/macosx/output.m:162 modules/gui/wxwindows/streamout.cpp:668
+#: modules/demux/a52sys.c:164 modules/demux/aac.c:177
+#: modules/demux/asf/asf.c:275 modules/demux/avi/avi.c:1178
+#: modules/demux/mkv.cpp:2453 modules/demux/ogg.c:562 modules/demux/ogg.c:838
+#: modules/demux/ogg.c:1011 modules/gui/gtk/gnome_interface.c:148
+#: modules/gui/gtk/gnome_interface.c:931 modules/gui/gtk/gtk_interface.c:481
+#: modules/gui/gtk/gtk_interface.c:1282 modules/gui/macosx/output.m:162
+#: modules/gui/wxwindows/streamout.cpp:668
 msgid "Channels"
 msgstr "Kanalen"
 
-#: modules/demux/aac/demux.c:564 modules/demux/asf/asf.c:277
-#: modules/demux/avi/avi.c:1180 modules/demux/mkv.cpp:2453
-#: modules/demux/mpeg/audio.c:632 modules/demux/ogg.c:559
-#: modules/demux/ogg.c:671 modules/demux/ogg.c:832 modules/demux/ogg.c:1005
+#: modules/demux/a52sys.c:165 modules/demux/aac.c:179
+#: modules/demux/asf/asf.c:277 modules/demux/avi/avi.c:1180
+#: modules/demux/mkv.cpp:2457 modules/demux/mpeg/mpga.c:337
+#: modules/demux/ogg.c:560 modules/demux/ogg.c:672 modules/demux/ogg.c:833
+#: modules/demux/ogg.c:1006
 msgid "Sample Rate"
 msgstr "Sample Rate"
 
+#: modules/demux/aac.c:41
+#, fuzzy
+msgid "AAC demuxer"
+msgstr "AU demuxer"
+
+#: modules/demux/aac.c:173
+msgid "Aac"
+msgstr "Aac"
+
 #: modules/demux/asf/asf.c:48
 msgid "ASF v1.0 demuxer (file only)"
 msgstr "ASF v1.0 demuxer (enkel bestanden)"
 
-#: modules/demux/asf/asf.c:165 modules/demux/mkv.cpp:2412
+#: modules/demux/asf/asf.c:165 modules/demux/mkv.cpp:2416
 msgid "Number of streams"
 msgstr "Aantal streams"
 
-#: modules/demux/asf/asf.c:228 modules/demux/asf/asf.c:302
+#: modules/demux/asf/asf.c:228 modules/demux/asf/asf.c:298
 #: modules/demux/avi/avi.c:1172 modules/demux/avi/avi.c:1217
-#: modules/demux/avi/avi.c:1250 modules/demux/mkv.cpp:2445
-#: modules/demux/mkv.cpp:2461 modules/demux/mkv.cpp:2477
-#: modules/demux/ogg.c:557 modules/demux/ogg.c:629 modules/demux/ogg.c:669
-#: modules/demux/ogg.c:734 modules/demux/ogg.c:829 modules/demux/ogg.c:909
-#: modules/demux/ogg.c:1002 modules/gui/familiar/interface.c:370
-#: modules/gui/macosx/output.m:139 modules/gui/pda/interface.c:372
+#: modules/demux/avi/avi.c:1250 modules/demux/mkv.cpp:2449
+#: modules/demux/mkv.cpp:2465 modules/demux/mkv.cpp:2481
+#: modules/demux/ogg.c:558 modules/demux/ogg.c:630 modules/demux/ogg.c:670
+#: modules/demux/ogg.c:735 modules/demux/ogg.c:830 modules/demux/ogg.c:910
+#: modules/demux/ogg.c:1003 modules/gui/macosx/output.m:139
+#: modules/gui/pda/interface.c:372
 msgid "Type"
 msgstr "Type"
 
-#: modules/demux/asf/asf.c:260 modules/demux/asf/asf.c:318
+#: modules/demux/asf/asf.c:260 modules/demux/asf/asf.c:314
 #: modules/demux/avi/avi.c:1174 modules/demux/avi/avi.c:1218
-#: modules/demux/mkv.cpp:2446 modules/demux/mkv.cpp:2462
-#: modules/demux/mkv.cpp:2478 modules/demux/ogg.c:558 modules/demux/ogg.c:630
-#: modules/demux/ogg.c:670 modules/demux/ogg.c:735 modules/demux/ogg.c:830
-#: modules/demux/ogg.c:910 modules/demux/ogg.c:1003
+#: modules/demux/mkv.cpp:2450 modules/demux/mkv.cpp:2466
+#: modules/demux/mkv.cpp:2482 modules/demux/ogg.c:559 modules/demux/ogg.c:631
+#: modules/demux/ogg.c:671 modules/demux/ogg.c:736 modules/demux/ogg.c:831
+#: modules/demux/ogg.c:911 modules/demux/ogg.c:1004
 msgid "Codec"
 msgstr "Codec"
 
@@ -2361,36 +2483,36 @@ msgid "Avg. byterate"
 msgstr "Gemiddelde byterate"
 
 #: modules/demux/asf/asf.c:282 modules/demux/avi/avi.c:1185
-#: modules/demux/mkv.cpp:2457
+#: modules/demux/mkv.cpp:2461
 msgid "Bits Per Sample"
 msgstr "Bits per Sample"
 
-#: modules/demux/asf/asf.c:332
+#: modules/demux/asf/asf.c:328
 msgid "Size"
 msgstr "Grootte"
 
-#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1222
-#: modules/demux/mkv.cpp:2465
+#: modules/demux/asf/asf.c:331 modules/demux/avi/avi.c:1222
+#: modules/demux/mkv.cpp:2469
 msgid "Resolution"
 msgstr "Resolutie"
 
-#: modules/demux/asf/asf.c:337
+#: modules/demux/asf/asf.c:333
 msgid "Planes"
 msgstr "Niveaus"
 
-#: modules/demux/asf/asf.c:339 modules/demux/avi/avi.c:1228
+#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1228
 msgid "Bits Per Pixel"
 msgstr "Bits per Pixel"
 
-#: modules/demux/asf/asf.c:342
+#: modules/demux/asf/asf.c:338
 msgid "Image Size"
 msgstr "Beeld grootte"
 
-#: modules/demux/asf/asf.c:344
+#: modules/demux/asf/asf.c:340
 msgid "X pixels per meter"
 msgstr "X pixels per meter"
 
-#: modules/demux/asf/asf.c:346
+#: modules/demux/asf/asf.c:342
 msgid "Y pixels per meter"
 msgstr "Y pixels per meter"
 
@@ -2423,7 +2545,7 @@ msgstr "Beschrijving"
 msgid "Rating"
 msgstr "Beoordeling"
 
-#: modules/demux/au.c:47
+#: modules/demux/au.c:42
 msgid "AU demuxer"
 msgstr "AU demuxer"
 
@@ -2468,8 +2590,8 @@ msgstr "FOURCC"
 msgid "Audio Bitrate"
 msgstr "Audio Bitrate"
 
-#: modules/demux/avi/avi.c:1225 modules/demux/ogg.c:631
-#: modules/demux/ogg.c:737 modules/demux/ogg.c:912
+#: modules/demux/avi/avi.c:1225 modules/demux/ogg.c:632
+#: modules/demux/ogg.c:738 modules/demux/ogg.c:913
 msgid "Frame Rate"
 msgstr "Frame rate"
 
@@ -2509,58 +2631,58 @@ msgstr "Zoek op basis van percentage i.p.v. op tijd"
 msgid "mka/mkv stream demuxer"
 msgstr "mka/mkv stream demuxer"
 
-#: modules/demux/mkv.cpp:2389 modules/gui/gtk/gnome_interface.c:2436
+#: modules/demux/mkv.cpp:2393 modules/gui/gtk/gnome_interface.c:2436
 #: modules/gui/gtk/gtk_interface.c:2857 modules/gui/wxwindows/playlist.cpp:150
 msgid "Duration"
 msgstr "Duur"
 
-#: modules/demux/mkv.cpp:2398
+#: modules/demux/mkv.cpp:2402
 msgid "Date UTC"
 msgstr "UTC datum"
 
-#: modules/demux/mkv.cpp:2402
+#: modules/demux/mkv.cpp:2406
 msgid "Segment Filename"
 msgstr "Bestandsnaam van segment"
 
-#: modules/demux/mkv.cpp:2406
+#: modules/demux/mkv.cpp:2410
 msgid "Muxing Application"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2410
+#: modules/demux/mkv.cpp:2414
 msgid "Writing Application"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2423 modules/gui/beos/PlayListWindow.cpp:144
-#: modules/gui/familiar/interface.c:362 modules/gui/gtk/preferences.c:325
-#: modules/gui/kde/pluginsbox.cpp:45 modules/gui/pda/interface.c:364
+#: modules/demux/mkv.cpp:2427 modules/gui/beos/PlayListWindow.cpp:144
+#: modules/gui/gtk/preferences.c:325 modules/gui/kde/pluginsbox.cpp:45
+#: modules/gui/pda/interface.c:364
 msgid "Name"
 msgstr "Naam"
 
-#: modules/demux/mkv.cpp:2427
+#: modules/demux/mkv.cpp:2431
 msgid "Codec Name"
 msgstr "Naam codec"
 
-#: modules/demux/mkv.cpp:2431
+#: modules/demux/mkv.cpp:2435
 msgid "Codec Setting"
 msgstr "Instelling Codec"
 
-#: modules/demux/mkv.cpp:2435
+#: modules/demux/mkv.cpp:2439
 msgid "Codec Info"
 msgstr "Codec Info"
 
-#: modules/demux/mkv.cpp:2439
+#: modules/demux/mkv.cpp:2443
 msgid "Codec Download"
 msgstr "Codec Download"
 
-#: modules/demux/mkv.cpp:2469
+#: modules/demux/mkv.cpp:2473
 msgid "Display Resolution"
 msgstr "Weergave Resolutie"
 
-#: modules/demux/mkv.cpp:2473
+#: modules/demux/mkv.cpp:2477
 msgid "Frame Per Second"
 msgstr "Beelden per Seconde"
 
-#: modules/demux/mkv.cpp:2477 modules/gui/gtk/gnome_interface.c:1963
+#: modules/demux/mkv.cpp:2481 modules/gui/gtk/gnome_interface.c:1963
 #: modules/gui/gtk/gtk_interface.c:2278
 msgid "Subtitle"
 msgstr "Ondertiteling"
@@ -2569,23 +2691,6 @@ msgstr "Ondertiteling"
 msgid "MP4 demuxer"
 msgstr "MP4 demuxer"
 
-#: modules/demux/mpeg/audio.c:47
-msgid "MPEG I/II audio stream demuxer"
-msgstr "MPEG I/II audio stream demuxer"
-
-#: modules/demux/mpeg/audio.c:626 modules/demux/mpeg/audio.c:643
-#: modules/demux/mpeg/m4v.c:149
-msgid "mpeg"
-msgstr "mpeg"
-
-#: modules/demux/mpeg/audio.c:630
-msgid "Mode"
-msgstr "Mode"
-
-#: modules/demux/mpeg/audio.c:634
-msgid "Average Bitrate"
-msgstr "Gemiddelde Bitrate"
-
 #: modules/demux/mpeg/es.c:49
 msgid "ISO 13818-1 MPEG Elementary Stream input"
 msgstr "ISO 13818-1 MPEG Elementary Stream input"
@@ -2594,10 +2699,36 @@ msgstr "ISO 13818-1 MPEG Elementary Stream input"
 msgid "MPEG-4 video elementary stream demuxer"
 msgstr "MPEG-4 video elementaire stream demuxer"
 
+#: modules/demux/mpeg/m4v.c:149
+msgid "mpeg"
+msgstr "mpeg"
+
 #: modules/demux/mpeg/m4v.c:150
 msgid "Video MPEG-4 (raw ES)"
 msgstr "Video MPEG-4 (raw ES)"
 
+#: modules/demux/mpeg/mpga.c:41
+#, fuzzy
+msgid "MPEG-I/II Audio demuxer"
+msgstr "MPEG I/II audio stream demuxer"
+
+#: modules/demux/mpeg/mpga.c:330
+#, fuzzy
+msgid "MPEG"
+msgstr "MPEG1"
+
+#: modules/demux/mpeg/mpga.c:333
+msgid "Layer"
+msgstr "Laag"
+
+#: modules/demux/mpeg/mpga.c:335
+msgid "Mode"
+msgstr "Mode"
+
+#: modules/demux/mpeg/mpga.c:339
+msgid "Average Bitrate"
+msgstr "Gemiddelde Bitrate"
+
 #: modules/demux/mpeg/ps.c:60
 msgid "ISO 13818-1 MPEG Program Stream input"
 msgstr "ISO 13818-1 MPEG Program Stream input"
@@ -2644,36 +2775,36 @@ msgstr "ISO 13818-1 MPEG Transport Stream input (libdvbpsi)"
 msgid "ogg stream demuxer"
 msgstr "ogg stream demuxer"
 
-#: modules/demux/ogg.c:558
+#: modules/demux/ogg.c:559
 msgid "Vorbis"
 msgstr "Vorbis"
 
-#: modules/demux/ogg.c:563 modules/demux/ogg.c:633 modules/demux/ogg.c:673
-#: modules/demux/ogg.c:834 modules/demux/ogg.c:1007
+#: modules/demux/ogg.c:564 modules/demux/ogg.c:634 modules/demux/ogg.c:674
+#: modules/demux/ogg.c:835 modules/demux/ogg.c:1008
 msgid "Bit Rate"
 msgstr "Bit Rate"
 
-#: modules/demux/ogg.c:630
+#: modules/demux/ogg.c:631
 msgid "Theora"
 msgstr "Theora"
 
-#: modules/demux/ogg.c:670
+#: modules/demux/ogg.c:671
 msgid "tarkin"
 msgstr "tarkin"
 
-#: modules/demux/ogg.c:739 modules/demux/ogg.c:914
+#: modules/demux/ogg.c:740 modules/demux/ogg.c:915
 msgid "Bit Count"
 msgstr "Aantal Bits"
 
-#: modules/demux/ogg.c:741 modules/demux/ogg.c:916
+#: modules/demux/ogg.c:742 modules/demux/ogg.c:917
 msgid "Width"
 msgstr "Breedte"
 
-#: modules/demux/ogg.c:743 modules/demux/ogg.c:918
+#: modules/demux/ogg.c:744 modules/demux/ogg.c:919
 msgid "Height"
 msgstr "Hoogte"
 
-#: modules/demux/ogg.c:839 modules/demux/ogg.c:1012
+#: modules/demux/ogg.c:840 modules/demux/ogg.c:1013
 msgid "Bits per Sample"
 msgstr "Aantal bits per sample"
 
@@ -2681,6 +2812,10 @@ msgstr "Aantal bits per sample"
 msgid "raw dv demuxer"
 msgstr "raw dv demuxer"
 
+#: modules/demux/sdp.c:64
+msgid "SDP demuxer + UDP/RTP/RTSP"
+msgstr ""
+
 #: modules/demux/util/id3.c:44
 msgid "Simple id3 tag skipper"
 msgstr "Simpele id3 tag routine"
@@ -3013,7 +3148,7 @@ msgstr "id3 tag parser die gebruik maakt van libid3tag"
 msgid "Text subtitles demux"
 msgstr "Ondertiteling demux"
 
-#: modules/demux/wav/wav.c:49
+#: modules/demux/wav.c:43
 msgid "WAV demuxer"
 msgstr "WAV demuxer"
 
@@ -3046,11 +3181,9 @@ msgid "Yes"
 msgstr "Ja"
 
 #: modules/gui/beos/InterfaceWindow.cpp:201
-#: modules/gui/beos/InterfaceWindow.cpp:308
-#: modules/gui/familiar/interface.c:149 modules/gui/familiar/interface.c:150
-#: modules/gui/macosx/intf.m:328 modules/gui/macosx/prefs.m:77
-#: modules/gui/pda/interface.c:151 modules/gui/pda/interface.c:152
-#: modules/gui/wxwindows/preferences.cpp:233
+#: modules/gui/beos/InterfaceWindow.cpp:308 modules/gui/macosx/intf.m:328
+#: modules/gui/macosx/prefs.m:77 modules/gui/pda/interface.c:151
+#: modules/gui/pda/interface.c:152 modules/gui/wxwindows/preferences.cpp:233
 msgid "Preferences"
 msgstr "Voorkeuren"
 
@@ -3065,7 +3198,7 @@ msgstr "Berichten"
 
 #: modules/gui/beos/InterfaceWindow.cpp:238
 #: modules/gui/beos/MediaControlView.cpp:1257
-#: modules/gui/beos/PlayListWindow.cpp:82 modules/gui/familiar/interface.c:378
+#: modules/gui/beos/PlayListWindow.cpp:82
 #: modules/gui/gtk/gnome_interface.c:503
 #: modules/gui/gtk/gnome_interface.c:1569
 #: modules/gui/gtk/gnome_interface.c:2274
@@ -3098,10 +3231,8 @@ msgid "Open Subtitles"
 msgstr "Open Ondertiteling"
 
 #: modules/gui/beos/InterfaceWindow.cpp:249
-#: modules/gui/familiar/interface.c:231 modules/gui/familiar/interface.c:232
-#: modules/gui/familiar/interface.c:765 modules/gui/gtk/gtk_interface.c:1580
-#: modules/gui/pda/interface.c:233 modules/gui/pda/interface.c:234
-#: modules/gui/pda/interface.c:767
+#: modules/gui/gtk/gtk_interface.c:1580 modules/gui/pda/interface.c:233
+#: modules/gui/pda/interface.c:234 modules/gui/pda/interface.c:767
 msgid "About"
 msgstr "Over"
 
@@ -3150,7 +3281,7 @@ msgstr "Speel Lijst"
 #: modules/gui/wxwindows/open.cpp:244
 #: modules/gui/wxwindows/preferences.cpp:253
 #: modules/gui/wxwindows/streamout.cpp:217
-#: modules/gui/wxwindows/subtitles.cpp:149
+#: modules/gui/wxwindows/subtitles.cpp:190
 msgid "OK"
 msgstr "OK"
 
@@ -3274,7 +3405,7 @@ msgstr "Hou op de Voorgrond"
 msgid "Take Screen Shot"
 msgstr "Neem een Screenshot"
 
-#: modules/gui/beos/VlcWrapper.cpp:165 modules/gui/gtk/menu.c:733
+#: modules/gui/beos/VlcWrapper.cpp:165 modules/gui/gtk/menu.c:734
 msgid "None"
 msgstr "Geen"
 
@@ -3282,202 +3413,6 @@ msgstr "Geen"
 msgid "<unknown>"
 msgstr "<onbekend>"
 
-#: modules/gui/familiar/familiar.c:62 modules/gui/pda/pda.c:62
-msgid "Autoplay selected file"
-msgstr "Geselecteerd bestand automatisch afspelen"
-
-#: modules/gui/familiar/familiar.c:63 modules/gui/pda/pda.c:63
-msgid "Automatically play a file when selected in the file selection list"
-msgstr ""
-"Speel automatisch een bestand af, wanneer het geselecteerd word in de "
-"bestandenselectielijst."
-
-#: modules/gui/familiar/familiar.c:72
-msgid "Familiar Linux Gtk+ interface"
-msgstr "Familiar Linux Gtk+ interface"
-
-#: modules/gui/familiar/interface.c:99 modules/gui/familiar/interface.c:732
-#: modules/gui/gtk/gnome_interface.c:274 modules/gui/gtk/gtk_interface.c:121
-#: modules/gui/gtk/gtk_interface.c:1595 modules/gui/pda/interface.c:99
-#: modules/gui/pda/interface.c:734
-msgid "VLC media player"
-msgstr "VLC media speler"
-
-#: modules/gui/familiar/interface.c:124 modules/gui/pda/interface.c:126
-#: modules/gui/wxwindows/dialogs.cpp:268 modules/gui/wxwindows/open.cpp:709
-#: modules/gui/wxwindows/preferences.cpp:1029
-#: modules/gui/wxwindows/subtitles.cpp:196
-msgid "Open file"
-msgstr "Open een bestand"
-
-#: modules/gui/familiar/interface.c:164 modules/gui/pda/interface.c:166
-msgid "Rewind"
-msgstr "Langzaam"
-
-#: modules/gui/familiar/interface.c:165 modules/gui/pda/interface.c:167
-msgid "Rewind stream"
-msgstr "Speel langzaam"
-
-#: modules/gui/familiar/interface.c:178 modules/gui/pda/interface.c:180
-msgid "Pause stream"
-msgstr "Pauzeer stream"
-
-#: modules/gui/familiar/interface.c:191 modules/gui/pda/interface.c:193
-msgid "Play stream"
-msgstr "Start stream"
-
-#: modules/gui/familiar/interface.c:203 modules/gui/gtk/gnome_interface.c:566
-#: modules/gui/gtk/gnome_interface.c:1027 modules/gui/gtk/gtk_interface.c:676
-#: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:639
-#: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
-#: modules/gui/macosx/intf.m:424 modules/gui/pda/interface.c:205
-#: modules/gui/wxwindows/interface.cpp:373
-msgid "Stop"
-msgstr "Stop"
-
-#: modules/gui/familiar/interface.c:204 modules/gui/pda/interface.c:206
-msgid "Stop stream"
-msgstr "Stop stream"
-
-#: modules/gui/familiar/interface.c:216 modules/gui/pda/interface.c:218
-msgid "Forward"
-msgstr "Sneller"
-
-#: modules/gui/familiar/interface.c:217 modules/gui/pda/interface.c:219
-msgid "Forward stream"
-msgstr "Speel sneller"
-
-#: modules/gui/familiar/interface.c:285 modules/gui/gtk/gnome_interface.c:2345
-#: modules/gui/gtk/gtk_interface.c:2712 modules/gui/macosx/playlist.m:198
-#: modules/gui/pda/interface.c:287
-msgid "Add"
-msgstr "Voeg toe"
-
-#: modules/gui/familiar/interface.c:293 modules/gui/pda/interface.c:295
-msgid "MRL :"
-msgstr "MRL :"
-
-#: modules/gui/familiar/interface.c:394
-msgid "UDP/RTP (Address when Multicast)"
-msgstr "UDP/RTP (Adres indien Multicast)"
-
-#: modules/gui/familiar/interface.c:412 modules/gui/gtk/gnome_interface.c:1747
-#: modules/gui/gtk/gtk_interface.c:2062 modules/gui/macosx/open.m:161
-#: modules/gui/macosx/output.m:133 modules/gui/pda/interface.c:414
-#: modules/gui/wxwindows/open.cpp:469 modules/gui/wxwindows/streamout.cpp:425
-msgid "Address"
-msgstr "Adres"
-
-#: modules/gui/familiar/interface.c:423 modules/gui/gtk/gnome_interface.c:1737
-#: modules/gui/gtk/gnome_interface.c:1786
-#: modules/gui/gtk/gnome_interface.c:2912 modules/gui/gtk/gtk_interface.c:2052
-#: modules/gui/gtk/gtk_interface.c:2101 modules/gui/gtk/gtk_interface.c:3225
-#: modules/gui/macosx/open.m:160 modules/gui/macosx/open.m:162
-#: modules/gui/macosx/output.m:134 modules/gui/pda/interface.c:425
-#: modules/gui/wxwindows/open.cpp:454 modules/gui/wxwindows/open.cpp:477
-#: modules/gui/wxwindows/streamout.cpp:436
-msgid "Port"
-msgstr "Poort"
-
-#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:136
-#: modules/gui/macosx/output.m:236 modules/gui/macosx/output.m:311
-#: modules/gui/pda/interface.c:480 modules/gui/wxwindows/streamout.cpp:386
-msgid "HTTP"
-msgstr "HTTP"
-
-#: modules/gui/familiar/interface.c:488 modules/gui/pda/interface.c:490
-msgid "FTP"
-msgstr "FTP"
-
-#: modules/gui/familiar/interface.c:498 modules/gui/pda/interface.c:500
-msgid "MMS"
-msgstr "MMS"
-
-#: modules/gui/familiar/interface.c:516 modules/gui/gtk/gnome_interface.c:1830
-#: modules/gui/gtk/gnome_interface.c:2281 modules/gui/gtk/gtk_interface.c:2145
-#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:144
-#: modules/gui/macosx/open.m:271 modules/gui/pda/interface.c:518
-#: modules/gui/wxwindows/open.cpp:257
-msgid "Network"
-msgstr "Netwerk"
-
-#: modules/gui/familiar/interface.c:524 modules/gui/pda/interface.c:526
-msgid "Media"
-msgstr "Media"
-
-#: modules/gui/familiar/interface.c:560 modules/gui/pda/interface.c:562
-msgid "MRL"
-msgstr "MRL"
-
-#: modules/gui/familiar/interface.c:569 modules/gui/pda/interface.c:571
-msgid "Time"
-msgstr "Positie"
-
-#: modules/gui/familiar/interface.c:586 modules/gui/pda/interface.c:588
-msgid "Update"
-msgstr "Bijwerken"
-
-#: modules/gui/familiar/interface.c:594 modules/gui/pda/interface.c:596
-msgid " Del "
-msgstr " Del "
-
-#: modules/gui/familiar/interface.c:602 modules/gui/pda/interface.c:604
-msgid " Clear "
-msgstr " Verwijder "
-
-#: modules/gui/familiar/interface.c:626 modules/gui/pda/interface.c:628
-msgid "Automatically play file"
-msgstr "Speel bestand automatisch af"
-
-#: modules/gui/familiar/interface.c:643 modules/gui/pda/interface.c:645
-msgid " Save "
-msgstr " Opslaan "
-
-#: modules/gui/familiar/interface.c:651 modules/gui/pda/interface.c:653
-msgid " Apply "
-msgstr " Pas Toe "
-
-#: modules/gui/familiar/interface.c:659 modules/gui/pda/interface.c:661
-msgid " Cancel "
-msgstr " Annuleer "
-
-#: modules/gui/familiar/interface.c:667 modules/gui/pda/interface.c:669
-msgid "Preference"
-msgstr "Voorkeur"
-
-#: modules/gui/familiar/interface.c:711 modules/gui/gtk/gnome_interface.c:1361
-#: modules/gui/gtk/gtk_interface.c:1603 modules/gui/kde/kde.cpp:111
-#: modules/gui/pda/interface.c:713
-msgid "(c) 1996-2003 the VideoLAN team"
-msgstr "(c) 1996-2003 het VideoLAN team"
-
-#: modules/gui/familiar/interface.c:721 modules/gui/pda/interface.c:723
-msgid "Authors: The VideoLAN Team, http://www.videolan.org"
-msgstr "Auteurs: Het VideoLAN Team, http://www.videolan.org"
-
-#: modules/gui/familiar/interface.c:753 modules/gui/pda/interface.c:755
-msgid ""
-"The VideoLAN Client is a MPEG, MPEG 2, MP3, DivX player, that accepts input "
-"from local or network sources."
-msgstr ""
-"De VideoLAN Client is een MPEG 1, MPEG 2, MP3, DivX multimedia speler, die "
-"invoer zowel van schijf als van netwerk kan afspelen."
-
-#: modules/gui/familiar/support.c:121 modules/gui/gtk/gnome_support.c:100
-#: modules/gui/gtk/gnome_support.c:138 modules/gui/gtk/gtk_support.c:121
-#: modules/gui/gtk2/gnome2_support.c:60 modules/gui/gtk2/gnome2_support.c:85
-#: modules/gui/gtk2/gtk2_support.c:90 modules/gui/gtk2/gtk2_support.c:114
-#: modules/gui/pda/support.c:121
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Pixmap bestand niet gevonden: %s"
-
-#: modules/gui/familiar/support.c:130 modules/gui/gtk/gtk_support.c:130
-#: modules/gui/pda/support.c:130
-#, c-format
-msgid "Error loading pixmap file: %s"
-msgstr "Fout tijdens laden van pixmap bestand: %s"
-
 #: modules/gui/gtk/gnome.c:55 modules/gui/gtk/gtk.c:57
 msgid "Show tooltips"
 msgstr "Toon tooltips"
@@ -3672,6 +3607,12 @@ msgstr "_Audio"
 msgid "_Video"
 msgstr "_Video"
 
+#: modules/gui/gtk/gnome_interface.c:274 modules/gui/gtk/gtk_interface.c:121
+#: modules/gui/gtk/gtk_interface.c:1595 modules/gui/pda/interface.c:99
+#: modules/gui/pda/interface.c:734
+msgid "VLC media player"
+msgstr "VLC media speler"
+
 #: modules/gui/gtk/gnome_interface.c:515 modules/gui/gtk/gnome_interface.c:718
 #: modules/gui/gtk/gnome_interface.c:1690
 #: modules/gui/gtk/gnome_interface.c:2267 modules/gui/gtk/gtk_interface.c:629
@@ -3706,6 +3647,15 @@ msgstr "Terug"
 msgid "Go Backward"
 msgstr "Ga Terug"
 
+#: modules/gui/gtk/gnome_interface.c:566
+#: modules/gui/gtk/gnome_interface.c:1027 modules/gui/gtk/gtk_interface.c:676
+#: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:639
+#: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
+#: modules/gui/macosx/intf.m:424 modules/gui/pda/interface.c:205
+#: modules/gui/wxwindows/interface.cpp:373
+msgid "Stop"
+msgstr "Stop"
+
 #: modules/gui/gtk/gnome_interface.c:567 modules/gui/gtk/gtk_interface.c:677
 msgid "Stop Stream"
 msgstr "Stop Stream"
@@ -3827,6 +3777,11 @@ msgstr "_Interface"
 msgid "Playlist..."
 msgstr "Speellijst..."
 
+#: modules/gui/gtk/gnome_interface.c:1361 modules/gui/gtk/gtk_interface.c:1603
+#: modules/gui/kde/kde.cpp:111 modules/gui/pda/interface.c:713
+msgid "(c) 1996-2003 the VideoLAN team"
+msgstr "(c) 1996-2003 het VideoLAN team"
+
 #: modules/gui/gtk/gnome_interface.c:1363 modules/gui/gtk/gtk_interface.c:1646
 #: modules/gui/kde/kde.cpp:108
 msgid ""
@@ -3865,7 +3820,7 @@ msgstr "Bouw een MRL met behulp van de volgende voorgedefinieerde doelen:"
 #: modules/gui/wxwindows/open.cpp:223 modules/gui/wxwindows/open.cpp:341
 #: modules/gui/wxwindows/preferences.cpp:832
 #: modules/gui/wxwindows/streamout.cpp:412
-#: modules/gui/wxwindows/subtitles.cpp:107
+#: modules/gui/wxwindows/subtitles.cpp:109
 msgid "Browse..."
 msgstr "Blader..."
 
@@ -3914,11 +3869,37 @@ msgstr "UDP/RTP Multicast"
 msgid "HTTP/FTP/MMS"
 msgstr "HTTP/FTP/MMS"
 
+#: modules/gui/gtk/gnome_interface.c:1737
+#: modules/gui/gtk/gnome_interface.c:1786
+#: modules/gui/gtk/gnome_interface.c:2912 modules/gui/gtk/gtk_interface.c:2052
+#: modules/gui/gtk/gtk_interface.c:2101 modules/gui/gtk/gtk_interface.c:3225
+#: modules/gui/macosx/open.m:160 modules/gui/macosx/open.m:162
+#: modules/gui/macosx/output.m:134 modules/gui/pda/interface.c:425
+#: modules/gui/wxwindows/open.cpp:454 modules/gui/wxwindows/open.cpp:477
+#: modules/gui/wxwindows/streamout.cpp:436
+msgid "Port"
+msgstr "Poort"
+
+#: modules/gui/gtk/gnome_interface.c:1747 modules/gui/gtk/gtk_interface.c:2062
+#: modules/gui/macosx/open.m:161 modules/gui/macosx/output.m:133
+#: modules/gui/pda/interface.c:414 modules/gui/wxwindows/open.cpp:469
+#: modules/gui/wxwindows/streamout.cpp:425
+msgid "Address"
+msgstr "Adres"
+
 #: modules/gui/gtk/gnome_interface.c:1759 modules/gui/gtk/gtk_interface.c:2074
 #: modules/gui/macosx/open.m:163 modules/gui/wxwindows/open.cpp:492
 msgid "URL"
 msgstr "URL"
 
+#: modules/gui/gtk/gnome_interface.c:1830
+#: modules/gui/gtk/gnome_interface.c:2281 modules/gui/gtk/gtk_interface.c:2145
+#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:144
+#: modules/gui/macosx/open.m:271 modules/gui/pda/interface.c:518
+#: modules/gui/wxwindows/open.cpp:257
+msgid "Network"
+msgstr "Netwerk"
+
 #: modules/gui/gtk/gnome_interface.c:1847 modules/gui/gtk/gtk_interface.c:2162
 msgid "Symbol Rate"
 msgstr "Symbol Rate"
@@ -3998,6 +3979,11 @@ msgstr "Inverteer"
 msgid "Select"
 msgstr "Selecteer"
 
+#: modules/gui/gtk/gnome_interface.c:2345 modules/gui/gtk/gtk_interface.c:2712
+#: modules/gui/macosx/playlist.m:198 modules/gui/pda/interface.c:287
+msgid "Add"
+msgstr "Voeg toe"
+
 #: modules/gui/gtk/gnome_interface.c:2352 modules/gui/gtk/gtk_interface.c:2754
 #: modules/gui/macosx/playlist.m:195 modules/gui/macosx/playlist.m:199
 msgid "Delete"
@@ -4065,6 +4051,14 @@ msgstr "PS"
 msgid "AVI"
 msgstr "AVI"
 
+#: modules/gui/gtk/gnome_support.c:100 modules/gui/gtk/gnome_support.c:138
+#: modules/gui/gtk/gtk_support.c:121 modules/gui/gtk2/gnome2_support.c:60
+#: modules/gui/gtk2/gnome2_support.c:85 modules/gui/gtk2/gtk2_support.c:90
+#: modules/gui/gtk2/gtk2_support.c:114 modules/gui/pda/support.c:121
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Pixmap bestand niet gevonden: %s"
+
 #: modules/gui/gtk/gnome_support.c:116
 #, c-format
 msgid "Couldn't create pixmap from file: %s"
@@ -4178,10 +4172,11 @@ msgstr "Stream uitvoer configurtie"
 #: modules/gui/gtk/gtk_interface.c:2403 modules/gui/gtk/gtk_interface.c:2645
 #: modules/gui/gtk/gtk_interface.c:2876 modules/gui/gtk/gtk_interface.c:3257
 #: modules/gui/gtk/preferences.c:618 modules/gui/macosx/open.m:140
-#: modules/gui/macosx/prefs.m:79 modules/gui/wxwindows/open.cpp:247
+#: modules/gui/macosx/prefs.m:79 modules/gui/macosx/prefs.m:170
+#: modules/gui/wxwindows/open.cpp:247
 #: modules/gui/wxwindows/preferences.cpp:256
 #: modules/gui/wxwindows/streamout.cpp:220
-#: modules/gui/wxwindows/subtitles.cpp:152
+#: modules/gui/wxwindows/subtitles.cpp:193
 msgid "Cancel"
 msgstr "Annuleer"
 
@@ -4213,12 +4208,17 @@ msgstr "_Inverteer"
 msgid "_Select"
 msgstr "_Selecteer"
 
-#: modules/gui/gtk/menu.c:900
+#: modules/gui/gtk/gtk_support.c:130 modules/gui/pda/support.c:130
+#, c-format
+msgid "Error loading pixmap file: %s"
+msgstr "Fout tijdens laden van pixmap bestand: %s"
+
+#: modules/gui/gtk/menu.c:901
 #, c-format
 msgid "Title %d (%d)"
 msgstr "Titel %d (%d)"
 
-#: modules/gui/gtk/menu.c:967
+#: modules/gui/gtk/menu.c:968
 #, c-format
 msgid "Chapter %d"
 msgstr "Hoofdstuk %d"
@@ -4370,8 +4370,9 @@ msgstr "Info"
 msgid "VLC - Controller"
 msgstr "VLC - Bedieningspaneel"
 
-#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/interface.cpp:904
-#: modules/gui/wxwindows/timer.cpp:131
+#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/control.cpp:160
+#: modules/gui/wxwindows/control.cpp:370
+#: modules/gui/wxwindows/interface.cpp:904 modules/gui/wxwindows/timer.cpp:131
 msgid "Volume"
 msgstr "Volume"
 
@@ -4623,6 +4624,12 @@ msgstr "Stream"
 msgid "TTL"
 msgstr "TTL"
 
+#: modules/gui/macosx/output.m:136 modules/gui/macosx/output.m:236
+#: modules/gui/macosx/output.m:311 modules/gui/pda/interface.c:480
+#: modules/gui/wxwindows/streamout.cpp:386
+msgid "HTTP"
+msgstr "HTTP"
+
 #: modules/gui/macosx/output.m:141 modules/gui/wxwindows/streamout.cpp:531
 msgid "Encapsulation Method"
 msgstr "Inkapseling Methode"
@@ -4680,6 +4687,11 @@ msgstr "Geavanceerd"
 msgid "Reset Preferences"
 msgstr "Reset Voorkeuren"
 
+#: modules/gui/macosx/prefs.m:170
+#, fuzzy
+msgid "Continue"
+msgstr "Configureer"
+
 #: modules/gui/macosx/prefs.m:172 modules/gui/wxwindows/preferences.cpp:316
 msgid ""
 "Beware this will reset your VLC Media Player config file.\n"
@@ -4701,10 +4713,123 @@ msgstr "Standaard"
 msgid "ncurses interface"
 msgstr "ncurses interface"
 
+#: modules/gui/pda/interface.c:126 modules/gui/wxwindows/dialogs.cpp:268
+#: modules/gui/wxwindows/open.cpp:709
+#: modules/gui/wxwindows/preferences.cpp:1029
+#: modules/gui/wxwindows/subtitles.cpp:234
+msgid "Open file"
+msgstr "Open een bestand"
+
+#: modules/gui/pda/interface.c:166
+msgid "Rewind"
+msgstr "Langzaam"
+
+#: modules/gui/pda/interface.c:167
+msgid "Rewind stream"
+msgstr "Speel langzaam"
+
+#: modules/gui/pda/interface.c:180
+msgid "Pause stream"
+msgstr "Pauzeer stream"
+
+#: modules/gui/pda/interface.c:193
+msgid "Play stream"
+msgstr "Start stream"
+
+#: modules/gui/pda/interface.c:206
+msgid "Stop stream"
+msgstr "Stop stream"
+
+#: modules/gui/pda/interface.c:218
+msgid "Forward"
+msgstr "Sneller"
+
+#: modules/gui/pda/interface.c:219
+msgid "Forward stream"
+msgstr "Speel sneller"
+
+#: modules/gui/pda/interface.c:295
+msgid "MRL :"
+msgstr "MRL :"
+
 #: modules/gui/pda/interface.c:396
 msgid "UDP/RTP (Adress when Multicast)"
 msgstr "UDP/RTP (Adres indien Multicast)"
 
+#: modules/gui/pda/interface.c:490
+msgid "FTP"
+msgstr "FTP"
+
+#: modules/gui/pda/interface.c:500
+msgid "MMS"
+msgstr "MMS"
+
+#: modules/gui/pda/interface.c:526
+msgid "Media"
+msgstr "Media"
+
+#: modules/gui/pda/interface.c:562
+msgid "MRL"
+msgstr "MRL"
+
+#: modules/gui/pda/interface.c:571
+msgid "Time"
+msgstr "Positie"
+
+#: modules/gui/pda/interface.c:588
+msgid "Update"
+msgstr "Bijwerken"
+
+#: modules/gui/pda/interface.c:596
+msgid " Del "
+msgstr " Del "
+
+#: modules/gui/pda/interface.c:604
+msgid " Clear "
+msgstr " Verwijder "
+
+#: modules/gui/pda/interface.c:628
+msgid "Automatically play file"
+msgstr "Speel bestand automatisch af"
+
+#: modules/gui/pda/interface.c:645
+msgid " Save "
+msgstr " Opslaan "
+
+#: modules/gui/pda/interface.c:653
+msgid " Apply "
+msgstr " Pas Toe "
+
+#: modules/gui/pda/interface.c:661
+msgid " Cancel "
+msgstr " Annuleer "
+
+#: modules/gui/pda/interface.c:669
+msgid "Preference"
+msgstr "Voorkeur"
+
+#: modules/gui/pda/interface.c:723
+msgid "Authors: The VideoLAN Team, http://www.videolan.org"
+msgstr "Auteurs: Het VideoLAN Team, http://www.videolan.org"
+
+#: modules/gui/pda/interface.c:755
+msgid ""
+"The VideoLAN Client is a MPEG, MPEG 2, MP3, DivX player, that accepts input "
+"from local or network sources."
+msgstr ""
+"De VideoLAN Client is een MPEG 1, MPEG 2, MP3, DivX multimedia speler, die "
+"invoer zowel van schijf als van netwerk kan afspelen."
+
+#: modules/gui/pda/pda.c:62
+msgid "Autoplay selected file"
+msgstr "Geselecteerd bestand automatisch afspelen"
+
+#: modules/gui/pda/pda.c:63
+msgid "Automatically play a file when selected in the file selection list"
+msgstr ""
+"Speel automatisch een bestand af, wanneer het geselecteerd word in de "
+"bestandenselectielijst."
+
 #: modules/gui/pda/pda.c:72
 msgid "PDA Linux Gtk2+ interface"
 msgstr "PDA Linux Gtk2+ interface"
@@ -4995,7 +5120,7 @@ msgstr "Opnemen van de stream"
 msgid "Capture the stream you are playing to a file"
 msgstr "Schrijf de stream die u afspeelt naar een bestand"
 
-#: modules/gui/wxwindows/open.cpp:348 modules/gui/wxwindows/subtitles.cpp:98
+#: modules/gui/wxwindows/open.cpp:348 modules/gui/wxwindows/subtitles.cpp:100
 msgid "Subtitles file"
 msgstr "Ondertitelingsbestand"
 
@@ -5013,7 +5138,7 @@ msgstr "DVD (menu ondersteuning)"
 msgid "CD Audio"
 msgstr "CD Audio"
 
-#: modules/gui/wxwindows/open.cpp:900 modules/gui/wxwindows/streamout.cpp:784
+#: modules/gui/wxwindows/open.cpp:903 modules/gui/wxwindows/streamout.cpp:784
 msgid "Save file"
 msgstr "Bewaar bestand"
 
@@ -5128,19 +5253,24 @@ msgstr "Audio codec"
 msgid "Open Subtitles File"
 msgstr "Open bestand met ondertitels"
 
-#: modules/gui/wxwindows/subtitles.cpp:115
+#: modules/gui/wxwindows/subtitles.cpp:123
+#, fuzzy
+msgid "Subtitles encoding"
+msgstr "tekstcodering van de ondertiteling"
+
+#: modules/gui/wxwindows/subtitles.cpp:155
 msgid "Subtitles options"
 msgstr "Ondertiteling opties"
 
-#: modules/gui/wxwindows/subtitles.cpp:119
+#: modules/gui/wxwindows/subtitles.cpp:159
 msgid "Delay subtitles (in 1/10s)"
 msgstr "Ondertiteling vertragen (in 1/10s)"
 
-#: modules/gui/wxwindows/subtitles.cpp:130
+#: modules/gui/wxwindows/subtitles.cpp:170
 msgid "Frames per second"
 msgstr "Beelden per seconde"
 
-#: modules/gui/wxwindows/subtitles.cpp:138
+#: modules/gui/wxwindows/subtitles.cpp:178
 msgid "Override frames per second. It will only work with MicroDVD subtitles."
 msgstr ""
 "Stel een ander aantal beelden per seconden in. Dit werkt enkel metMicroDVD "
@@ -5213,28 +5343,28 @@ msgstr "dummy font renderer functie"
 msgid "Using the dummy interface plugin..."
 msgstr "Gebruik de dummy interface plugin..."
 
-#: modules/misc/freetype.c:67 modules/visualization/xosd/xosd.c:71
+#: modules/misc/freetype.c:72 modules/visualization/xosd/xosd.c:71
 msgid "Font"
 msgstr "Lettertype"
 
-#: modules/misc/freetype.c:68
+#: modules/misc/freetype.c:73
 msgid "Filename of Font"
 msgstr "Bestandsnaam van Lettertype"
 
-#: modules/misc/freetype.c:69
+#: modules/misc/freetype.c:74
 msgid "Font size"
 msgstr "Lettertype grootte"
 
-#: modules/misc/freetype.c:70
+#: modules/misc/freetype.c:75
 msgid "The size of the fonts used by the osd module"
 msgstr ""
 "De grootte van de lettertypen die zal worden gebruikt voor de OSD module"
 
-#: modules/misc/freetype.c:73
+#: modules/misc/freetype.c:78
 msgid "Fonts"
 msgstr "Lettertypen"
 
-#: modules/misc/freetype.c:76
+#: modules/misc/freetype.c:81
 msgid "freetype2 font renderer"
 msgstr "freetype2 lettertype renderer"
 
@@ -5371,19 +5501,19 @@ msgstr "Avi muxer"
 msgid "Dummy muxer"
 msgstr "Dummy muxer"
 
-#: modules/mux/mp4.c:52
+#: modules/mux/mp4.c:56
 msgid "MP4/MOV muxer"
 msgstr "MP4/MOV demuxer"
 
-#: modules/mux/mpeg/ps.c:79
+#: modules/mux/mpeg/ps.c:53
 msgid "PS muxer"
 msgstr "PS muxer"
 
-#: modules/mux/mpeg/ts.c:138
+#: modules/mux/mpeg/ts.c:78
 msgid "TS muxer"
 msgstr "TS muxer"
 
-#: modules/mux/mpeg/ts.c:143
+#: modules/mux/mpeg/ts.c:83
 msgid "TS muxer (libdvbpsi)"
 msgstr "TS muxer (libdvbpsi)"
 
@@ -5395,7 +5525,7 @@ msgstr "Ogg/ogm muxer"
 msgid "A/52 audio packetizer"
 msgstr "A/52 audio packetizer"
 
-#: modules/packetizer/copy.c:69
+#: modules/packetizer/copy.c:43
 msgid "Copy packetizer"
 msgstr "Copy packetizer"
 
@@ -5439,7 +5569,7 @@ msgstr "ES stream"
 msgid "Standard stream"
 msgstr "Standaard stream"
 
-#: modules/stream_out/transcode.c:71
+#: modules/stream_out/transcode.c:73
 msgid "Transcode stream"
 msgstr "Transcode stream"
 
@@ -5945,6 +6075,15 @@ msgstr "XOSD module"
 msgid "xosd interface"
 msgstr "xosd interface"
 
+#~ msgid "AAC stream demuxer"
+#~ msgstr "AAC stream demuxer"
+
+#~ msgid "Familiar Linux Gtk+ interface"
+#~ msgstr "Familiar Linux Gtk+ interface"
+
+#~ msgid "UDP/RTP (Address when Multicast)"
+#~ msgstr "UDP/RTP (Adres indien Multicast)"
+
 #~ msgid ""
 #~ "the device for the joystick (usually /dev/jsX or /dev/input/jsXwith X the "
 #~ "number of the joystick"
diff --git a/po/no.po b/po/no.po
index 6af2de3a56..3ea94997c3 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vlc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-07-31 15:04+0200\n"
+"POT-Creation-Date: 2003-08-11 21:05+0200\n"
 "PO-Revision-Date: 2003-04-06 12:32+0200\n"
 "Last-Translator: Haakon Meland Eriksen <haakon.eriksen@far.no>\n"
 "Language-Team: vlc <>\n"
@@ -32,7 +32,7 @@ msgid "Audio channels"
 msgstr "Velg lydkanal"
 
 #: src/audio_output/output.c:107 src/audio_output/output.c:142
-#: modules/audio_output/alsa.c:179 modules/audio_output/directx.c:423
+#: modules/audio_output/alsa.c:177 modules/audio_output/directx.c:423
 #: modules/audio_output/oss.c:202 modules/audio_output/sdl.c:181
 #: modules/audio_output/sdl.c:198 modules/audio_output/waveout.c:386
 msgid "Stereo"
@@ -109,11 +109,11 @@ msgstr ""
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr ""
 
-#: src/input/input.c:171
+#: src/input/input.c:174
 msgid "General"
 msgstr ""
 
-#: src/input/input.c:172
+#: src/input/input.c:175
 #, fuzzy
 msgid "Playlist Item"
 msgstr "Spilleliste"
@@ -126,9 +126,9 @@ msgid "Program"
 msgstr "Avslutt programmet"
 
 #: src/input/input_programs.c:98 modules/demux/asf/libasf.c:696
-#: modules/demux/mkv.cpp:2394 modules/gui/beos/MediaControlView.cpp:1258
+#: modules/demux/mkv.cpp:2398 modules/gui/beos/MediaControlView.cpp:1258
 #: modules/gui/gtk/gnome_interface.c:1650 modules/gui/gtk/gtk_interface.c:1956
-#: modules/gui/gtk/menu.c:1402 modules/gui/gtk/menu.c:1423
+#: modules/gui/gtk/menu.c:1403 modules/gui/gtk/menu.c:1424
 #: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:373
 #: modules/gui/macosx/intf.m:374 modules/gui/macosx/open.m:150
 #: modules/gui/wxwindows/open.cpp:406
@@ -137,7 +137,7 @@ msgstr "Tittel"
 
 #: src/input/input_programs.c:102 modules/gui/beos/MediaControlView.cpp:1259
 #: modules/gui/gtk/gnome_interface.c:1640 modules/gui/gtk/gtk_interface.c:1946
-#: modules/gui/gtk/menu.c:1019 modules/gui/gtk/menu.c:1432
+#: modules/gui/gtk/menu.c:1020 modules/gui/gtk/menu.c:1433
 #: modules/gui/kde/interface.cpp:146 modules/gui/macosx/intf.m:375
 #: modules/gui/macosx/intf.m:376 modules/gui/macosx/open.m:151
 #: modules/gui/wxwindows/open.cpp:412
@@ -219,15 +219,15 @@ msgstr ""
 "Bruk: %s [alternativer] [punkter]...\n"
 "\n"
 
-#: src/libvlc.c:1200 src/misc/configuration.c:1019
+#: src/libvlc.c:1200 src/misc/configuration.c:1040
 msgid "string"
 msgstr "tegn"
 
-#: src/libvlc.c:1217 src/misc/configuration.c:1000
+#: src/libvlc.c:1217 src/misc/configuration.c:1021
 msgid "integer"
 msgstr "heltall"
 
-#: src/libvlc.c:1220 src/misc/configuration.c:1009
+#: src/libvlc.c:1220 src/misc/configuration.c:1030
 msgid "float"
 msgstr "desimaltall"
 
@@ -1185,16 +1185,16 @@ msgstr "Grensesnitt"
 
 #: src/libvlc.h:474 modules/audio_output/coreaudio.c:227
 #: modules/audio_output/file.c:108 modules/demux/asf/asf.c:228
-#: modules/demux/mkv.cpp:2445 modules/demux/ogg.c:557 modules/demux/ogg.c:829
-#: modules/demux/ogg.c:1002 modules/gui/beos/InterfaceWindow.cpp:259
+#: modules/demux/mkv.cpp:2449 modules/demux/ogg.c:558 modules/demux/ogg.c:830
+#: modules/demux/ogg.c:1003 modules/gui/beos/InterfaceWindow.cpp:259
 #: modules/gui/gtk/gnome_interface.c:1092 modules/gui/gtk/gtk_interface.c:1219
 #: modules/gui/macosx/intf.m:378 modules/gui/macosx/output.m:156
 msgid "Audio"
 msgstr "Lyd"
 
-#: src/libvlc.h:493 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1217
-#: modules/demux/mkv.cpp:2461 modules/demux/ogg.c:629 modules/demux/ogg.c:669
-#: modules/demux/ogg.c:734 modules/demux/ogg.c:909
+#: src/libvlc.h:493 modules/demux/asf/asf.c:298 modules/demux/avi/avi.c:1217
+#: modules/demux/mkv.cpp:2465 modules/demux/ogg.c:630 modules/demux/ogg.c:670
+#: modules/demux/ogg.c:735 modules/demux/ogg.c:910
 #: modules/gui/gtk/gnome_interface.c:1099 modules/gui/gtk/gtk_interface.c:1296
 #: modules/gui/macosx/intf.m:389 modules/gui/macosx/macosx.m:68
 #: modules/gui/macosx/output.m:150 modules/misc/dummy/dummy.c:81
@@ -1202,7 +1202,8 @@ msgstr "Lyd"
 msgid "Video"
 msgstr "Video"
 
-#: src/libvlc.h:515 modules/access/satellite/satellite.c:66
+#: src/libvlc.h:515 modules/access/dvb/qpsk.c:101
+#: modules/access/satellite/satellite.c:66
 msgid "Input"
 msgstr ""
 
@@ -1227,7 +1228,7 @@ msgid "CPU"
 msgstr ""
 
 #: src/libvlc.h:579 modules/gui/beos/InterfaceWindow.cpp:206
-#: modules/gui/familiar/interface.c:610 modules/gui/gtk/gnome_interface.c:643
+#: modules/gui/gtk/gnome_interface.c:643
 #: modules/gui/gtk/gnome_interface.c:2384
 #: modules/gui/gtk/gnome_interface.c:2409 modules/gui/gtk/gtk_interface.c:747
 #: modules/gui/gtk/gtk_interface.c:2697 modules/gui/macosx/intf.m:321
@@ -1240,11 +1241,10 @@ msgstr "Spilleliste"
 #: src/libvlc.h:585 modules/audio_filter/converter/a52tofloat32.c:85
 #: modules/audio_filter/converter/mpgatofixed32.c:60
 #: modules/codec/a52old/a52old.c:59 modules/codec/mpeg_video/parser.c:84
-#: modules/demux/mpeg/ts.c:118 modules/gui/familiar/familiar.c:70
-#: modules/gui/pda/pda.c:70 modules/misc/logger/logger.c:89
-#: modules/video_filter/motionblur.c:58 modules/video_filter/transform.c:63
-#: modules/video_filter/wall.c:66 modules/video_output/ggi.c:62
-#: modules/video_output/mga/xmga.c:102
+#: modules/demux/mpeg/ts.c:118 modules/gui/pda/pda.c:70
+#: modules/misc/logger/logger.c:89 modules/video_filter/motionblur.c:58
+#: modules/video_filter/transform.c:63 modules/video_filter/wall.c:66
+#: modules/video_output/ggi.c:62 modules/video_output/mga/xmga.c:102
 msgid "Miscellaneous"
 msgstr "Forskjellig"
 
@@ -1272,7 +1272,7 @@ msgstr "skriv ut hjelp for et modul"
 msgid "print version information"
 msgstr "skriv ut versjonsinformasjon"
 
-#: src/misc/configuration.c:1000
+#: src/misc/configuration.c:1021
 msgid "boolean"
 msgstr "boolsk"
 
@@ -1340,6 +1340,102 @@ msgstr "_Innstillinger"
 msgid "Standard filesystem directory input"
 msgstr ""
 
+#: modules/access/dvb/qpsk.c:44
+msgid "adapter card to tune"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:45
+msgid "adapter cards have a device file named /dev/dvb/adapter[n] with n>=0"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:47
+msgid "device nummer to use on adapter"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:50
+msgid "satellite default transponder frequency"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:53
+msgid "satellite default transponder polarization"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:56
+msgid "satellite default transponder FEC"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:57
+msgid "FEC=Forward Error Correction mode"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:59
+msgid "satellite default transponder symbol rate"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:62
+msgid "use diseqc with antenna"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:65
+msgid "antenna lnb_lof1 (kHz)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:68
+msgid "antenna lnb_lof2 (kHz)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:71
+msgid "antenna lnb_slof (kHz)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:74
+msgid "probe the dvb card for capabilities (default disabled)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:75
+msgid "some dvb cards do not like to be probed for their capabilities"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:78
+msgid "modulation type"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:79
+msgid "modulation type for frontend device "
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:82
+msgid "terrestrial high priority stream code rate (FEC)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:85
+msgid "terrestrial low priority stream code rate (FEC)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:88
+msgid "terrestrial bandwidth"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:89
+msgid "terrestrial bandwidth [0=auto,6,7,8 in MHz]"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:91
+msgid "terrestrial guard interval"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:94
+msgid "terrestrial transmission mode"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:97
+msgid "terrestrial hierarchy mode"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:123
+msgid "DVB input module with v4l2 support"
+msgstr ""
+
 #: modules/access/dvd/dvd.c:65
 msgid "Method to use by libdvdcss for key decryption"
 msgstr ""
@@ -1434,7 +1530,7 @@ msgstr ""
 msgid "http"
 msgstr ""
 
-#: modules/access/http.c:89
+#: modules/access/http.c:91
 msgid "HTTP input"
 msgstr ""
 
@@ -1452,6 +1548,10 @@ msgstr ""
 msgid "Hauppauge PVR cards input"
 msgstr ""
 
+#: modules/access/rtsp.c:68
+msgid "RTSP SDP request"
+msgstr ""
+
 #: modules/access/satellite/satellite.c:41
 msgid "Satellite default transponder frequency"
 msgstr ""
@@ -1719,23 +1819,23 @@ msgstr "Lydeksport volum"
 msgid "Audio device"
 msgstr ""
 
-#: modules/audio_output/alsa.c:173 modules/audio_output/directx.c:435
+#: modules/audio_output/alsa.c:171 modules/audio_output/directx.c:435
 #: modules/audio_output/oss.c:222 modules/audio_output/sdl.c:182
 #: modules/audio_output/sdl.c:201 modules/audio_output/waveout.c:399
 msgid "Mono"
 msgstr "Mono"
 
-#: modules/audio_output/alsa.c:186 modules/audio_output/directx.c:409
+#: modules/audio_output/alsa.c:184 modules/audio_output/directx.c:409
 #: modules/audio_output/oss.c:178 modules/audio_output/waveout.c:371
 msgid "2 Front 2 Rear"
 msgstr "2 Front 2 Bak"
 
-#: modules/audio_output/alsa.c:192 modules/audio_output/directx.c:391
+#: modules/audio_output/alsa.c:190 modules/audio_output/directx.c:391
 #: modules/audio_output/oss.c:167 modules/audio_output/waveout.c:352
 msgid "5.1"
 msgstr ""
 
-#: modules/audio_output/alsa.c:219 modules/audio_output/directx.c:478
+#: modules/audio_output/alsa.c:217 modules/audio_output/directx.c:478
 #: modules/audio_output/oss.c:246 modules/audio_output/waveout.c:415
 msgid "A/52 over S/PDIF"
 msgstr ""
@@ -2113,19 +2213,28 @@ msgstr "Standard grensesnitt: "
 
 #: modules/codec/subsdec/subsdec.c:68
 #, fuzzy
-msgid "subtitle text encoding"
+msgid "Subtitles text encoding"
 msgstr "Standard grensesnitt: "
 
 #: modules/codec/subsdec/subsdec.c:69
-msgid "change the encoding used in text subtitles"
+msgid "Change the encoding used in text subtitles"
 msgstr ""
 
-#: modules/codec/subsdec/subsdec.c:72
+#: modules/codec/subsdec/subsdec.c:70
+#, fuzzy
+msgid "Subtitles justification"
+msgstr "_Teksting"
+
+#: modules/codec/subsdec/subsdec.c:71
+msgid "Change the justification of substitles (0=center, 1=left, 2=right)"
+msgstr ""
+
+#: modules/codec/subsdec/subsdec.c:74
 #, fuzzy
 msgid "file subtitles decoder"
 msgstr "Standard grensesnitt: "
 
-#: modules/codec/subsdec/subsdec.c:75 modules/gui/beos/InterfaceWindow.cpp:256
+#: modules/codec/subsdec/subsdec.c:77 modules/gui/beos/InterfaceWindow.cpp:256
 #: modules/gui/kde/interface.cpp:93
 #, fuzzy
 msgid "Subtitles"
@@ -2282,7 +2391,7 @@ msgid "Quit"
 msgstr "Om"
 
 #: modules/control/lirc/lirc.c:297 modules/control/lirc/lirc.c:323
-#: modules/gui/familiar/interface.c:177 modules/gui/gtk/gnome_interface.c:602
+#: modules/gui/gtk/gnome_interface.c:602
 #: modules/gui/gtk/gnome_interface.c:1020 modules/gui/gtk/gtk_interface.c:709
 #: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:921
 #: modules/gui/macosx/intf.m:922 modules/gui/macosx/intf.m:923
@@ -2290,8 +2399,7 @@ msgstr "Om"
 msgid "Pause"
 msgstr "Pause"
 
-#: modules/control/lirc/lirc.c:310 modules/gui/familiar/interface.c:190
-#: modules/gui/gtk/gnome_interface.c:590
+#: modules/control/lirc/lirc.c:310 modules/gui/gtk/gnome_interface.c:590
 #: modules/gui/gtk/gnome_interface.c:1013 modules/gui/gtk/gtk_interface.c:698
 #: modules/gui/macosx/intf.m:324 modules/gui/macosx/intf.m:362
 #: modules/gui/macosx/intf.m:423 modules/gui/macosx/intf.m:928
@@ -2329,69 +2437,71 @@ msgstr ""
 msgid "remote control interface"
 msgstr "Standard grensesnitt: "
 
-#: modules/demux/a52sys.c:52
+#: modules/demux/a52sys.c:41
 msgid "A52 demuxer"
 msgstr ""
 
-#: modules/demux/aac/demux.c:46
-msgid "AAC stream demuxer"
+#: modules/demux/a52sys.c:161
+msgid "A52"
 msgstr ""
 
-#: modules/demux/aac/demux.c:555
-msgid "Aac"
-msgstr ""
-
-#: modules/demux/aac/demux.c:557 modules/demux/mpeg/audio.c:627
-#: modules/demux/mpeg/audio.c:644 modules/demux/mpeg/m4v.c:150
+#: modules/demux/a52sys.c:163 modules/demux/aac.c:175
+#: modules/demux/mpeg/m4v.c:150 modules/demux/mpeg/mpga.c:331
 msgid "Input Type"
 msgstr ""
 
-#: modules/demux/aac/demux.c:560 modules/demux/mpeg/audio.c:629
-msgid "Layer"
-msgstr ""
-
-#: modules/demux/aac/demux.c:562 modules/demux/asf/asf.c:275
-#: modules/demux/avi/avi.c:1178 modules/demux/mkv.cpp:2449
-#: modules/demux/ogg.c:561 modules/demux/ogg.c:837 modules/demux/ogg.c:1010
-#: modules/gui/gtk/gnome_interface.c:148 modules/gui/gtk/gnome_interface.c:931
-#: modules/gui/gtk/gtk_interface.c:481 modules/gui/gtk/gtk_interface.c:1282
-#: modules/gui/macosx/output.m:162 modules/gui/wxwindows/streamout.cpp:668
+#: modules/demux/a52sys.c:164 modules/demux/aac.c:177
+#: modules/demux/asf/asf.c:275 modules/demux/avi/avi.c:1178
+#: modules/demux/mkv.cpp:2453 modules/demux/ogg.c:562 modules/demux/ogg.c:838
+#: modules/demux/ogg.c:1011 modules/gui/gtk/gnome_interface.c:148
+#: modules/gui/gtk/gnome_interface.c:931 modules/gui/gtk/gtk_interface.c:481
+#: modules/gui/gtk/gtk_interface.c:1282 modules/gui/macosx/output.m:162
+#: modules/gui/wxwindows/streamout.cpp:668
 msgid "Channels"
 msgstr "Kanaler"
 
-#: modules/demux/aac/demux.c:564 modules/demux/asf/asf.c:277
-#: modules/demux/avi/avi.c:1180 modules/demux/mkv.cpp:2453
-#: modules/demux/mpeg/audio.c:632 modules/demux/ogg.c:559
-#: modules/demux/ogg.c:671 modules/demux/ogg.c:832 modules/demux/ogg.c:1005
+#: modules/demux/a52sys.c:165 modules/demux/aac.c:179
+#: modules/demux/asf/asf.c:277 modules/demux/avi/avi.c:1180
+#: modules/demux/mkv.cpp:2457 modules/demux/mpeg/mpga.c:337
+#: modules/demux/ogg.c:560 modules/demux/ogg.c:672 modules/demux/ogg.c:833
+#: modules/demux/ogg.c:1006
 msgid "Sample Rate"
 msgstr ""
 
+#: modules/demux/aac.c:41
+msgid "AAC demuxer"
+msgstr ""
+
+#: modules/demux/aac.c:173
+msgid "Aac"
+msgstr ""
+
 #: modules/demux/asf/asf.c:48
 msgid "ASF v1.0 demuxer (file only)"
 msgstr ""
 
-#: modules/demux/asf/asf.c:165 modules/demux/mkv.cpp:2412
+#: modules/demux/asf/asf.c:165 modules/demux/mkv.cpp:2416
 #, fuzzy
 msgid "Number of streams"
 msgstr "Stopp strøm"
 
-#: modules/demux/asf/asf.c:228 modules/demux/asf/asf.c:302
+#: modules/demux/asf/asf.c:228 modules/demux/asf/asf.c:298
 #: modules/demux/avi/avi.c:1172 modules/demux/avi/avi.c:1217
-#: modules/demux/avi/avi.c:1250 modules/demux/mkv.cpp:2445
-#: modules/demux/mkv.cpp:2461 modules/demux/mkv.cpp:2477
-#: modules/demux/ogg.c:557 modules/demux/ogg.c:629 modules/demux/ogg.c:669
-#: modules/demux/ogg.c:734 modules/demux/ogg.c:829 modules/demux/ogg.c:909
-#: modules/demux/ogg.c:1002 modules/gui/familiar/interface.c:370
-#: modules/gui/macosx/output.m:139 modules/gui/pda/interface.c:372
+#: modules/demux/avi/avi.c:1250 modules/demux/mkv.cpp:2449
+#: modules/demux/mkv.cpp:2465 modules/demux/mkv.cpp:2481
+#: modules/demux/ogg.c:558 modules/demux/ogg.c:630 modules/demux/ogg.c:670
+#: modules/demux/ogg.c:735 modules/demux/ogg.c:830 modules/demux/ogg.c:910
+#: modules/demux/ogg.c:1003 modules/gui/macosx/output.m:139
+#: modules/gui/pda/interface.c:372
 msgid "Type"
 msgstr ""
 
-#: modules/demux/asf/asf.c:260 modules/demux/asf/asf.c:318
+#: modules/demux/asf/asf.c:260 modules/demux/asf/asf.c:314
 #: modules/demux/avi/avi.c:1174 modules/demux/avi/avi.c:1218
-#: modules/demux/mkv.cpp:2446 modules/demux/mkv.cpp:2462
-#: modules/demux/mkv.cpp:2478 modules/demux/ogg.c:558 modules/demux/ogg.c:630
-#: modules/demux/ogg.c:670 modules/demux/ogg.c:735 modules/demux/ogg.c:830
-#: modules/demux/ogg.c:910 modules/demux/ogg.c:1003
+#: modules/demux/mkv.cpp:2450 modules/demux/mkv.cpp:2466
+#: modules/demux/mkv.cpp:2482 modules/demux/ogg.c:559 modules/demux/ogg.c:631
+#: modules/demux/ogg.c:671 modules/demux/ogg.c:736 modules/demux/ogg.c:831
+#: modules/demux/ogg.c:911 modules/demux/ogg.c:1004
 msgid "Codec"
 msgstr ""
 
@@ -2400,37 +2510,37 @@ msgid "Avg. byterate"
 msgstr ""
 
 #: modules/demux/asf/asf.c:282 modules/demux/avi/avi.c:1185
-#: modules/demux/mkv.cpp:2457
+#: modules/demux/mkv.cpp:2461
 msgid "Bits Per Sample"
 msgstr ""
 
-#: modules/demux/asf/asf.c:332
+#: modules/demux/asf/asf.c:328
 msgid "Size"
 msgstr ""
 
-#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1222
-#: modules/demux/mkv.cpp:2465
+#: modules/demux/asf/asf.c:331 modules/demux/avi/avi.c:1222
+#: modules/demux/mkv.cpp:2469
 msgid "Resolution"
 msgstr "Oppløsning"
 
-#: modules/demux/asf/asf.c:337
+#: modules/demux/asf/asf.c:333
 #, fuzzy
 msgid "Planes"
 msgstr "Spill"
 
-#: modules/demux/asf/asf.c:339 modules/demux/avi/avi.c:1228
+#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1228
 msgid "Bits Per Pixel"
 msgstr ""
 
-#: modules/demux/asf/asf.c:342
+#: modules/demux/asf/asf.c:338
 msgid "Image Size"
 msgstr ""
 
-#: modules/demux/asf/asf.c:344
+#: modules/demux/asf/asf.c:340
 msgid "X pixels per meter"
 msgstr ""
 
-#: modules/demux/asf/asf.c:346
+#: modules/demux/asf/asf.c:342
 msgid "Y pixels per meter"
 msgstr ""
 
@@ -2469,7 +2579,7 @@ msgstr "Varighet"
 msgid "Rating"
 msgstr "tegn"
 
-#: modules/demux/au.c:47
+#: modules/demux/au.c:42
 msgid "AU demuxer"
 msgstr ""
 
@@ -2518,8 +2628,8 @@ msgstr ""
 msgid "Audio Bitrate"
 msgstr "Lyd"
 
-#: modules/demux/avi/avi.c:1225 modules/demux/ogg.c:631
-#: modules/demux/ogg.c:737 modules/demux/ogg.c:912
+#: modules/demux/avi/avi.c:1225 modules/demux/ogg.c:632
+#: modules/demux/ogg.c:738 modules/demux/ogg.c:913
 msgid "Frame Rate"
 msgstr ""
 
@@ -2562,66 +2672,66 @@ msgstr ""
 msgid "mka/mkv stream demuxer"
 msgstr "Standard grensesnitt: "
 
-#: modules/demux/mkv.cpp:2389 modules/gui/gtk/gnome_interface.c:2436
+#: modules/demux/mkv.cpp:2393 modules/gui/gtk/gnome_interface.c:2436
 #: modules/gui/gtk/gtk_interface.c:2857 modules/gui/wxwindows/playlist.cpp:150
 msgid "Duration"
 msgstr "Varighet"
 
-#: modules/demux/mkv.cpp:2398
+#: modules/demux/mkv.cpp:2402
 msgid "Date UTC"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2402
+#: modules/demux/mkv.cpp:2406
 #, fuzzy
 msgid "Segment Filename"
 msgstr "Fil"
 
-#: modules/demux/mkv.cpp:2406
+#: modules/demux/mkv.cpp:2410
 #, fuzzy
 msgid "Muxing Application"
 msgstr "Om dette programmet"
 
-#: modules/demux/mkv.cpp:2410
+#: modules/demux/mkv.cpp:2414
 #, fuzzy
 msgid "Writing Application"
 msgstr "Startposisjon"
 
-#: modules/demux/mkv.cpp:2423 modules/gui/beos/PlayListWindow.cpp:144
-#: modules/gui/familiar/interface.c:362 modules/gui/gtk/preferences.c:325
-#: modules/gui/kde/pluginsbox.cpp:45 modules/gui/pda/interface.c:364
+#: modules/demux/mkv.cpp:2427 modules/gui/beos/PlayListWindow.cpp:144
+#: modules/gui/gtk/preferences.c:325 modules/gui/kde/pluginsbox.cpp:45
+#: modules/gui/pda/interface.c:364
 msgid "Name"
 msgstr "Navn"
 
-#: modules/demux/mkv.cpp:2427
+#: modules/demux/mkv.cpp:2431
 #, fuzzy
 msgid "Codec Name"
 msgstr "Navn på enhet"
 
-#: modules/demux/mkv.cpp:2431
+#: modules/demux/mkv.cpp:2435
 #, fuzzy
 msgid "Codec Setting"
 msgstr "_Innstillinger"
 
-#: modules/demux/mkv.cpp:2435
+#: modules/demux/mkv.cpp:2439
 #, fuzzy
 msgid "Codec Info"
 msgstr "Navn på enhet"
 
-#: modules/demux/mkv.cpp:2439
+#: modules/demux/mkv.cpp:2443
 #, fuzzy
 msgid "Codec Download"
 msgstr "Navn på enhet"
 
-#: modules/demux/mkv.cpp:2469
+#: modules/demux/mkv.cpp:2473
 #, fuzzy
 msgid "Display Resolution"
 msgstr "Oppløsning"
 
-#: modules/demux/mkv.cpp:2473
+#: modules/demux/mkv.cpp:2477
 msgid "Frame Per Second"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2477 modules/gui/gtk/gnome_interface.c:1963
+#: modules/demux/mkv.cpp:2481 modules/gui/gtk/gnome_interface.c:1963
 #: modules/gui/gtk/gtk_interface.c:2278
 #, fuzzy
 msgid "Subtitle"
@@ -2631,35 +2741,42 @@ msgstr "_Teksting"
 msgid "MP4 demuxer"
 msgstr ""
 
-#: modules/demux/mpeg/audio.c:47
+#: modules/demux/mpeg/es.c:49
+msgid "ISO 13818-1 MPEG Elementary Stream input"
+msgstr ""
+
+#: modules/demux/mpeg/m4v.c:43
 #, fuzzy
-msgid "MPEG I/II audio stream demuxer"
+msgid "MPEG-4 video elementary stream demuxer"
 msgstr "Standard grensesnitt: "
 
-#: modules/demux/mpeg/audio.c:626 modules/demux/mpeg/audio.c:643
 #: modules/demux/mpeg/m4v.c:149
 msgid "mpeg"
 msgstr "mpeg"
 
-#: modules/demux/mpeg/audio.c:630
-msgid "Mode"
-msgstr "Modus"
+#: modules/demux/mpeg/m4v.c:150
+msgid "Video MPEG-4 (raw ES)"
+msgstr ""
 
-#: modules/demux/mpeg/audio.c:634
-msgid "Average Bitrate"
+#: modules/demux/mpeg/mpga.c:41
+#, fuzzy
+msgid "MPEG-I/II Audio demuxer"
+msgstr "Standard grensesnitt: "
+
+#: modules/demux/mpeg/mpga.c:330
+msgid "MPEG"
 msgstr ""
 
-#: modules/demux/mpeg/es.c:49
-msgid "ISO 13818-1 MPEG Elementary Stream input"
+#: modules/demux/mpeg/mpga.c:333
+msgid "Layer"
 msgstr ""
 
-#: modules/demux/mpeg/m4v.c:43
-#, fuzzy
-msgid "MPEG-4 video elementary stream demuxer"
-msgstr "Standard grensesnitt: "
+#: modules/demux/mpeg/mpga.c:335
+msgid "Mode"
+msgstr "Modus"
 
-#: modules/demux/mpeg/m4v.c:150
-msgid "Video MPEG-4 (raw ES)"
+#: modules/demux/mpeg/mpga.c:339
+msgid "Average Bitrate"
 msgstr ""
 
 #: modules/demux/mpeg/ps.c:60
@@ -2703,37 +2820,37 @@ msgstr ""
 msgid "ogg stream demuxer"
 msgstr ""
 
-#: modules/demux/ogg.c:558
+#: modules/demux/ogg.c:559
 msgid "Vorbis"
 msgstr ""
 
-#: modules/demux/ogg.c:563 modules/demux/ogg.c:633 modules/demux/ogg.c:673
-#: modules/demux/ogg.c:834 modules/demux/ogg.c:1007
+#: modules/demux/ogg.c:564 modules/demux/ogg.c:634 modules/demux/ogg.c:674
+#: modules/demux/ogg.c:835 modules/demux/ogg.c:1008
 msgid "Bit Rate"
 msgstr ""
 
-#: modules/demux/ogg.c:630
+#: modules/demux/ogg.c:631
 msgid "Theora"
 msgstr ""
 
-#: modules/demux/ogg.c:670
+#: modules/demux/ogg.c:671
 #, fuzzy
 msgid "tarkin"
 msgstr "tegn"
 
-#: modules/demux/ogg.c:739 modules/demux/ogg.c:914
+#: modules/demux/ogg.c:740 modules/demux/ogg.c:915
 msgid "Bit Count"
 msgstr ""
 
-#: modules/demux/ogg.c:741 modules/demux/ogg.c:916
+#: modules/demux/ogg.c:742 modules/demux/ogg.c:917
 msgid "Width"
 msgstr ""
 
-#: modules/demux/ogg.c:743 modules/demux/ogg.c:918
+#: modules/demux/ogg.c:744 modules/demux/ogg.c:919
 msgid "Height"
 msgstr ""
 
-#: modules/demux/ogg.c:839 modules/demux/ogg.c:1012
+#: modules/demux/ogg.c:840 modules/demux/ogg.c:1013
 msgid "Bits per Sample"
 msgstr ""
 
@@ -2741,6 +2858,10 @@ msgstr ""
 msgid "raw dv demuxer"
 msgstr ""
 
+#: modules/demux/sdp.c:64
+msgid "SDP demuxer + UDP/RTP/RTSP"
+msgstr ""
+
 #: modules/demux/util/id3.c:44
 msgid "Simple id3 tag skipper"
 msgstr ""
@@ -3090,7 +3211,7 @@ msgstr ""
 msgid "Text subtitles demux"
 msgstr "Velg teksting kanal"
 
-#: modules/demux/wav/wav.c:49
+#: modules/demux/wav.c:43
 msgid "WAV demuxer"
 msgstr ""
 
@@ -3126,11 +3247,9 @@ msgid "Yes"
 msgstr ""
 
 #: modules/gui/beos/InterfaceWindow.cpp:201
-#: modules/gui/beos/InterfaceWindow.cpp:308
-#: modules/gui/familiar/interface.c:149 modules/gui/familiar/interface.c:150
-#: modules/gui/macosx/intf.m:328 modules/gui/macosx/prefs.m:77
-#: modules/gui/pda/interface.c:151 modules/gui/pda/interface.c:152
-#: modules/gui/wxwindows/preferences.cpp:233
+#: modules/gui/beos/InterfaceWindow.cpp:308 modules/gui/macosx/intf.m:328
+#: modules/gui/macosx/prefs.m:77 modules/gui/pda/interface.c:151
+#: modules/gui/pda/interface.c:152 modules/gui/wxwindows/preferences.cpp:233
 msgid "Preferences"
 msgstr "Innstillinger"
 
@@ -3145,7 +3264,7 @@ msgstr "Beskjeder"
 
 #: modules/gui/beos/InterfaceWindow.cpp:238
 #: modules/gui/beos/MediaControlView.cpp:1257
-#: modules/gui/beos/PlayListWindow.cpp:82 modules/gui/familiar/interface.c:378
+#: modules/gui/beos/PlayListWindow.cpp:82
 #: modules/gui/gtk/gnome_interface.c:503
 #: modules/gui/gtk/gnome_interface.c:1569
 #: modules/gui/gtk/gnome_interface.c:2274
@@ -3180,10 +3299,8 @@ msgid "Open Subtitles"
 msgstr "_Teksting"
 
 #: modules/gui/beos/InterfaceWindow.cpp:249
-#: modules/gui/familiar/interface.c:231 modules/gui/familiar/interface.c:232
-#: modules/gui/familiar/interface.c:765 modules/gui/gtk/gtk_interface.c:1580
-#: modules/gui/pda/interface.c:233 modules/gui/pda/interface.c:234
-#: modules/gui/pda/interface.c:767
+#: modules/gui/gtk/gtk_interface.c:1580 modules/gui/pda/interface.c:233
+#: modules/gui/pda/interface.c:234 modules/gui/pda/interface.c:767
 msgid "About"
 msgstr "Om"
 
@@ -3239,7 +3356,7 @@ msgstr "Spilleliste"
 #: modules/gui/wxwindows/open.cpp:244
 #: modules/gui/wxwindows/preferences.cpp:253
 #: modules/gui/wxwindows/streamout.cpp:217
-#: modules/gui/wxwindows/subtitles.cpp:149
+#: modules/gui/wxwindows/subtitles.cpp:190
 msgid "OK"
 msgstr "OK"
 
@@ -3374,7 +3491,7 @@ msgstr ""
 msgid "Take Screen Shot"
 msgstr ""
 
-#: modules/gui/beos/VlcWrapper.cpp:165 modules/gui/gtk/menu.c:733
+#: modules/gui/beos/VlcWrapper.cpp:165 modules/gui/gtk/menu.c:734
 msgid "None"
 msgstr ""
 
@@ -3383,211 +3500,6 @@ msgstr ""
 msgid "<unknown>"
 msgstr "Ukjent"
 
-#: modules/gui/familiar/familiar.c:62 modules/gui/pda/pda.c:62
-#, fuzzy
-msgid "Autoplay selected file"
-msgstr "Spill strøm"
-
-#: modules/gui/familiar/familiar.c:63 modules/gui/pda/pda.c:63
-msgid "Automatically play a file when selected in the file selection list"
-msgstr ""
-
-#: modules/gui/familiar/familiar.c:72
-#, fuzzy
-msgid "Familiar Linux Gtk+ interface"
-msgstr "Standard grensesnitt: "
-
-#: modules/gui/familiar/interface.c:99 modules/gui/familiar/interface.c:732
-#: modules/gui/gtk/gnome_interface.c:274 modules/gui/gtk/gtk_interface.c:121
-#: modules/gui/gtk/gtk_interface.c:1595 modules/gui/pda/interface.c:99
-#: modules/gui/pda/interface.c:734
-msgid "VLC media player"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:124 modules/gui/pda/interface.c:126
-#: modules/gui/wxwindows/dialogs.cpp:268 modules/gui/wxwindows/open.cpp:709
-#: modules/gui/wxwindows/preferences.cpp:1029
-#: modules/gui/wxwindows/subtitles.cpp:196
-#, fuzzy
-msgid "Open file"
-msgstr "Åpne fil"
-
-#: modules/gui/familiar/interface.c:164 modules/gui/pda/interface.c:166
-msgid "Rewind"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:165 modules/gui/pda/interface.c:167
-#, fuzzy
-msgid "Rewind stream"
-msgstr "Stopp strøm"
-
-#: modules/gui/familiar/interface.c:178 modules/gui/pda/interface.c:180
-#, fuzzy
-msgid "Pause stream"
-msgstr "Pause strøm"
-
-#: modules/gui/familiar/interface.c:191 modules/gui/pda/interface.c:193
-#, fuzzy
-msgid "Play stream"
-msgstr "Spill strøm"
-
-#: modules/gui/familiar/interface.c:203 modules/gui/gtk/gnome_interface.c:566
-#: modules/gui/gtk/gnome_interface.c:1027 modules/gui/gtk/gtk_interface.c:676
-#: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:639
-#: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
-#: modules/gui/macosx/intf.m:424 modules/gui/pda/interface.c:205
-#: modules/gui/wxwindows/interface.cpp:373
-msgid "Stop"
-msgstr "Stopp"
-
-#: modules/gui/familiar/interface.c:204 modules/gui/pda/interface.c:206
-#, fuzzy
-msgid "Stop stream"
-msgstr "Stopp strøm"
-
-#: modules/gui/familiar/interface.c:216 modules/gui/pda/interface.c:218
-msgid "Forward"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:217 modules/gui/pda/interface.c:219
-msgid "Forward stream"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:285 modules/gui/gtk/gnome_interface.c:2345
-#: modules/gui/gtk/gtk_interface.c:2712 modules/gui/macosx/playlist.m:198
-#: modules/gui/pda/interface.c:287
-msgid "Add"
-msgstr "Legg til"
-
-#: modules/gui/familiar/interface.c:293 modules/gui/pda/interface.c:295
-msgid "MRL :"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:394
-msgid "UDP/RTP (Address when Multicast)"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:412 modules/gui/gtk/gnome_interface.c:1747
-#: modules/gui/gtk/gtk_interface.c:2062 modules/gui/macosx/open.m:161
-#: modules/gui/macosx/output.m:133 modules/gui/pda/interface.c:414
-#: modules/gui/wxwindows/open.cpp:469 modules/gui/wxwindows/streamout.cpp:425
-msgid "Address"
-msgstr "Adresse"
-
-#: modules/gui/familiar/interface.c:423 modules/gui/gtk/gnome_interface.c:1737
-#: modules/gui/gtk/gnome_interface.c:1786
-#: modules/gui/gtk/gnome_interface.c:2912 modules/gui/gtk/gtk_interface.c:2052
-#: modules/gui/gtk/gtk_interface.c:2101 modules/gui/gtk/gtk_interface.c:3225
-#: modules/gui/macosx/open.m:160 modules/gui/macosx/open.m:162
-#: modules/gui/macosx/output.m:134 modules/gui/pda/interface.c:425
-#: modules/gui/wxwindows/open.cpp:454 modules/gui/wxwindows/open.cpp:477
-#: modules/gui/wxwindows/streamout.cpp:436
-msgid "Port"
-msgstr "Port"
-
-#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:136
-#: modules/gui/macosx/output.m:236 modules/gui/macosx/output.m:311
-#: modules/gui/pda/interface.c:480 modules/gui/wxwindows/streamout.cpp:386
-msgid "HTTP"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:488 modules/gui/pda/interface.c:490
-#, fuzzy
-msgid "FTP"
-msgstr "RTP"
-
-#: modules/gui/familiar/interface.c:498 modules/gui/pda/interface.c:500
-msgid "MMS"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:516 modules/gui/gtk/gnome_interface.c:1830
-#: modules/gui/gtk/gnome_interface.c:2281 modules/gui/gtk/gtk_interface.c:2145
-#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:144
-#: modules/gui/macosx/open.m:271 modules/gui/pda/interface.c:518
-#: modules/gui/wxwindows/open.cpp:257
-msgid "Network"
-msgstr "Nettverk"
-
-#: modules/gui/familiar/interface.c:524 modules/gui/pda/interface.c:526
-msgid "Media"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:560 modules/gui/pda/interface.c:562
-msgid "MRL"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:569 modules/gui/pda/interface.c:571
-#, fuzzy
-msgid "Time"
-msgstr "Tid"
-
-#: modules/gui/familiar/interface.c:586 modules/gui/pda/interface.c:588
-msgid "Update"
-msgstr "Oppdater"
-
-#: modules/gui/familiar/interface.c:594 modules/gui/pda/interface.c:596
-msgid " Del "
-msgstr ""
-
-#: modules/gui/familiar/interface.c:602 modules/gui/pda/interface.c:604
-msgid " Clear "
-msgstr ""
-
-#: modules/gui/familiar/interface.c:626 modules/gui/pda/interface.c:628
-msgid "Automatically play file"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:643 modules/gui/pda/interface.c:645
-#, fuzzy
-msgid " Save "
-msgstr "Tjener"
-
-#: modules/gui/familiar/interface.c:651 modules/gui/pda/interface.c:653
-#, fuzzy
-msgid " Apply "
-msgstr "Bruk"
-
-#: modules/gui/familiar/interface.c:659 modules/gui/pda/interface.c:661
-#, fuzzy
-msgid " Cancel "
-msgstr "Avbryt"
-
-#: modules/gui/familiar/interface.c:667 modules/gui/pda/interface.c:669
-#, fuzzy
-msgid "Preference"
-msgstr "Innstillinger"
-
-#: modules/gui/familiar/interface.c:711 modules/gui/gtk/gnome_interface.c:1361
-#: modules/gui/gtk/gtk_interface.c:1603 modules/gui/kde/kde.cpp:111
-#: modules/gui/pda/interface.c:713
-msgid "(c) 1996-2003 the VideoLAN team"
-msgstr "(c) 1996-2003 the VideoLAN team"
-
-#: modules/gui/familiar/interface.c:721 modules/gui/pda/interface.c:723
-msgid "Authors: The VideoLAN Team, http://www.videolan.org"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:753 modules/gui/pda/interface.c:755
-msgid ""
-"The VideoLAN Client is a MPEG, MPEG 2, MP3, DivX player, that accepts input "
-"from local or network sources."
-msgstr ""
-
-#: modules/gui/familiar/support.c:121 modules/gui/gtk/gnome_support.c:100
-#: modules/gui/gtk/gnome_support.c:138 modules/gui/gtk/gtk_support.c:121
-#: modules/gui/gtk2/gnome2_support.c:60 modules/gui/gtk2/gnome2_support.c:85
-#: modules/gui/gtk2/gtk2_support.c:90 modules/gui/gtk2/gtk2_support.c:114
-#: modules/gui/pda/support.c:121
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr ""
-
-#: modules/gui/familiar/support.c:130 modules/gui/gtk/gtk_support.c:130
-#: modules/gui/pda/support.c:130
-#, c-format
-msgid "Error loading pixmap file: %s"
-msgstr ""
-
 #: modules/gui/gtk/gnome.c:55 modules/gui/gtk/gtk.c:57
 msgid "Show tooltips"
 msgstr ""
@@ -3787,6 +3699,12 @@ msgstr "_Lyd"
 msgid "_Video"
 msgstr "_Video"
 
+#: modules/gui/gtk/gnome_interface.c:274 modules/gui/gtk/gtk_interface.c:121
+#: modules/gui/gtk/gtk_interface.c:1595 modules/gui/pda/interface.c:99
+#: modules/gui/pda/interface.c:734
+msgid "VLC media player"
+msgstr ""
+
 #: modules/gui/gtk/gnome_interface.c:515 modules/gui/gtk/gnome_interface.c:718
 #: modules/gui/gtk/gnome_interface.c:1690
 #: modules/gui/gtk/gnome_interface.c:2267 modules/gui/gtk/gtk_interface.c:629
@@ -3822,6 +3740,15 @@ msgstr "Tilbake"
 msgid "Go Backward"
 msgstr "Gå tilbake"
 
+#: modules/gui/gtk/gnome_interface.c:566
+#: modules/gui/gtk/gnome_interface.c:1027 modules/gui/gtk/gtk_interface.c:676
+#: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:639
+#: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
+#: modules/gui/macosx/intf.m:424 modules/gui/pda/interface.c:205
+#: modules/gui/wxwindows/interface.cpp:373
+msgid "Stop"
+msgstr "Stopp"
+
 #: modules/gui/gtk/gnome_interface.c:567 modules/gui/gtk/gtk_interface.c:677
 msgid "Stop Stream"
 msgstr "Stopp strøm"
@@ -3947,6 +3874,11 @@ msgstr "Grensesnitt"
 msgid "Playlist..."
 msgstr "Spilleliste..."
 
+#: modules/gui/gtk/gnome_interface.c:1361 modules/gui/gtk/gtk_interface.c:1603
+#: modules/gui/kde/kde.cpp:111 modules/gui/pda/interface.c:713
+msgid "(c) 1996-2003 the VideoLAN team"
+msgstr "(c) 1996-2003 the VideoLAN team"
+
 #: modules/gui/gtk/gnome_interface.c:1363 modules/gui/gtk/gtk_interface.c:1646
 #: modules/gui/kde/kde.cpp:108
 msgid ""
@@ -3987,7 +3919,7 @@ msgstr ""
 #: modules/gui/wxwindows/open.cpp:223 modules/gui/wxwindows/open.cpp:341
 #: modules/gui/wxwindows/preferences.cpp:832
 #: modules/gui/wxwindows/streamout.cpp:412
-#: modules/gui/wxwindows/subtitles.cpp:107
+#: modules/gui/wxwindows/subtitles.cpp:109
 #, fuzzy
 msgid "Browse..."
 msgstr "Utforsk"
@@ -4037,11 +3969,37 @@ msgstr ""
 msgid "HTTP/FTP/MMS"
 msgstr ""
 
+#: modules/gui/gtk/gnome_interface.c:1737
+#: modules/gui/gtk/gnome_interface.c:1786
+#: modules/gui/gtk/gnome_interface.c:2912 modules/gui/gtk/gtk_interface.c:2052
+#: modules/gui/gtk/gtk_interface.c:2101 modules/gui/gtk/gtk_interface.c:3225
+#: modules/gui/macosx/open.m:160 modules/gui/macosx/open.m:162
+#: modules/gui/macosx/output.m:134 modules/gui/pda/interface.c:425
+#: modules/gui/wxwindows/open.cpp:454 modules/gui/wxwindows/open.cpp:477
+#: modules/gui/wxwindows/streamout.cpp:436
+msgid "Port"
+msgstr "Port"
+
+#: modules/gui/gtk/gnome_interface.c:1747 modules/gui/gtk/gtk_interface.c:2062
+#: modules/gui/macosx/open.m:161 modules/gui/macosx/output.m:133
+#: modules/gui/pda/interface.c:414 modules/gui/wxwindows/open.cpp:469
+#: modules/gui/wxwindows/streamout.cpp:425
+msgid "Address"
+msgstr "Adresse"
+
 #: modules/gui/gtk/gnome_interface.c:1759 modules/gui/gtk/gtk_interface.c:2074
 #: modules/gui/macosx/open.m:163 modules/gui/wxwindows/open.cpp:492
 msgid "URL"
 msgstr ""
 
+#: modules/gui/gtk/gnome_interface.c:1830
+#: modules/gui/gtk/gnome_interface.c:2281 modules/gui/gtk/gtk_interface.c:2145
+#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:144
+#: modules/gui/macosx/open.m:271 modules/gui/pda/interface.c:518
+#: modules/gui/wxwindows/open.cpp:257
+msgid "Network"
+msgstr "Nettverk"
+
 #: modules/gui/gtk/gnome_interface.c:1847 modules/gui/gtk/gtk_interface.c:2162
 msgid "Symbol Rate"
 msgstr ""
@@ -4127,6 +4085,11 @@ msgstr "Inverter"
 msgid "Select"
 msgstr "Velg"
 
+#: modules/gui/gtk/gnome_interface.c:2345 modules/gui/gtk/gtk_interface.c:2712
+#: modules/gui/macosx/playlist.m:198 modules/gui/pda/interface.c:287
+msgid "Add"
+msgstr "Legg til"
+
 #: modules/gui/gtk/gnome_interface.c:2352 modules/gui/gtk/gtk_interface.c:2754
 #: modules/gui/macosx/playlist.m:195 modules/gui/macosx/playlist.m:199
 msgid "Delete"
@@ -4199,6 +4162,14 @@ msgstr ""
 msgid "AVI"
 msgstr ""
 
+#: modules/gui/gtk/gnome_support.c:100 modules/gui/gtk/gnome_support.c:138
+#: modules/gui/gtk/gtk_support.c:121 modules/gui/gtk2/gnome2_support.c:60
+#: modules/gui/gtk2/gnome2_support.c:85 modules/gui/gtk2/gtk2_support.c:90
+#: modules/gui/gtk2/gtk2_support.c:114 modules/gui/pda/support.c:121
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr ""
+
 #: modules/gui/gtk/gnome_support.c:116
 #, c-format
 msgid "Couldn't create pixmap from file: %s"
@@ -4319,10 +4290,11 @@ msgstr "Standard output:"
 #: modules/gui/gtk/gtk_interface.c:2403 modules/gui/gtk/gtk_interface.c:2645
 #: modules/gui/gtk/gtk_interface.c:2876 modules/gui/gtk/gtk_interface.c:3257
 #: modules/gui/gtk/preferences.c:618 modules/gui/macosx/open.m:140
-#: modules/gui/macosx/prefs.m:79 modules/gui/wxwindows/open.cpp:247
+#: modules/gui/macosx/prefs.m:79 modules/gui/macosx/prefs.m:170
+#: modules/gui/wxwindows/open.cpp:247
 #: modules/gui/wxwindows/preferences.cpp:256
 #: modules/gui/wxwindows/streamout.cpp:220
-#: modules/gui/wxwindows/subtitles.cpp:152
+#: modules/gui/wxwindows/subtitles.cpp:193
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -4354,12 +4326,17 @@ msgstr "_Invertert"
 msgid "_Select"
 msgstr "_Valgt"
 
-#: modules/gui/gtk/menu.c:900
+#: modules/gui/gtk/gtk_support.c:130 modules/gui/pda/support.c:130
+#, c-format
+msgid "Error loading pixmap file: %s"
+msgstr ""
+
+#: modules/gui/gtk/menu.c:901
 #, fuzzy, c-format
 msgid "Title %d (%d)"
 msgstr "Tittel: "
 
-#: modules/gui/gtk/menu.c:967
+#: modules/gui/gtk/menu.c:968
 #, fuzzy, c-format
 msgid "Chapter %d"
 msgstr "Kapittel"
@@ -4524,8 +4501,9 @@ msgstr ""
 msgid "VLC - Controller"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/interface.cpp:904
-#: modules/gui/wxwindows/timer.cpp:131
+#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/control.cpp:160
+#: modules/gui/wxwindows/control.cpp:370
+#: modules/gui/wxwindows/interface.cpp:904 modules/gui/wxwindows/timer.cpp:131
 msgid "Volume"
 msgstr ""
 
@@ -4793,6 +4771,12 @@ msgstr "Stopp str
 msgid "TTL"
 msgstr ""
 
+#: modules/gui/macosx/output.m:136 modules/gui/macosx/output.m:236
+#: modules/gui/macosx/output.m:311 modules/gui/pda/interface.c:480
+#: modules/gui/wxwindows/streamout.cpp:386
+msgid "HTTP"
+msgstr ""
+
 #: modules/gui/macosx/output.m:141 modules/gui/wxwindows/streamout.cpp:531
 msgid "Encapsulation Method"
 msgstr ""
@@ -4854,6 +4838,10 @@ msgstr ""
 msgid "Reset Preferences"
 msgstr "Innstillinger"
 
+#: modules/gui/macosx/prefs.m:170
+msgid "Continue"
+msgstr ""
+
 #: modules/gui/macosx/prefs.m:172 modules/gui/wxwindows/preferences.cpp:316
 msgid ""
 "Beware this will reset your VLC Media Player config file.\n"
@@ -4874,10 +4862,131 @@ msgstr "Slett"
 msgid "ncurses interface"
 msgstr "Standard grensesnitt: "
 
+#: modules/gui/pda/interface.c:126 modules/gui/wxwindows/dialogs.cpp:268
+#: modules/gui/wxwindows/open.cpp:709
+#: modules/gui/wxwindows/preferences.cpp:1029
+#: modules/gui/wxwindows/subtitles.cpp:234
+#, fuzzy
+msgid "Open file"
+msgstr "Åpne fil"
+
+#: modules/gui/pda/interface.c:166
+msgid "Rewind"
+msgstr ""
+
+#: modules/gui/pda/interface.c:167
+#, fuzzy
+msgid "Rewind stream"
+msgstr "Stopp strøm"
+
+#: modules/gui/pda/interface.c:180
+#, fuzzy
+msgid "Pause stream"
+msgstr "Pause strøm"
+
+#: modules/gui/pda/interface.c:193
+#, fuzzy
+msgid "Play stream"
+msgstr "Spill strøm"
+
+#: modules/gui/pda/interface.c:206
+#, fuzzy
+msgid "Stop stream"
+msgstr "Stopp strøm"
+
+#: modules/gui/pda/interface.c:218
+msgid "Forward"
+msgstr ""
+
+#: modules/gui/pda/interface.c:219
+msgid "Forward stream"
+msgstr ""
+
+#: modules/gui/pda/interface.c:295
+msgid "MRL :"
+msgstr ""
+
 #: modules/gui/pda/interface.c:396
 msgid "UDP/RTP (Adress when Multicast)"
 msgstr ""
 
+#: modules/gui/pda/interface.c:490
+#, fuzzy
+msgid "FTP"
+msgstr "RTP"
+
+#: modules/gui/pda/interface.c:500
+msgid "MMS"
+msgstr ""
+
+#: modules/gui/pda/interface.c:526
+msgid "Media"
+msgstr ""
+
+#: modules/gui/pda/interface.c:562
+msgid "MRL"
+msgstr ""
+
+#: modules/gui/pda/interface.c:571
+#, fuzzy
+msgid "Time"
+msgstr "Tid"
+
+#: modules/gui/pda/interface.c:588
+msgid "Update"
+msgstr "Oppdater"
+
+#: modules/gui/pda/interface.c:596
+msgid " Del "
+msgstr ""
+
+#: modules/gui/pda/interface.c:604
+msgid " Clear "
+msgstr ""
+
+#: modules/gui/pda/interface.c:628
+msgid "Automatically play file"
+msgstr ""
+
+#: modules/gui/pda/interface.c:645
+#, fuzzy
+msgid " Save "
+msgstr "Tjener"
+
+#: modules/gui/pda/interface.c:653
+#, fuzzy
+msgid " Apply "
+msgstr "Bruk"
+
+#: modules/gui/pda/interface.c:661
+#, fuzzy
+msgid " Cancel "
+msgstr "Avbryt"
+
+#: modules/gui/pda/interface.c:669
+#, fuzzy
+msgid "Preference"
+msgstr "Innstillinger"
+
+#: modules/gui/pda/interface.c:723
+msgid "Authors: The VideoLAN Team, http://www.videolan.org"
+msgstr ""
+
+#: modules/gui/pda/interface.c:755
+msgid ""
+"The VideoLAN Client is a MPEG, MPEG 2, MP3, DivX player, that accepts input "
+"from local or network sources."
+msgstr ""
+
+#: modules/gui/pda/pda.c:62
+#, fuzzy
+msgid "Autoplay selected file"
+msgstr "Spill strøm"
+
+#: modules/gui/pda/pda.c:63
+msgid "Automatically play a file when selected in the file selection list"
+msgstr ""
+
 #: modules/gui/pda/pda.c:72
 #, fuzzy
 msgid "PDA Linux Gtk2+ interface"
@@ -5206,7 +5315,7 @@ msgstr "Pause str
 msgid "Capture the stream you are playing to a file"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:348 modules/gui/wxwindows/subtitles.cpp:98
+#: modules/gui/wxwindows/open.cpp:348 modules/gui/wxwindows/subtitles.cpp:100
 #, fuzzy
 msgid "Subtitles file"
 msgstr "_Teksting"
@@ -5224,7 +5333,7 @@ msgstr ""
 msgid "CD Audio"
 msgstr "Lyd"
 
-#: modules/gui/wxwindows/open.cpp:900 modules/gui/wxwindows/streamout.cpp:784
+#: modules/gui/wxwindows/open.cpp:903 modules/gui/wxwindows/streamout.cpp:784
 #, fuzzy
 msgid "Save file"
 msgstr "Velg fil"
@@ -5359,21 +5468,26 @@ msgstr "Standard grensesnitt: "
 msgid "Open Subtitles File"
 msgstr "Velg teksting kanal"
 
-#: modules/gui/wxwindows/subtitles.cpp:115
+#: modules/gui/wxwindows/subtitles.cpp:123
+#, fuzzy
+msgid "Subtitles encoding"
+msgstr "Standard grensesnitt: "
+
+#: modules/gui/wxwindows/subtitles.cpp:155
 #, fuzzy
 msgid "Subtitles options"
 msgstr "_Teksting"
 
-#: modules/gui/wxwindows/subtitles.cpp:119
+#: modules/gui/wxwindows/subtitles.cpp:159
 #, fuzzy
 msgid "Delay subtitles (in 1/10s)"
 msgstr "Velg teksting kanal"
 
-#: modules/gui/wxwindows/subtitles.cpp:130
+#: modules/gui/wxwindows/subtitles.cpp:170
 msgid "Frames per second"
 msgstr ""
 
-#: modules/gui/wxwindows/subtitles.cpp:138
+#: modules/gui/wxwindows/subtitles.cpp:178
 msgid "Override frames per second. It will only work with MicroDVD subtitles."
 msgstr ""
 
@@ -5446,30 +5560,30 @@ msgstr "Skjul grensesnittvinduet"
 msgid "Using the dummy interface plugin..."
 msgstr "Skjul grensesnittvinduet"
 
-#: modules/misc/freetype.c:67 modules/visualization/xosd/xosd.c:71
+#: modules/misc/freetype.c:72 modules/visualization/xosd/xosd.c:71
 #, fuzzy
 msgid "Font"
 msgstr "skrifttype"
 
-#: modules/misc/freetype.c:68
+#: modules/misc/freetype.c:73
 #, fuzzy
 msgid "Filename of Font"
 msgstr "Fil"
 
-#: modules/misc/freetype.c:69
+#: modules/misc/freetype.c:74
 msgid "Font size"
 msgstr ""
 
-#: modules/misc/freetype.c:70
+#: modules/misc/freetype.c:75
 msgid "The size of the fonts used by the osd module"
 msgstr ""
 
-#: modules/misc/freetype.c:73
+#: modules/misc/freetype.c:78
 #, fuzzy
 msgid "Fonts"
 msgstr "skrifttype"
 
-#: modules/misc/freetype.c:76
+#: modules/misc/freetype.c:81
 msgid "freetype2 font renderer"
 msgstr ""
 
@@ -5609,19 +5723,19 @@ msgstr ""
 msgid "Dummy muxer"
 msgstr ""
 
-#: modules/mux/mp4.c:52
+#: modules/mux/mp4.c:56
 msgid "MP4/MOV muxer"
 msgstr ""
 
-#: modules/mux/mpeg/ps.c:79
+#: modules/mux/mpeg/ps.c:53
 msgid "PS muxer"
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:138
+#: modules/mux/mpeg/ts.c:78
 msgid "TS muxer"
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:143
+#: modules/mux/mpeg/ts.c:83
 msgid "TS muxer (libdvbpsi)"
 msgstr ""
 
@@ -5633,7 +5747,7 @@ msgstr ""
 msgid "A/52 audio packetizer"
 msgstr ""
 
-#: modules/packetizer/copy.c:69
+#: modules/packetizer/copy.c:43
 msgid "Copy packetizer"
 msgstr ""
 
@@ -5683,7 +5797,7 @@ msgstr "Stopp str
 msgid "Standard stream"
 msgstr "Stopp strøm"
 
-#: modules/stream_out/transcode.c:71
+#: modules/stream_out/transcode.c:73
 #, fuzzy
 msgid "Transcode stream"
 msgstr "Pause strøm"
@@ -6189,6 +6303,10 @@ msgstr "XOSD modul"
 msgid "xosd interface"
 msgstr "xosd modulgrensesnitt"
 
+#, fuzzy
+#~ msgid "Familiar Linux Gtk+ interface"
+#~ msgstr "Standard grensesnitt: "
+
 #, fuzzy
 #~ msgid "Advanced open options"
 #~ msgstr "vis avanserte alternativer"
diff --git a/po/pl.po b/po/pl.po
index 980f2eb7d7..d9e2b97d51 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vlc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-07-31 15:04+0200\n"
+"POT-Creation-Date: 2003-08-11 21:05+0200\n"
 "PO-Revision-Date: 2002-07-12 11:49+0100\n"
 "Last-Translator: Arkadiusz Lipiec <alipiec@elka.pw.edu.pl>\n"
 "Language-Team: polish <pl@li.org>\n"
@@ -28,7 +28,7 @@ msgid "Audio channels"
 msgstr "Wybiera kana³ d¼wiêkowy"
 
 #: src/audio_output/output.c:107 src/audio_output/output.c:142
-#: modules/audio_output/alsa.c:179 modules/audio_output/directx.c:423
+#: modules/audio_output/alsa.c:177 modules/audio_output/directx.c:423
 #: modules/audio_output/oss.c:202 modules/audio_output/sdl.c:181
 #: modules/audio_output/sdl.c:198 modules/audio_output/waveout.c:386
 #, fuzzy
@@ -106,11 +106,11 @@ msgstr ""
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr ""
 
-#: src/input/input.c:171
+#: src/input/input.c:174
 msgid "General"
 msgstr ""
 
-#: src/input/input.c:172
+#: src/input/input.c:175
 #, fuzzy
 msgid "Playlist Item"
 msgstr "Lista odtwarzania"
@@ -122,9 +122,9 @@ msgid "Program"
 msgstr "Program"
 
 #: src/input/input_programs.c:98 modules/demux/asf/libasf.c:696
-#: modules/demux/mkv.cpp:2394 modules/gui/beos/MediaControlView.cpp:1258
+#: modules/demux/mkv.cpp:2398 modules/gui/beos/MediaControlView.cpp:1258
 #: modules/gui/gtk/gnome_interface.c:1650 modules/gui/gtk/gtk_interface.c:1956
-#: modules/gui/gtk/menu.c:1402 modules/gui/gtk/menu.c:1423
+#: modules/gui/gtk/menu.c:1403 modules/gui/gtk/menu.c:1424
 #: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:373
 #: modules/gui/macosx/intf.m:374 modules/gui/macosx/open.m:150
 #: modules/gui/wxwindows/open.cpp:406
@@ -133,7 +133,7 @@ msgstr "Tytu
 
 #: src/input/input_programs.c:102 modules/gui/beos/MediaControlView.cpp:1259
 #: modules/gui/gtk/gnome_interface.c:1640 modules/gui/gtk/gtk_interface.c:1946
-#: modules/gui/gtk/menu.c:1019 modules/gui/gtk/menu.c:1432
+#: modules/gui/gtk/menu.c:1020 modules/gui/gtk/menu.c:1433
 #: modules/gui/kde/interface.cpp:146 modules/gui/macosx/intf.m:375
 #: modules/gui/macosx/intf.m:376 modules/gui/macosx/open.m:151
 #: modules/gui/wxwindows/open.cpp:412
@@ -215,15 +215,15 @@ msgstr ""
 "U¿ycie: %s [opcje] [parametry] [plik]...\n"
 "\n"
 
-#: src/libvlc.c:1200 src/misc/configuration.c:1019
+#: src/libvlc.c:1200 src/misc/configuration.c:1040
 msgid "string"
 msgstr "napis"
 
-#: src/libvlc.c:1217 src/misc/configuration.c:1000
+#: src/libvlc.c:1217 src/misc/configuration.c:1021
 msgid "integer"
 msgstr "liczba ca³kowita"
 
-#: src/libvlc.c:1220 src/misc/configuration.c:1009
+#: src/libvlc.c:1220 src/misc/configuration.c:1030
 msgid "float"
 msgstr "liczba zmiennoprz."
 
@@ -1126,16 +1126,16 @@ msgstr "Interfejs"
 
 #: src/libvlc.h:474 modules/audio_output/coreaudio.c:227
 #: modules/audio_output/file.c:108 modules/demux/asf/asf.c:228
-#: modules/demux/mkv.cpp:2445 modules/demux/ogg.c:557 modules/demux/ogg.c:829
-#: modules/demux/ogg.c:1002 modules/gui/beos/InterfaceWindow.cpp:259
+#: modules/demux/mkv.cpp:2449 modules/demux/ogg.c:558 modules/demux/ogg.c:830
+#: modules/demux/ogg.c:1003 modules/gui/beos/InterfaceWindow.cpp:259
 #: modules/gui/gtk/gnome_interface.c:1092 modules/gui/gtk/gtk_interface.c:1219
 #: modules/gui/macosx/intf.m:378 modules/gui/macosx/output.m:156
 msgid "Audio"
 msgstr "D¼wiêk"
 
-#: src/libvlc.h:493 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1217
-#: modules/demux/mkv.cpp:2461 modules/demux/ogg.c:629 modules/demux/ogg.c:669
-#: modules/demux/ogg.c:734 modules/demux/ogg.c:909
+#: src/libvlc.h:493 modules/demux/asf/asf.c:298 modules/demux/avi/avi.c:1217
+#: modules/demux/mkv.cpp:2465 modules/demux/ogg.c:630 modules/demux/ogg.c:670
+#: modules/demux/ogg.c:735 modules/demux/ogg.c:910
 #: modules/gui/gtk/gnome_interface.c:1099 modules/gui/gtk/gtk_interface.c:1296
 #: modules/gui/macosx/intf.m:389 modules/gui/macosx/macosx.m:68
 #: modules/gui/macosx/output.m:150 modules/misc/dummy/dummy.c:81
@@ -1143,7 +1143,8 @@ msgstr "D
 msgid "Video"
 msgstr "Obraz"
 
-#: src/libvlc.h:515 modules/access/satellite/satellite.c:66
+#: src/libvlc.h:515 modules/access/dvb/qpsk.c:101
+#: modules/access/satellite/satellite.c:66
 msgid "Input"
 msgstr "Wej¶cie"
 
@@ -1167,7 +1168,7 @@ msgid "CPU"
 msgstr "CPU"
 
 #: src/libvlc.h:579 modules/gui/beos/InterfaceWindow.cpp:206
-#: modules/gui/familiar/interface.c:610 modules/gui/gtk/gnome_interface.c:643
+#: modules/gui/gtk/gnome_interface.c:643
 #: modules/gui/gtk/gnome_interface.c:2384
 #: modules/gui/gtk/gnome_interface.c:2409 modules/gui/gtk/gtk_interface.c:747
 #: modules/gui/gtk/gtk_interface.c:2697 modules/gui/macosx/intf.m:321
@@ -1180,11 +1181,10 @@ msgstr "Lista odtwarzania"
 #: src/libvlc.h:585 modules/audio_filter/converter/a52tofloat32.c:85
 #: modules/audio_filter/converter/mpgatofixed32.c:60
 #: modules/codec/a52old/a52old.c:59 modules/codec/mpeg_video/parser.c:84
-#: modules/demux/mpeg/ts.c:118 modules/gui/familiar/familiar.c:70
-#: modules/gui/pda/pda.c:70 modules/misc/logger/logger.c:89
-#: modules/video_filter/motionblur.c:58 modules/video_filter/transform.c:63
-#: modules/video_filter/wall.c:66 modules/video_output/ggi.c:62
-#: modules/video_output/mga/xmga.c:102
+#: modules/demux/mpeg/ts.c:118 modules/gui/pda/pda.c:70
+#: modules/misc/logger/logger.c:89 modules/video_filter/motionblur.c:58
+#: modules/video_filter/transform.c:63 modules/video_filter/wall.c:66
+#: modules/video_output/ggi.c:62 modules/video_output/mga/xmga.c:102
 msgid "Miscellaneous"
 msgstr "Ró¿ne"
 
@@ -1212,7 +1212,7 @@ msgstr "wy
 msgid "print version information"
 msgstr "Wy¶wietl informacje o wersji"
 
-#: src/misc/configuration.c:1000
+#: src/misc/configuration.c:1021
 msgid "boolean"
 msgstr "zm. logiczna"
 
@@ -1282,6 +1282,110 @@ msgstr "U_stawienia"
 msgid "Standard filesystem directory input"
 msgstr "CZytanie standartowego pliku systemowego"
 
+#: modules/access/dvb/qpsk.c:44
+msgid "adapter card to tune"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:45
+msgid "adapter cards have a device file named /dev/dvb/adapter[n] with n>=0"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:47
+msgid "device nummer to use on adapter"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:50
+#, fuzzy
+msgid "satellite default transponder frequency"
+msgstr "czêstotlowo¶æ domy¶lnego transpondera satelitarnego"
+
+#: modules/access/dvb/qpsk.c:53
+#, fuzzy
+msgid "satellite default transponder polarization"
+msgstr "polaryzacja domy¶lnego transpondera satelitarnego"
+
+#: modules/access/dvb/qpsk.c:56
+#, fuzzy
+msgid "satellite default transponder FEC"
+msgstr "FEC domy¶lnego transpondera satelitarnego"
+
+#: modules/access/dvb/qpsk.c:57
+msgid "FEC=Forward Error Correction mode"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:59
+#, fuzzy
+msgid "satellite default transponder symbol rate"
+msgstr "szybko¶æ symboli domy¶lnego transpondera satelitarnego"
+
+#: modules/access/dvb/qpsk.c:62
+#, fuzzy
+msgid "use diseqc with antenna"
+msgstr "u¿ywanie diseqc z anten±"
+
+#: modules/access/dvb/qpsk.c:65
+#, fuzzy
+msgid "antenna lnb_lof1 (kHz)"
+msgstr "antena lnb_lof1 (kHz)"
+
+#: modules/access/dvb/qpsk.c:68
+#, fuzzy
+msgid "antenna lnb_lof2 (kHz)"
+msgstr "antena lnb_lof1 (kHz)"
+
+#: modules/access/dvb/qpsk.c:71
+#, fuzzy
+msgid "antenna lnb_slof (kHz)"
+msgstr "antena lnb_slof (kHz)"
+
+#: modules/access/dvb/qpsk.c:74
+msgid "probe the dvb card for capabilities (default disabled)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:75
+msgid "some dvb cards do not like to be probed for their capabilities"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:78
+msgid "modulation type"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:79
+msgid "modulation type for frontend device "
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:82
+msgid "terrestrial high priority stream code rate (FEC)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:85
+msgid "terrestrial low priority stream code rate (FEC)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:88
+msgid "terrestrial bandwidth"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:89
+msgid "terrestrial bandwidth [0=auto,6,7,8 in MHz]"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:91
+msgid "terrestrial guard interval"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:94
+msgid "terrestrial transmission mode"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:97
+msgid "terrestrial hierarchy mode"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:123
+msgid "DVB input module with v4l2 support"
+msgstr ""
+
 #: modules/access/dvd/dvd.c:65
 msgid "Method to use by libdvdcss for key decryption"
 msgstr ""
@@ -1382,7 +1486,7 @@ msgstr ""
 msgid "http"
 msgstr ""
 
-#: modules/access/http.c:89
+#: modules/access/http.c:91
 msgid "HTTP input"
 msgstr ""
 
@@ -1400,6 +1504,10 @@ msgstr ""
 msgid "Hauppauge PVR cards input"
 msgstr ""
 
+#: modules/access/rtsp.c:68
+msgid "RTSP SDP request"
+msgstr ""
+
 #: modules/access/satellite/satellite.c:41
 #, fuzzy
 msgid "Satellite default transponder frequency"
@@ -1685,23 +1793,23 @@ msgstr "modu
 msgid "Audio device"
 msgstr "urz±dzenie VCD"
 
-#: modules/audio_output/alsa.c:173 modules/audio_output/directx.c:435
+#: modules/audio_output/alsa.c:171 modules/audio_output/directx.c:435
 #: modules/audio_output/oss.c:222 modules/audio_output/sdl.c:182
 #: modules/audio_output/sdl.c:201 modules/audio_output/waveout.c:399
 msgid "Mono"
 msgstr ""
 
-#: modules/audio_output/alsa.c:186 modules/audio_output/directx.c:409
+#: modules/audio_output/alsa.c:184 modules/audio_output/directx.c:409
 #: modules/audio_output/oss.c:178 modules/audio_output/waveout.c:371
 msgid "2 Front 2 Rear"
 msgstr ""
 
-#: modules/audio_output/alsa.c:192 modules/audio_output/directx.c:391
+#: modules/audio_output/alsa.c:190 modules/audio_output/directx.c:391
 #: modules/audio_output/oss.c:167 modules/audio_output/waveout.c:352
 msgid "5.1"
 msgstr ""
 
-#: modules/audio_output/alsa.c:219 modules/audio_output/directx.c:478
+#: modules/audio_output/alsa.c:217 modules/audio_output/directx.c:478
 #: modules/audio_output/oss.c:246 modules/audio_output/waveout.c:415
 msgid "A/52 over S/PDIF"
 msgstr ""
@@ -2117,19 +2225,28 @@ msgstr "modu
 
 #: modules/codec/subsdec/subsdec.c:68
 #, fuzzy
-msgid "subtitle text encoding"
+msgid "Subtitles text encoding"
 msgstr "modu³ dekodera podtytu³ów DVD"
 
 #: modules/codec/subsdec/subsdec.c:69
-msgid "change the encoding used in text subtitles"
+msgid "Change the encoding used in text subtitles"
+msgstr ""
+
+#: modules/codec/subsdec/subsdec.c:70
+#, fuzzy
+msgid "Subtitles justification"
+msgstr "_Podtytu³y"
+
+#: modules/codec/subsdec/subsdec.c:71
+msgid "Change the justification of substitles (0=center, 1=left, 2=right)"
 msgstr ""
 
-#: modules/codec/subsdec/subsdec.c:72
+#: modules/codec/subsdec/subsdec.c:74
 #, fuzzy
 msgid "file subtitles decoder"
 msgstr "modu³ dekodera podtytu³ów DVD"
 
-#: modules/codec/subsdec/subsdec.c:75 modules/gui/beos/InterfaceWindow.cpp:256
+#: modules/codec/subsdec/subsdec.c:77 modules/gui/beos/InterfaceWindow.cpp:256
 #: modules/gui/kde/interface.cpp:93
 #, fuzzy
 msgid "Subtitles"
@@ -2289,7 +2406,7 @@ msgid "Quit"
 msgstr "Informacje o..."
 
 #: modules/control/lirc/lirc.c:297 modules/control/lirc/lirc.c:323
-#: modules/gui/familiar/interface.c:177 modules/gui/gtk/gnome_interface.c:602
+#: modules/gui/gtk/gnome_interface.c:602
 #: modules/gui/gtk/gnome_interface.c:1020 modules/gui/gtk/gtk_interface.c:709
 #: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:921
 #: modules/gui/macosx/intf.m:922 modules/gui/macosx/intf.m:923
@@ -2297,8 +2414,7 @@ msgstr "Informacje o..."
 msgid "Pause"
 msgstr "Wstrzymaj"
 
-#: modules/control/lirc/lirc.c:310 modules/gui/familiar/interface.c:190
-#: modules/gui/gtk/gnome_interface.c:590
+#: modules/control/lirc/lirc.c:310 modules/gui/gtk/gnome_interface.c:590
 #: modules/gui/gtk/gnome_interface.c:1013 modules/gui/gtk/gtk_interface.c:698
 #: modules/gui/macosx/intf.m:324 modules/gui/macosx/intf.m:362
 #: modules/gui/macosx/intf.m:423 modules/gui/macosx/intf.m:928
@@ -2336,72 +2452,74 @@ msgstr ""
 msgid "remote control interface"
 msgstr "modu³ interfejsu sterowania zdalnego"
 
-#: modules/demux/a52sys.c:52
+#: modules/demux/a52sys.c:41
 msgid "A52 demuxer"
 msgstr ""
 
-#: modules/demux/aac/demux.c:46
-#, fuzzy
-msgid "AAC stream demuxer"
-msgstr "dekoder d¼wiêku MPEG warstwa I/II"
-
-#: modules/demux/aac/demux.c:555
-msgid "Aac"
+#: modules/demux/a52sys.c:161
+msgid "A52"
 msgstr ""
 
-#: modules/demux/aac/demux.c:557 modules/demux/mpeg/audio.c:627
-#: modules/demux/mpeg/audio.c:644 modules/demux/mpeg/m4v.c:150
+#: modules/demux/a52sys.c:163 modules/demux/aac.c:175
+#: modules/demux/mpeg/m4v.c:150 modules/demux/mpeg/mpga.c:331
 #, fuzzy
 msgid "Input Type"
 msgstr "Wej¶cie"
 
-#: modules/demux/aac/demux.c:560 modules/demux/mpeg/audio.c:629
-msgid "Layer"
-msgstr ""
-
-#: modules/demux/aac/demux.c:562 modules/demux/asf/asf.c:275
-#: modules/demux/avi/avi.c:1178 modules/demux/mkv.cpp:2449
-#: modules/demux/ogg.c:561 modules/demux/ogg.c:837 modules/demux/ogg.c:1010
-#: modules/gui/gtk/gnome_interface.c:148 modules/gui/gtk/gnome_interface.c:931
-#: modules/gui/gtk/gtk_interface.c:481 modules/gui/gtk/gtk_interface.c:1282
-#: modules/gui/macosx/output.m:162 modules/gui/wxwindows/streamout.cpp:668
+#: modules/demux/a52sys.c:164 modules/demux/aac.c:177
+#: modules/demux/asf/asf.c:275 modules/demux/avi/avi.c:1178
+#: modules/demux/mkv.cpp:2453 modules/demux/ogg.c:562 modules/demux/ogg.c:838
+#: modules/demux/ogg.c:1011 modules/gui/gtk/gnome_interface.c:148
+#: modules/gui/gtk/gnome_interface.c:931 modules/gui/gtk/gtk_interface.c:481
+#: modules/gui/gtk/gtk_interface.c:1282 modules/gui/macosx/output.m:162
+#: modules/gui/wxwindows/streamout.cpp:668
 msgid "Channels"
 msgstr "Kana³y"
 
-#: modules/demux/aac/demux.c:564 modules/demux/asf/asf.c:277
-#: modules/demux/avi/avi.c:1180 modules/demux/mkv.cpp:2453
-#: modules/demux/mpeg/audio.c:632 modules/demux/ogg.c:559
-#: modules/demux/ogg.c:671 modules/demux/ogg.c:832 modules/demux/ogg.c:1005
+#: modules/demux/a52sys.c:165 modules/demux/aac.c:179
+#: modules/demux/asf/asf.c:277 modules/demux/avi/avi.c:1180
+#: modules/demux/mkv.cpp:2457 modules/demux/mpeg/mpga.c:337
+#: modules/demux/ogg.c:560 modules/demux/ogg.c:672 modules/demux/ogg.c:833
+#: modules/demux/ogg.c:1006
 #, fuzzy
 msgid "Sample Rate"
 msgstr "Szybko¶æ symboliczna"
 
+#: modules/demux/aac.c:41
+#, fuzzy
+msgid "AAC demuxer"
+msgstr "dekoder d¼wiêku MPEG warstwa I/II"
+
+#: modules/demux/aac.c:173
+msgid "Aac"
+msgstr ""
+
 #: modules/demux/asf/asf.c:48
 msgid "ASF v1.0 demuxer (file only)"
 msgstr ""
 
-#: modules/demux/asf/asf.c:165 modules/demux/mkv.cpp:2412
+#: modules/demux/asf/asf.c:165 modules/demux/mkv.cpp:2416
 #, fuzzy
 msgid "Number of streams"
 msgstr "Liczba wierszy"
 
-#: modules/demux/asf/asf.c:228 modules/demux/asf/asf.c:302
+#: modules/demux/asf/asf.c:228 modules/demux/asf/asf.c:298
 #: modules/demux/avi/avi.c:1172 modules/demux/avi/avi.c:1217
-#: modules/demux/avi/avi.c:1250 modules/demux/mkv.cpp:2445
-#: modules/demux/mkv.cpp:2461 modules/demux/mkv.cpp:2477
-#: modules/demux/ogg.c:557 modules/demux/ogg.c:629 modules/demux/ogg.c:669
-#: modules/demux/ogg.c:734 modules/demux/ogg.c:829 modules/demux/ogg.c:909
-#: modules/demux/ogg.c:1002 modules/gui/familiar/interface.c:370
-#: modules/gui/macosx/output.m:139 modules/gui/pda/interface.c:372
+#: modules/demux/avi/avi.c:1250 modules/demux/mkv.cpp:2449
+#: modules/demux/mkv.cpp:2465 modules/demux/mkv.cpp:2481
+#: modules/demux/ogg.c:558 modules/demux/ogg.c:630 modules/demux/ogg.c:670
+#: modules/demux/ogg.c:735 modules/demux/ogg.c:830 modules/demux/ogg.c:910
+#: modules/demux/ogg.c:1003 modules/gui/macosx/output.m:139
+#: modules/gui/pda/interface.c:372
 msgid "Type"
 msgstr ""
 
-#: modules/demux/asf/asf.c:260 modules/demux/asf/asf.c:318
+#: modules/demux/asf/asf.c:260 modules/demux/asf/asf.c:314
 #: modules/demux/avi/avi.c:1174 modules/demux/avi/avi.c:1218
-#: modules/demux/mkv.cpp:2446 modules/demux/mkv.cpp:2462
-#: modules/demux/mkv.cpp:2478 modules/demux/ogg.c:558 modules/demux/ogg.c:630
-#: modules/demux/ogg.c:670 modules/demux/ogg.c:735 modules/demux/ogg.c:830
-#: modules/demux/ogg.c:910 modules/demux/ogg.c:1003
+#: modules/demux/mkv.cpp:2450 modules/demux/mkv.cpp:2466
+#: modules/demux/mkv.cpp:2482 modules/demux/ogg.c:559 modules/demux/ogg.c:631
+#: modules/demux/ogg.c:671 modules/demux/ogg.c:736 modules/demux/ogg.c:831
+#: modules/demux/ogg.c:911 modules/demux/ogg.c:1004
 #, fuzzy
 msgid "Codec"
 msgstr "Nic"
@@ -2411,38 +2529,38 @@ msgid "Avg. byterate"
 msgstr ""
 
 #: modules/demux/asf/asf.c:282 modules/demux/avi/avi.c:1185
-#: modules/demux/mkv.cpp:2457
+#: modules/demux/mkv.cpp:2461
 msgid "Bits Per Sample"
 msgstr ""
 
-#: modules/demux/asf/asf.c:332
+#: modules/demux/asf/asf.c:328
 msgid "Size"
 msgstr ""
 
-#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1222
-#: modules/demux/mkv.cpp:2465
+#: modules/demux/asf/asf.c:331 modules/demux/avi/avi.c:1222
+#: modules/demux/mkv.cpp:2469
 #, fuzzy
 msgid "Resolution"
 msgstr "Wybór"
 
-#: modules/demux/asf/asf.c:337
+#: modules/demux/asf/asf.c:333
 #, fuzzy
 msgid "Planes"
 msgstr "Odtwórz"
 
-#: modules/demux/asf/asf.c:339 modules/demux/avi/avi.c:1228
+#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1228
 msgid "Bits Per Pixel"
 msgstr ""
 
-#: modules/demux/asf/asf.c:342
+#: modules/demux/asf/asf.c:338
 msgid "Image Size"
 msgstr ""
 
-#: modules/demux/asf/asf.c:344
+#: modules/demux/asf/asf.c:340
 msgid "X pixels per meter"
 msgstr ""
 
-#: modules/demux/asf/asf.c:346
+#: modules/demux/asf/asf.c:342
 msgid "Y pixels per meter"
 msgstr ""
 
@@ -2480,7 +2598,7 @@ msgstr "Opis"
 msgid "Rating"
 msgstr "napis"
 
-#: modules/demux/au.c:47
+#: modules/demux/au.c:42
 msgid "AU demuxer"
 msgstr ""
 
@@ -2530,8 +2648,8 @@ msgstr ""
 msgid "Audio Bitrate"
 msgstr "D¼wiêk"
 
-#: modules/demux/avi/avi.c:1225 modules/demux/ogg.c:631
-#: modules/demux/ogg.c:737 modules/demux/ogg.c:912
+#: modules/demux/avi/avi.c:1225 modules/demux/ogg.c:632
+#: modules/demux/ogg.c:738 modules/demux/ogg.c:913
 msgid "Frame Rate"
 msgstr ""
 
@@ -2574,66 +2692,66 @@ msgstr ""
 msgid "mka/mkv stream demuxer"
 msgstr "dekoder d¼wiêku MPEG warstwa I/II"
 
-#: modules/demux/mkv.cpp:2389 modules/gui/gtk/gnome_interface.c:2436
+#: modules/demux/mkv.cpp:2393 modules/gui/gtk/gnome_interface.c:2436
 #: modules/gui/gtk/gtk_interface.c:2857 modules/gui/wxwindows/playlist.cpp:150
 msgid "Duration"
 msgstr "Czas trwania"
 
-#: modules/demux/mkv.cpp:2398
+#: modules/demux/mkv.cpp:2402
 msgid "Date UTC"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2402
+#: modules/demux/mkv.cpp:2406
 #, fuzzy
 msgid "Segment Filename"
 msgstr "nazwa pliku dziennika"
 
-#: modules/demux/mkv.cpp:2406
+#: modules/demux/mkv.cpp:2410
 #, fuzzy
 msgid "Muxing Application"
 msgstr "Informacje dotycz±ce tej aplikacji"
 
-#: modules/demux/mkv.cpp:2410
+#: modules/demux/mkv.cpp:2414
 #, fuzzy
 msgid "Writing Application"
 msgstr "Pozycja pocz±tkowa"
 
-#: modules/demux/mkv.cpp:2423 modules/gui/beos/PlayListWindow.cpp:144
-#: modules/gui/familiar/interface.c:362 modules/gui/gtk/preferences.c:325
-#: modules/gui/kde/pluginsbox.cpp:45 modules/gui/pda/interface.c:364
+#: modules/demux/mkv.cpp:2427 modules/gui/beos/PlayListWindow.cpp:144
+#: modules/gui/gtk/preferences.c:325 modules/gui/kde/pluginsbox.cpp:45
+#: modules/gui/pda/interface.c:364
 msgid "Name"
 msgstr "Nazwa"
 
-#: modules/demux/mkv.cpp:2427
+#: modules/demux/mkv.cpp:2431
 #, fuzzy
 msgid "Codec Name"
 msgstr "Nazwa urz±dzenia"
 
-#: modules/demux/mkv.cpp:2431
+#: modules/demux/mkv.cpp:2435
 #, fuzzy
 msgid "Codec Setting"
 msgstr "U_stawienia"
 
-#: modules/demux/mkv.cpp:2435
+#: modules/demux/mkv.cpp:2439
 #, fuzzy
 msgid "Codec Info"
 msgstr "Nazwa urz±dzenia"
 
-#: modules/demux/mkv.cpp:2439
+#: modules/demux/mkv.cpp:2443
 #, fuzzy
 msgid "Codec Download"
 msgstr "Nazwa urz±dzenia"
 
-#: modules/demux/mkv.cpp:2469
+#: modules/demux/mkv.cpp:2473
 #, fuzzy
 msgid "Display Resolution"
 msgstr "Wybór"
 
-#: modules/demux/mkv.cpp:2473
+#: modules/demux/mkv.cpp:2477
 msgid "Frame Per Second"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2477 modules/gui/gtk/gnome_interface.c:1963
+#: modules/demux/mkv.cpp:2481 modules/gui/gtk/gnome_interface.c:1963
 #: modules/gui/gtk/gtk_interface.c:2278
 #, fuzzy
 msgid "Subtitle"
@@ -2643,37 +2761,44 @@ msgstr "_Podtytu
 msgid "MP4 demuxer"
 msgstr ""
 
-#: modules/demux/mpeg/audio.c:47
+#: modules/demux/mpeg/es.c:49
 #, fuzzy
-msgid "MPEG I/II audio stream demuxer"
+msgid "ISO 13818-1 MPEG Elementary Stream input"
+msgstr "Elementarne wej¶cie strumienia ISO 13818-2 MPEG"
+
+#: modules/demux/mpeg/m4v.c:43
+#, fuzzy
+msgid "MPEG-4 video elementary stream demuxer"
 msgstr "dekoder d¼wiêku MPEG warstwa I/II"
 
-#: modules/demux/mpeg/audio.c:626 modules/demux/mpeg/audio.c:643
 #: modules/demux/mpeg/m4v.c:149
 msgid "mpeg"
 msgstr ""
 
-#: modules/demux/mpeg/audio.c:630
+#: modules/demux/mpeg/m4v.c:150
+msgid "Video MPEG-4 (raw ES)"
+msgstr ""
+
+#: modules/demux/mpeg/mpga.c:41
 #, fuzzy
-msgid "Mode"
-msgstr "Modu³y"
+msgid "MPEG-I/II Audio demuxer"
+msgstr "dekoder d¼wiêku MPEG warstwa I/II"
 
-#: modules/demux/mpeg/audio.c:634
-msgid "Average Bitrate"
+#: modules/demux/mpeg/mpga.c:330
+msgid "MPEG"
 msgstr ""
 
-#: modules/demux/mpeg/es.c:49
-#, fuzzy
-msgid "ISO 13818-1 MPEG Elementary Stream input"
-msgstr "Elementarne wej¶cie strumienia ISO 13818-2 MPEG"
+#: modules/demux/mpeg/mpga.c:333
+msgid "Layer"
+msgstr ""
 
-#: modules/demux/mpeg/m4v.c:43
+#: modules/demux/mpeg/mpga.c:335
 #, fuzzy
-msgid "MPEG-4 video elementary stream demuxer"
-msgstr "dekoder d¼wiêku MPEG warstwa I/II"
+msgid "Mode"
+msgstr "Modu³y"
 
-#: modules/demux/mpeg/m4v.c:150
-msgid "Video MPEG-4 (raw ES)"
+#: modules/demux/mpeg/mpga.c:339
+msgid "Average Bitrate"
 msgstr ""
 
 #: modules/demux/mpeg/ps.c:60
@@ -2718,37 +2843,37 @@ msgstr "Wej
 msgid "ogg stream demuxer"
 msgstr "dekoder d¼wiêku MPEG warstwa I/II"
 
-#: modules/demux/ogg.c:558
+#: modules/demux/ogg.c:559
 msgid "Vorbis"
 msgstr ""
 
-#: modules/demux/ogg.c:563 modules/demux/ogg.c:633 modules/demux/ogg.c:673
-#: modules/demux/ogg.c:834 modules/demux/ogg.c:1007
+#: modules/demux/ogg.c:564 modules/demux/ogg.c:634 modules/demux/ogg.c:674
+#: modules/demux/ogg.c:835 modules/demux/ogg.c:1008
 msgid "Bit Rate"
 msgstr ""
 
-#: modules/demux/ogg.c:630
+#: modules/demux/ogg.c:631
 msgid "Theora"
 msgstr ""
 
-#: modules/demux/ogg.c:670
+#: modules/demux/ogg.c:671
 #, fuzzy
 msgid "tarkin"
 msgstr "napis"
 
-#: modules/demux/ogg.c:739 modules/demux/ogg.c:914
+#: modules/demux/ogg.c:740 modules/demux/ogg.c:915
 msgid "Bit Count"
 msgstr ""
 
-#: modules/demux/ogg.c:741 modules/demux/ogg.c:916
+#: modules/demux/ogg.c:742 modules/demux/ogg.c:917
 msgid "Width"
 msgstr ""
 
-#: modules/demux/ogg.c:743 modules/demux/ogg.c:918
+#: modules/demux/ogg.c:744 modules/demux/ogg.c:919
 msgid "Height"
 msgstr ""
 
-#: modules/demux/ogg.c:839 modules/demux/ogg.c:1012
+#: modules/demux/ogg.c:840 modules/demux/ogg.c:1013
 msgid "Bits per Sample"
 msgstr ""
 
@@ -2756,6 +2881,10 @@ msgstr ""
 msgid "raw dv demuxer"
 msgstr ""
 
+#: modules/demux/sdp.c:64
+msgid "SDP demuxer + UDP/RTP/RTSP"
+msgstr ""
+
 #: modules/demux/util/id3.c:44
 msgid "Simple id3 tag skipper"
 msgstr ""
@@ -3108,7 +3237,7 @@ msgstr ""
 msgid "Text subtitles demux"
 msgstr "Wybiera kana³ podtytu³ów"
 
-#: modules/demux/wav/wav.c:49
+#: modules/demux/wav.c:43
 msgid "WAV demuxer"
 msgstr ""
 
@@ -3146,11 +3275,9 @@ msgid "Yes"
 msgstr ""
 
 #: modules/gui/beos/InterfaceWindow.cpp:201
-#: modules/gui/beos/InterfaceWindow.cpp:308
-#: modules/gui/familiar/interface.c:149 modules/gui/familiar/interface.c:150
-#: modules/gui/macosx/intf.m:328 modules/gui/macosx/prefs.m:77
-#: modules/gui/pda/interface.c:151 modules/gui/pda/interface.c:152
-#: modules/gui/wxwindows/preferences.cpp:233
+#: modules/gui/beos/InterfaceWindow.cpp:308 modules/gui/macosx/intf.m:328
+#: modules/gui/macosx/prefs.m:77 modules/gui/pda/interface.c:151
+#: modules/gui/pda/interface.c:152 modules/gui/wxwindows/preferences.cpp:233
 #, fuzzy
 msgid "Preferences"
 msgstr "_Preferencje..."
@@ -3166,7 +3293,7 @@ msgstr "Komunikaty"
 
 #: modules/gui/beos/InterfaceWindow.cpp:238
 #: modules/gui/beos/MediaControlView.cpp:1257
-#: modules/gui/beos/PlayListWindow.cpp:82 modules/gui/familiar/interface.c:378
+#: modules/gui/beos/PlayListWindow.cpp:82
 #: modules/gui/gtk/gnome_interface.c:503
 #: modules/gui/gtk/gnome_interface.c:1569
 #: modules/gui/gtk/gnome_interface.c:2274
@@ -3201,10 +3328,8 @@ msgid "Open Subtitles"
 msgstr "_Podtytu³y"
 
 #: modules/gui/beos/InterfaceWindow.cpp:249
-#: modules/gui/familiar/interface.c:231 modules/gui/familiar/interface.c:232
-#: modules/gui/familiar/interface.c:765 modules/gui/gtk/gtk_interface.c:1580
-#: modules/gui/pda/interface.c:233 modules/gui/pda/interface.c:234
-#: modules/gui/pda/interface.c:767
+#: modules/gui/gtk/gtk_interface.c:1580 modules/gui/pda/interface.c:233
+#: modules/gui/pda/interface.c:234 modules/gui/pda/interface.c:767
 msgid "About"
 msgstr "Informacje o..."
 
@@ -3260,7 +3385,7 @@ msgstr "Lista odtwarzania"
 #: modules/gui/wxwindows/open.cpp:244
 #: modules/gui/wxwindows/preferences.cpp:253
 #: modules/gui/wxwindows/streamout.cpp:217
-#: modules/gui/wxwindows/subtitles.cpp:149
+#: modules/gui/wxwindows/subtitles.cpp:190
 msgid "OK"
 msgstr "OK"
 
@@ -3397,7 +3522,7 @@ msgstr ""
 msgid "Take Screen Shot"
 msgstr ""
 
-#: modules/gui/beos/VlcWrapper.cpp:165 modules/gui/gtk/menu.c:733
+#: modules/gui/beos/VlcWrapper.cpp:165 modules/gui/gtk/menu.c:734
 msgid "None"
 msgstr "Nic"
 
@@ -3405,217 +3530,6 @@ msgstr "Nic"
 msgid "<unknown>"
 msgstr ""
 
-#: modules/gui/familiar/familiar.c:62 modules/gui/pda/pda.c:62
-#, fuzzy
-msgid "Autoplay selected file"
-msgstr "Odtwarza strumieñ"
-
-#: modules/gui/familiar/familiar.c:63 modules/gui/pda/pda.c:63
-msgid "Automatically play a file when selected in the file selection list"
-msgstr ""
-
-#: modules/gui/familiar/familiar.c:72
-#, fuzzy
-msgid "Familiar Linux Gtk+ interface"
-msgstr "Modu³ interfejsu Gtk+"
-
-#: modules/gui/familiar/interface.c:99 modules/gui/familiar/interface.c:732
-#: modules/gui/gtk/gnome_interface.c:274 modules/gui/gtk/gtk_interface.c:121
-#: modules/gui/gtk/gtk_interface.c:1595 modules/gui/pda/interface.c:99
-#: modules/gui/pda/interface.c:734
-msgid "VLC media player"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:124 modules/gui/pda/interface.c:126
-#: modules/gui/wxwindows/dialogs.cpp:268 modules/gui/wxwindows/open.cpp:709
-#: modules/gui/wxwindows/preferences.cpp:1029
-#: modules/gui/wxwindows/subtitles.cpp:196
-#, fuzzy
-msgid "Open file"
-msgstr "Otwórz plik"
-
-#: modules/gui/familiar/interface.c:164 modules/gui/pda/interface.c:166
-msgid "Rewind"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:165 modules/gui/pda/interface.c:167
-#, fuzzy
-msgid "Rewind stream"
-msgstr "Otwórz strumieñ"
-
-#: modules/gui/familiar/interface.c:178 modules/gui/pda/interface.c:180
-#, fuzzy
-msgid "Pause stream"
-msgstr "Wstrzymuje strumieñ"
-
-#: modules/gui/familiar/interface.c:191 modules/gui/pda/interface.c:193
-#, fuzzy
-msgid "Play stream"
-msgstr "Odtwarza strumieñ"
-
-#: modules/gui/familiar/interface.c:203 modules/gui/gtk/gnome_interface.c:566
-#: modules/gui/gtk/gnome_interface.c:1027 modules/gui/gtk/gtk_interface.c:676
-#: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:639
-#: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
-#: modules/gui/macosx/intf.m:424 modules/gui/pda/interface.c:205
-#: modules/gui/wxwindows/interface.cpp:373
-msgid "Stop"
-msgstr "Zatrzymaj"
-
-#: modules/gui/familiar/interface.c:204 modules/gui/pda/interface.c:206
-#, fuzzy
-msgid "Stop stream"
-msgstr "Zatrzymuje strumieñ"
-
-#: modules/gui/familiar/interface.c:216 modules/gui/pda/interface.c:218
-msgid "Forward"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:217 modules/gui/pda/interface.c:219
-msgid "Forward stream"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:285 modules/gui/gtk/gnome_interface.c:2345
-#: modules/gui/gtk/gtk_interface.c:2712 modules/gui/macosx/playlist.m:198
-#: modules/gui/pda/interface.c:287
-msgid "Add"
-msgstr "Dodaj"
-
-#: modules/gui/familiar/interface.c:293 modules/gui/pda/interface.c:295
-#, fuzzy
-msgid "MRL :"
-msgstr "URL"
-
-#: modules/gui/familiar/interface.c:394
-#, fuzzy
-msgid "UDP/RTP (Address when Multicast)"
-msgstr "UDP Multicast"
-
-#: modules/gui/familiar/interface.c:412 modules/gui/gtk/gnome_interface.c:1747
-#: modules/gui/gtk/gtk_interface.c:2062 modules/gui/macosx/open.m:161
-#: modules/gui/macosx/output.m:133 modules/gui/pda/interface.c:414
-#: modules/gui/wxwindows/open.cpp:469 modules/gui/wxwindows/streamout.cpp:425
-msgid "Address"
-msgstr "Adres"
-
-#: modules/gui/familiar/interface.c:423 modules/gui/gtk/gnome_interface.c:1737
-#: modules/gui/gtk/gnome_interface.c:1786
-#: modules/gui/gtk/gnome_interface.c:2912 modules/gui/gtk/gtk_interface.c:2052
-#: modules/gui/gtk/gtk_interface.c:2101 modules/gui/gtk/gtk_interface.c:3225
-#: modules/gui/macosx/open.m:160 modules/gui/macosx/open.m:162
-#: modules/gui/macosx/output.m:134 modules/gui/pda/interface.c:425
-#: modules/gui/wxwindows/open.cpp:454 modules/gui/wxwindows/open.cpp:477
-#: modules/gui/wxwindows/streamout.cpp:436
-msgid "Port"
-msgstr "Port"
-
-#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:136
-#: modules/gui/macosx/output.m:236 modules/gui/macosx/output.m:311
-#: modules/gui/pda/interface.c:480 modules/gui/wxwindows/streamout.cpp:386
-msgid "HTTP"
-msgstr "HTTP"
-
-#: modules/gui/familiar/interface.c:488 modules/gui/pda/interface.c:490
-#, fuzzy
-msgid "FTP"
-msgstr "RPT"
-
-#: modules/gui/familiar/interface.c:498 modules/gui/pda/interface.c:500
-msgid "MMS"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:516 modules/gui/gtk/gnome_interface.c:1830
-#: modules/gui/gtk/gnome_interface.c:2281 modules/gui/gtk/gtk_interface.c:2145
-#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:144
-#: modules/gui/macosx/open.m:271 modules/gui/pda/interface.c:518
-#: modules/gui/wxwindows/open.cpp:257
-msgid "Network"
-msgstr "Sieæ"
-
-#: modules/gui/familiar/interface.c:524 modules/gui/pda/interface.c:526
-msgid "Media"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:560 modules/gui/pda/interface.c:562
-#, fuzzy
-msgid "MRL"
-msgstr "URL"
-
-#: modules/gui/familiar/interface.c:569 modules/gui/pda/interface.c:571
-#, fuzzy
-msgid "Time"
-msgstr "Tytu³"
-
-#: modules/gui/familiar/interface.c:586 modules/gui/pda/interface.c:588
-msgid "Update"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:594 modules/gui/pda/interface.c:596
-msgid " Del "
-msgstr ""
-
-#: modules/gui/familiar/interface.c:602 modules/gui/pda/interface.c:604
-msgid " Clear "
-msgstr ""
-
-#: modules/gui/familiar/interface.c:626 modules/gui/pda/interface.c:628
-msgid "Automatically play file"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:643 modules/gui/pda/interface.c:645
-#, fuzzy
-msgid " Save "
-msgstr "Zapisz"
-
-#: modules/gui/familiar/interface.c:651 modules/gui/pda/interface.c:653
-#, fuzzy
-msgid " Apply "
-msgstr "Zastosuj"
-
-#: modules/gui/familiar/interface.c:659 modules/gui/pda/interface.c:661
-#, fuzzy
-msgid " Cancel "
-msgstr "Anuluj"
-
-#: modules/gui/familiar/interface.c:667 modules/gui/pda/interface.c:669
-#, fuzzy
-msgid "Preference"
-msgstr "_Preferencje..."
-
-#: modules/gui/familiar/interface.c:711 modules/gui/gtk/gnome_interface.c:1361
-#: modules/gui/gtk/gtk_interface.c:1603 modules/gui/kde/kde.cpp:111
-#: modules/gui/pda/interface.c:713
-msgid "(c) 1996-2003 the VideoLAN team"
-msgstr "(c) 1996-2003 Zespó³ VideoLAN"
-
-#: modules/gui/familiar/interface.c:721 modules/gui/pda/interface.c:723
-#, fuzzy
-msgid "Authors: The VideoLAN Team, http://www.videolan.org"
-msgstr ""
-"Zespó³ VideoLAN <videolan@videolan.org>\n"
-"http://www.videolan.org/"
-
-#: modules/gui/familiar/interface.c:753 modules/gui/pda/interface.c:755
-msgid ""
-"The VideoLAN Client is a MPEG, MPEG 2, MP3, DivX player, that accepts input "
-"from local or network sources."
-msgstr ""
-
-#: modules/gui/familiar/support.c:121 modules/gui/gtk/gnome_support.c:100
-#: modules/gui/gtk/gnome_support.c:138 modules/gui/gtk/gtk_support.c:121
-#: modules/gui/gtk2/gnome2_support.c:60 modules/gui/gtk2/gnome2_support.c:85
-#: modules/gui/gtk2/gtk2_support.c:90 modules/gui/gtk2/gtk2_support.c:114
-#: modules/gui/pda/support.c:121
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr ""
-
-#: modules/gui/familiar/support.c:130 modules/gui/gtk/gtk_support.c:130
-#: modules/gui/pda/support.c:130
-#, c-format
-msgid "Error loading pixmap file: %s"
-msgstr ""
-
 #: modules/gui/gtk/gnome.c:55 modules/gui/gtk/gtk.c:57
 #, fuzzy
 msgid "Show tooltips"
@@ -3819,6 +3733,12 @@ msgstr "_D
 msgid "_Video"
 msgstr "Obraz"
 
+#: modules/gui/gtk/gnome_interface.c:274 modules/gui/gtk/gtk_interface.c:121
+#: modules/gui/gtk/gtk_interface.c:1595 modules/gui/pda/interface.c:99
+#: modules/gui/pda/interface.c:734
+msgid "VLC media player"
+msgstr ""
+
 #: modules/gui/gtk/gnome_interface.c:515 modules/gui/gtk/gnome_interface.c:718
 #: modules/gui/gtk/gnome_interface.c:1690
 #: modules/gui/gtk/gnome_interface.c:2267 modules/gui/gtk/gtk_interface.c:629
@@ -3853,6 +3773,15 @@ msgstr "Wstecz"
 msgid "Go Backward"
 msgstr "Przechodzi wstecz"
 
+#: modules/gui/gtk/gnome_interface.c:566
+#: modules/gui/gtk/gnome_interface.c:1027 modules/gui/gtk/gtk_interface.c:676
+#: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:639
+#: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
+#: modules/gui/macosx/intf.m:424 modules/gui/pda/interface.c:205
+#: modules/gui/wxwindows/interface.cpp:373
+msgid "Stop"
+msgstr "Zatrzymaj"
+
 #: modules/gui/gtk/gnome_interface.c:567 modules/gui/gtk/gtk_interface.c:677
 msgid "Stop Stream"
 msgstr "Zatrzymuje strumieñ"
@@ -3975,6 +3904,11 @@ msgstr "Prze
 msgid "Playlist..."
 msgstr "Lista odtwarzania..."
 
+#: modules/gui/gtk/gnome_interface.c:1361 modules/gui/gtk/gtk_interface.c:1603
+#: modules/gui/kde/kde.cpp:111 modules/gui/pda/interface.c:713
+msgid "(c) 1996-2003 the VideoLAN team"
+msgstr "(c) 1996-2003 Zespó³ VideoLAN"
+
 #: modules/gui/gtk/gnome_interface.c:1363 modules/gui/gtk/gtk_interface.c:1646
 #: modules/gui/kde/kde.cpp:108
 msgid ""
@@ -4014,7 +3948,7 @@ msgstr ""
 #: modules/gui/wxwindows/open.cpp:223 modules/gui/wxwindows/open.cpp:341
 #: modules/gui/wxwindows/preferences.cpp:832
 #: modules/gui/wxwindows/streamout.cpp:412
-#: modules/gui/wxwindows/subtitles.cpp:107
+#: modules/gui/wxwindows/subtitles.cpp:109
 msgid "Browse..."
 msgstr ""
 
@@ -4064,11 +3998,37 @@ msgstr "UDP Multicast"
 msgid "HTTP/FTP/MMS"
 msgstr ""
 
+#: modules/gui/gtk/gnome_interface.c:1737
+#: modules/gui/gtk/gnome_interface.c:1786
+#: modules/gui/gtk/gnome_interface.c:2912 modules/gui/gtk/gtk_interface.c:2052
+#: modules/gui/gtk/gtk_interface.c:2101 modules/gui/gtk/gtk_interface.c:3225
+#: modules/gui/macosx/open.m:160 modules/gui/macosx/open.m:162
+#: modules/gui/macosx/output.m:134 modules/gui/pda/interface.c:425
+#: modules/gui/wxwindows/open.cpp:454 modules/gui/wxwindows/open.cpp:477
+#: modules/gui/wxwindows/streamout.cpp:436
+msgid "Port"
+msgstr "Port"
+
+#: modules/gui/gtk/gnome_interface.c:1747 modules/gui/gtk/gtk_interface.c:2062
+#: modules/gui/macosx/open.m:161 modules/gui/macosx/output.m:133
+#: modules/gui/pda/interface.c:414 modules/gui/wxwindows/open.cpp:469
+#: modules/gui/wxwindows/streamout.cpp:425
+msgid "Address"
+msgstr "Adres"
+
 #: modules/gui/gtk/gnome_interface.c:1759 modules/gui/gtk/gtk_interface.c:2074
 #: modules/gui/macosx/open.m:163 modules/gui/wxwindows/open.cpp:492
 msgid "URL"
 msgstr "URL"
 
+#: modules/gui/gtk/gnome_interface.c:1830
+#: modules/gui/gtk/gnome_interface.c:2281 modules/gui/gtk/gtk_interface.c:2145
+#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:144
+#: modules/gui/macosx/open.m:271 modules/gui/pda/interface.c:518
+#: modules/gui/wxwindows/open.cpp:257
+msgid "Network"
+msgstr "Sieæ"
+
 #: modules/gui/gtk/gnome_interface.c:1847 modules/gui/gtk/gtk_interface.c:2162
 msgid "Symbol Rate"
 msgstr "Szybko¶æ symboliczna"
@@ -4152,6 +4112,11 @@ msgstr "Odwr
 msgid "Select"
 msgstr "Wybierz"
 
+#: modules/gui/gtk/gnome_interface.c:2345 modules/gui/gtk/gtk_interface.c:2712
+#: modules/gui/macosx/playlist.m:198 modules/gui/pda/interface.c:287
+msgid "Add"
+msgstr "Dodaj"
+
 #: modules/gui/gtk/gnome_interface.c:2352 modules/gui/gtk/gtk_interface.c:2754
 #: modules/gui/macosx/playlist.m:195 modules/gui/macosx/playlist.m:199
 msgid "Delete"
@@ -4222,6 +4187,14 @@ msgstr ""
 msgid "AVI"
 msgstr ""
 
+#: modules/gui/gtk/gnome_support.c:100 modules/gui/gtk/gnome_support.c:138
+#: modules/gui/gtk/gtk_support.c:121 modules/gui/gtk2/gnome2_support.c:60
+#: modules/gui/gtk2/gnome2_support.c:85 modules/gui/gtk2/gtk2_support.c:90
+#: modules/gui/gtk2/gtk2_support.c:114 modules/gui/pda/support.c:121
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr ""
+
 #: modules/gui/gtk/gnome_support.c:116
 #, c-format
 msgid "Couldn't create pixmap from file: %s"
@@ -4341,10 +4314,11 @@ msgstr ""
 #: modules/gui/gtk/gtk_interface.c:2403 modules/gui/gtk/gtk_interface.c:2645
 #: modules/gui/gtk/gtk_interface.c:2876 modules/gui/gtk/gtk_interface.c:3257
 #: modules/gui/gtk/preferences.c:618 modules/gui/macosx/open.m:140
-#: modules/gui/macosx/prefs.m:79 modules/gui/wxwindows/open.cpp:247
+#: modules/gui/macosx/prefs.m:79 modules/gui/macosx/prefs.m:170
+#: modules/gui/wxwindows/open.cpp:247
 #: modules/gui/wxwindows/preferences.cpp:256
 #: modules/gui/wxwindows/streamout.cpp:220
-#: modules/gui/wxwindows/subtitles.cpp:152
+#: modules/gui/wxwindows/subtitles.cpp:193
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -4376,12 +4350,17 @@ msgstr "_Odwr
 msgid "_Select"
 msgstr "_Wybierz"
 
-#: modules/gui/gtk/menu.c:900
+#: modules/gui/gtk/gtk_support.c:130 modules/gui/pda/support.c:130
+#, c-format
+msgid "Error loading pixmap file: %s"
+msgstr ""
+
+#: modules/gui/gtk/menu.c:901
 #, c-format
 msgid "Title %d (%d)"
 msgstr "Tytu³ %d (%d)"
 
-#: modules/gui/gtk/menu.c:967
+#: modules/gui/gtk/menu.c:968
 #, c-format
 msgid "Chapter %d"
 msgstr "Rozdzia³ %d"
@@ -4546,8 +4525,9 @@ msgstr ""
 msgid "VLC - Controller"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/interface.cpp:904
-#: modules/gui/wxwindows/timer.cpp:131
+#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/control.cpp:160
+#: modules/gui/wxwindows/control.cpp:370
+#: modules/gui/wxwindows/interface.cpp:904 modules/gui/wxwindows/timer.cpp:131
 msgid "Volume"
 msgstr ""
 
@@ -4818,6 +4798,12 @@ msgstr "Zatrzymuje strumie
 msgid "TTL"
 msgstr ""
 
+#: modules/gui/macosx/output.m:136 modules/gui/macosx/output.m:236
+#: modules/gui/macosx/output.m:311 modules/gui/pda/interface.c:480
+#: modules/gui/wxwindows/streamout.cpp:386
+msgid "HTTP"
+msgstr "HTTP"
+
 #: modules/gui/macosx/output.m:141 modules/gui/wxwindows/streamout.cpp:531
 msgid "Encapsulation Method"
 msgstr ""
@@ -4879,6 +4865,11 @@ msgstr ""
 msgid "Reset Preferences"
 msgstr "_Preferencje..."
 
+#: modules/gui/macosx/prefs.m:170
+#, fuzzy
+msgid "Continue"
+msgstr "Skonfiguruj"
+
 #: modules/gui/macosx/prefs.m:172 modules/gui/wxwindows/preferences.cpp:316
 msgid ""
 "Beware this will reset your VLC Media Player config file.\n"
@@ -4899,11 +4890,137 @@ msgstr "Usu
 msgid "ncurses interface"
 msgstr "modu³ interfejsu ncurses"
 
+#: modules/gui/pda/interface.c:126 modules/gui/wxwindows/dialogs.cpp:268
+#: modules/gui/wxwindows/open.cpp:709
+#: modules/gui/wxwindows/preferences.cpp:1029
+#: modules/gui/wxwindows/subtitles.cpp:234
+#, fuzzy
+msgid "Open file"
+msgstr "Otwórz plik"
+
+#: modules/gui/pda/interface.c:166
+msgid "Rewind"
+msgstr ""
+
+#: modules/gui/pda/interface.c:167
+#, fuzzy
+msgid "Rewind stream"
+msgstr "Otwórz strumieñ"
+
+#: modules/gui/pda/interface.c:180
+#, fuzzy
+msgid "Pause stream"
+msgstr "Wstrzymuje strumieñ"
+
+#: modules/gui/pda/interface.c:193
+#, fuzzy
+msgid "Play stream"
+msgstr "Odtwarza strumieñ"
+
+#: modules/gui/pda/interface.c:206
+#, fuzzy
+msgid "Stop stream"
+msgstr "Zatrzymuje strumieñ"
+
+#: modules/gui/pda/interface.c:218
+msgid "Forward"
+msgstr ""
+
+#: modules/gui/pda/interface.c:219
+msgid "Forward stream"
+msgstr ""
+
+#: modules/gui/pda/interface.c:295
+#, fuzzy
+msgid "MRL :"
+msgstr "URL"
+
 #: modules/gui/pda/interface.c:396
 #, fuzzy
 msgid "UDP/RTP (Adress when Multicast)"
 msgstr "UDP Multicast"
 
+#: modules/gui/pda/interface.c:490
+#, fuzzy
+msgid "FTP"
+msgstr "RPT"
+
+#: modules/gui/pda/interface.c:500
+msgid "MMS"
+msgstr ""
+
+#: modules/gui/pda/interface.c:526
+msgid "Media"
+msgstr ""
+
+#: modules/gui/pda/interface.c:562
+#, fuzzy
+msgid "MRL"
+msgstr "URL"
+
+#: modules/gui/pda/interface.c:571
+#, fuzzy
+msgid "Time"
+msgstr "Tytu³"
+
+#: modules/gui/pda/interface.c:588
+msgid "Update"
+msgstr ""
+
+#: modules/gui/pda/interface.c:596
+msgid " Del "
+msgstr ""
+
+#: modules/gui/pda/interface.c:604
+msgid " Clear "
+msgstr ""
+
+#: modules/gui/pda/interface.c:628
+msgid "Automatically play file"
+msgstr ""
+
+#: modules/gui/pda/interface.c:645
+#, fuzzy
+msgid " Save "
+msgstr "Zapisz"
+
+#: modules/gui/pda/interface.c:653
+#, fuzzy
+msgid " Apply "
+msgstr "Zastosuj"
+
+#: modules/gui/pda/interface.c:661
+#, fuzzy
+msgid " Cancel "
+msgstr "Anuluj"
+
+#: modules/gui/pda/interface.c:669
+#, fuzzy
+msgid "Preference"
+msgstr "_Preferencje..."
+
+#: modules/gui/pda/interface.c:723
+#, fuzzy
+msgid "Authors: The VideoLAN Team, http://www.videolan.org"
+msgstr ""
+"Zespó³ VideoLAN <videolan@videolan.org>\n"
+"http://www.videolan.org/"
+
+#: modules/gui/pda/interface.c:755
+msgid ""
+"The VideoLAN Client is a MPEG, MPEG 2, MP3, DivX player, that accepts input "
+"from local or network sources."
+msgstr ""
+
+#: modules/gui/pda/pda.c:62
+#, fuzzy
+msgid "Autoplay selected file"
+msgstr "Odtwarza strumieñ"
+
+#: modules/gui/pda/pda.c:63
+msgid "Automatically play a file when selected in the file selection list"
+msgstr ""
+
 #: modules/gui/pda/pda.c:72
 #, fuzzy
 msgid "PDA Linux Gtk2+ interface"
@@ -5236,7 +5353,7 @@ msgstr "Wstrzymuje strumie
 msgid "Capture the stream you are playing to a file"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:348 modules/gui/wxwindows/subtitles.cpp:98
+#: modules/gui/wxwindows/open.cpp:348 modules/gui/wxwindows/subtitles.cpp:100
 #, fuzzy
 msgid "Subtitles file"
 msgstr "_Podtytu³y"
@@ -5254,7 +5371,7 @@ msgstr ""
 msgid "CD Audio"
 msgstr "D¼wiêk"
 
-#: modules/gui/wxwindows/open.cpp:900 modules/gui/wxwindows/streamout.cpp:784
+#: modules/gui/wxwindows/open.cpp:903 modules/gui/wxwindows/streamout.cpp:784
 #, fuzzy
 msgid "Save file"
 msgstr "Wybierz plik"
@@ -5389,21 +5506,26 @@ msgstr "urz
 msgid "Open Subtitles File"
 msgstr "Wybiera kana³ podtytu³ów"
 
-#: modules/gui/wxwindows/subtitles.cpp:115
+#: modules/gui/wxwindows/subtitles.cpp:123
+#, fuzzy
+msgid "Subtitles encoding"
+msgstr "modu³ dekodera podtytu³ów DVD"
+
+#: modules/gui/wxwindows/subtitles.cpp:155
 #, fuzzy
 msgid "Subtitles options"
 msgstr "_Podtytu³y"
 
-#: modules/gui/wxwindows/subtitles.cpp:119
+#: modules/gui/wxwindows/subtitles.cpp:159
 #, fuzzy
 msgid "Delay subtitles (in 1/10s)"
 msgstr "Wybiera kana³ podtytu³ów"
 
-#: modules/gui/wxwindows/subtitles.cpp:130
+#: modules/gui/wxwindows/subtitles.cpp:170
 msgid "Frames per second"
 msgstr ""
 
-#: modules/gui/wxwindows/subtitles.cpp:138
+#: modules/gui/wxwindows/subtitles.cpp:178
 msgid "Override frames per second. It will only work with MicroDVD subtitles."
 msgstr ""
 
@@ -5484,30 +5606,30 @@ msgstr ""
 "\n"
 "U¿ywanie wtyczku interfejsu zapisu do dziennika..."
 
-#: modules/misc/freetype.c:67 modules/visualization/xosd/xosd.c:71
+#: modules/misc/freetype.c:72 modules/visualization/xosd/xosd.c:71
 #, fuzzy
 msgid "Font"
 msgstr "liczba zmiennoprz."
 
-#: modules/misc/freetype.c:68
+#: modules/misc/freetype.c:73
 #, fuzzy
 msgid "Filename of Font"
 msgstr "nazwa pliku dziennika"
 
-#: modules/misc/freetype.c:69
+#: modules/misc/freetype.c:74
 msgid "Font size"
 msgstr ""
 
-#: modules/misc/freetype.c:70
+#: modules/misc/freetype.c:75
 msgid "The size of the fonts used by the osd module"
 msgstr ""
 
-#: modules/misc/freetype.c:73
+#: modules/misc/freetype.c:78
 #, fuzzy
 msgid "Fonts"
 msgstr "liczba zmiennoprz."
 
-#: modules/misc/freetype.c:76
+#: modules/misc/freetype.c:81
 msgid "freetype2 font renderer"
 msgstr ""
 
@@ -5659,19 +5781,19 @@ msgstr ""
 msgid "Dummy muxer"
 msgstr ""
 
-#: modules/mux/mp4.c:52
+#: modules/mux/mp4.c:56
 msgid "MP4/MOV muxer"
 msgstr ""
 
-#: modules/mux/mpeg/ps.c:79
+#: modules/mux/mpeg/ps.c:53
 msgid "PS muxer"
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:138
+#: modules/mux/mpeg/ts.c:78
 msgid "TS muxer"
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:143
+#: modules/mux/mpeg/ts.c:83
 msgid "TS muxer (libdvbpsi)"
 msgstr ""
 
@@ -5683,7 +5805,7 @@ msgstr ""
 msgid "A/52 audio packetizer"
 msgstr ""
 
-#: modules/packetizer/copy.c:69
+#: modules/packetizer/copy.c:43
 msgid "Copy packetizer"
 msgstr ""
 
@@ -5735,7 +5857,7 @@ msgstr "Zatrzymuje strumie
 msgid "Standard stream"
 msgstr "Zatrzymuje strumieñ"
 
-#: modules/stream_out/transcode.c:71
+#: modules/stream_out/transcode.c:73
 #, fuzzy
 msgid "Transcode stream"
 msgstr "Wstrzymuje strumieñ"
@@ -6273,6 +6395,14 @@ msgstr "modu
 msgid "xosd interface"
 msgstr "modu³ interfejsu"
 
+#, fuzzy
+#~ msgid "Familiar Linux Gtk+ interface"
+#~ msgstr "Modu³ interfejsu Gtk+"
+
+#, fuzzy
+#~ msgid "UDP/RTP (Address when Multicast)"
+#~ msgstr "UDP Multicast"
+
 #, fuzzy
 #~ msgid "Advanced open options"
 #~ msgstr "modu³ d¼wiêkowy ALSA"
diff --git a/po/ru.po b/po/ru.po
index 5c58f05f07..81cee45639 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vlc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-07-31 15:04+0200\n"
+"POT-Creation-Date: 2003-08-11 21:05+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"
@@ -27,7 +27,7 @@ msgid "Audio channels"
 msgstr ""
 
 #: src/audio_output/output.c:107 src/audio_output/output.c:142
-#: modules/audio_output/alsa.c:179 modules/audio_output/directx.c:423
+#: modules/audio_output/alsa.c:177 modules/audio_output/directx.c:423
 #: modules/audio_output/oss.c:202 modules/audio_output/sdl.c:181
 #: modules/audio_output/sdl.c:198 modules/audio_output/waveout.c:386
 #, fuzzy
@@ -105,11 +105,11 @@ msgstr ""
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr ""
 
-#: src/input/input.c:171
+#: src/input/input.c:174
 msgid "General"
 msgstr ""
 
-#: src/input/input.c:172
+#: src/input/input.c:175
 #, fuzzy
 msgid "Playlist Item"
 msgstr "óÐÉÓÏË ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ"
@@ -121,9 +121,9 @@ msgid "Program"
 msgstr ""
 
 #: src/input/input_programs.c:98 modules/demux/asf/libasf.c:696
-#: modules/demux/mkv.cpp:2394 modules/gui/beos/MediaControlView.cpp:1258
+#: modules/demux/mkv.cpp:2398 modules/gui/beos/MediaControlView.cpp:1258
 #: modules/gui/gtk/gnome_interface.c:1650 modules/gui/gtk/gtk_interface.c:1956
-#: modules/gui/gtk/menu.c:1402 modules/gui/gtk/menu.c:1423
+#: modules/gui/gtk/menu.c:1403 modules/gui/gtk/menu.c:1424
 #: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:373
 #: modules/gui/macosx/intf.m:374 modules/gui/macosx/open.m:150
 #: modules/gui/wxwindows/open.cpp:406
@@ -132,7 +132,7 @@ msgstr ""
 
 #: src/input/input_programs.c:102 modules/gui/beos/MediaControlView.cpp:1259
 #: modules/gui/gtk/gnome_interface.c:1640 modules/gui/gtk/gtk_interface.c:1946
-#: modules/gui/gtk/menu.c:1019 modules/gui/gtk/menu.c:1432
+#: modules/gui/gtk/menu.c:1020 modules/gui/gtk/menu.c:1433
 #: modules/gui/kde/interface.cpp:146 modules/gui/macosx/intf.m:375
 #: modules/gui/macosx/intf.m:376 modules/gui/macosx/open.m:151
 #: modules/gui/wxwindows/open.cpp:412
@@ -210,15 +210,15 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/libvlc.c:1200 src/misc/configuration.c:1019
+#: src/libvlc.c:1200 src/misc/configuration.c:1040
 msgid "string"
 msgstr ""
 
-#: src/libvlc.c:1217 src/misc/configuration.c:1000
+#: src/libvlc.c:1217 src/misc/configuration.c:1021
 msgid "integer"
 msgstr ""
 
-#: src/libvlc.c:1220 src/misc/configuration.c:1009
+#: src/libvlc.c:1220 src/misc/configuration.c:1030
 msgid "float"
 msgstr ""
 
@@ -984,16 +984,16 @@ msgstr ""
 
 #: src/libvlc.h:474 modules/audio_output/coreaudio.c:227
 #: modules/audio_output/file.c:108 modules/demux/asf/asf.c:228
-#: modules/demux/mkv.cpp:2445 modules/demux/ogg.c:557 modules/demux/ogg.c:829
-#: modules/demux/ogg.c:1002 modules/gui/beos/InterfaceWindow.cpp:259
+#: modules/demux/mkv.cpp:2449 modules/demux/ogg.c:558 modules/demux/ogg.c:830
+#: modules/demux/ogg.c:1003 modules/gui/beos/InterfaceWindow.cpp:259
 #: modules/gui/gtk/gnome_interface.c:1092 modules/gui/gtk/gtk_interface.c:1219
 #: modules/gui/macosx/intf.m:378 modules/gui/macosx/output.m:156
 msgid "Audio"
 msgstr ""
 
-#: src/libvlc.h:493 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1217
-#: modules/demux/mkv.cpp:2461 modules/demux/ogg.c:629 modules/demux/ogg.c:669
-#: modules/demux/ogg.c:734 modules/demux/ogg.c:909
+#: src/libvlc.h:493 modules/demux/asf/asf.c:298 modules/demux/avi/avi.c:1217
+#: modules/demux/mkv.cpp:2465 modules/demux/ogg.c:630 modules/demux/ogg.c:670
+#: modules/demux/ogg.c:735 modules/demux/ogg.c:910
 #: modules/gui/gtk/gnome_interface.c:1099 modules/gui/gtk/gtk_interface.c:1296
 #: modules/gui/macosx/intf.m:389 modules/gui/macosx/macosx.m:68
 #: modules/gui/macosx/output.m:150 modules/misc/dummy/dummy.c:81
@@ -1001,7 +1001,8 @@ msgstr ""
 msgid "Video"
 msgstr ""
 
-#: src/libvlc.h:515 modules/access/satellite/satellite.c:66
+#: src/libvlc.h:515 modules/access/dvb/qpsk.c:101
+#: modules/access/satellite/satellite.c:66
 msgid "Input"
 msgstr ""
 
@@ -1024,7 +1025,7 @@ msgid "CPU"
 msgstr ""
 
 #: src/libvlc.h:579 modules/gui/beos/InterfaceWindow.cpp:206
-#: modules/gui/familiar/interface.c:610 modules/gui/gtk/gnome_interface.c:643
+#: modules/gui/gtk/gnome_interface.c:643
 #: modules/gui/gtk/gnome_interface.c:2384
 #: modules/gui/gtk/gnome_interface.c:2409 modules/gui/gtk/gtk_interface.c:747
 #: modules/gui/gtk/gtk_interface.c:2697 modules/gui/macosx/intf.m:321
@@ -1037,11 +1038,10 @@ msgstr "
 #: src/libvlc.h:585 modules/audio_filter/converter/a52tofloat32.c:85
 #: modules/audio_filter/converter/mpgatofixed32.c:60
 #: modules/codec/a52old/a52old.c:59 modules/codec/mpeg_video/parser.c:84
-#: modules/demux/mpeg/ts.c:118 modules/gui/familiar/familiar.c:70
-#: modules/gui/pda/pda.c:70 modules/misc/logger/logger.c:89
-#: modules/video_filter/motionblur.c:58 modules/video_filter/transform.c:63
-#: modules/video_filter/wall.c:66 modules/video_output/ggi.c:62
-#: modules/video_output/mga/xmga.c:102
+#: modules/demux/mpeg/ts.c:118 modules/gui/pda/pda.c:70
+#: modules/misc/logger/logger.c:89 modules/video_filter/motionblur.c:58
+#: modules/video_filter/transform.c:63 modules/video_filter/wall.c:66
+#: modules/video_output/ggi.c:62 modules/video_output/mga/xmga.c:102
 msgid "Miscellaneous"
 msgstr ""
 
@@ -1069,7 +1069,7 @@ msgstr ""
 msgid "print version information"
 msgstr ""
 
-#: src/misc/configuration.c:1000
+#: src/misc/configuration.c:1021
 msgid "boolean"
 msgstr ""
 
@@ -1133,6 +1133,102 @@ msgstr "
 msgid "Standard filesystem directory input"
 msgstr ""
 
+#: modules/access/dvb/qpsk.c:44
+msgid "adapter card to tune"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:45
+msgid "adapter cards have a device file named /dev/dvb/adapter[n] with n>=0"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:47
+msgid "device nummer to use on adapter"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:50
+msgid "satellite default transponder frequency"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:53
+msgid "satellite default transponder polarization"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:56
+msgid "satellite default transponder FEC"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:57
+msgid "FEC=Forward Error Correction mode"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:59
+msgid "satellite default transponder symbol rate"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:62
+msgid "use diseqc with antenna"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:65
+msgid "antenna lnb_lof1 (kHz)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:68
+msgid "antenna lnb_lof2 (kHz)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:71
+msgid "antenna lnb_slof (kHz)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:74
+msgid "probe the dvb card for capabilities (default disabled)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:75
+msgid "some dvb cards do not like to be probed for their capabilities"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:78
+msgid "modulation type"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:79
+msgid "modulation type for frontend device "
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:82
+msgid "terrestrial high priority stream code rate (FEC)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:85
+msgid "terrestrial low priority stream code rate (FEC)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:88
+msgid "terrestrial bandwidth"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:89
+msgid "terrestrial bandwidth [0=auto,6,7,8 in MHz]"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:91
+msgid "terrestrial guard interval"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:94
+msgid "terrestrial transmission mode"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:97
+msgid "terrestrial hierarchy mode"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:123
+msgid "DVB input module with v4l2 support"
+msgstr ""
+
 #: modules/access/dvd/dvd.c:65
 msgid "Method to use by libdvdcss for key decryption"
 msgstr ""
@@ -1227,7 +1323,7 @@ msgstr ""
 msgid "http"
 msgstr ""
 
-#: modules/access/http.c:89
+#: modules/access/http.c:91
 msgid "HTTP input"
 msgstr ""
 
@@ -1245,6 +1341,10 @@ msgstr ""
 msgid "Hauppauge PVR cards input"
 msgstr ""
 
+#: modules/access/rtsp.c:68
+msgid "RTSP SDP request"
+msgstr ""
+
 #: modules/access/satellite/satellite.c:41
 msgid "Satellite default transponder frequency"
 msgstr ""
@@ -1505,23 +1605,23 @@ msgstr ""
 msgid "Audio device"
 msgstr ""
 
-#: modules/audio_output/alsa.c:173 modules/audio_output/directx.c:435
+#: modules/audio_output/alsa.c:171 modules/audio_output/directx.c:435
 #: modules/audio_output/oss.c:222 modules/audio_output/sdl.c:182
 #: modules/audio_output/sdl.c:201 modules/audio_output/waveout.c:399
 msgid "Mono"
 msgstr ""
 
-#: modules/audio_output/alsa.c:186 modules/audio_output/directx.c:409
+#: modules/audio_output/alsa.c:184 modules/audio_output/directx.c:409
 #: modules/audio_output/oss.c:178 modules/audio_output/waveout.c:371
 msgid "2 Front 2 Rear"
 msgstr ""
 
-#: modules/audio_output/alsa.c:192 modules/audio_output/directx.c:391
+#: modules/audio_output/alsa.c:190 modules/audio_output/directx.c:391
 #: modules/audio_output/oss.c:167 modules/audio_output/waveout.c:352
 msgid "5.1"
 msgstr ""
 
-#: modules/audio_output/alsa.c:219 modules/audio_output/directx.c:478
+#: modules/audio_output/alsa.c:217 modules/audio_output/directx.c:478
 #: modules/audio_output/oss.c:246 modules/audio_output/waveout.c:415
 msgid "A/52 over S/PDIF"
 msgstr ""
@@ -1885,19 +1985,29 @@ msgid "DVD subtitles decoder"
 msgstr "óÌÅÄÕÀÝÉÊ ÆÁÊÌ"
 
 #: modules/codec/subsdec/subsdec.c:68
-msgid "subtitle text encoding"
-msgstr ""
+#, fuzzy
+msgid "Subtitles text encoding"
+msgstr "óÌÅÄÕÀÝÉÊ ÆÁÊÌ"
 
 #: modules/codec/subsdec/subsdec.c:69
-msgid "change the encoding used in text subtitles"
+msgid "Change the encoding used in text subtitles"
+msgstr ""
+
+#: modules/codec/subsdec/subsdec.c:70
+#, fuzzy
+msgid "Subtitles justification"
+msgstr "óÌÅÄÕÀÝÉÊ ÆÁÊÌ"
+
+#: modules/codec/subsdec/subsdec.c:71
+msgid "Change the justification of substitles (0=center, 1=left, 2=right)"
 msgstr ""
 
-#: modules/codec/subsdec/subsdec.c:72
+#: modules/codec/subsdec/subsdec.c:74
 #, fuzzy
 msgid "file subtitles decoder"
 msgstr "óÌÅÄÕÀÝÉÊ ÆÁÊÌ"
 
-#: modules/codec/subsdec/subsdec.c:75 modules/gui/beos/InterfaceWindow.cpp:256
+#: modules/codec/subsdec/subsdec.c:77 modules/gui/beos/InterfaceWindow.cpp:256
 #: modules/gui/kde/interface.cpp:93
 msgid "Subtitles"
 msgstr ""
@@ -2043,7 +2153,7 @@ msgid "Quit"
 msgstr ""
 
 #: modules/control/lirc/lirc.c:297 modules/control/lirc/lirc.c:323
-#: modules/gui/familiar/interface.c:177 modules/gui/gtk/gnome_interface.c:602
+#: modules/gui/gtk/gnome_interface.c:602
 #: modules/gui/gtk/gnome_interface.c:1020 modules/gui/gtk/gtk_interface.c:709
 #: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:921
 #: modules/gui/macosx/intf.m:922 modules/gui/macosx/intf.m:923
@@ -2051,8 +2161,7 @@ msgstr ""
 msgid "Pause"
 msgstr "ðÁÕÚÁ"
 
-#: modules/control/lirc/lirc.c:310 modules/gui/familiar/interface.c:190
-#: modules/gui/gtk/gnome_interface.c:590
+#: modules/control/lirc/lirc.c:310 modules/gui/gtk/gnome_interface.c:590
 #: modules/gui/gtk/gnome_interface.c:1013 modules/gui/gtk/gtk_interface.c:698
 #: modules/gui/macosx/intf.m:324 modules/gui/macosx/intf.m:362
 #: modules/gui/macosx/intf.m:423 modules/gui/macosx/intf.m:928
@@ -2088,69 +2197,71 @@ msgstr ""
 msgid "remote control interface"
 msgstr ""
 
-#: modules/demux/a52sys.c:52
+#: modules/demux/a52sys.c:41
 msgid "A52 demuxer"
 msgstr ""
 
-#: modules/demux/aac/demux.c:46
-msgid "AAC stream demuxer"
+#: modules/demux/a52sys.c:161
+msgid "A52"
 msgstr ""
 
-#: modules/demux/aac/demux.c:555
-msgid "Aac"
+#: modules/demux/a52sys.c:163 modules/demux/aac.c:175
+#: modules/demux/mpeg/m4v.c:150 modules/demux/mpeg/mpga.c:331
+msgid "Input Type"
 msgstr ""
 
-#: modules/demux/aac/demux.c:557 modules/demux/mpeg/audio.c:627
-#: modules/demux/mpeg/audio.c:644 modules/demux/mpeg/m4v.c:150
-msgid "Input Type"
+#: modules/demux/a52sys.c:164 modules/demux/aac.c:177
+#: modules/demux/asf/asf.c:275 modules/demux/avi/avi.c:1178
+#: modules/demux/mkv.cpp:2453 modules/demux/ogg.c:562 modules/demux/ogg.c:838
+#: modules/demux/ogg.c:1011 modules/gui/gtk/gnome_interface.c:148
+#: modules/gui/gtk/gnome_interface.c:931 modules/gui/gtk/gtk_interface.c:481
+#: modules/gui/gtk/gtk_interface.c:1282 modules/gui/macosx/output.m:162
+#: modules/gui/wxwindows/streamout.cpp:668
+msgid "Channels"
 msgstr ""
 
-#: modules/demux/aac/demux.c:560 modules/demux/mpeg/audio.c:629
-msgid "Layer"
+#: modules/demux/a52sys.c:165 modules/demux/aac.c:179
+#: modules/demux/asf/asf.c:277 modules/demux/avi/avi.c:1180
+#: modules/demux/mkv.cpp:2457 modules/demux/mpeg/mpga.c:337
+#: modules/demux/ogg.c:560 modules/demux/ogg.c:672 modules/demux/ogg.c:833
+#: modules/demux/ogg.c:1006
+msgid "Sample Rate"
 msgstr ""
 
-#: modules/demux/aac/demux.c:562 modules/demux/asf/asf.c:275
-#: modules/demux/avi/avi.c:1178 modules/demux/mkv.cpp:2449
-#: modules/demux/ogg.c:561 modules/demux/ogg.c:837 modules/demux/ogg.c:1010
-#: modules/gui/gtk/gnome_interface.c:148 modules/gui/gtk/gnome_interface.c:931
-#: modules/gui/gtk/gtk_interface.c:481 modules/gui/gtk/gtk_interface.c:1282
-#: modules/gui/macosx/output.m:162 modules/gui/wxwindows/streamout.cpp:668
-msgid "Channels"
+#: modules/demux/aac.c:41
+msgid "AAC demuxer"
 msgstr ""
 
-#: modules/demux/aac/demux.c:564 modules/demux/asf/asf.c:277
-#: modules/demux/avi/avi.c:1180 modules/demux/mkv.cpp:2453
-#: modules/demux/mpeg/audio.c:632 modules/demux/ogg.c:559
-#: modules/demux/ogg.c:671 modules/demux/ogg.c:832 modules/demux/ogg.c:1005
-msgid "Sample Rate"
+#: modules/demux/aac.c:173
+msgid "Aac"
 msgstr ""
 
 #: modules/demux/asf/asf.c:48
 msgid "ASF v1.0 demuxer (file only)"
 msgstr ""
 
-#: modules/demux/asf/asf.c:165 modules/demux/mkv.cpp:2412
+#: modules/demux/asf/asf.c:165 modules/demux/mkv.cpp:2416
 #, fuzzy
 msgid "Number of streams"
 msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
 
-#: modules/demux/asf/asf.c:228 modules/demux/asf/asf.c:302
+#: modules/demux/asf/asf.c:228 modules/demux/asf/asf.c:298
 #: modules/demux/avi/avi.c:1172 modules/demux/avi/avi.c:1217
-#: modules/demux/avi/avi.c:1250 modules/demux/mkv.cpp:2445
-#: modules/demux/mkv.cpp:2461 modules/demux/mkv.cpp:2477
-#: modules/demux/ogg.c:557 modules/demux/ogg.c:629 modules/demux/ogg.c:669
-#: modules/demux/ogg.c:734 modules/demux/ogg.c:829 modules/demux/ogg.c:909
-#: modules/demux/ogg.c:1002 modules/gui/familiar/interface.c:370
-#: modules/gui/macosx/output.m:139 modules/gui/pda/interface.c:372
+#: modules/demux/avi/avi.c:1250 modules/demux/mkv.cpp:2449
+#: modules/demux/mkv.cpp:2465 modules/demux/mkv.cpp:2481
+#: modules/demux/ogg.c:558 modules/demux/ogg.c:630 modules/demux/ogg.c:670
+#: modules/demux/ogg.c:735 modules/demux/ogg.c:830 modules/demux/ogg.c:910
+#: modules/demux/ogg.c:1003 modules/gui/macosx/output.m:139
+#: modules/gui/pda/interface.c:372
 msgid "Type"
 msgstr ""
 
-#: modules/demux/asf/asf.c:260 modules/demux/asf/asf.c:318
+#: modules/demux/asf/asf.c:260 modules/demux/asf/asf.c:314
 #: modules/demux/avi/avi.c:1174 modules/demux/avi/avi.c:1218
-#: modules/demux/mkv.cpp:2446 modules/demux/mkv.cpp:2462
-#: modules/demux/mkv.cpp:2478 modules/demux/ogg.c:558 modules/demux/ogg.c:630
-#: modules/demux/ogg.c:670 modules/demux/ogg.c:735 modules/demux/ogg.c:830
-#: modules/demux/ogg.c:910 modules/demux/ogg.c:1003
+#: modules/demux/mkv.cpp:2450 modules/demux/mkv.cpp:2466
+#: modules/demux/mkv.cpp:2482 modules/demux/ogg.c:559 modules/demux/ogg.c:631
+#: modules/demux/ogg.c:671 modules/demux/ogg.c:736 modules/demux/ogg.c:831
+#: modules/demux/ogg.c:911 modules/demux/ogg.c:1004
 msgid "Codec"
 msgstr ""
 
@@ -2159,38 +2270,38 @@ msgid "Avg. byterate"
 msgstr ""
 
 #: modules/demux/asf/asf.c:282 modules/demux/avi/avi.c:1185
-#: modules/demux/mkv.cpp:2457
+#: modules/demux/mkv.cpp:2461
 msgid "Bits Per Sample"
 msgstr ""
 
-#: modules/demux/asf/asf.c:332
+#: modules/demux/asf/asf.c:328
 msgid "Size"
 msgstr ""
 
-#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1222
-#: modules/demux/mkv.cpp:2465
+#: modules/demux/asf/asf.c:331 modules/demux/avi/avi.c:1222
+#: modules/demux/mkv.cpp:2469
 #, fuzzy
 msgid "Resolution"
 msgstr "óÌÅÄÕÀÝÉÊ ÆÁÊÌ"
 
-#: modules/demux/asf/asf.c:337
+#: modules/demux/asf/asf.c:333
 #, fuzzy
 msgid "Planes"
 msgstr "÷ÏÓÐÒ."
 
-#: modules/demux/asf/asf.c:339 modules/demux/avi/avi.c:1228
+#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1228
 msgid "Bits Per Pixel"
 msgstr ""
 
-#: modules/demux/asf/asf.c:342
+#: modules/demux/asf/asf.c:338
 msgid "Image Size"
 msgstr ""
 
-#: modules/demux/asf/asf.c:344
+#: modules/demux/asf/asf.c:340
 msgid "X pixels per meter"
 msgstr ""
 
-#: modules/demux/asf/asf.c:346
+#: modules/demux/asf/asf.c:342
 msgid "Y pixels per meter"
 msgstr ""
 
@@ -2223,7 +2334,7 @@ msgstr ""
 msgid "Rating"
 msgstr ""
 
-#: modules/demux/au.c:47
+#: modules/demux/au.c:42
 msgid "AU demuxer"
 msgstr ""
 
@@ -2270,8 +2381,8 @@ msgstr ""
 msgid "Audio Bitrate"
 msgstr ""
 
-#: modules/demux/avi/avi.c:1225 modules/demux/ogg.c:631
-#: modules/demux/ogg.c:737 modules/demux/ogg.c:912
+#: modules/demux/avi/avi.c:1225 modules/demux/ogg.c:632
+#: modules/demux/ogg.c:738 modules/demux/ogg.c:913
 msgid "Frame Rate"
 msgstr ""
 
@@ -2313,61 +2424,61 @@ msgstr ""
 msgid "mka/mkv stream demuxer"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2389 modules/gui/gtk/gnome_interface.c:2436
+#: modules/demux/mkv.cpp:2393 modules/gui/gtk/gnome_interface.c:2436
 #: modules/gui/gtk/gtk_interface.c:2857 modules/gui/wxwindows/playlist.cpp:150
 msgid "Duration"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2398
+#: modules/demux/mkv.cpp:2402
 msgid "Date UTC"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2402
+#: modules/demux/mkv.cpp:2406
 #, fuzzy
 msgid "Segment Filename"
 msgstr "óÌÅÄÕÀÝÉÊ ÆÁÊÌ"
 
-#: modules/demux/mkv.cpp:2406
+#: modules/demux/mkv.cpp:2410
 msgid "Muxing Application"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2410
+#: modules/demux/mkv.cpp:2414
 msgid "Writing Application"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2423 modules/gui/beos/PlayListWindow.cpp:144
-#: modules/gui/familiar/interface.c:362 modules/gui/gtk/preferences.c:325
-#: modules/gui/kde/pluginsbox.cpp:45 modules/gui/pda/interface.c:364
+#: modules/demux/mkv.cpp:2427 modules/gui/beos/PlayListWindow.cpp:144
+#: modules/gui/gtk/preferences.c:325 modules/gui/kde/pluginsbox.cpp:45
+#: modules/gui/pda/interface.c:364
 msgid "Name"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2427
+#: modules/demux/mkv.cpp:2431
 msgid "Codec Name"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2431
+#: modules/demux/mkv.cpp:2435
 #, fuzzy
 msgid "Codec Setting"
 msgstr "óÌÅÄÕÀÝÉÊ ÆÁÊÌ"
 
-#: modules/demux/mkv.cpp:2435
+#: modules/demux/mkv.cpp:2439
 msgid "Codec Info"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2439
+#: modules/demux/mkv.cpp:2443
 msgid "Codec Download"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2469
+#: modules/demux/mkv.cpp:2473
 #, fuzzy
 msgid "Display Resolution"
 msgstr "óÌÅÄÕÀÝÉÊ ÆÁÊÌ"
 
-#: modules/demux/mkv.cpp:2473
+#: modules/demux/mkv.cpp:2477
 msgid "Frame Per Second"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2477 modules/gui/gtk/gnome_interface.c:1963
+#: modules/demux/mkv.cpp:2481 modules/gui/gtk/gnome_interface.c:1963
 #: modules/gui/gtk/gtk_interface.c:2278
 msgid "Subtitle"
 msgstr ""
@@ -2376,34 +2487,42 @@ msgstr ""
 msgid "MP4 demuxer"
 msgstr ""
 
-#: modules/demux/mpeg/audio.c:47
-msgid "MPEG I/II audio stream demuxer"
+#: modules/demux/mpeg/es.c:49
+msgid "ISO 13818-1 MPEG Elementary Stream input"
+msgstr ""
+
+#: modules/demux/mpeg/m4v.c:43
+msgid "MPEG-4 video elementary stream demuxer"
 msgstr ""
 
-#: modules/demux/mpeg/audio.c:626 modules/demux/mpeg/audio.c:643
 #: modules/demux/mpeg/m4v.c:149
 msgid "mpeg"
 msgstr ""
 
-#: modules/demux/mpeg/audio.c:630
+#: modules/demux/mpeg/m4v.c:150
+msgid "Video MPEG-4 (raw ES)"
+msgstr ""
+
+#: modules/demux/mpeg/mpga.c:41
 #, fuzzy
-msgid "Mode"
-msgstr "íÏÄÕÌÉ"
+msgid "MPEG-I/II Audio demuxer"
+msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
 
-#: modules/demux/mpeg/audio.c:634
-msgid "Average Bitrate"
+#: modules/demux/mpeg/mpga.c:330
+msgid "MPEG"
 msgstr ""
 
-#: modules/demux/mpeg/es.c:49
-msgid "ISO 13818-1 MPEG Elementary Stream input"
+#: modules/demux/mpeg/mpga.c:333
+msgid "Layer"
 msgstr ""
 
-#: modules/demux/mpeg/m4v.c:43
-msgid "MPEG-4 video elementary stream demuxer"
-msgstr ""
+#: modules/demux/mpeg/mpga.c:335
+#, fuzzy
+msgid "Mode"
+msgstr "íÏÄÕÌÉ"
 
-#: modules/demux/mpeg/m4v.c:150
-msgid "Video MPEG-4 (raw ES)"
+#: modules/demux/mpeg/mpga.c:339
+msgid "Average Bitrate"
 msgstr ""
 
 #: modules/demux/mpeg/ps.c:60
@@ -2447,36 +2566,36 @@ msgstr ""
 msgid "ogg stream demuxer"
 msgstr ""
 
-#: modules/demux/ogg.c:558
+#: modules/demux/ogg.c:559
 msgid "Vorbis"
 msgstr ""
 
-#: modules/demux/ogg.c:563 modules/demux/ogg.c:633 modules/demux/ogg.c:673
-#: modules/demux/ogg.c:834 modules/demux/ogg.c:1007
+#: modules/demux/ogg.c:564 modules/demux/ogg.c:634 modules/demux/ogg.c:674
+#: modules/demux/ogg.c:835 modules/demux/ogg.c:1008
 msgid "Bit Rate"
 msgstr ""
 
-#: modules/demux/ogg.c:630
+#: modules/demux/ogg.c:631
 msgid "Theora"
 msgstr ""
 
-#: modules/demux/ogg.c:670
+#: modules/demux/ogg.c:671
 msgid "tarkin"
 msgstr ""
 
-#: modules/demux/ogg.c:739 modules/demux/ogg.c:914
+#: modules/demux/ogg.c:740 modules/demux/ogg.c:915
 msgid "Bit Count"
 msgstr ""
 
-#: modules/demux/ogg.c:741 modules/demux/ogg.c:916
+#: modules/demux/ogg.c:742 modules/demux/ogg.c:917
 msgid "Width"
 msgstr ""
 
-#: modules/demux/ogg.c:743 modules/demux/ogg.c:918
+#: modules/demux/ogg.c:744 modules/demux/ogg.c:919
 msgid "Height"
 msgstr ""
 
-#: modules/demux/ogg.c:839 modules/demux/ogg.c:1012
+#: modules/demux/ogg.c:840 modules/demux/ogg.c:1013
 msgid "Bits per Sample"
 msgstr ""
 
@@ -2484,6 +2603,10 @@ msgstr ""
 msgid "raw dv demuxer"
 msgstr ""
 
+#: modules/demux/sdp.c:64
+msgid "SDP demuxer + UDP/RTP/RTSP"
+msgstr ""
+
 #: modules/demux/util/id3.c:44
 msgid "Simple id3 tag skipper"
 msgstr ""
@@ -2824,7 +2947,7 @@ msgstr ""
 msgid "Text subtitles demux"
 msgstr "óÌÅÄÕÀÝÉÊ ÆÁÊÌ"
 
-#: modules/demux/wav/wav.c:49
+#: modules/demux/wav.c:43
 msgid "WAV demuxer"
 msgstr ""
 
@@ -2858,11 +2981,9 @@ msgid "Yes"
 msgstr ""
 
 #: modules/gui/beos/InterfaceWindow.cpp:201
-#: modules/gui/beos/InterfaceWindow.cpp:308
-#: modules/gui/familiar/interface.c:149 modules/gui/familiar/interface.c:150
-#: modules/gui/macosx/intf.m:328 modules/gui/macosx/prefs.m:77
-#: modules/gui/pda/interface.c:151 modules/gui/pda/interface.c:152
-#: modules/gui/wxwindows/preferences.cpp:233
+#: modules/gui/beos/InterfaceWindow.cpp:308 modules/gui/macosx/intf.m:328
+#: modules/gui/macosx/prefs.m:77 modules/gui/pda/interface.c:151
+#: modules/gui/pda/interface.c:152 modules/gui/wxwindows/preferences.cpp:233
 msgid "Preferences"
 msgstr ""
 
@@ -2877,7 +2998,7 @@ msgstr ""
 
 #: modules/gui/beos/InterfaceWindow.cpp:238
 #: modules/gui/beos/MediaControlView.cpp:1257
-#: modules/gui/beos/PlayListWindow.cpp:82 modules/gui/familiar/interface.c:378
+#: modules/gui/beos/PlayListWindow.cpp:82
 #: modules/gui/gtk/gnome_interface.c:503
 #: modules/gui/gtk/gnome_interface.c:1569
 #: modules/gui/gtk/gnome_interface.c:2274
@@ -2913,10 +3034,8 @@ msgid "Open Subtitles"
 msgstr "óÌÅÄÕÀÝÉÊ ÆÁÊÌ"
 
 #: modules/gui/beos/InterfaceWindow.cpp:249
-#: modules/gui/familiar/interface.c:231 modules/gui/familiar/interface.c:232
-#: modules/gui/familiar/interface.c:765 modules/gui/gtk/gtk_interface.c:1580
-#: modules/gui/pda/interface.c:233 modules/gui/pda/interface.c:234
-#: modules/gui/pda/interface.c:767
+#: modules/gui/gtk/gtk_interface.c:1580 modules/gui/pda/interface.c:233
+#: modules/gui/pda/interface.c:234 modules/gui/pda/interface.c:767
 msgid "About"
 msgstr ""
 
@@ -2969,7 +3088,7 @@ msgstr "
 #: modules/gui/wxwindows/open.cpp:244
 #: modules/gui/wxwindows/preferences.cpp:253
 #: modules/gui/wxwindows/streamout.cpp:217
-#: modules/gui/wxwindows/subtitles.cpp:149
+#: modules/gui/wxwindows/subtitles.cpp:190
 msgid "OK"
 msgstr ""
 
@@ -3100,7 +3219,7 @@ msgstr ""
 msgid "Take Screen Shot"
 msgstr ""
 
-#: modules/gui/beos/VlcWrapper.cpp:165 modules/gui/gtk/menu.c:733
+#: modules/gui/beos/VlcWrapper.cpp:165 modules/gui/gtk/menu.c:734
 msgid "None"
 msgstr ""
 
@@ -3108,206 +3227,6 @@ msgstr ""
 msgid "<unknown>"
 msgstr ""
 
-#: modules/gui/familiar/familiar.c:62 modules/gui/pda/pda.c:62
-#, fuzzy
-msgid "Autoplay selected file"
-msgstr "÷ÏÓÐÒÏÉÚ×ÅÓÔÉ ÐÏÔÏË"
-
-#: modules/gui/familiar/familiar.c:63 modules/gui/pda/pda.c:63
-msgid "Automatically play a file when selected in the file selection list"
-msgstr ""
-
-#: modules/gui/familiar/familiar.c:72
-msgid "Familiar Linux Gtk+ interface"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:99 modules/gui/familiar/interface.c:732
-#: modules/gui/gtk/gnome_interface.c:274 modules/gui/gtk/gtk_interface.c:121
-#: modules/gui/gtk/gtk_interface.c:1595 modules/gui/pda/interface.c:99
-#: modules/gui/pda/interface.c:734
-msgid "VLC media player"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:124 modules/gui/pda/interface.c:126
-#: modules/gui/wxwindows/dialogs.cpp:268 modules/gui/wxwindows/open.cpp:709
-#: modules/gui/wxwindows/preferences.cpp:1029
-#: modules/gui/wxwindows/subtitles.cpp:196
-#, fuzzy
-msgid "Open file"
-msgstr "ïÔËÒÙÔØ ÆÁÊÌ"
-
-#: modules/gui/familiar/interface.c:164 modules/gui/pda/interface.c:166
-msgid "Rewind"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:165 modules/gui/pda/interface.c:167
-#, fuzzy
-msgid "Rewind stream"
-msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
-
-#: modules/gui/familiar/interface.c:178 modules/gui/pda/interface.c:180
-#, fuzzy
-msgid "Pause stream"
-msgstr "ðÒÉÏÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
-
-#: modules/gui/familiar/interface.c:191 modules/gui/pda/interface.c:193
-#, fuzzy
-msgid "Play stream"
-msgstr "÷ÏÓÐÒÏÉÚ×ÅÓÔÉ ÐÏÔÏË"
-
-#: modules/gui/familiar/interface.c:203 modules/gui/gtk/gnome_interface.c:566
-#: modules/gui/gtk/gnome_interface.c:1027 modules/gui/gtk/gtk_interface.c:676
-#: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:639
-#: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
-#: modules/gui/macosx/intf.m:424 modules/gui/pda/interface.c:205
-#: modules/gui/wxwindows/interface.cpp:373
-msgid "Stop"
-msgstr "óÔÏÐ"
-
-#: modules/gui/familiar/interface.c:204 modules/gui/pda/interface.c:206
-#, fuzzy
-msgid "Stop stream"
-msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
-
-#: modules/gui/familiar/interface.c:216 modules/gui/pda/interface.c:218
-msgid "Forward"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:217 modules/gui/pda/interface.c:219
-msgid "Forward stream"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:285 modules/gui/gtk/gnome_interface.c:2345
-#: modules/gui/gtk/gtk_interface.c:2712 modules/gui/macosx/playlist.m:198
-#: modules/gui/pda/interface.c:287
-msgid "Add"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:293 modules/gui/pda/interface.c:295
-msgid "MRL :"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:394
-msgid "UDP/RTP (Address when Multicast)"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:412 modules/gui/gtk/gnome_interface.c:1747
-#: modules/gui/gtk/gtk_interface.c:2062 modules/gui/macosx/open.m:161
-#: modules/gui/macosx/output.m:133 modules/gui/pda/interface.c:414
-#: modules/gui/wxwindows/open.cpp:469 modules/gui/wxwindows/streamout.cpp:425
-msgid "Address"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:423 modules/gui/gtk/gnome_interface.c:1737
-#: modules/gui/gtk/gnome_interface.c:1786
-#: modules/gui/gtk/gnome_interface.c:2912 modules/gui/gtk/gtk_interface.c:2052
-#: modules/gui/gtk/gtk_interface.c:2101 modules/gui/gtk/gtk_interface.c:3225
-#: modules/gui/macosx/open.m:160 modules/gui/macosx/open.m:162
-#: modules/gui/macosx/output.m:134 modules/gui/pda/interface.c:425
-#: modules/gui/wxwindows/open.cpp:454 modules/gui/wxwindows/open.cpp:477
-#: modules/gui/wxwindows/streamout.cpp:436
-msgid "Port"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:136
-#: modules/gui/macosx/output.m:236 modules/gui/macosx/output.m:311
-#: modules/gui/pda/interface.c:480 modules/gui/wxwindows/streamout.cpp:386
-msgid "HTTP"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:488 modules/gui/pda/interface.c:490
-msgid "FTP"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:498 modules/gui/pda/interface.c:500
-msgid "MMS"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:516 modules/gui/gtk/gnome_interface.c:1830
-#: modules/gui/gtk/gnome_interface.c:2281 modules/gui/gtk/gtk_interface.c:2145
-#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:144
-#: modules/gui/macosx/open.m:271 modules/gui/pda/interface.c:518
-#: modules/gui/wxwindows/open.cpp:257
-msgid "Network"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:524 modules/gui/pda/interface.c:526
-msgid "Media"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:560 modules/gui/pda/interface.c:562
-msgid "MRL"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:569 modules/gui/pda/interface.c:571
-#, fuzzy
-msgid "Time"
-msgstr "óÌÅÄÕÀÝÉÊ ÆÁÊÌ"
-
-#: modules/gui/familiar/interface.c:586 modules/gui/pda/interface.c:588
-msgid "Update"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:594 modules/gui/pda/interface.c:596
-msgid " Del "
-msgstr ""
-
-#: modules/gui/familiar/interface.c:602 modules/gui/pda/interface.c:604
-msgid " Clear "
-msgstr ""
-
-#: modules/gui/familiar/interface.c:626 modules/gui/pda/interface.c:628
-msgid "Automatically play file"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:643 modules/gui/pda/interface.c:645
-#, fuzzy
-msgid " Save "
-msgstr "óÌÅÄÕÀÝÉÊ ÆÁÊÌ"
-
-#: modules/gui/familiar/interface.c:651 modules/gui/pda/interface.c:653
-msgid " Apply "
-msgstr ""
-
-#: modules/gui/familiar/interface.c:659 modules/gui/pda/interface.c:661
-msgid " Cancel "
-msgstr ""
-
-#: modules/gui/familiar/interface.c:667 modules/gui/pda/interface.c:669
-msgid "Preference"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:711 modules/gui/gtk/gnome_interface.c:1361
-#: modules/gui/gtk/gtk_interface.c:1603 modules/gui/kde/kde.cpp:111
-#: modules/gui/pda/interface.c:713
-msgid "(c) 1996-2003 the VideoLAN team"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:721 modules/gui/pda/interface.c:723
-msgid "Authors: The VideoLAN Team, http://www.videolan.org"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:753 modules/gui/pda/interface.c:755
-msgid ""
-"The VideoLAN Client is a MPEG, MPEG 2, MP3, DivX player, that accepts input "
-"from local or network sources."
-msgstr ""
-
-#: modules/gui/familiar/support.c:121 modules/gui/gtk/gnome_support.c:100
-#: modules/gui/gtk/gnome_support.c:138 modules/gui/gtk/gtk_support.c:121
-#: modules/gui/gtk2/gnome2_support.c:60 modules/gui/gtk2/gnome2_support.c:85
-#: modules/gui/gtk2/gtk2_support.c:90 modules/gui/gtk2/gtk2_support.c:114
-#: modules/gui/pda/support.c:121
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr ""
-
-#: modules/gui/familiar/support.c:130 modules/gui/gtk/gtk_support.c:130
-#: modules/gui/pda/support.c:130
-#, c-format
-msgid "Error loading pixmap file: %s"
-msgstr ""
-
 #: modules/gui/gtk/gnome.c:55 modules/gui/gtk/gtk.c:57
 msgid "Show tooltips"
 msgstr ""
@@ -3507,6 +3426,12 @@ msgstr ""
 msgid "_Video"
 msgstr ""
 
+#: modules/gui/gtk/gnome_interface.c:274 modules/gui/gtk/gtk_interface.c:121
+#: modules/gui/gtk/gtk_interface.c:1595 modules/gui/pda/interface.c:99
+#: modules/gui/pda/interface.c:734
+msgid "VLC media player"
+msgstr ""
+
 #: modules/gui/gtk/gnome_interface.c:515 modules/gui/gtk/gnome_interface.c:718
 #: modules/gui/gtk/gnome_interface.c:1690
 #: modules/gui/gtk/gnome_interface.c:2267 modules/gui/gtk/gtk_interface.c:629
@@ -3544,6 +3469,15 @@ msgstr "
 msgid "Go Backward"
 msgstr "÷ÅÒÎÕÔØÓÑ ÎÁÚÁÄ"
 
+#: modules/gui/gtk/gnome_interface.c:566
+#: modules/gui/gtk/gnome_interface.c:1027 modules/gui/gtk/gtk_interface.c:676
+#: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:639
+#: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
+#: modules/gui/macosx/intf.m:424 modules/gui/pda/interface.c:205
+#: modules/gui/wxwindows/interface.cpp:373
+msgid "Stop"
+msgstr "óÔÏÐ"
+
 #: modules/gui/gtk/gnome_interface.c:567 modules/gui/gtk/gtk_interface.c:677
 msgid "Stop Stream"
 msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
@@ -3667,6 +3601,11 @@ msgstr ""
 msgid "Playlist..."
 msgstr "óÐÉÓÏË ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ..."
 
+#: modules/gui/gtk/gnome_interface.c:1361 modules/gui/gtk/gtk_interface.c:1603
+#: modules/gui/kde/kde.cpp:111 modules/gui/pda/interface.c:713
+msgid "(c) 1996-2003 the VideoLAN team"
+msgstr ""
+
 #: modules/gui/gtk/gnome_interface.c:1363 modules/gui/gtk/gtk_interface.c:1646
 #: modules/gui/kde/kde.cpp:108
 msgid ""
@@ -3707,7 +3646,7 @@ msgstr ""
 #: modules/gui/wxwindows/open.cpp:223 modules/gui/wxwindows/open.cpp:341
 #: modules/gui/wxwindows/preferences.cpp:832
 #: modules/gui/wxwindows/streamout.cpp:412
-#: modules/gui/wxwindows/subtitles.cpp:107
+#: modules/gui/wxwindows/subtitles.cpp:109
 msgid "Browse..."
 msgstr ""
 
@@ -3756,11 +3695,37 @@ msgstr ""
 msgid "HTTP/FTP/MMS"
 msgstr ""
 
+#: modules/gui/gtk/gnome_interface.c:1737
+#: modules/gui/gtk/gnome_interface.c:1786
+#: modules/gui/gtk/gnome_interface.c:2912 modules/gui/gtk/gtk_interface.c:2052
+#: modules/gui/gtk/gtk_interface.c:2101 modules/gui/gtk/gtk_interface.c:3225
+#: modules/gui/macosx/open.m:160 modules/gui/macosx/open.m:162
+#: modules/gui/macosx/output.m:134 modules/gui/pda/interface.c:425
+#: modules/gui/wxwindows/open.cpp:454 modules/gui/wxwindows/open.cpp:477
+#: modules/gui/wxwindows/streamout.cpp:436
+msgid "Port"
+msgstr ""
+
+#: modules/gui/gtk/gnome_interface.c:1747 modules/gui/gtk/gtk_interface.c:2062
+#: modules/gui/macosx/open.m:161 modules/gui/macosx/output.m:133
+#: modules/gui/pda/interface.c:414 modules/gui/wxwindows/open.cpp:469
+#: modules/gui/wxwindows/streamout.cpp:425
+msgid "Address"
+msgstr ""
+
 #: modules/gui/gtk/gnome_interface.c:1759 modules/gui/gtk/gtk_interface.c:2074
 #: modules/gui/macosx/open.m:163 modules/gui/wxwindows/open.cpp:492
 msgid "URL"
 msgstr ""
 
+#: modules/gui/gtk/gnome_interface.c:1830
+#: modules/gui/gtk/gnome_interface.c:2281 modules/gui/gtk/gtk_interface.c:2145
+#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:144
+#: modules/gui/macosx/open.m:271 modules/gui/pda/interface.c:518
+#: modules/gui/wxwindows/open.cpp:257
+msgid "Network"
+msgstr ""
+
 #: modules/gui/gtk/gnome_interface.c:1847 modules/gui/gtk/gtk_interface.c:2162
 msgid "Symbol Rate"
 msgstr ""
@@ -3843,6 +3808,11 @@ msgstr ""
 msgid "Select"
 msgstr ""
 
+#: modules/gui/gtk/gnome_interface.c:2345 modules/gui/gtk/gtk_interface.c:2712
+#: modules/gui/macosx/playlist.m:198 modules/gui/pda/interface.c:287
+msgid "Add"
+msgstr ""
+
 #: modules/gui/gtk/gnome_interface.c:2352 modules/gui/gtk/gtk_interface.c:2754
 #: modules/gui/macosx/playlist.m:195 modules/gui/macosx/playlist.m:199
 msgid "Delete"
@@ -3912,6 +3882,14 @@ msgstr ""
 msgid "AVI"
 msgstr ""
 
+#: modules/gui/gtk/gnome_support.c:100 modules/gui/gtk/gnome_support.c:138
+#: modules/gui/gtk/gtk_support.c:121 modules/gui/gtk2/gnome2_support.c:60
+#: modules/gui/gtk2/gnome2_support.c:85 modules/gui/gtk2/gtk2_support.c:90
+#: modules/gui/gtk2/gtk2_support.c:114 modules/gui/pda/support.c:121
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr ""
+
 #: modules/gui/gtk/gnome_support.c:116
 #, c-format
 msgid "Couldn't create pixmap from file: %s"
@@ -4033,10 +4011,11 @@ msgstr ""
 #: modules/gui/gtk/gtk_interface.c:2403 modules/gui/gtk/gtk_interface.c:2645
 #: modules/gui/gtk/gtk_interface.c:2876 modules/gui/gtk/gtk_interface.c:3257
 #: modules/gui/gtk/preferences.c:618 modules/gui/macosx/open.m:140
-#: modules/gui/macosx/prefs.m:79 modules/gui/wxwindows/open.cpp:247
+#: modules/gui/macosx/prefs.m:79 modules/gui/macosx/prefs.m:170
+#: modules/gui/wxwindows/open.cpp:247
 #: modules/gui/wxwindows/preferences.cpp:256
 #: modules/gui/wxwindows/streamout.cpp:220
-#: modules/gui/wxwindows/subtitles.cpp:152
+#: modules/gui/wxwindows/subtitles.cpp:193
 msgid "Cancel"
 msgstr ""
 
@@ -4069,12 +4048,17 @@ msgstr ""
 msgid "_Select"
 msgstr ""
 
-#: modules/gui/gtk/menu.c:900
+#: modules/gui/gtk/gtk_support.c:130 modules/gui/pda/support.c:130
+#, c-format
+msgid "Error loading pixmap file: %s"
+msgstr ""
+
+#: modules/gui/gtk/menu.c:901
 #, c-format
 msgid "Title %d (%d)"
 msgstr ""
 
-#: modules/gui/gtk/menu.c:967
+#: modules/gui/gtk/menu.c:968
 #, c-format
 msgid "Chapter %d"
 msgstr ""
@@ -4234,8 +4218,9 @@ msgstr ""
 msgid "VLC - Controller"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/interface.cpp:904
-#: modules/gui/wxwindows/timer.cpp:131
+#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/control.cpp:160
+#: modules/gui/wxwindows/control.cpp:370
+#: modules/gui/wxwindows/interface.cpp:904 modules/gui/wxwindows/timer.cpp:131
 msgid "Volume"
 msgstr ""
 
@@ -4496,6 +4481,12 @@ msgstr "
 msgid "TTL"
 msgstr ""
 
+#: modules/gui/macosx/output.m:136 modules/gui/macosx/output.m:236
+#: modules/gui/macosx/output.m:311 modules/gui/pda/interface.c:480
+#: modules/gui/wxwindows/streamout.cpp:386
+msgid "HTTP"
+msgstr ""
+
 #: modules/gui/macosx/output.m:141 modules/gui/wxwindows/streamout.cpp:531
 msgid "Encapsulation Method"
 msgstr ""
@@ -4555,6 +4546,10 @@ msgstr ""
 msgid "Reset Preferences"
 msgstr ""
 
+#: modules/gui/macosx/prefs.m:170
+msgid "Continue"
+msgstr ""
+
 #: modules/gui/macosx/prefs.m:172 modules/gui/wxwindows/preferences.cpp:316
 msgid ""
 "Beware this will reset your VLC Media Player config file.\n"
@@ -4574,10 +4569,127 @@ msgstr ""
 msgid "ncurses interface"
 msgstr "ïÔËÒÙÔØ ÏËÎÏ ÓÐÉÓËÁ ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ"
 
+#: modules/gui/pda/interface.c:126 modules/gui/wxwindows/dialogs.cpp:268
+#: modules/gui/wxwindows/open.cpp:709
+#: modules/gui/wxwindows/preferences.cpp:1029
+#: modules/gui/wxwindows/subtitles.cpp:234
+#, fuzzy
+msgid "Open file"
+msgstr "ïÔËÒÙÔØ ÆÁÊÌ"
+
+#: modules/gui/pda/interface.c:166
+msgid "Rewind"
+msgstr ""
+
+#: modules/gui/pda/interface.c:167
+#, fuzzy
+msgid "Rewind stream"
+msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
+
+#: modules/gui/pda/interface.c:180
+#, fuzzy
+msgid "Pause stream"
+msgstr "ðÒÉÏÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
+
+#: modules/gui/pda/interface.c:193
+#, fuzzy
+msgid "Play stream"
+msgstr "÷ÏÓÐÒÏÉÚ×ÅÓÔÉ ÐÏÔÏË"
+
+#: modules/gui/pda/interface.c:206
+#, fuzzy
+msgid "Stop stream"
+msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
+
+#: modules/gui/pda/interface.c:218
+msgid "Forward"
+msgstr ""
+
+#: modules/gui/pda/interface.c:219
+msgid "Forward stream"
+msgstr ""
+
+#: modules/gui/pda/interface.c:295
+msgid "MRL :"
+msgstr ""
+
 #: modules/gui/pda/interface.c:396
 msgid "UDP/RTP (Adress when Multicast)"
 msgstr ""
 
+#: modules/gui/pda/interface.c:490
+msgid "FTP"
+msgstr ""
+
+#: modules/gui/pda/interface.c:500
+msgid "MMS"
+msgstr ""
+
+#: modules/gui/pda/interface.c:526
+msgid "Media"
+msgstr ""
+
+#: modules/gui/pda/interface.c:562
+msgid "MRL"
+msgstr ""
+
+#: modules/gui/pda/interface.c:571
+#, fuzzy
+msgid "Time"
+msgstr "óÌÅÄÕÀÝÉÊ ÆÁÊÌ"
+
+#: modules/gui/pda/interface.c:588
+msgid "Update"
+msgstr ""
+
+#: modules/gui/pda/interface.c:596
+msgid " Del "
+msgstr ""
+
+#: modules/gui/pda/interface.c:604
+msgid " Clear "
+msgstr ""
+
+#: modules/gui/pda/interface.c:628
+msgid "Automatically play file"
+msgstr ""
+
+#: modules/gui/pda/interface.c:645
+#, fuzzy
+msgid " Save "
+msgstr "óÌÅÄÕÀÝÉÊ ÆÁÊÌ"
+
+#: modules/gui/pda/interface.c:653
+msgid " Apply "
+msgstr ""
+
+#: modules/gui/pda/interface.c:661
+msgid " Cancel "
+msgstr ""
+
+#: modules/gui/pda/interface.c:669
+msgid "Preference"
+msgstr ""
+
+#: modules/gui/pda/interface.c:723
+msgid "Authors: The VideoLAN Team, http://www.videolan.org"
+msgstr ""
+
+#: modules/gui/pda/interface.c:755
+msgid ""
+"The VideoLAN Client is a MPEG, MPEG 2, MP3, DivX player, that accepts input "
+"from local or network sources."
+msgstr ""
+
+#: modules/gui/pda/pda.c:62
+#, fuzzy
+msgid "Autoplay selected file"
+msgstr "÷ÏÓÐÒÏÉÚ×ÅÓÔÉ ÐÏÔÏË"
+
+#: modules/gui/pda/pda.c:63
+msgid "Automatically play a file when selected in the file selection list"
+msgstr ""
+
 #: modules/gui/pda/pda.c:72
 #, fuzzy
 msgid "PDA Linux Gtk2+ interface"
@@ -4891,7 +5003,7 @@ msgstr "
 msgid "Capture the stream you are playing to a file"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:348 modules/gui/wxwindows/subtitles.cpp:98
+#: modules/gui/wxwindows/open.cpp:348 modules/gui/wxwindows/subtitles.cpp:100
 #, fuzzy
 msgid "Subtitles file"
 msgstr "óÌÅÄÕÀÝÉÊ ÆÁÊÌ"
@@ -4908,7 +5020,7 @@ msgstr ""
 msgid "CD Audio"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:900 modules/gui/wxwindows/streamout.cpp:784
+#: modules/gui/wxwindows/open.cpp:903 modules/gui/wxwindows/streamout.cpp:784
 #, fuzzy
 msgid "Save file"
 msgstr "óÌÅÄÕÀÝÉÊ ÆÁÊÌ"
@@ -5037,20 +5149,25 @@ msgstr "
 msgid "Open Subtitles File"
 msgstr "óÌÅÄÕÀÝÉÊ ÆÁÊÌ"
 
-#: modules/gui/wxwindows/subtitles.cpp:115
+#: modules/gui/wxwindows/subtitles.cpp:123
+#, fuzzy
+msgid "Subtitles encoding"
+msgstr "óÌÅÄÕÀÝÉÊ ÆÁÊÌ"
+
+#: modules/gui/wxwindows/subtitles.cpp:155
 msgid "Subtitles options"
 msgstr ""
 
-#: modules/gui/wxwindows/subtitles.cpp:119
+#: modules/gui/wxwindows/subtitles.cpp:159
 #, fuzzy
 msgid "Delay subtitles (in 1/10s)"
 msgstr "óÌÅÄÕÀÝÉÊ ÆÁÊÌ"
 
-#: modules/gui/wxwindows/subtitles.cpp:130
+#: modules/gui/wxwindows/subtitles.cpp:170
 msgid "Frames per second"
 msgstr ""
 
-#: modules/gui/wxwindows/subtitles.cpp:138
+#: modules/gui/wxwindows/subtitles.cpp:178
 msgid "Override frames per second. It will only work with MicroDVD subtitles."
 msgstr ""
 
@@ -5118,28 +5235,28 @@ msgstr "
 msgid "Using the dummy interface plugin..."
 msgstr "ïÔËÒÙÔØ ÏËÎÏ ÓÐÉÓËÁ ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ"
 
-#: modules/misc/freetype.c:67 modules/visualization/xosd/xosd.c:71
+#: modules/misc/freetype.c:72 modules/visualization/xosd/xosd.c:71
 msgid "Font"
 msgstr ""
 
-#: modules/misc/freetype.c:68
+#: modules/misc/freetype.c:73
 #, fuzzy
 msgid "Filename of Font"
 msgstr "óÌÅÄÕÀÝÉÊ ÆÁÊÌ"
 
-#: modules/misc/freetype.c:69
+#: modules/misc/freetype.c:74
 msgid "Font size"
 msgstr ""
 
-#: modules/misc/freetype.c:70
+#: modules/misc/freetype.c:75
 msgid "The size of the fonts used by the osd module"
 msgstr ""
 
-#: modules/misc/freetype.c:73
+#: modules/misc/freetype.c:78
 msgid "Fonts"
 msgstr ""
 
-#: modules/misc/freetype.c:76
+#: modules/misc/freetype.c:81
 msgid "freetype2 font renderer"
 msgstr ""
 
@@ -5276,19 +5393,19 @@ msgstr ""
 msgid "Dummy muxer"
 msgstr ""
 
-#: modules/mux/mp4.c:52
+#: modules/mux/mp4.c:56
 msgid "MP4/MOV muxer"
 msgstr ""
 
-#: modules/mux/mpeg/ps.c:79
+#: modules/mux/mpeg/ps.c:53
 msgid "PS muxer"
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:138
+#: modules/mux/mpeg/ts.c:78
 msgid "TS muxer"
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:143
+#: modules/mux/mpeg/ts.c:83
 msgid "TS muxer (libdvbpsi)"
 msgstr ""
 
@@ -5300,7 +5417,7 @@ msgstr ""
 msgid "A/52 audio packetizer"
 msgstr ""
 
-#: modules/packetizer/copy.c:69
+#: modules/packetizer/copy.c:43
 msgid "Copy packetizer"
 msgstr ""
 
@@ -5349,7 +5466,7 @@ msgstr "
 msgid "Standard stream"
 msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
 
-#: modules/stream_out/transcode.c:71
+#: modules/stream_out/transcode.c:73
 #, fuzzy
 msgid "Transcode stream"
 msgstr "ðÒÉÏÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
diff --git a/po/sv.po b/po/sv.po
index 0c18d3ed1b..58783f1a14 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vlc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-07-31 15:04+0200\n"
+"POT-Creation-Date: 2003-08-11 21:05+0200\n"
 "PO-Revision-Date: 2002-07-23 23:00+0200\n"
 "Last-Translator: Joel Arvidsson <dogai@privat.utfors.se>\n"
 "Language-Team: \n"
@@ -29,7 +29,7 @@ msgid "Audio channels"
 msgstr "Kanal:"
 
 #: src/audio_output/output.c:107 src/audio_output/output.c:142
-#: modules/audio_output/alsa.c:179 modules/audio_output/directx.c:423
+#: modules/audio_output/alsa.c:177 modules/audio_output/directx.c:423
 #: modules/audio_output/oss.c:202 modules/audio_output/sdl.c:181
 #: modules/audio_output/sdl.c:198 modules/audio_output/waveout.c:386
 #, fuzzy
@@ -107,11 +107,11 @@ msgstr ""
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr ""
 
-#: src/input/input.c:171
+#: src/input/input.c:174
 msgid "General"
 msgstr ""
 
-#: src/input/input.c:172
+#: src/input/input.c:175
 #, fuzzy
 msgid "Playlist Item"
 msgstr "Föregående fil"
@@ -123,9 +123,9 @@ msgid "Program"
 msgstr ""
 
 #: src/input/input_programs.c:98 modules/demux/asf/libasf.c:696
-#: modules/demux/mkv.cpp:2394 modules/gui/beos/MediaControlView.cpp:1258
+#: modules/demux/mkv.cpp:2398 modules/gui/beos/MediaControlView.cpp:1258
 #: modules/gui/gtk/gnome_interface.c:1650 modules/gui/gtk/gtk_interface.c:1956
-#: modules/gui/gtk/menu.c:1402 modules/gui/gtk/menu.c:1423
+#: modules/gui/gtk/menu.c:1403 modules/gui/gtk/menu.c:1424
 #: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:373
 #: modules/gui/macosx/intf.m:374 modules/gui/macosx/open.m:150
 #: modules/gui/wxwindows/open.cpp:406
@@ -134,7 +134,7 @@ msgstr "Titel"
 
 #: src/input/input_programs.c:102 modules/gui/beos/MediaControlView.cpp:1259
 #: modules/gui/gtk/gnome_interface.c:1640 modules/gui/gtk/gtk_interface.c:1946
-#: modules/gui/gtk/menu.c:1019 modules/gui/gtk/menu.c:1432
+#: modules/gui/gtk/menu.c:1020 modules/gui/gtk/menu.c:1433
 #: modules/gui/kde/interface.cpp:146 modules/gui/macosx/intf.m:375
 #: modules/gui/macosx/intf.m:376 modules/gui/macosx/open.m:151
 #: modules/gui/wxwindows/open.cpp:412
@@ -212,15 +212,15 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/libvlc.c:1200 src/misc/configuration.c:1019
+#: src/libvlc.c:1200 src/misc/configuration.c:1040
 msgid "string"
 msgstr ""
 
-#: src/libvlc.c:1217 src/misc/configuration.c:1000
+#: src/libvlc.c:1217 src/misc/configuration.c:1021
 msgid "integer"
 msgstr ""
 
-#: src/libvlc.c:1220 src/misc/configuration.c:1009
+#: src/libvlc.c:1220 src/misc/configuration.c:1030
 msgid "float"
 msgstr ""
 
@@ -984,16 +984,16 @@ msgstr ""
 
 #: src/libvlc.h:474 modules/audio_output/coreaudio.c:227
 #: modules/audio_output/file.c:108 modules/demux/asf/asf.c:228
-#: modules/demux/mkv.cpp:2445 modules/demux/ogg.c:557 modules/demux/ogg.c:829
-#: modules/demux/ogg.c:1002 modules/gui/beos/InterfaceWindow.cpp:259
+#: modules/demux/mkv.cpp:2449 modules/demux/ogg.c:558 modules/demux/ogg.c:830
+#: modules/demux/ogg.c:1003 modules/gui/beos/InterfaceWindow.cpp:259
 #: modules/gui/gtk/gnome_interface.c:1092 modules/gui/gtk/gtk_interface.c:1219
 #: modules/gui/macosx/intf.m:378 modules/gui/macosx/output.m:156
 msgid "Audio"
 msgstr ""
 
-#: src/libvlc.h:493 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1217
-#: modules/demux/mkv.cpp:2461 modules/demux/ogg.c:629 modules/demux/ogg.c:669
-#: modules/demux/ogg.c:734 modules/demux/ogg.c:909
+#: src/libvlc.h:493 modules/demux/asf/asf.c:298 modules/demux/avi/avi.c:1217
+#: modules/demux/mkv.cpp:2465 modules/demux/ogg.c:630 modules/demux/ogg.c:670
+#: modules/demux/ogg.c:735 modules/demux/ogg.c:910
 #: modules/gui/gtk/gnome_interface.c:1099 modules/gui/gtk/gtk_interface.c:1296
 #: modules/gui/macosx/intf.m:389 modules/gui/macosx/macosx.m:68
 #: modules/gui/macosx/output.m:150 modules/misc/dummy/dummy.c:81
@@ -1001,7 +1001,8 @@ msgstr ""
 msgid "Video"
 msgstr ""
 
-#: src/libvlc.h:515 modules/access/satellite/satellite.c:66
+#: src/libvlc.h:515 modules/access/dvb/qpsk.c:101
+#: modules/access/satellite/satellite.c:66
 msgid "Input"
 msgstr ""
 
@@ -1024,7 +1025,7 @@ msgid "CPU"
 msgstr ""
 
 #: src/libvlc.h:579 modules/gui/beos/InterfaceWindow.cpp:206
-#: modules/gui/familiar/interface.c:610 modules/gui/gtk/gnome_interface.c:643
+#: modules/gui/gtk/gnome_interface.c:643
 #: modules/gui/gtk/gnome_interface.c:2384
 #: modules/gui/gtk/gnome_interface.c:2409 modules/gui/gtk/gtk_interface.c:747
 #: modules/gui/gtk/gtk_interface.c:2697 modules/gui/macosx/intf.m:321
@@ -1037,11 +1038,10 @@ msgstr ""
 #: src/libvlc.h:585 modules/audio_filter/converter/a52tofloat32.c:85
 #: modules/audio_filter/converter/mpgatofixed32.c:60
 #: modules/codec/a52old/a52old.c:59 modules/codec/mpeg_video/parser.c:84
-#: modules/demux/mpeg/ts.c:118 modules/gui/familiar/familiar.c:70
-#: modules/gui/pda/pda.c:70 modules/misc/logger/logger.c:89
-#: modules/video_filter/motionblur.c:58 modules/video_filter/transform.c:63
-#: modules/video_filter/wall.c:66 modules/video_output/ggi.c:62
-#: modules/video_output/mga/xmga.c:102
+#: modules/demux/mpeg/ts.c:118 modules/gui/pda/pda.c:70
+#: modules/misc/logger/logger.c:89 modules/video_filter/motionblur.c:58
+#: modules/video_filter/transform.c:63 modules/video_filter/wall.c:66
+#: modules/video_output/ggi.c:62 modules/video_output/mga/xmga.c:102
 msgid "Miscellaneous"
 msgstr ""
 
@@ -1069,7 +1069,7 @@ msgstr ""
 msgid "print version information"
 msgstr ""
 
-#: src/misc/configuration.c:1000
+#: src/misc/configuration.c:1021
 msgid "boolean"
 msgstr ""
 
@@ -1134,6 +1134,102 @@ msgstr "_N
 msgid "Standard filesystem directory input"
 msgstr ""
 
+#: modules/access/dvb/qpsk.c:44
+msgid "adapter card to tune"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:45
+msgid "adapter cards have a device file named /dev/dvb/adapter[n] with n>=0"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:47
+msgid "device nummer to use on adapter"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:50
+msgid "satellite default transponder frequency"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:53
+msgid "satellite default transponder polarization"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:56
+msgid "satellite default transponder FEC"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:57
+msgid "FEC=Forward Error Correction mode"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:59
+msgid "satellite default transponder symbol rate"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:62
+msgid "use diseqc with antenna"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:65
+msgid "antenna lnb_lof1 (kHz)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:68
+msgid "antenna lnb_lof2 (kHz)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:71
+msgid "antenna lnb_slof (kHz)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:74
+msgid "probe the dvb card for capabilities (default disabled)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:75
+msgid "some dvb cards do not like to be probed for their capabilities"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:78
+msgid "modulation type"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:79
+msgid "modulation type for frontend device "
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:82
+msgid "terrestrial high priority stream code rate (FEC)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:85
+msgid "terrestrial low priority stream code rate (FEC)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:88
+msgid "terrestrial bandwidth"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:89
+msgid "terrestrial bandwidth [0=auto,6,7,8 in MHz]"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:91
+msgid "terrestrial guard interval"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:94
+msgid "terrestrial transmission mode"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:97
+msgid "terrestrial hierarchy mode"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:123
+msgid "DVB input module with v4l2 support"
+msgstr ""
+
 #: modules/access/dvd/dvd.c:65
 msgid "Method to use by libdvdcss for key decryption"
 msgstr ""
@@ -1228,7 +1324,7 @@ msgstr ""
 msgid "http"
 msgstr ""
 
-#: modules/access/http.c:89
+#: modules/access/http.c:91
 msgid "HTTP input"
 msgstr ""
 
@@ -1246,6 +1342,10 @@ msgstr ""
 msgid "Hauppauge PVR cards input"
 msgstr ""
 
+#: modules/access/rtsp.c:68
+msgid "RTSP SDP request"
+msgstr ""
+
 #: modules/access/satellite/satellite.c:41
 msgid "Satellite default transponder frequency"
 msgstr ""
@@ -1505,23 +1605,23 @@ msgstr ""
 msgid "Audio device"
 msgstr ""
 
-#: modules/audio_output/alsa.c:173 modules/audio_output/directx.c:435
+#: modules/audio_output/alsa.c:171 modules/audio_output/directx.c:435
 #: modules/audio_output/oss.c:222 modules/audio_output/sdl.c:182
 #: modules/audio_output/sdl.c:201 modules/audio_output/waveout.c:399
 msgid "Mono"
 msgstr ""
 
-#: modules/audio_output/alsa.c:186 modules/audio_output/directx.c:409
+#: modules/audio_output/alsa.c:184 modules/audio_output/directx.c:409
 #: modules/audio_output/oss.c:178 modules/audio_output/waveout.c:371
 msgid "2 Front 2 Rear"
 msgstr ""
 
-#: modules/audio_output/alsa.c:192 modules/audio_output/directx.c:391
+#: modules/audio_output/alsa.c:190 modules/audio_output/directx.c:391
 #: modules/audio_output/oss.c:167 modules/audio_output/waveout.c:352
 msgid "5.1"
 msgstr ""
 
-#: modules/audio_output/alsa.c:219 modules/audio_output/directx.c:478
+#: modules/audio_output/alsa.c:217 modules/audio_output/directx.c:478
 #: modules/audio_output/oss.c:246 modules/audio_output/waveout.c:415
 msgid "A/52 over S/PDIF"
 msgstr ""
@@ -1886,19 +1986,28 @@ msgstr "Undertext"
 
 #: modules/codec/subsdec/subsdec.c:68
 #, fuzzy
-msgid "subtitle text encoding"
+msgid "Subtitles text encoding"
 msgstr "Undertext"
 
 #: modules/codec/subsdec/subsdec.c:69
-msgid "change the encoding used in text subtitles"
+msgid "Change the encoding used in text subtitles"
 msgstr ""
 
-#: modules/codec/subsdec/subsdec.c:72
+#: modules/codec/subsdec/subsdec.c:70
+#, fuzzy
+msgid "Subtitles justification"
+msgstr "Undertext"
+
+#: modules/codec/subsdec/subsdec.c:71
+msgid "Change the justification of substitles (0=center, 1=left, 2=right)"
+msgstr ""
+
+#: modules/codec/subsdec/subsdec.c:74
 #, fuzzy
 msgid "file subtitles decoder"
 msgstr "Undertext"
 
-#: modules/codec/subsdec/subsdec.c:75 modules/gui/beos/InterfaceWindow.cpp:256
+#: modules/codec/subsdec/subsdec.c:77 modules/gui/beos/InterfaceWindow.cpp:256
 #: modules/gui/kde/interface.cpp:93
 msgid "Subtitles"
 msgstr "Undertext"
@@ -2047,7 +2156,7 @@ msgid "Quit"
 msgstr "Avsluta VLC"
 
 #: modules/control/lirc/lirc.c:297 modules/control/lirc/lirc.c:323
-#: modules/gui/familiar/interface.c:177 modules/gui/gtk/gnome_interface.c:602
+#: modules/gui/gtk/gnome_interface.c:602
 #: modules/gui/gtk/gnome_interface.c:1020 modules/gui/gtk/gtk_interface.c:709
 #: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:921
 #: modules/gui/macosx/intf.m:922 modules/gui/macosx/intf.m:923
@@ -2055,8 +2164,7 @@ msgstr "Avsluta VLC"
 msgid "Pause"
 msgstr "Paus"
 
-#: modules/control/lirc/lirc.c:310 modules/gui/familiar/interface.c:190
-#: modules/gui/gtk/gnome_interface.c:590
+#: modules/control/lirc/lirc.c:310 modules/gui/gtk/gnome_interface.c:590
 #: modules/gui/gtk/gnome_interface.c:1013 modules/gui/gtk/gtk_interface.c:698
 #: modules/gui/macosx/intf.m:324 modules/gui/macosx/intf.m:362
 #: modules/gui/macosx/intf.m:423 modules/gui/macosx/intf.m:928
@@ -2092,70 +2200,72 @@ msgstr ""
 msgid "remote control interface"
 msgstr ""
 
-#: modules/demux/a52sys.c:52
+#: modules/demux/a52sys.c:41
 msgid "A52 demuxer"
 msgstr ""
 
-#: modules/demux/aac/demux.c:46
-msgid "AAC stream demuxer"
-msgstr ""
-
-#: modules/demux/aac/demux.c:555
-msgid "Aac"
+#: modules/demux/a52sys.c:161
+msgid "A52"
 msgstr ""
 
-#: modules/demux/aac/demux.c:557 modules/demux/mpeg/audio.c:627
-#: modules/demux/mpeg/audio.c:644 modules/demux/mpeg/m4v.c:150
+#: modules/demux/a52sys.c:163 modules/demux/aac.c:175
+#: modules/demux/mpeg/m4v.c:150 modules/demux/mpeg/mpga.c:331
 msgid "Input Type"
 msgstr ""
 
-#: modules/demux/aac/demux.c:560 modules/demux/mpeg/audio.c:629
-msgid "Layer"
-msgstr ""
-
-#: modules/demux/aac/demux.c:562 modules/demux/asf/asf.c:275
-#: modules/demux/avi/avi.c:1178 modules/demux/mkv.cpp:2449
-#: modules/demux/ogg.c:561 modules/demux/ogg.c:837 modules/demux/ogg.c:1010
-#: modules/gui/gtk/gnome_interface.c:148 modules/gui/gtk/gnome_interface.c:931
-#: modules/gui/gtk/gtk_interface.c:481 modules/gui/gtk/gtk_interface.c:1282
-#: modules/gui/macosx/output.m:162 modules/gui/wxwindows/streamout.cpp:668
+#: modules/demux/a52sys.c:164 modules/demux/aac.c:177
+#: modules/demux/asf/asf.c:275 modules/demux/avi/avi.c:1178
+#: modules/demux/mkv.cpp:2453 modules/demux/ogg.c:562 modules/demux/ogg.c:838
+#: modules/demux/ogg.c:1011 modules/gui/gtk/gnome_interface.c:148
+#: modules/gui/gtk/gnome_interface.c:931 modules/gui/gtk/gtk_interface.c:481
+#: modules/gui/gtk/gtk_interface.c:1282 modules/gui/macosx/output.m:162
+#: modules/gui/wxwindows/streamout.cpp:668
 #, fuzzy
 msgid "Channels"
 msgstr "Kanal:"
 
-#: modules/demux/aac/demux.c:564 modules/demux/asf/asf.c:277
-#: modules/demux/avi/avi.c:1180 modules/demux/mkv.cpp:2453
-#: modules/demux/mpeg/audio.c:632 modules/demux/ogg.c:559
-#: modules/demux/ogg.c:671 modules/demux/ogg.c:832 modules/demux/ogg.c:1005
+#: modules/demux/a52sys.c:165 modules/demux/aac.c:179
+#: modules/demux/asf/asf.c:277 modules/demux/avi/avi.c:1180
+#: modules/demux/mkv.cpp:2457 modules/demux/mpeg/mpga.c:337
+#: modules/demux/ogg.c:560 modules/demux/ogg.c:672 modules/demux/ogg.c:833
+#: modules/demux/ogg.c:1006
 msgid "Sample Rate"
 msgstr ""
 
+#: modules/demux/aac.c:41
+msgid "AAC demuxer"
+msgstr ""
+
+#: modules/demux/aac.c:173
+msgid "Aac"
+msgstr ""
+
 #: modules/demux/asf/asf.c:48
 msgid "ASF v1.0 demuxer (file only)"
 msgstr ""
 
-#: modules/demux/asf/asf.c:165 modules/demux/mkv.cpp:2412
+#: modules/demux/asf/asf.c:165 modules/demux/mkv.cpp:2416
 #, fuzzy
 msgid "Number of streams"
 msgstr "Paus"
 
-#: modules/demux/asf/asf.c:228 modules/demux/asf/asf.c:302
+#: modules/demux/asf/asf.c:228 modules/demux/asf/asf.c:298
 #: modules/demux/avi/avi.c:1172 modules/demux/avi/avi.c:1217
-#: modules/demux/avi/avi.c:1250 modules/demux/mkv.cpp:2445
-#: modules/demux/mkv.cpp:2461 modules/demux/mkv.cpp:2477
-#: modules/demux/ogg.c:557 modules/demux/ogg.c:629 modules/demux/ogg.c:669
-#: modules/demux/ogg.c:734 modules/demux/ogg.c:829 modules/demux/ogg.c:909
-#: modules/demux/ogg.c:1002 modules/gui/familiar/interface.c:370
-#: modules/gui/macosx/output.m:139 modules/gui/pda/interface.c:372
+#: modules/demux/avi/avi.c:1250 modules/demux/mkv.cpp:2449
+#: modules/demux/mkv.cpp:2465 modules/demux/mkv.cpp:2481
+#: modules/demux/ogg.c:558 modules/demux/ogg.c:630 modules/demux/ogg.c:670
+#: modules/demux/ogg.c:735 modules/demux/ogg.c:830 modules/demux/ogg.c:910
+#: modules/demux/ogg.c:1003 modules/gui/macosx/output.m:139
+#: modules/gui/pda/interface.c:372
 msgid "Type"
 msgstr ""
 
-#: modules/demux/asf/asf.c:260 modules/demux/asf/asf.c:318
+#: modules/demux/asf/asf.c:260 modules/demux/asf/asf.c:314
 #: modules/demux/avi/avi.c:1174 modules/demux/avi/avi.c:1218
-#: modules/demux/mkv.cpp:2446 modules/demux/mkv.cpp:2462
-#: modules/demux/mkv.cpp:2478 modules/demux/ogg.c:558 modules/demux/ogg.c:630
-#: modules/demux/ogg.c:670 modules/demux/ogg.c:735 modules/demux/ogg.c:830
-#: modules/demux/ogg.c:910 modules/demux/ogg.c:1003
+#: modules/demux/mkv.cpp:2450 modules/demux/mkv.cpp:2466
+#: modules/demux/mkv.cpp:2482 modules/demux/ogg.c:559 modules/demux/ogg.c:631
+#: modules/demux/ogg.c:671 modules/demux/ogg.c:736 modules/demux/ogg.c:831
+#: modules/demux/ogg.c:911 modules/demux/ogg.c:1004
 #, fuzzy
 msgid "Codec"
 msgstr "Radera"
@@ -2165,38 +2275,38 @@ msgid "Avg. byterate"
 msgstr ""
 
 #: modules/demux/asf/asf.c:282 modules/demux/avi/avi.c:1185
-#: modules/demux/mkv.cpp:2457
+#: modules/demux/mkv.cpp:2461
 msgid "Bits Per Sample"
 msgstr ""
 
-#: modules/demux/asf/asf.c:332
+#: modules/demux/asf/asf.c:328
 msgid "Size"
 msgstr ""
 
-#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1222
-#: modules/demux/mkv.cpp:2465
+#: modules/demux/asf/asf.c:331 modules/demux/avi/avi.c:1222
+#: modules/demux/mkv.cpp:2469
 #, fuzzy
 msgid "Resolution"
 msgstr "Markera allt"
 
-#: modules/demux/asf/asf.c:337
+#: modules/demux/asf/asf.c:333
 #, fuzzy
 msgid "Planes"
 msgstr "Spela upp"
 
-#: modules/demux/asf/asf.c:339 modules/demux/avi/avi.c:1228
+#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1228
 msgid "Bits Per Pixel"
 msgstr ""
 
-#: modules/demux/asf/asf.c:342
+#: modules/demux/asf/asf.c:338
 msgid "Image Size"
 msgstr ""
 
-#: modules/demux/asf/asf.c:344
+#: modules/demux/asf/asf.c:340
 msgid "X pixels per meter"
 msgstr ""
 
-#: modules/demux/asf/asf.c:346
+#: modules/demux/asf/asf.c:342
 msgid "Y pixels per meter"
 msgstr ""
 
@@ -2231,7 +2341,7 @@ msgstr ""
 msgid "Rating"
 msgstr ""
 
-#: modules/demux/au.c:47
+#: modules/demux/au.c:42
 msgid "AU demuxer"
 msgstr ""
 
@@ -2279,8 +2389,8 @@ msgstr ""
 msgid "Audio Bitrate"
 msgstr "_Nästa objekt"
 
-#: modules/demux/avi/avi.c:1225 modules/demux/ogg.c:631
-#: modules/demux/ogg.c:737 modules/demux/ogg.c:912
+#: modules/demux/avi/avi.c:1225 modules/demux/ogg.c:632
+#: modules/demux/ogg.c:738 modules/demux/ogg.c:913
 msgid "Frame Rate"
 msgstr ""
 
@@ -2322,66 +2432,66 @@ msgstr ""
 msgid "mka/mkv stream demuxer"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2389 modules/gui/gtk/gnome_interface.c:2436
+#: modules/demux/mkv.cpp:2393 modules/gui/gtk/gnome_interface.c:2436
 #: modules/gui/gtk/gtk_interface.c:2857 modules/gui/wxwindows/playlist.cpp:150
 msgid "Duration"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2398
+#: modules/demux/mkv.cpp:2402
 msgid "Date UTC"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2402
+#: modules/demux/mkv.cpp:2406
 #, fuzzy
 msgid "Segment Filename"
 msgstr "Arkiv"
 
-#: modules/demux/mkv.cpp:2406
+#: modules/demux/mkv.cpp:2410
 #, fuzzy
 msgid "Muxing Application"
 msgstr "Om VLC"
 
-#: modules/demux/mkv.cpp:2410
+#: modules/demux/mkv.cpp:2414
 #, fuzzy
 msgid "Writing Application"
 msgstr "Om VLC"
 
-#: modules/demux/mkv.cpp:2423 modules/gui/beos/PlayListWindow.cpp:144
-#: modules/gui/familiar/interface.c:362 modules/gui/gtk/preferences.c:325
-#: modules/gui/kde/pluginsbox.cpp:45 modules/gui/pda/interface.c:364
+#: modules/demux/mkv.cpp:2427 modules/gui/beos/PlayListWindow.cpp:144
+#: modules/gui/gtk/preferences.c:325 modules/gui/kde/pluginsbox.cpp:45
+#: modules/gui/pda/interface.c:364
 msgid "Name"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2427
+#: modules/demux/mkv.cpp:2431
 #, fuzzy
 msgid "Codec Name"
 msgstr "Radera"
 
-#: modules/demux/mkv.cpp:2431
+#: modules/demux/mkv.cpp:2435
 #, fuzzy
 msgid "Codec Setting"
 msgstr "Markera allt"
 
-#: modules/demux/mkv.cpp:2435
+#: modules/demux/mkv.cpp:2439
 #, fuzzy
 msgid "Codec Info"
 msgstr "Radera"
 
-#: modules/demux/mkv.cpp:2439
+#: modules/demux/mkv.cpp:2443
 #, fuzzy
 msgid "Codec Download"
 msgstr "Radera"
 
-#: modules/demux/mkv.cpp:2469
+#: modules/demux/mkv.cpp:2473
 #, fuzzy
 msgid "Display Resolution"
 msgstr "Markera allt"
 
-#: modules/demux/mkv.cpp:2473
+#: modules/demux/mkv.cpp:2477
 msgid "Frame Per Second"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2477 modules/gui/gtk/gnome_interface.c:1963
+#: modules/demux/mkv.cpp:2481 modules/gui/gtk/gnome_interface.c:1963
 #: modules/gui/gtk/gtk_interface.c:2278
 #, fuzzy
 msgid "Subtitle"
@@ -2391,33 +2501,41 @@ msgstr "Undertext"
 msgid "MP4 demuxer"
 msgstr ""
 
-#: modules/demux/mpeg/audio.c:47
-msgid "MPEG I/II audio stream demuxer"
+#: modules/demux/mpeg/es.c:49
+msgid "ISO 13818-1 MPEG Elementary Stream input"
+msgstr ""
+
+#: modules/demux/mpeg/m4v.c:43
+msgid "MPEG-4 video elementary stream demuxer"
 msgstr ""
 
-#: modules/demux/mpeg/audio.c:626 modules/demux/mpeg/audio.c:643
 #: modules/demux/mpeg/m4v.c:149
 msgid "mpeg"
 msgstr ""
 
-#: modules/demux/mpeg/audio.c:630
-msgid "Mode"
+#: modules/demux/mpeg/m4v.c:150
+msgid "Video MPEG-4 (raw ES)"
 msgstr ""
 
-#: modules/demux/mpeg/audio.c:634
-msgid "Average Bitrate"
+#: modules/demux/mpeg/mpga.c:41
+#, fuzzy
+msgid "MPEG-I/II Audio demuxer"
+msgstr "_Nästa objekt"
+
+#: modules/demux/mpeg/mpga.c:330
+msgid "MPEG"
 msgstr ""
 
-#: modules/demux/mpeg/es.c:49
-msgid "ISO 13818-1 MPEG Elementary Stream input"
+#: modules/demux/mpeg/mpga.c:333
+msgid "Layer"
 msgstr ""
 
-#: modules/demux/mpeg/m4v.c:43
-msgid "MPEG-4 video elementary stream demuxer"
+#: modules/demux/mpeg/mpga.c:335
+msgid "Mode"
 msgstr ""
 
-#: modules/demux/mpeg/m4v.c:150
-msgid "Video MPEG-4 (raw ES)"
+#: modules/demux/mpeg/mpga.c:339
+msgid "Average Bitrate"
 msgstr ""
 
 #: modules/demux/mpeg/ps.c:60
@@ -2461,36 +2579,36 @@ msgstr ""
 msgid "ogg stream demuxer"
 msgstr ""
 
-#: modules/demux/ogg.c:558
+#: modules/demux/ogg.c:559
 msgid "Vorbis"
 msgstr ""
 
-#: modules/demux/ogg.c:563 modules/demux/ogg.c:633 modules/demux/ogg.c:673
-#: modules/demux/ogg.c:834 modules/demux/ogg.c:1007
+#: modules/demux/ogg.c:564 modules/demux/ogg.c:634 modules/demux/ogg.c:674
+#: modules/demux/ogg.c:835 modules/demux/ogg.c:1008
 msgid "Bit Rate"
 msgstr ""
 
-#: modules/demux/ogg.c:630
+#: modules/demux/ogg.c:631
 msgid "Theora"
 msgstr ""
 
-#: modules/demux/ogg.c:670
+#: modules/demux/ogg.c:671
 msgid "tarkin"
 msgstr ""
 
-#: modules/demux/ogg.c:739 modules/demux/ogg.c:914
+#: modules/demux/ogg.c:740 modules/demux/ogg.c:915
 msgid "Bit Count"
 msgstr ""
 
-#: modules/demux/ogg.c:741 modules/demux/ogg.c:916
+#: modules/demux/ogg.c:742 modules/demux/ogg.c:917
 msgid "Width"
 msgstr ""
 
-#: modules/demux/ogg.c:743 modules/demux/ogg.c:918
+#: modules/demux/ogg.c:744 modules/demux/ogg.c:919
 msgid "Height"
 msgstr ""
 
-#: modules/demux/ogg.c:839 modules/demux/ogg.c:1012
+#: modules/demux/ogg.c:840 modules/demux/ogg.c:1013
 msgid "Bits per Sample"
 msgstr ""
 
@@ -2498,6 +2616,10 @@ msgstr ""
 msgid "raw dv demuxer"
 msgstr ""
 
+#: modules/demux/sdp.c:64
+msgid "SDP demuxer + UDP/RTP/RTSP"
+msgstr ""
+
 #: modules/demux/util/id3.c:44
 msgid "Simple id3 tag skipper"
 msgstr ""
@@ -2845,7 +2967,7 @@ msgstr ""
 msgid "Text subtitles demux"
 msgstr "Markera allt"
 
-#: modules/demux/wav/wav.c:49
+#: modules/demux/wav.c:43
 msgid "WAV demuxer"
 msgstr ""
 
@@ -2879,11 +3001,9 @@ msgid "Yes"
 msgstr ""
 
 #: modules/gui/beos/InterfaceWindow.cpp:201
-#: modules/gui/beos/InterfaceWindow.cpp:308
-#: modules/gui/familiar/interface.c:149 modules/gui/familiar/interface.c:150
-#: modules/gui/macosx/intf.m:328 modules/gui/macosx/prefs.m:77
-#: modules/gui/pda/interface.c:151 modules/gui/pda/interface.c:152
-#: modules/gui/wxwindows/preferences.cpp:233
+#: modules/gui/beos/InterfaceWindow.cpp:308 modules/gui/macosx/intf.m:328
+#: modules/gui/macosx/prefs.m:77 modules/gui/pda/interface.c:151
+#: modules/gui/pda/interface.c:152 modules/gui/wxwindows/preferences.cpp:233
 msgid "Preferences"
 msgstr ""
 
@@ -2898,7 +3018,7 @@ msgstr ""
 
 #: modules/gui/beos/InterfaceWindow.cpp:238
 #: modules/gui/beos/MediaControlView.cpp:1257
-#: modules/gui/beos/PlayListWindow.cpp:82 modules/gui/familiar/interface.c:378
+#: modules/gui/beos/PlayListWindow.cpp:82
 #: modules/gui/gtk/gnome_interface.c:503
 #: modules/gui/gtk/gnome_interface.c:1569
 #: modules/gui/gtk/gnome_interface.c:2274
@@ -2933,10 +3053,8 @@ msgid "Open Subtitles"
 msgstr "Undertext"
 
 #: modules/gui/beos/InterfaceWindow.cpp:249
-#: modules/gui/familiar/interface.c:231 modules/gui/familiar/interface.c:232
-#: modules/gui/familiar/interface.c:765 modules/gui/gtk/gtk_interface.c:1580
-#: modules/gui/pda/interface.c:233 modules/gui/pda/interface.c:234
-#: modules/gui/pda/interface.c:767
+#: modules/gui/gtk/gtk_interface.c:1580 modules/gui/pda/interface.c:233
+#: modules/gui/pda/interface.c:234 modules/gui/pda/interface.c:767
 msgid "About"
 msgstr "Om VLC"
 
@@ -2991,7 +3109,7 @@ msgstr "Spola fram
 #: modules/gui/wxwindows/open.cpp:244
 #: modules/gui/wxwindows/preferences.cpp:253
 #: modules/gui/wxwindows/streamout.cpp:217
-#: modules/gui/wxwindows/subtitles.cpp:149
+#: modules/gui/wxwindows/subtitles.cpp:190
 msgid "OK"
 msgstr ""
 
@@ -3121,7 +3239,7 @@ msgstr ""
 msgid "Take Screen Shot"
 msgstr ""
 
-#: modules/gui/beos/VlcWrapper.cpp:165 modules/gui/gtk/menu.c:733
+#: modules/gui/beos/VlcWrapper.cpp:165 modules/gui/gtk/menu.c:734
 msgid "None"
 msgstr ""
 
@@ -3129,207 +3247,6 @@ msgstr ""
 msgid "<unknown>"
 msgstr ""
 
-#: modules/gui/familiar/familiar.c:62 modules/gui/pda/pda.c:62
-#, fuzzy
-msgid "Autoplay selected file"
-msgstr "Spela upp"
-
-#: modules/gui/familiar/familiar.c:63 modules/gui/pda/pda.c:63
-msgid "Automatically play a file when selected in the file selection list"
-msgstr ""
-
-#: modules/gui/familiar/familiar.c:72
-msgid "Familiar Linux Gtk+ interface"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:99 modules/gui/familiar/interface.c:732
-#: modules/gui/gtk/gnome_interface.c:274 modules/gui/gtk/gtk_interface.c:121
-#: modules/gui/gtk/gtk_interface.c:1595 modules/gui/pda/interface.c:99
-#: modules/gui/pda/interface.c:734
-msgid "VLC media player"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:124 modules/gui/pda/interface.c:126
-#: modules/gui/wxwindows/dialogs.cpp:268 modules/gui/wxwindows/open.cpp:709
-#: modules/gui/wxwindows/preferences.cpp:1029
-#: modules/gui/wxwindows/subtitles.cpp:196
-#, fuzzy
-msgid "Open file"
-msgstr "Öppna fil"
-
-#: modules/gui/familiar/interface.c:164 modules/gui/pda/interface.c:166
-msgid "Rewind"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:165 modules/gui/pda/interface.c:167
-msgid "Rewind stream"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:178 modules/gui/pda/interface.c:180
-#, fuzzy
-msgid "Pause stream"
-msgstr "Paus"
-
-#: modules/gui/familiar/interface.c:191 modules/gui/pda/interface.c:193
-#, fuzzy
-msgid "Play stream"
-msgstr "Spela upp"
-
-#: modules/gui/familiar/interface.c:203 modules/gui/gtk/gnome_interface.c:566
-#: modules/gui/gtk/gnome_interface.c:1027 modules/gui/gtk/gtk_interface.c:676
-#: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:639
-#: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
-#: modules/gui/macosx/intf.m:424 modules/gui/pda/interface.c:205
-#: modules/gui/wxwindows/interface.cpp:373
-msgid "Stop"
-msgstr "Stopp"
-
-#: modules/gui/familiar/interface.c:204 modules/gui/pda/interface.c:206
-#, fuzzy
-msgid "Stop stream"
-msgstr "Stopp"
-
-#: modules/gui/familiar/interface.c:216 modules/gui/pda/interface.c:218
-msgid "Forward"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:217 modules/gui/pda/interface.c:219
-msgid "Forward stream"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:285 modules/gui/gtk/gnome_interface.c:2345
-#: modules/gui/gtk/gtk_interface.c:2712 modules/gui/macosx/playlist.m:198
-#: modules/gui/pda/interface.c:287
-msgid "Add"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:293 modules/gui/pda/interface.c:295
-msgid "MRL :"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:394
-msgid "UDP/RTP (Address when Multicast)"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:412 modules/gui/gtk/gnome_interface.c:1747
-#: modules/gui/gtk/gtk_interface.c:2062 modules/gui/macosx/open.m:161
-#: modules/gui/macosx/output.m:133 modules/gui/pda/interface.c:414
-#: modules/gui/wxwindows/open.cpp:469 modules/gui/wxwindows/streamout.cpp:425
-msgid "Address"
-msgstr "Adress"
-
-#: modules/gui/familiar/interface.c:423 modules/gui/gtk/gnome_interface.c:1737
-#: modules/gui/gtk/gnome_interface.c:1786
-#: modules/gui/gtk/gnome_interface.c:2912 modules/gui/gtk/gtk_interface.c:2052
-#: modules/gui/gtk/gtk_interface.c:2101 modules/gui/gtk/gtk_interface.c:3225
-#: modules/gui/macosx/open.m:160 modules/gui/macosx/open.m:162
-#: modules/gui/macosx/output.m:134 modules/gui/pda/interface.c:425
-#: modules/gui/wxwindows/open.cpp:454 modules/gui/wxwindows/open.cpp:477
-#: modules/gui/wxwindows/streamout.cpp:436
-msgid "Port"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:136
-#: modules/gui/macosx/output.m:236 modules/gui/macosx/output.m:311
-#: modules/gui/pda/interface.c:480 modules/gui/wxwindows/streamout.cpp:386
-msgid "HTTP"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:488 modules/gui/pda/interface.c:490
-msgid "FTP"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:498 modules/gui/pda/interface.c:500
-msgid "MMS"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:516 modules/gui/gtk/gnome_interface.c:1830
-#: modules/gui/gtk/gnome_interface.c:2281 modules/gui/gtk/gtk_interface.c:2145
-#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:144
-#: modules/gui/macosx/open.m:271 modules/gui/pda/interface.c:518
-#: modules/gui/wxwindows/open.cpp:257
-msgid "Network"
-msgstr "Nätverk"
-
-#: modules/gui/familiar/interface.c:524 modules/gui/pda/interface.c:526
-msgid "Media"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:560 modules/gui/pda/interface.c:562
-msgid "MRL"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:569 modules/gui/pda/interface.c:571
-#, fuzzy
-msgid "Time"
-msgstr "Titel"
-
-#: modules/gui/familiar/interface.c:586 modules/gui/pda/interface.c:588
-msgid "Update"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:594 modules/gui/pda/interface.c:596
-msgid " Del "
-msgstr ""
-
-#: modules/gui/familiar/interface.c:602 modules/gui/pda/interface.c:604
-#, fuzzy
-msgid " Clear "
-msgstr "Radera"
-
-#: modules/gui/familiar/interface.c:626 modules/gui/pda/interface.c:628
-msgid "Automatically play file"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:643 modules/gui/pda/interface.c:645
-#, fuzzy
-msgid " Save "
-msgstr "Nästa file"
-
-#: modules/gui/familiar/interface.c:651 modules/gui/pda/interface.c:653
-msgid " Apply "
-msgstr ""
-
-#: modules/gui/familiar/interface.c:659 modules/gui/pda/interface.c:661
-#, fuzzy
-msgid " Cancel "
-msgstr "Avbryt"
-
-#: modules/gui/familiar/interface.c:667 modules/gui/pda/interface.c:669
-msgid "Preference"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:711 modules/gui/gtk/gnome_interface.c:1361
-#: modules/gui/gtk/gtk_interface.c:1603 modules/gui/kde/kde.cpp:111
-#: modules/gui/pda/interface.c:713
-msgid "(c) 1996-2003 the VideoLAN team"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:721 modules/gui/pda/interface.c:723
-msgid "Authors: The VideoLAN Team, http://www.videolan.org"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:753 modules/gui/pda/interface.c:755
-msgid ""
-"The VideoLAN Client is a MPEG, MPEG 2, MP3, DivX player, that accepts input "
-"from local or network sources."
-msgstr ""
-
-#: modules/gui/familiar/support.c:121 modules/gui/gtk/gnome_support.c:100
-#: modules/gui/gtk/gnome_support.c:138 modules/gui/gtk/gtk_support.c:121
-#: modules/gui/gtk2/gnome2_support.c:60 modules/gui/gtk2/gnome2_support.c:85
-#: modules/gui/gtk2/gtk2_support.c:90 modules/gui/gtk2/gtk2_support.c:114
-#: modules/gui/pda/support.c:121
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr ""
-
-#: modules/gui/familiar/support.c:130 modules/gui/gtk/gtk_support.c:130
-#: modules/gui/pda/support.c:130
-#, c-format
-msgid "Error loading pixmap file: %s"
-msgstr ""
-
 #: modules/gui/gtk/gnome.c:55 modules/gui/gtk/gtk.c:57
 msgid "Show tooltips"
 msgstr ""
@@ -3526,6 +3443,12 @@ msgstr "_N
 msgid "_Video"
 msgstr ""
 
+#: modules/gui/gtk/gnome_interface.c:274 modules/gui/gtk/gtk_interface.c:121
+#: modules/gui/gtk/gtk_interface.c:1595 modules/gui/pda/interface.c:99
+#: modules/gui/pda/interface.c:734
+msgid "VLC media player"
+msgstr ""
+
 #: modules/gui/gtk/gnome_interface.c:515 modules/gui/gtk/gnome_interface.c:718
 #: modules/gui/gtk/gnome_interface.c:1690
 #: modules/gui/gtk/gnome_interface.c:2267 modules/gui/gtk/gtk_interface.c:629
@@ -3560,6 +3483,15 @@ msgstr "F
 msgid "Go Backward"
 msgstr "Föregående objekt"
 
+#: modules/gui/gtk/gnome_interface.c:566
+#: modules/gui/gtk/gnome_interface.c:1027 modules/gui/gtk/gtk_interface.c:676
+#: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:639
+#: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
+#: modules/gui/macosx/intf.m:424 modules/gui/pda/interface.c:205
+#: modules/gui/wxwindows/interface.cpp:373
+msgid "Stop"
+msgstr "Stopp"
+
 #: modules/gui/gtk/gnome_interface.c:567 modules/gui/gtk/gtk_interface.c:677
 msgid "Stop Stream"
 msgstr "Stopp"
@@ -3682,6 +3614,11 @@ msgstr ""
 msgid "Playlist..."
 msgstr ""
 
+#: modules/gui/gtk/gnome_interface.c:1361 modules/gui/gtk/gtk_interface.c:1603
+#: modules/gui/kde/kde.cpp:111 modules/gui/pda/interface.c:713
+msgid "(c) 1996-2003 the VideoLAN team"
+msgstr ""
+
 #: modules/gui/gtk/gnome_interface.c:1363 modules/gui/gtk/gtk_interface.c:1646
 #: modules/gui/kde/kde.cpp:108
 msgid ""
@@ -3718,7 +3655,7 @@ msgstr ""
 #: modules/gui/wxwindows/open.cpp:223 modules/gui/wxwindows/open.cpp:341
 #: modules/gui/wxwindows/preferences.cpp:832
 #: modules/gui/wxwindows/streamout.cpp:412
-#: modules/gui/wxwindows/subtitles.cpp:107
+#: modules/gui/wxwindows/subtitles.cpp:109
 msgid "Browse..."
 msgstr ""
 
@@ -3767,11 +3704,37 @@ msgstr ""
 msgid "HTTP/FTP/MMS"
 msgstr ""
 
+#: modules/gui/gtk/gnome_interface.c:1737
+#: modules/gui/gtk/gnome_interface.c:1786
+#: modules/gui/gtk/gnome_interface.c:2912 modules/gui/gtk/gtk_interface.c:2052
+#: modules/gui/gtk/gtk_interface.c:2101 modules/gui/gtk/gtk_interface.c:3225
+#: modules/gui/macosx/open.m:160 modules/gui/macosx/open.m:162
+#: modules/gui/macosx/output.m:134 modules/gui/pda/interface.c:425
+#: modules/gui/wxwindows/open.cpp:454 modules/gui/wxwindows/open.cpp:477
+#: modules/gui/wxwindows/streamout.cpp:436
+msgid "Port"
+msgstr ""
+
+#: modules/gui/gtk/gnome_interface.c:1747 modules/gui/gtk/gtk_interface.c:2062
+#: modules/gui/macosx/open.m:161 modules/gui/macosx/output.m:133
+#: modules/gui/pda/interface.c:414 modules/gui/wxwindows/open.cpp:469
+#: modules/gui/wxwindows/streamout.cpp:425
+msgid "Address"
+msgstr "Adress"
+
 #: modules/gui/gtk/gnome_interface.c:1759 modules/gui/gtk/gtk_interface.c:2074
 #: modules/gui/macosx/open.m:163 modules/gui/wxwindows/open.cpp:492
 msgid "URL"
 msgstr ""
 
+#: modules/gui/gtk/gnome_interface.c:1830
+#: modules/gui/gtk/gnome_interface.c:2281 modules/gui/gtk/gtk_interface.c:2145
+#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:144
+#: modules/gui/macosx/open.m:271 modules/gui/pda/interface.c:518
+#: modules/gui/wxwindows/open.cpp:257
+msgid "Network"
+msgstr "Nätverk"
+
 #: modules/gui/gtk/gnome_interface.c:1847 modules/gui/gtk/gtk_interface.c:2162
 msgid "Symbol Rate"
 msgstr ""
@@ -3851,6 +3814,11 @@ msgstr ""
 msgid "Select"
 msgstr ""
 
+#: modules/gui/gtk/gnome_interface.c:2345 modules/gui/gtk/gtk_interface.c:2712
+#: modules/gui/macosx/playlist.m:198 modules/gui/pda/interface.c:287
+msgid "Add"
+msgstr ""
+
 #: modules/gui/gtk/gnome_interface.c:2352 modules/gui/gtk/gtk_interface.c:2754
 #: modules/gui/macosx/playlist.m:195 modules/gui/macosx/playlist.m:199
 msgid "Delete"
@@ -3920,6 +3888,14 @@ msgstr ""
 msgid "AVI"
 msgstr ""
 
+#: modules/gui/gtk/gnome_support.c:100 modules/gui/gtk/gnome_support.c:138
+#: modules/gui/gtk/gtk_support.c:121 modules/gui/gtk2/gnome2_support.c:60
+#: modules/gui/gtk2/gnome2_support.c:85 modules/gui/gtk2/gtk2_support.c:90
+#: modules/gui/gtk2/gtk2_support.c:114 modules/gui/pda/support.c:121
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr ""
+
 #: modules/gui/gtk/gnome_support.c:116
 #, c-format
 msgid "Couldn't create pixmap from file: %s"
@@ -4037,10 +4013,11 @@ msgstr ""
 #: modules/gui/gtk/gtk_interface.c:2403 modules/gui/gtk/gtk_interface.c:2645
 #: modules/gui/gtk/gtk_interface.c:2876 modules/gui/gtk/gtk_interface.c:3257
 #: modules/gui/gtk/preferences.c:618 modules/gui/macosx/open.m:140
-#: modules/gui/macosx/prefs.m:79 modules/gui/wxwindows/open.cpp:247
+#: modules/gui/macosx/prefs.m:79 modules/gui/macosx/prefs.m:170
+#: modules/gui/wxwindows/open.cpp:247
 #: modules/gui/wxwindows/preferences.cpp:256
 #: modules/gui/wxwindows/streamout.cpp:220
-#: modules/gui/wxwindows/subtitles.cpp:152
+#: modules/gui/wxwindows/subtitles.cpp:193
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -4072,12 +4049,17 @@ msgstr ""
 msgid "_Select"
 msgstr ""
 
-#: modules/gui/gtk/menu.c:900
+#: modules/gui/gtk/gtk_support.c:130 modules/gui/pda/support.c:130
+#, c-format
+msgid "Error loading pixmap file: %s"
+msgstr ""
+
+#: modules/gui/gtk/menu.c:901
 #, c-format
 msgid "Title %d (%d)"
 msgstr "Titel %d (%d)"
 
-#: modules/gui/gtk/menu.c:967
+#: modules/gui/gtk/menu.c:968
 #, c-format
 msgid "Chapter %d"
 msgstr "Kapitel %d"
@@ -4241,8 +4223,9 @@ msgstr ""
 msgid "VLC - Controller"
 msgstr "Kontroller"
 
-#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/interface.cpp:904
-#: modules/gui/wxwindows/timer.cpp:131
+#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/control.cpp:160
+#: modules/gui/wxwindows/control.cpp:370
+#: modules/gui/wxwindows/interface.cpp:904 modules/gui/wxwindows/timer.cpp:131
 msgid "Volume"
 msgstr ""
 
@@ -4503,6 +4486,12 @@ msgstr "Stopp"
 msgid "TTL"
 msgstr ""
 
+#: modules/gui/macosx/output.m:136 modules/gui/macosx/output.m:236
+#: modules/gui/macosx/output.m:311 modules/gui/pda/interface.c:480
+#: modules/gui/wxwindows/streamout.cpp:386
+msgid "HTTP"
+msgstr ""
+
 #: modules/gui/macosx/output.m:141 modules/gui/wxwindows/streamout.cpp:531
 msgid "Encapsulation Method"
 msgstr ""
@@ -4562,6 +4551,11 @@ msgstr ""
 msgid "Reset Preferences"
 msgstr ""
 
+#: modules/gui/macosx/prefs.m:170
+#, fuzzy
+msgid "Continue"
+msgstr "Radera"
+
 #: modules/gui/macosx/prefs.m:172 modules/gui/wxwindows/preferences.cpp:316
 msgid ""
 "Beware this will reset your VLC Media Player config file.\n"
@@ -4581,10 +4575,128 @@ msgstr ""
 msgid "ncurses interface"
 msgstr "Göm andra"
 
+#: modules/gui/pda/interface.c:126 modules/gui/wxwindows/dialogs.cpp:268
+#: modules/gui/wxwindows/open.cpp:709
+#: modules/gui/wxwindows/preferences.cpp:1029
+#: modules/gui/wxwindows/subtitles.cpp:234
+#, fuzzy
+msgid "Open file"
+msgstr "Öppna fil"
+
+#: modules/gui/pda/interface.c:166
+msgid "Rewind"
+msgstr ""
+
+#: modules/gui/pda/interface.c:167
+msgid "Rewind stream"
+msgstr ""
+
+#: modules/gui/pda/interface.c:180
+#, fuzzy
+msgid "Pause stream"
+msgstr "Paus"
+
+#: modules/gui/pda/interface.c:193
+#, fuzzy
+msgid "Play stream"
+msgstr "Spela upp"
+
+#: modules/gui/pda/interface.c:206
+#, fuzzy
+msgid "Stop stream"
+msgstr "Stopp"
+
+#: modules/gui/pda/interface.c:218
+msgid "Forward"
+msgstr ""
+
+#: modules/gui/pda/interface.c:219
+msgid "Forward stream"
+msgstr ""
+
+#: modules/gui/pda/interface.c:295
+msgid "MRL :"
+msgstr ""
+
 #: modules/gui/pda/interface.c:396
 msgid "UDP/RTP (Adress when Multicast)"
 msgstr ""
 
+#: modules/gui/pda/interface.c:490
+msgid "FTP"
+msgstr ""
+
+#: modules/gui/pda/interface.c:500
+msgid "MMS"
+msgstr ""
+
+#: modules/gui/pda/interface.c:526
+msgid "Media"
+msgstr ""
+
+#: modules/gui/pda/interface.c:562
+msgid "MRL"
+msgstr ""
+
+#: modules/gui/pda/interface.c:571
+#, fuzzy
+msgid "Time"
+msgstr "Titel"
+
+#: modules/gui/pda/interface.c:588
+msgid "Update"
+msgstr ""
+
+#: modules/gui/pda/interface.c:596
+msgid " Del "
+msgstr ""
+
+#: modules/gui/pda/interface.c:604
+#, fuzzy
+msgid " Clear "
+msgstr "Radera"
+
+#: modules/gui/pda/interface.c:628
+msgid "Automatically play file"
+msgstr ""
+
+#: modules/gui/pda/interface.c:645
+#, fuzzy
+msgid " Save "
+msgstr "Nästa file"
+
+#: modules/gui/pda/interface.c:653
+msgid " Apply "
+msgstr ""
+
+#: modules/gui/pda/interface.c:661
+#, fuzzy
+msgid " Cancel "
+msgstr "Avbryt"
+
+#: modules/gui/pda/interface.c:669
+msgid "Preference"
+msgstr ""
+
+#: modules/gui/pda/interface.c:723
+msgid "Authors: The VideoLAN Team, http://www.videolan.org"
+msgstr ""
+
+#: modules/gui/pda/interface.c:755
+msgid ""
+"The VideoLAN Client is a MPEG, MPEG 2, MP3, DivX player, that accepts input "
+"from local or network sources."
+msgstr ""
+
+#: modules/gui/pda/pda.c:62
+#, fuzzy
+msgid "Autoplay selected file"
+msgstr "Spela upp"
+
+#: modules/gui/pda/pda.c:63
+msgid "Automatically play a file when selected in the file selection list"
+msgstr ""
+
 #: modules/gui/pda/pda.c:72
 #, fuzzy
 msgid "PDA Linux Gtk2+ interface"
@@ -4897,7 +5009,7 @@ msgstr "Paus"
 msgid "Capture the stream you are playing to a file"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:348 modules/gui/wxwindows/subtitles.cpp:98
+#: modules/gui/wxwindows/open.cpp:348 modules/gui/wxwindows/subtitles.cpp:100
 #, fuzzy
 msgid "Subtitles file"
 msgstr "Undertext"
@@ -4915,7 +5027,7 @@ msgstr ""
 msgid "CD Audio"
 msgstr "_Nästa objekt"
 
-#: modules/gui/wxwindows/open.cpp:900 modules/gui/wxwindows/streamout.cpp:784
+#: modules/gui/wxwindows/open.cpp:903 modules/gui/wxwindows/streamout.cpp:784
 #, fuzzy
 msgid "Save file"
 msgstr "Nästa file"
@@ -5046,21 +5158,26 @@ msgstr "_N
 msgid "Open Subtitles File"
 msgstr "Markera allt"
 
-#: modules/gui/wxwindows/subtitles.cpp:115
+#: modules/gui/wxwindows/subtitles.cpp:123
+#, fuzzy
+msgid "Subtitles encoding"
+msgstr "Undertext"
+
+#: modules/gui/wxwindows/subtitles.cpp:155
 #, fuzzy
 msgid "Subtitles options"
 msgstr "Undertext"
 
-#: modules/gui/wxwindows/subtitles.cpp:119
+#: modules/gui/wxwindows/subtitles.cpp:159
 #, fuzzy
 msgid "Delay subtitles (in 1/10s)"
 msgstr "Markera allt"
 
-#: modules/gui/wxwindows/subtitles.cpp:130
+#: modules/gui/wxwindows/subtitles.cpp:170
 msgid "Frames per second"
 msgstr ""
 
-#: modules/gui/wxwindows/subtitles.cpp:138
+#: modules/gui/wxwindows/subtitles.cpp:178
 msgid "Override frames per second. It will only work with MicroDVD subtitles."
 msgstr ""
 
@@ -5125,29 +5242,29 @@ msgstr ""
 msgid "Using the dummy interface plugin..."
 msgstr ""
 
-#: modules/misc/freetype.c:67 modules/visualization/xosd/xosd.c:71
+#: modules/misc/freetype.c:72 modules/visualization/xosd/xosd.c:71
 msgid "Font"
 msgstr ""
 
-#: modules/misc/freetype.c:68
+#: modules/misc/freetype.c:73
 #, fuzzy
 msgid "Filename of Font"
 msgstr "Arkiv"
 
-#: modules/misc/freetype.c:69
+#: modules/misc/freetype.c:74
 msgid "Font size"
 msgstr ""
 
-#: modules/misc/freetype.c:70
+#: modules/misc/freetype.c:75
 msgid "The size of the fonts used by the osd module"
 msgstr ""
 
-#: modules/misc/freetype.c:73
+#: modules/misc/freetype.c:78
 #, fuzzy
 msgid "Fonts"
 msgstr "Kontroller"
 
-#: modules/misc/freetype.c:76
+#: modules/misc/freetype.c:81
 msgid "freetype2 font renderer"
 msgstr ""
 
@@ -5284,19 +5401,19 @@ msgstr ""
 msgid "Dummy muxer"
 msgstr ""
 
-#: modules/mux/mp4.c:52
+#: modules/mux/mp4.c:56
 msgid "MP4/MOV muxer"
 msgstr ""
 
-#: modules/mux/mpeg/ps.c:79
+#: modules/mux/mpeg/ps.c:53
 msgid "PS muxer"
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:138
+#: modules/mux/mpeg/ts.c:78
 msgid "TS muxer"
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:143
+#: modules/mux/mpeg/ts.c:83
 msgid "TS muxer (libdvbpsi)"
 msgstr ""
 
@@ -5308,7 +5425,7 @@ msgstr ""
 msgid "A/52 audio packetizer"
 msgstr ""
 
-#: modules/packetizer/copy.c:69
+#: modules/packetizer/copy.c:43
 msgid "Copy packetizer"
 msgstr ""
 
@@ -5357,7 +5474,7 @@ msgstr "Stopp"
 msgid "Standard stream"
 msgstr "Stopp"
 
-#: modules/stream_out/transcode.c:71
+#: modules/stream_out/transcode.c:73
 #, fuzzy
 msgid "Transcode stream"
 msgstr "Paus"
diff --git a/po/vlc.pot b/po/vlc.pot
index bbbf332340..b1f8f088d2 100644
--- a/po/vlc.pot
+++ b/po/vlc.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-07-31 15:04+0200\n"
+"POT-Creation-Date: 2003-08-11 21:05+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"
@@ -29,7 +29,7 @@ msgid "Audio channels"
 msgstr ""
 
 #: src/audio_output/output.c:107 src/audio_output/output.c:142
-#: modules/audio_output/alsa.c:179 modules/audio_output/directx.c:423
+#: modules/audio_output/alsa.c:177 modules/audio_output/directx.c:423
 #: modules/audio_output/oss.c:202 modules/audio_output/sdl.c:181
 #: modules/audio_output/sdl.c:198 modules/audio_output/waveout.c:386
 msgid "Stereo"
@@ -106,11 +106,11 @@ msgstr ""
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr ""
 
-#: src/input/input.c:171
+#: src/input/input.c:174
 msgid "General"
 msgstr ""
 
-#: src/input/input.c:172
+#: src/input/input.c:175
 msgid "Playlist Item"
 msgstr ""
 
@@ -121,9 +121,9 @@ msgid "Program"
 msgstr ""
 
 #: src/input/input_programs.c:98 modules/demux/asf/libasf.c:696
-#: modules/demux/mkv.cpp:2394 modules/gui/beos/MediaControlView.cpp:1258
+#: modules/demux/mkv.cpp:2398 modules/gui/beos/MediaControlView.cpp:1258
 #: modules/gui/gtk/gnome_interface.c:1650 modules/gui/gtk/gtk_interface.c:1956
-#: modules/gui/gtk/menu.c:1402 modules/gui/gtk/menu.c:1423
+#: modules/gui/gtk/menu.c:1403 modules/gui/gtk/menu.c:1424
 #: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:373
 #: modules/gui/macosx/intf.m:374 modules/gui/macosx/open.m:150
 #: modules/gui/wxwindows/open.cpp:406
@@ -132,7 +132,7 @@ msgstr ""
 
 #: src/input/input_programs.c:102 modules/gui/beos/MediaControlView.cpp:1259
 #: modules/gui/gtk/gnome_interface.c:1640 modules/gui/gtk/gtk_interface.c:1946
-#: modules/gui/gtk/menu.c:1019 modules/gui/gtk/menu.c:1432
+#: modules/gui/gtk/menu.c:1020 modules/gui/gtk/menu.c:1433
 #: modules/gui/kde/interface.cpp:146 modules/gui/macosx/intf.m:375
 #: modules/gui/macosx/intf.m:376 modules/gui/macosx/open.m:151
 #: modules/gui/wxwindows/open.cpp:412
@@ -204,15 +204,15 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/libvlc.c:1200 src/misc/configuration.c:1019
+#: src/libvlc.c:1200 src/misc/configuration.c:1040
 msgid "string"
 msgstr ""
 
-#: src/libvlc.c:1217 src/misc/configuration.c:1000
+#: src/libvlc.c:1217 src/misc/configuration.c:1021
 msgid "integer"
 msgstr ""
 
-#: src/libvlc.c:1220 src/misc/configuration.c:1009
+#: src/libvlc.c:1220 src/misc/configuration.c:1030
 msgid "float"
 msgstr ""
 
@@ -960,16 +960,16 @@ msgstr ""
 
 #: src/libvlc.h:474 modules/audio_output/coreaudio.c:227
 #: modules/audio_output/file.c:108 modules/demux/asf/asf.c:228
-#: modules/demux/mkv.cpp:2445 modules/demux/ogg.c:557 modules/demux/ogg.c:829
-#: modules/demux/ogg.c:1002 modules/gui/beos/InterfaceWindow.cpp:259
+#: modules/demux/mkv.cpp:2449 modules/demux/ogg.c:558 modules/demux/ogg.c:830
+#: modules/demux/ogg.c:1003 modules/gui/beos/InterfaceWindow.cpp:259
 #: modules/gui/gtk/gnome_interface.c:1092 modules/gui/gtk/gtk_interface.c:1219
 #: modules/gui/macosx/intf.m:378 modules/gui/macosx/output.m:156
 msgid "Audio"
 msgstr ""
 
-#: src/libvlc.h:493 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1217
-#: modules/demux/mkv.cpp:2461 modules/demux/ogg.c:629 modules/demux/ogg.c:669
-#: modules/demux/ogg.c:734 modules/demux/ogg.c:909
+#: src/libvlc.h:493 modules/demux/asf/asf.c:298 modules/demux/avi/avi.c:1217
+#: modules/demux/mkv.cpp:2465 modules/demux/ogg.c:630 modules/demux/ogg.c:670
+#: modules/demux/ogg.c:735 modules/demux/ogg.c:910
 #: modules/gui/gtk/gnome_interface.c:1099 modules/gui/gtk/gtk_interface.c:1296
 #: modules/gui/macosx/intf.m:389 modules/gui/macosx/macosx.m:68
 #: modules/gui/macosx/output.m:150 modules/misc/dummy/dummy.c:81
@@ -977,7 +977,8 @@ msgstr ""
 msgid "Video"
 msgstr ""
 
-#: src/libvlc.h:515 modules/access/satellite/satellite.c:66
+#: src/libvlc.h:515 modules/access/dvb/qpsk.c:101
+#: modules/access/satellite/satellite.c:66
 msgid "Input"
 msgstr ""
 
@@ -1000,7 +1001,7 @@ msgid "CPU"
 msgstr ""
 
 #: src/libvlc.h:579 modules/gui/beos/InterfaceWindow.cpp:206
-#: modules/gui/familiar/interface.c:610 modules/gui/gtk/gnome_interface.c:643
+#: modules/gui/gtk/gnome_interface.c:643
 #: modules/gui/gtk/gnome_interface.c:2384
 #: modules/gui/gtk/gnome_interface.c:2409 modules/gui/gtk/gtk_interface.c:747
 #: modules/gui/gtk/gtk_interface.c:2697 modules/gui/macosx/intf.m:321
@@ -1013,11 +1014,10 @@ msgstr ""
 #: src/libvlc.h:585 modules/audio_filter/converter/a52tofloat32.c:85
 #: modules/audio_filter/converter/mpgatofixed32.c:60
 #: modules/codec/a52old/a52old.c:59 modules/codec/mpeg_video/parser.c:84
-#: modules/demux/mpeg/ts.c:118 modules/gui/familiar/familiar.c:70
-#: modules/gui/pda/pda.c:70 modules/misc/logger/logger.c:89
-#: modules/video_filter/motionblur.c:58 modules/video_filter/transform.c:63
-#: modules/video_filter/wall.c:66 modules/video_output/ggi.c:62
-#: modules/video_output/mga/xmga.c:102
+#: modules/demux/mpeg/ts.c:118 modules/gui/pda/pda.c:70
+#: modules/misc/logger/logger.c:89 modules/video_filter/motionblur.c:58
+#: modules/video_filter/transform.c:63 modules/video_filter/wall.c:66
+#: modules/video_output/ggi.c:62 modules/video_output/mga/xmga.c:102
 msgid "Miscellaneous"
 msgstr ""
 
@@ -1045,7 +1045,7 @@ msgstr ""
 msgid "print version information"
 msgstr ""
 
-#: src/misc/configuration.c:1000
+#: src/misc/configuration.c:1021
 msgid "boolean"
 msgstr ""
 
@@ -1107,6 +1107,102 @@ msgstr ""
 msgid "Standard filesystem directory input"
 msgstr ""
 
+#: modules/access/dvb/qpsk.c:44
+msgid "adapter card to tune"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:45
+msgid "adapter cards have a device file named /dev/dvb/adapter[n] with n>=0"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:47
+msgid "device nummer to use on adapter"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:50
+msgid "satellite default transponder frequency"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:53
+msgid "satellite default transponder polarization"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:56
+msgid "satellite default transponder FEC"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:57
+msgid "FEC=Forward Error Correction mode"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:59
+msgid "satellite default transponder symbol rate"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:62
+msgid "use diseqc with antenna"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:65
+msgid "antenna lnb_lof1 (kHz)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:68
+msgid "antenna lnb_lof2 (kHz)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:71
+msgid "antenna lnb_slof (kHz)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:74
+msgid "probe the dvb card for capabilities (default disabled)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:75
+msgid "some dvb cards do not like to be probed for their capabilities"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:78
+msgid "modulation type"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:79
+msgid "modulation type for frontend device "
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:82
+msgid "terrestrial high priority stream code rate (FEC)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:85
+msgid "terrestrial low priority stream code rate (FEC)"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:88
+msgid "terrestrial bandwidth"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:89
+msgid "terrestrial bandwidth [0=auto,6,7,8 in MHz]"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:91
+msgid "terrestrial guard interval"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:94
+msgid "terrestrial transmission mode"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:97
+msgid "terrestrial hierarchy mode"
+msgstr ""
+
+#: modules/access/dvb/qpsk.c:123
+msgid "DVB input module with v4l2 support"
+msgstr ""
+
 #: modules/access/dvd/dvd.c:65
 msgid "Method to use by libdvdcss for key decryption"
 msgstr ""
@@ -1200,7 +1296,7 @@ msgstr ""
 msgid "http"
 msgstr ""
 
-#: modules/access/http.c:89
+#: modules/access/http.c:91
 msgid "HTTP input"
 msgstr ""
 
@@ -1218,6 +1314,10 @@ msgstr ""
 msgid "Hauppauge PVR cards input"
 msgstr ""
 
+#: modules/access/rtsp.c:68
+msgid "RTSP SDP request"
+msgstr ""
+
 #: modules/access/satellite/satellite.c:41
 msgid "Satellite default transponder frequency"
 msgstr ""
@@ -1472,23 +1572,23 @@ msgstr ""
 msgid "Audio device"
 msgstr ""
 
-#: modules/audio_output/alsa.c:173 modules/audio_output/directx.c:435
+#: modules/audio_output/alsa.c:171 modules/audio_output/directx.c:435
 #: modules/audio_output/oss.c:222 modules/audio_output/sdl.c:182
 #: modules/audio_output/sdl.c:201 modules/audio_output/waveout.c:399
 msgid "Mono"
 msgstr ""
 
-#: modules/audio_output/alsa.c:186 modules/audio_output/directx.c:409
+#: modules/audio_output/alsa.c:184 modules/audio_output/directx.c:409
 #: modules/audio_output/oss.c:178 modules/audio_output/waveout.c:371
 msgid "2 Front 2 Rear"
 msgstr ""
 
-#: modules/audio_output/alsa.c:192 modules/audio_output/directx.c:391
+#: modules/audio_output/alsa.c:190 modules/audio_output/directx.c:391
 #: modules/audio_output/oss.c:167 modules/audio_output/waveout.c:352
 msgid "5.1"
 msgstr ""
 
-#: modules/audio_output/alsa.c:219 modules/audio_output/directx.c:478
+#: modules/audio_output/alsa.c:217 modules/audio_output/directx.c:478
 #: modules/audio_output/oss.c:246 modules/audio_output/waveout.c:415
 msgid "A/52 over S/PDIF"
 msgstr ""
@@ -1847,18 +1947,26 @@ msgid "DVD subtitles decoder"
 msgstr ""
 
 #: modules/codec/subsdec/subsdec.c:68
-msgid "subtitle text encoding"
+msgid "Subtitles text encoding"
 msgstr ""
 
 #: modules/codec/subsdec/subsdec.c:69
-msgid "change the encoding used in text subtitles"
+msgid "Change the encoding used in text subtitles"
+msgstr ""
+
+#: modules/codec/subsdec/subsdec.c:70
+msgid "Subtitles justification"
+msgstr ""
+
+#: modules/codec/subsdec/subsdec.c:71
+msgid "Change the justification of substitles (0=center, 1=left, 2=right)"
 msgstr ""
 
-#: modules/codec/subsdec/subsdec.c:72
+#: modules/codec/subsdec/subsdec.c:74
 msgid "file subtitles decoder"
 msgstr ""
 
-#: modules/codec/subsdec/subsdec.c:75 modules/gui/beos/InterfaceWindow.cpp:256
+#: modules/codec/subsdec/subsdec.c:77 modules/gui/beos/InterfaceWindow.cpp:256
 #: modules/gui/kde/interface.cpp:93
 msgid "Subtitles"
 msgstr ""
@@ -2002,7 +2110,7 @@ msgid "Quit"
 msgstr ""
 
 #: modules/control/lirc/lirc.c:297 modules/control/lirc/lirc.c:323
-#: modules/gui/familiar/interface.c:177 modules/gui/gtk/gnome_interface.c:602
+#: modules/gui/gtk/gnome_interface.c:602
 #: modules/gui/gtk/gnome_interface.c:1020 modules/gui/gtk/gtk_interface.c:709
 #: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:921
 #: modules/gui/macosx/intf.m:922 modules/gui/macosx/intf.m:923
@@ -2010,8 +2118,7 @@ msgstr ""
 msgid "Pause"
 msgstr ""
 
-#: modules/control/lirc/lirc.c:310 modules/gui/familiar/interface.c:190
-#: modules/gui/gtk/gnome_interface.c:590
+#: modules/control/lirc/lirc.c:310 modules/gui/gtk/gnome_interface.c:590
 #: modules/gui/gtk/gnome_interface.c:1013 modules/gui/gtk/gtk_interface.c:698
 #: modules/gui/macosx/intf.m:324 modules/gui/macosx/intf.m:362
 #: modules/gui/macosx/intf.m:423 modules/gui/macosx/intf.m:928
@@ -2047,68 +2154,70 @@ msgstr ""
 msgid "remote control interface"
 msgstr ""
 
-#: modules/demux/a52sys.c:52
+#: modules/demux/a52sys.c:41
 msgid "A52 demuxer"
 msgstr ""
 
-#: modules/demux/aac/demux.c:46
-msgid "AAC stream demuxer"
+#: modules/demux/a52sys.c:161
+msgid "A52"
 msgstr ""
 
-#: modules/demux/aac/demux.c:555
-msgid "Aac"
+#: modules/demux/a52sys.c:163 modules/demux/aac.c:175
+#: modules/demux/mpeg/m4v.c:150 modules/demux/mpeg/mpga.c:331
+msgid "Input Type"
 msgstr ""
 
-#: modules/demux/aac/demux.c:557 modules/demux/mpeg/audio.c:627
-#: modules/demux/mpeg/audio.c:644 modules/demux/mpeg/m4v.c:150
-msgid "Input Type"
+#: modules/demux/a52sys.c:164 modules/demux/aac.c:177
+#: modules/demux/asf/asf.c:275 modules/demux/avi/avi.c:1178
+#: modules/demux/mkv.cpp:2453 modules/demux/ogg.c:562 modules/demux/ogg.c:838
+#: modules/demux/ogg.c:1011 modules/gui/gtk/gnome_interface.c:148
+#: modules/gui/gtk/gnome_interface.c:931 modules/gui/gtk/gtk_interface.c:481
+#: modules/gui/gtk/gtk_interface.c:1282 modules/gui/macosx/output.m:162
+#: modules/gui/wxwindows/streamout.cpp:668
+msgid "Channels"
 msgstr ""
 
-#: modules/demux/aac/demux.c:560 modules/demux/mpeg/audio.c:629
-msgid "Layer"
+#: modules/demux/a52sys.c:165 modules/demux/aac.c:179
+#: modules/demux/asf/asf.c:277 modules/demux/avi/avi.c:1180
+#: modules/demux/mkv.cpp:2457 modules/demux/mpeg/mpga.c:337
+#: modules/demux/ogg.c:560 modules/demux/ogg.c:672 modules/demux/ogg.c:833
+#: modules/demux/ogg.c:1006
+msgid "Sample Rate"
 msgstr ""
 
-#: modules/demux/aac/demux.c:562 modules/demux/asf/asf.c:275
-#: modules/demux/avi/avi.c:1178 modules/demux/mkv.cpp:2449
-#: modules/demux/ogg.c:561 modules/demux/ogg.c:837 modules/demux/ogg.c:1010
-#: modules/gui/gtk/gnome_interface.c:148 modules/gui/gtk/gnome_interface.c:931
-#: modules/gui/gtk/gtk_interface.c:481 modules/gui/gtk/gtk_interface.c:1282
-#: modules/gui/macosx/output.m:162 modules/gui/wxwindows/streamout.cpp:668
-msgid "Channels"
+#: modules/demux/aac.c:41
+msgid "AAC demuxer"
 msgstr ""
 
-#: modules/demux/aac/demux.c:564 modules/demux/asf/asf.c:277
-#: modules/demux/avi/avi.c:1180 modules/demux/mkv.cpp:2453
-#: modules/demux/mpeg/audio.c:632 modules/demux/ogg.c:559
-#: modules/demux/ogg.c:671 modules/demux/ogg.c:832 modules/demux/ogg.c:1005
-msgid "Sample Rate"
+#: modules/demux/aac.c:173
+msgid "Aac"
 msgstr ""
 
 #: modules/demux/asf/asf.c:48
 msgid "ASF v1.0 demuxer (file only)"
 msgstr ""
 
-#: modules/demux/asf/asf.c:165 modules/demux/mkv.cpp:2412
+#: modules/demux/asf/asf.c:165 modules/demux/mkv.cpp:2416
 msgid "Number of streams"
 msgstr ""
 
-#: modules/demux/asf/asf.c:228 modules/demux/asf/asf.c:302
+#: modules/demux/asf/asf.c:228 modules/demux/asf/asf.c:298
 #: modules/demux/avi/avi.c:1172 modules/demux/avi/avi.c:1217
-#: modules/demux/avi/avi.c:1250 modules/demux/mkv.cpp:2445
-#: modules/demux/mkv.cpp:2461 modules/demux/mkv.cpp:2477
-#: modules/demux/ogg.c:557 modules/demux/ogg.c:629 modules/demux/ogg.c:669
-#: modules/demux/ogg.c:734 modules/demux/ogg.c:829 modules/demux/ogg.c:909
-#: modules/demux/ogg.c:1002 modules/gui/familiar/interface.c:370
-#: modules/gui/macosx/output.m:139 modules/gui/pda/interface.c:372
+#: modules/demux/avi/avi.c:1250 modules/demux/mkv.cpp:2449
+#: modules/demux/mkv.cpp:2465 modules/demux/mkv.cpp:2481
+#: modules/demux/ogg.c:558 modules/demux/ogg.c:630 modules/demux/ogg.c:670
+#: modules/demux/ogg.c:735 modules/demux/ogg.c:830 modules/demux/ogg.c:910
+#: modules/demux/ogg.c:1003 modules/gui/macosx/output.m:139
+#: modules/gui/pda/interface.c:372
 msgid "Type"
 msgstr ""
 
-#: modules/demux/asf/asf.c:260 modules/demux/asf/asf.c:318
+#: modules/demux/asf/asf.c:260 modules/demux/asf/asf.c:314
 #: modules/demux/avi/avi.c:1174 modules/demux/avi/avi.c:1218
-#: modules/demux/mkv.cpp:2446 modules/demux/mkv.cpp:2462
-#: modules/demux/mkv.cpp:2478 modules/demux/ogg.c:558 modules/demux/ogg.c:630
-#: modules/demux/ogg.c:670 modules/demux/ogg.c:735 modules/demux/ogg.c:830
-#: modules/demux/ogg.c:910 modules/demux/ogg.c:1003
+#: modules/demux/mkv.cpp:2450 modules/demux/mkv.cpp:2466
+#: modules/demux/mkv.cpp:2482 modules/demux/ogg.c:559 modules/demux/ogg.c:631
+#: modules/demux/ogg.c:671 modules/demux/ogg.c:736 modules/demux/ogg.c:831
+#: modules/demux/ogg.c:911 modules/demux/ogg.c:1004
 msgid "Codec"
 msgstr ""
 
@@ -2117,36 +2226,36 @@ msgid "Avg. byterate"
 msgstr ""
 
 #: modules/demux/asf/asf.c:282 modules/demux/avi/avi.c:1185
-#: modules/demux/mkv.cpp:2457
+#: modules/demux/mkv.cpp:2461
 msgid "Bits Per Sample"
 msgstr ""
 
-#: modules/demux/asf/asf.c:332
+#: modules/demux/asf/asf.c:328
 msgid "Size"
 msgstr ""
 
-#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1222
-#: modules/demux/mkv.cpp:2465
+#: modules/demux/asf/asf.c:331 modules/demux/avi/avi.c:1222
+#: modules/demux/mkv.cpp:2469
 msgid "Resolution"
 msgstr ""
 
-#: modules/demux/asf/asf.c:337
+#: modules/demux/asf/asf.c:333
 msgid "Planes"
 msgstr ""
 
-#: modules/demux/asf/asf.c:339 modules/demux/avi/avi.c:1228
+#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1228
 msgid "Bits Per Pixel"
 msgstr ""
 
-#: modules/demux/asf/asf.c:342
+#: modules/demux/asf/asf.c:338
 msgid "Image Size"
 msgstr ""
 
-#: modules/demux/asf/asf.c:344
+#: modules/demux/asf/asf.c:340
 msgid "X pixels per meter"
 msgstr ""
 
-#: modules/demux/asf/asf.c:346
+#: modules/demux/asf/asf.c:342
 msgid "Y pixels per meter"
 msgstr ""
 
@@ -2179,7 +2288,7 @@ msgstr ""
 msgid "Rating"
 msgstr ""
 
-#: modules/demux/au.c:47
+#: modules/demux/au.c:42
 msgid "AU demuxer"
 msgstr ""
 
@@ -2224,8 +2333,8 @@ msgstr ""
 msgid "Audio Bitrate"
 msgstr ""
 
-#: modules/demux/avi/avi.c:1225 modules/demux/ogg.c:631
-#: modules/demux/ogg.c:737 modules/demux/ogg.c:912
+#: modules/demux/avi/avi.c:1225 modules/demux/ogg.c:632
+#: modules/demux/ogg.c:738 modules/demux/ogg.c:913
 msgid "Frame Rate"
 msgstr ""
 
@@ -2265,58 +2374,58 @@ msgstr ""
 msgid "mka/mkv stream demuxer"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2389 modules/gui/gtk/gnome_interface.c:2436
+#: modules/demux/mkv.cpp:2393 modules/gui/gtk/gnome_interface.c:2436
 #: modules/gui/gtk/gtk_interface.c:2857 modules/gui/wxwindows/playlist.cpp:150
 msgid "Duration"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2398
+#: modules/demux/mkv.cpp:2402
 msgid "Date UTC"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2402
+#: modules/demux/mkv.cpp:2406
 msgid "Segment Filename"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2406
+#: modules/demux/mkv.cpp:2410
 msgid "Muxing Application"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2410
+#: modules/demux/mkv.cpp:2414
 msgid "Writing Application"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2423 modules/gui/beos/PlayListWindow.cpp:144
-#: modules/gui/familiar/interface.c:362 modules/gui/gtk/preferences.c:325
-#: modules/gui/kde/pluginsbox.cpp:45 modules/gui/pda/interface.c:364
+#: modules/demux/mkv.cpp:2427 modules/gui/beos/PlayListWindow.cpp:144
+#: modules/gui/gtk/preferences.c:325 modules/gui/kde/pluginsbox.cpp:45
+#: modules/gui/pda/interface.c:364
 msgid "Name"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2427
+#: modules/demux/mkv.cpp:2431
 msgid "Codec Name"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2431
+#: modules/demux/mkv.cpp:2435
 msgid "Codec Setting"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2435
+#: modules/demux/mkv.cpp:2439
 msgid "Codec Info"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2439
+#: modules/demux/mkv.cpp:2443
 msgid "Codec Download"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2469
+#: modules/demux/mkv.cpp:2473
 msgid "Display Resolution"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2473
+#: modules/demux/mkv.cpp:2477
 msgid "Frame Per Second"
 msgstr ""
 
-#: modules/demux/mkv.cpp:2477 modules/gui/gtk/gnome_interface.c:1963
+#: modules/demux/mkv.cpp:2481 modules/gui/gtk/gnome_interface.c:1963
 #: modules/gui/gtk/gtk_interface.c:2278
 msgid "Subtitle"
 msgstr ""
@@ -2325,33 +2434,40 @@ msgstr ""
 msgid "MP4 demuxer"
 msgstr ""
 
-#: modules/demux/mpeg/audio.c:47
-msgid "MPEG I/II audio stream demuxer"
+#: modules/demux/mpeg/es.c:49
+msgid "ISO 13818-1 MPEG Elementary Stream input"
+msgstr ""
+
+#: modules/demux/mpeg/m4v.c:43
+msgid "MPEG-4 video elementary stream demuxer"
 msgstr ""
 
-#: modules/demux/mpeg/audio.c:626 modules/demux/mpeg/audio.c:643
 #: modules/demux/mpeg/m4v.c:149
 msgid "mpeg"
 msgstr ""
 
-#: modules/demux/mpeg/audio.c:630
-msgid "Mode"
+#: modules/demux/mpeg/m4v.c:150
+msgid "Video MPEG-4 (raw ES)"
 msgstr ""
 
-#: modules/demux/mpeg/audio.c:634
-msgid "Average Bitrate"
+#: modules/demux/mpeg/mpga.c:41
+msgid "MPEG-I/II Audio demuxer"
 msgstr ""
 
-#: modules/demux/mpeg/es.c:49
-msgid "ISO 13818-1 MPEG Elementary Stream input"
+#: modules/demux/mpeg/mpga.c:330
+msgid "MPEG"
 msgstr ""
 
-#: modules/demux/mpeg/m4v.c:43
-msgid "MPEG-4 video elementary stream demuxer"
+#: modules/demux/mpeg/mpga.c:333
+msgid "Layer"
 msgstr ""
 
-#: modules/demux/mpeg/m4v.c:150
-msgid "Video MPEG-4 (raw ES)"
+#: modules/demux/mpeg/mpga.c:335
+msgid "Mode"
+msgstr ""
+
+#: modules/demux/mpeg/mpga.c:339
+msgid "Average Bitrate"
 msgstr ""
 
 #: modules/demux/mpeg/ps.c:60
@@ -2395,36 +2511,36 @@ msgstr ""
 msgid "ogg stream demuxer"
 msgstr ""
 
-#: modules/demux/ogg.c:558
+#: modules/demux/ogg.c:559
 msgid "Vorbis"
 msgstr ""
 
-#: modules/demux/ogg.c:563 modules/demux/ogg.c:633 modules/demux/ogg.c:673
-#: modules/demux/ogg.c:834 modules/demux/ogg.c:1007
+#: modules/demux/ogg.c:564 modules/demux/ogg.c:634 modules/demux/ogg.c:674
+#: modules/demux/ogg.c:835 modules/demux/ogg.c:1008
 msgid "Bit Rate"
 msgstr ""
 
-#: modules/demux/ogg.c:630
+#: modules/demux/ogg.c:631
 msgid "Theora"
 msgstr ""
 
-#: modules/demux/ogg.c:670
+#: modules/demux/ogg.c:671
 msgid "tarkin"
 msgstr ""
 
-#: modules/demux/ogg.c:739 modules/demux/ogg.c:914
+#: modules/demux/ogg.c:740 modules/demux/ogg.c:915
 msgid "Bit Count"
 msgstr ""
 
-#: modules/demux/ogg.c:741 modules/demux/ogg.c:916
+#: modules/demux/ogg.c:742 modules/demux/ogg.c:917
 msgid "Width"
 msgstr ""
 
-#: modules/demux/ogg.c:743 modules/demux/ogg.c:918
+#: modules/demux/ogg.c:744 modules/demux/ogg.c:919
 msgid "Height"
 msgstr ""
 
-#: modules/demux/ogg.c:839 modules/demux/ogg.c:1012
+#: modules/demux/ogg.c:840 modules/demux/ogg.c:1013
 msgid "Bits per Sample"
 msgstr ""
 
@@ -2432,6 +2548,10 @@ msgstr ""
 msgid "raw dv demuxer"
 msgstr ""
 
+#: modules/demux/sdp.c:64
+msgid "SDP demuxer + UDP/RTP/RTSP"
+msgstr ""
+
 #: modules/demux/util/id3.c:44
 msgid "Simple id3 tag skipper"
 msgstr ""
@@ -2764,7 +2884,7 @@ msgstr ""
 msgid "Text subtitles demux"
 msgstr ""
 
-#: modules/demux/wav/wav.c:49
+#: modules/demux/wav.c:43
 msgid "WAV demuxer"
 msgstr ""
 
@@ -2797,11 +2917,9 @@ msgid "Yes"
 msgstr ""
 
 #: modules/gui/beos/InterfaceWindow.cpp:201
-#: modules/gui/beos/InterfaceWindow.cpp:308
-#: modules/gui/familiar/interface.c:149 modules/gui/familiar/interface.c:150
-#: modules/gui/macosx/intf.m:328 modules/gui/macosx/prefs.m:77
-#: modules/gui/pda/interface.c:151 modules/gui/pda/interface.c:152
-#: modules/gui/wxwindows/preferences.cpp:233
+#: modules/gui/beos/InterfaceWindow.cpp:308 modules/gui/macosx/intf.m:328
+#: modules/gui/macosx/prefs.m:77 modules/gui/pda/interface.c:151
+#: modules/gui/pda/interface.c:152 modules/gui/wxwindows/preferences.cpp:233
 msgid "Preferences"
 msgstr ""
 
@@ -2816,7 +2934,7 @@ msgstr ""
 
 #: modules/gui/beos/InterfaceWindow.cpp:238
 #: modules/gui/beos/MediaControlView.cpp:1257
-#: modules/gui/beos/PlayListWindow.cpp:82 modules/gui/familiar/interface.c:378
+#: modules/gui/beos/PlayListWindow.cpp:82
 #: modules/gui/gtk/gnome_interface.c:503
 #: modules/gui/gtk/gnome_interface.c:1569
 #: modules/gui/gtk/gnome_interface.c:2274
@@ -2849,10 +2967,8 @@ msgid "Open Subtitles"
 msgstr ""
 
 #: modules/gui/beos/InterfaceWindow.cpp:249
-#: modules/gui/familiar/interface.c:231 modules/gui/familiar/interface.c:232
-#: modules/gui/familiar/interface.c:765 modules/gui/gtk/gtk_interface.c:1580
-#: modules/gui/pda/interface.c:233 modules/gui/pda/interface.c:234
-#: modules/gui/pda/interface.c:767
+#: modules/gui/gtk/gtk_interface.c:1580 modules/gui/pda/interface.c:233
+#: modules/gui/pda/interface.c:234 modules/gui/pda/interface.c:767
 msgid "About"
 msgstr ""
 
@@ -2901,7 +3017,7 @@ msgstr ""
 #: modules/gui/wxwindows/open.cpp:244
 #: modules/gui/wxwindows/preferences.cpp:253
 #: modules/gui/wxwindows/streamout.cpp:217
-#: modules/gui/wxwindows/subtitles.cpp:149
+#: modules/gui/wxwindows/subtitles.cpp:190
 msgid "OK"
 msgstr ""
 
@@ -3025,7 +3141,7 @@ msgstr ""
 msgid "Take Screen Shot"
 msgstr ""
 
-#: modules/gui/beos/VlcWrapper.cpp:165 modules/gui/gtk/menu.c:733
+#: modules/gui/beos/VlcWrapper.cpp:165 modules/gui/gtk/menu.c:734
 msgid "None"
 msgstr ""
 
@@ -3033,198 +3149,6 @@ msgstr ""
 msgid "<unknown>"
 msgstr ""
 
-#: modules/gui/familiar/familiar.c:62 modules/gui/pda/pda.c:62
-msgid "Autoplay selected file"
-msgstr ""
-
-#: modules/gui/familiar/familiar.c:63 modules/gui/pda/pda.c:63
-msgid "Automatically play a file when selected in the file selection list"
-msgstr ""
-
-#: modules/gui/familiar/familiar.c:72
-msgid "Familiar Linux Gtk+ interface"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:99 modules/gui/familiar/interface.c:732
-#: modules/gui/gtk/gnome_interface.c:274 modules/gui/gtk/gtk_interface.c:121
-#: modules/gui/gtk/gtk_interface.c:1595 modules/gui/pda/interface.c:99
-#: modules/gui/pda/interface.c:734
-msgid "VLC media player"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:124 modules/gui/pda/interface.c:126
-#: modules/gui/wxwindows/dialogs.cpp:268 modules/gui/wxwindows/open.cpp:709
-#: modules/gui/wxwindows/preferences.cpp:1029
-#: modules/gui/wxwindows/subtitles.cpp:196
-msgid "Open file"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:164 modules/gui/pda/interface.c:166
-msgid "Rewind"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:165 modules/gui/pda/interface.c:167
-msgid "Rewind stream"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:178 modules/gui/pda/interface.c:180
-msgid "Pause stream"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:191 modules/gui/pda/interface.c:193
-msgid "Play stream"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:203 modules/gui/gtk/gnome_interface.c:566
-#: modules/gui/gtk/gnome_interface.c:1027 modules/gui/gtk/gtk_interface.c:676
-#: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:639
-#: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
-#: modules/gui/macosx/intf.m:424 modules/gui/pda/interface.c:205
-#: modules/gui/wxwindows/interface.cpp:373
-msgid "Stop"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:204 modules/gui/pda/interface.c:206
-msgid "Stop stream"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:216 modules/gui/pda/interface.c:218
-msgid "Forward"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:217 modules/gui/pda/interface.c:219
-msgid "Forward stream"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:285 modules/gui/gtk/gnome_interface.c:2345
-#: modules/gui/gtk/gtk_interface.c:2712 modules/gui/macosx/playlist.m:198
-#: modules/gui/pda/interface.c:287
-msgid "Add"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:293 modules/gui/pda/interface.c:295
-msgid "MRL :"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:394
-msgid "UDP/RTP (Address when Multicast)"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:412 modules/gui/gtk/gnome_interface.c:1747
-#: modules/gui/gtk/gtk_interface.c:2062 modules/gui/macosx/open.m:161
-#: modules/gui/macosx/output.m:133 modules/gui/pda/interface.c:414
-#: modules/gui/wxwindows/open.cpp:469 modules/gui/wxwindows/streamout.cpp:425
-msgid "Address"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:423 modules/gui/gtk/gnome_interface.c:1737
-#: modules/gui/gtk/gnome_interface.c:1786
-#: modules/gui/gtk/gnome_interface.c:2912 modules/gui/gtk/gtk_interface.c:2052
-#: modules/gui/gtk/gtk_interface.c:2101 modules/gui/gtk/gtk_interface.c:3225
-#: modules/gui/macosx/open.m:160 modules/gui/macosx/open.m:162
-#: modules/gui/macosx/output.m:134 modules/gui/pda/interface.c:425
-#: modules/gui/wxwindows/open.cpp:454 modules/gui/wxwindows/open.cpp:477
-#: modules/gui/wxwindows/streamout.cpp:436
-msgid "Port"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:136
-#: modules/gui/macosx/output.m:236 modules/gui/macosx/output.m:311
-#: modules/gui/pda/interface.c:480 modules/gui/wxwindows/streamout.cpp:386
-msgid "HTTP"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:488 modules/gui/pda/interface.c:490
-msgid "FTP"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:498 modules/gui/pda/interface.c:500
-msgid "MMS"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:516 modules/gui/gtk/gnome_interface.c:1830
-#: modules/gui/gtk/gnome_interface.c:2281 modules/gui/gtk/gtk_interface.c:2145
-#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:144
-#: modules/gui/macosx/open.m:271 modules/gui/pda/interface.c:518
-#: modules/gui/wxwindows/open.cpp:257
-msgid "Network"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:524 modules/gui/pda/interface.c:526
-msgid "Media"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:560 modules/gui/pda/interface.c:562
-msgid "MRL"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:569 modules/gui/pda/interface.c:571
-msgid "Time"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:586 modules/gui/pda/interface.c:588
-msgid "Update"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:594 modules/gui/pda/interface.c:596
-msgid " Del "
-msgstr ""
-
-#: modules/gui/familiar/interface.c:602 modules/gui/pda/interface.c:604
-msgid " Clear "
-msgstr ""
-
-#: modules/gui/familiar/interface.c:626 modules/gui/pda/interface.c:628
-msgid "Automatically play file"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:643 modules/gui/pda/interface.c:645
-msgid " Save "
-msgstr ""
-
-#: modules/gui/familiar/interface.c:651 modules/gui/pda/interface.c:653
-msgid " Apply "
-msgstr ""
-
-#: modules/gui/familiar/interface.c:659 modules/gui/pda/interface.c:661
-msgid " Cancel "
-msgstr ""
-
-#: modules/gui/familiar/interface.c:667 modules/gui/pda/interface.c:669
-msgid "Preference"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:711 modules/gui/gtk/gnome_interface.c:1361
-#: modules/gui/gtk/gtk_interface.c:1603 modules/gui/kde/kde.cpp:111
-#: modules/gui/pda/interface.c:713
-msgid "(c) 1996-2003 the VideoLAN team"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:721 modules/gui/pda/interface.c:723
-msgid "Authors: The VideoLAN Team, http://www.videolan.org"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:753 modules/gui/pda/interface.c:755
-msgid ""
-"The VideoLAN Client is a MPEG, MPEG 2, MP3, DivX player, that accepts input "
-"from local or network sources."
-msgstr ""
-
-#: modules/gui/familiar/support.c:121 modules/gui/gtk/gnome_support.c:100
-#: modules/gui/gtk/gnome_support.c:138 modules/gui/gtk/gtk_support.c:121
-#: modules/gui/gtk2/gnome2_support.c:60 modules/gui/gtk2/gnome2_support.c:85
-#: modules/gui/gtk2/gtk2_support.c:90 modules/gui/gtk2/gtk2_support.c:114
-#: modules/gui/pda/support.c:121
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr ""
-
-#: modules/gui/familiar/support.c:130 modules/gui/gtk/gtk_support.c:130
-#: modules/gui/pda/support.c:130
-#, c-format
-msgid "Error loading pixmap file: %s"
-msgstr ""
-
 #: modules/gui/gtk/gnome.c:55 modules/gui/gtk/gtk.c:57
 msgid "Show tooltips"
 msgstr ""
@@ -3417,6 +3341,12 @@ msgstr ""
 msgid "_Video"
 msgstr ""
 
+#: modules/gui/gtk/gnome_interface.c:274 modules/gui/gtk/gtk_interface.c:121
+#: modules/gui/gtk/gtk_interface.c:1595 modules/gui/pda/interface.c:99
+#: modules/gui/pda/interface.c:734
+msgid "VLC media player"
+msgstr ""
+
 #: modules/gui/gtk/gnome_interface.c:515 modules/gui/gtk/gnome_interface.c:718
 #: modules/gui/gtk/gnome_interface.c:1690
 #: modules/gui/gtk/gnome_interface.c:2267 modules/gui/gtk/gtk_interface.c:629
@@ -3451,6 +3381,15 @@ msgstr ""
 msgid "Go Backward"
 msgstr ""
 
+#: modules/gui/gtk/gnome_interface.c:566
+#: modules/gui/gtk/gnome_interface.c:1027 modules/gui/gtk/gtk_interface.c:676
+#: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:639
+#: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
+#: modules/gui/macosx/intf.m:424 modules/gui/pda/interface.c:205
+#: modules/gui/wxwindows/interface.cpp:373
+msgid "Stop"
+msgstr ""
+
 #: modules/gui/gtk/gnome_interface.c:567 modules/gui/gtk/gtk_interface.c:677
 msgid "Stop Stream"
 msgstr ""
@@ -3572,6 +3511,11 @@ msgstr ""
 msgid "Playlist..."
 msgstr ""
 
+#: modules/gui/gtk/gnome_interface.c:1361 modules/gui/gtk/gtk_interface.c:1603
+#: modules/gui/kde/kde.cpp:111 modules/gui/pda/interface.c:713
+msgid "(c) 1996-2003 the VideoLAN team"
+msgstr ""
+
 #: modules/gui/gtk/gnome_interface.c:1363 modules/gui/gtk/gtk_interface.c:1646
 #: modules/gui/kde/kde.cpp:108
 msgid ""
@@ -3608,7 +3552,7 @@ msgstr ""
 #: modules/gui/wxwindows/open.cpp:223 modules/gui/wxwindows/open.cpp:341
 #: modules/gui/wxwindows/preferences.cpp:832
 #: modules/gui/wxwindows/streamout.cpp:412
-#: modules/gui/wxwindows/subtitles.cpp:107
+#: modules/gui/wxwindows/subtitles.cpp:109
 msgid "Browse..."
 msgstr ""
 
@@ -3657,11 +3601,37 @@ msgstr ""
 msgid "HTTP/FTP/MMS"
 msgstr ""
 
+#: modules/gui/gtk/gnome_interface.c:1737
+#: modules/gui/gtk/gnome_interface.c:1786
+#: modules/gui/gtk/gnome_interface.c:2912 modules/gui/gtk/gtk_interface.c:2052
+#: modules/gui/gtk/gtk_interface.c:2101 modules/gui/gtk/gtk_interface.c:3225
+#: modules/gui/macosx/open.m:160 modules/gui/macosx/open.m:162
+#: modules/gui/macosx/output.m:134 modules/gui/pda/interface.c:425
+#: modules/gui/wxwindows/open.cpp:454 modules/gui/wxwindows/open.cpp:477
+#: modules/gui/wxwindows/streamout.cpp:436
+msgid "Port"
+msgstr ""
+
+#: modules/gui/gtk/gnome_interface.c:1747 modules/gui/gtk/gtk_interface.c:2062
+#: modules/gui/macosx/open.m:161 modules/gui/macosx/output.m:133
+#: modules/gui/pda/interface.c:414 modules/gui/wxwindows/open.cpp:469
+#: modules/gui/wxwindows/streamout.cpp:425
+msgid "Address"
+msgstr ""
+
 #: modules/gui/gtk/gnome_interface.c:1759 modules/gui/gtk/gtk_interface.c:2074
 #: modules/gui/macosx/open.m:163 modules/gui/wxwindows/open.cpp:492
 msgid "URL"
 msgstr ""
 
+#: modules/gui/gtk/gnome_interface.c:1830
+#: modules/gui/gtk/gnome_interface.c:2281 modules/gui/gtk/gtk_interface.c:2145
+#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:144
+#: modules/gui/macosx/open.m:271 modules/gui/pda/interface.c:518
+#: modules/gui/wxwindows/open.cpp:257
+msgid "Network"
+msgstr ""
+
 #: modules/gui/gtk/gnome_interface.c:1847 modules/gui/gtk/gtk_interface.c:2162
 msgid "Symbol Rate"
 msgstr ""
@@ -3740,6 +3710,11 @@ msgstr ""
 msgid "Select"
 msgstr ""
 
+#: modules/gui/gtk/gnome_interface.c:2345 modules/gui/gtk/gtk_interface.c:2712
+#: modules/gui/macosx/playlist.m:198 modules/gui/pda/interface.c:287
+msgid "Add"
+msgstr ""
+
 #: modules/gui/gtk/gnome_interface.c:2352 modules/gui/gtk/gtk_interface.c:2754
 #: modules/gui/macosx/playlist.m:195 modules/gui/macosx/playlist.m:199
 msgid "Delete"
@@ -3807,6 +3782,14 @@ msgstr ""
 msgid "AVI"
 msgstr ""
 
+#: modules/gui/gtk/gnome_support.c:100 modules/gui/gtk/gnome_support.c:138
+#: modules/gui/gtk/gtk_support.c:121 modules/gui/gtk2/gnome2_support.c:60
+#: modules/gui/gtk2/gnome2_support.c:85 modules/gui/gtk2/gtk2_support.c:90
+#: modules/gui/gtk2/gtk2_support.c:114 modules/gui/pda/support.c:121
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr ""
+
 #: modules/gui/gtk/gnome_support.c:116
 #, c-format
 msgid "Couldn't create pixmap from file: %s"
@@ -3920,10 +3903,11 @@ msgstr ""
 #: modules/gui/gtk/gtk_interface.c:2403 modules/gui/gtk/gtk_interface.c:2645
 #: modules/gui/gtk/gtk_interface.c:2876 modules/gui/gtk/gtk_interface.c:3257
 #: modules/gui/gtk/preferences.c:618 modules/gui/macosx/open.m:140
-#: modules/gui/macosx/prefs.m:79 modules/gui/wxwindows/open.cpp:247
+#: modules/gui/macosx/prefs.m:79 modules/gui/macosx/prefs.m:170
+#: modules/gui/wxwindows/open.cpp:247
 #: modules/gui/wxwindows/preferences.cpp:256
 #: modules/gui/wxwindows/streamout.cpp:220
-#: modules/gui/wxwindows/subtitles.cpp:152
+#: modules/gui/wxwindows/subtitles.cpp:193
 msgid "Cancel"
 msgstr ""
 
@@ -3955,12 +3939,17 @@ msgstr ""
 msgid "_Select"
 msgstr ""
 
-#: modules/gui/gtk/menu.c:900
+#: modules/gui/gtk/gtk_support.c:130 modules/gui/pda/support.c:130
+#, c-format
+msgid "Error loading pixmap file: %s"
+msgstr ""
+
+#: modules/gui/gtk/menu.c:901
 #, c-format
 msgid "Title %d (%d)"
 msgstr ""
 
-#: modules/gui/gtk/menu.c:967
+#: modules/gui/gtk/menu.c:968
 #, c-format
 msgid "Chapter %d"
 msgstr ""
@@ -4112,8 +4101,9 @@ msgstr ""
 msgid "VLC - Controller"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/interface.cpp:904
-#: modules/gui/wxwindows/timer.cpp:131
+#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/control.cpp:160
+#: modules/gui/wxwindows/control.cpp:370
+#: modules/gui/wxwindows/interface.cpp:904 modules/gui/wxwindows/timer.cpp:131
 msgid "Volume"
 msgstr ""
 
@@ -4357,6 +4347,12 @@ msgstr ""
 msgid "TTL"
 msgstr ""
 
+#: modules/gui/macosx/output.m:136 modules/gui/macosx/output.m:236
+#: modules/gui/macosx/output.m:311 modules/gui/pda/interface.c:480
+#: modules/gui/wxwindows/streamout.cpp:386
+msgid "HTTP"
+msgstr ""
+
 #: modules/gui/macosx/output.m:141 modules/gui/wxwindows/streamout.cpp:531
 msgid "Encapsulation Method"
 msgstr ""
@@ -4414,6 +4410,10 @@ msgstr ""
 msgid "Reset Preferences"
 msgstr ""
 
+#: modules/gui/macosx/prefs.m:170
+msgid "Continue"
+msgstr ""
+
 #: modules/gui/macosx/prefs.m:172 modules/gui/wxwindows/preferences.cpp:316
 msgid ""
 "Beware this will reset your VLC Media Player config file.\n"
@@ -4432,10 +4432,119 @@ msgstr ""
 msgid "ncurses interface"
 msgstr ""
 
+#: modules/gui/pda/interface.c:126 modules/gui/wxwindows/dialogs.cpp:268
+#: modules/gui/wxwindows/open.cpp:709
+#: modules/gui/wxwindows/preferences.cpp:1029
+#: modules/gui/wxwindows/subtitles.cpp:234
+msgid "Open file"
+msgstr ""
+
+#: modules/gui/pda/interface.c:166
+msgid "Rewind"
+msgstr ""
+
+#: modules/gui/pda/interface.c:167
+msgid "Rewind stream"
+msgstr ""
+
+#: modules/gui/pda/interface.c:180
+msgid "Pause stream"
+msgstr ""
+
+#: modules/gui/pda/interface.c:193
+msgid "Play stream"
+msgstr ""
+
+#: modules/gui/pda/interface.c:206
+msgid "Stop stream"
+msgstr ""
+
+#: modules/gui/pda/interface.c:218
+msgid "Forward"
+msgstr ""
+
+#: modules/gui/pda/interface.c:219
+msgid "Forward stream"
+msgstr ""
+
+#: modules/gui/pda/interface.c:295
+msgid "MRL :"
+msgstr ""
+
 #: modules/gui/pda/interface.c:396
 msgid "UDP/RTP (Adress when Multicast)"
 msgstr ""
 
+#: modules/gui/pda/interface.c:490
+msgid "FTP"
+msgstr ""
+
+#: modules/gui/pda/interface.c:500
+msgid "MMS"
+msgstr ""
+
+#: modules/gui/pda/interface.c:526
+msgid "Media"
+msgstr ""
+
+#: modules/gui/pda/interface.c:562
+msgid "MRL"
+msgstr ""
+
+#: modules/gui/pda/interface.c:571
+msgid "Time"
+msgstr ""
+
+#: modules/gui/pda/interface.c:588
+msgid "Update"
+msgstr ""
+
+#: modules/gui/pda/interface.c:596
+msgid " Del "
+msgstr ""
+
+#: modules/gui/pda/interface.c:604
+msgid " Clear "
+msgstr ""
+
+#: modules/gui/pda/interface.c:628
+msgid "Automatically play file"
+msgstr ""
+
+#: modules/gui/pda/interface.c:645
+msgid " Save "
+msgstr ""
+
+#: modules/gui/pda/interface.c:653
+msgid " Apply "
+msgstr ""
+
+#: modules/gui/pda/interface.c:661
+msgid " Cancel "
+msgstr ""
+
+#: modules/gui/pda/interface.c:669
+msgid "Preference"
+msgstr ""
+
+#: modules/gui/pda/interface.c:723
+msgid "Authors: The VideoLAN Team, http://www.videolan.org"
+msgstr ""
+
+#: modules/gui/pda/interface.c:755
+msgid ""
+"The VideoLAN Client is a MPEG, MPEG 2, MP3, DivX player, that accepts input "
+"from local or network sources."
+msgstr ""
+
+#: modules/gui/pda/pda.c:62
+msgid "Autoplay selected file"
+msgstr ""
+
+#: modules/gui/pda/pda.c:63
+msgid "Automatically play a file when selected in the file selection list"
+msgstr ""
+
 #: modules/gui/pda/pda.c:72
 msgid "PDA Linux Gtk2+ interface"
 msgstr ""
@@ -4716,7 +4825,7 @@ msgstr ""
 msgid "Capture the stream you are playing to a file"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:348 modules/gui/wxwindows/subtitles.cpp:98
+#: modules/gui/wxwindows/open.cpp:348 modules/gui/wxwindows/subtitles.cpp:100
 msgid "Subtitles file"
 msgstr ""
 
@@ -4732,7 +4841,7 @@ msgstr ""
 msgid "CD Audio"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:900 modules/gui/wxwindows/streamout.cpp:784
+#: modules/gui/wxwindows/open.cpp:903 modules/gui/wxwindows/streamout.cpp:784
 msgid "Save file"
 msgstr ""
 
@@ -4847,19 +4956,23 @@ msgstr ""
 msgid "Open Subtitles File"
 msgstr ""
 
-#: modules/gui/wxwindows/subtitles.cpp:115
+#: modules/gui/wxwindows/subtitles.cpp:123
+msgid "Subtitles encoding"
+msgstr ""
+
+#: modules/gui/wxwindows/subtitles.cpp:155
 msgid "Subtitles options"
 msgstr ""
 
-#: modules/gui/wxwindows/subtitles.cpp:119
+#: modules/gui/wxwindows/subtitles.cpp:159
 msgid "Delay subtitles (in 1/10s)"
 msgstr ""
 
-#: modules/gui/wxwindows/subtitles.cpp:130
+#: modules/gui/wxwindows/subtitles.cpp:170
 msgid "Frames per second"
 msgstr ""
 
-#: modules/gui/wxwindows/subtitles.cpp:138
+#: modules/gui/wxwindows/subtitles.cpp:178
 msgid "Override frames per second. It will only work with MicroDVD subtitles."
 msgstr ""
 
@@ -4924,27 +5037,27 @@ msgstr ""
 msgid "Using the dummy interface plugin..."
 msgstr ""
 
-#: modules/misc/freetype.c:67 modules/visualization/xosd/xosd.c:71
+#: modules/misc/freetype.c:72 modules/visualization/xosd/xosd.c:71
 msgid "Font"
 msgstr ""
 
-#: modules/misc/freetype.c:68
+#: modules/misc/freetype.c:73
 msgid "Filename of Font"
 msgstr ""
 
-#: modules/misc/freetype.c:69
+#: modules/misc/freetype.c:74
 msgid "Font size"
 msgstr ""
 
-#: modules/misc/freetype.c:70
+#: modules/misc/freetype.c:75
 msgid "The size of the fonts used by the osd module"
 msgstr ""
 
-#: modules/misc/freetype.c:73
+#: modules/misc/freetype.c:78
 msgid "Fonts"
 msgstr ""
 
-#: modules/misc/freetype.c:76
+#: modules/misc/freetype.c:81
 msgid "freetype2 font renderer"
 msgstr ""
 
@@ -5079,19 +5192,19 @@ msgstr ""
 msgid "Dummy muxer"
 msgstr ""
 
-#: modules/mux/mp4.c:52
+#: modules/mux/mp4.c:56
 msgid "MP4/MOV muxer"
 msgstr ""
 
-#: modules/mux/mpeg/ps.c:79
+#: modules/mux/mpeg/ps.c:53
 msgid "PS muxer"
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:138
+#: modules/mux/mpeg/ts.c:78
 msgid "TS muxer"
 msgstr ""
 
-#: modules/mux/mpeg/ts.c:143
+#: modules/mux/mpeg/ts.c:83
 msgid "TS muxer (libdvbpsi)"
 msgstr ""
 
@@ -5103,7 +5216,7 @@ msgstr ""
 msgid "A/52 audio packetizer"
 msgstr ""
 
-#: modules/packetizer/copy.c:69
+#: modules/packetizer/copy.c:43
 msgid "Copy packetizer"
 msgstr ""
 
@@ -5147,7 +5260,7 @@ msgstr ""
 msgid "Standard stream"
 msgstr ""
 
-#: modules/stream_out/transcode.c:71
+#: modules/stream_out/transcode.c:73
 msgid "Transcode stream"
 msgstr ""