* Bumped up revision number to 0.5.0-test2,

* MacOS X port: new error dialog displaying error messages,
* Updated localization files,
* Comestic fixes.

configure.ac.in

@@ -11,7 +11,7 @@ AC_CANONICAL_SYSTEM
 
 dnl XXX: we don't put any flags here, because automake 1.5 doesn't support
 dnl them. And we need the comma otherwize automake will choke on it.
-AM_INIT_AUTOMAKE(vlc,0.5.0-cvs)
+AM_INIT_AUTOMAKE(vlc,0.5.0-test2)
 AM_CONFIG_HEADER(config.h)
 
 dnl

extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib

@@ -32,6 +32,7 @@
         {
             ACTIONS = {
                 clearRecentItems = id; 
+                closeError = id; 
                 openRecentItem = id; 
                 timesliderUpdate = id; 
                 viewPreferences = id; 
@@ -52,12 +53,19 @@
                 "o_dmi_pause" = id; 
                 "o_dmi_play" = id; 
                 "o_dmi_stop" = id; 
+                "o_err_btn_dismiss" = id; 
+                "o_err_btn_msgs" = id; 
+                "o_err_bug_lbl" = id; 
+                "o_err_lbl" = id; 
+                "o_err_msg" = id; 
+                "o_error" = id; 
                 "o_messages" = id; 
                 "o_mi_about" = id; 
                 "o_mi_bring_atf" = id; 
                 "o_mi_channels" = id; 
                 "o_mi_chapter" = id; 
                 "o_mi_clear" = id; 
+                "o_mi_close_window" = id; 
                 "o_mi_copy" = id; 
                 "o_mi_cut" = id; 
                 "o_mi_deinterlace" = id; 

extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib

@@ -7,7 +7,7 @@
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>29</key>
-		<string>407 753 308 44 0 0 1600 1178 </string>
+		<string>355 598 308 44 0 0 1152 746 </string>
 		<key>303</key>
 		<string>93 566 72 114 0 0 1600 1178 </string>
 		<key>909</key>
@@ -19,6 +19,7 @@
 	<string>291.0</string>
 	<key>IBOpenObjects</key>
 	<array>
+		<integer>29</integer>
 		<integer>636</integer>
 	</array>
 	<key>IBSystem Version</key>

extras/MacOSX/vlc.pbproj/project.pbxproj

@@ -7,7 +7,7 @@
 	objects = {
 		014CEA410018CDE011CA2923 = {
 			isa = PBXBundleReference;
-			path = vlc.bundle;
+			path = "VLC Media Player.bundle";
 			refType = 3;
 		};
 		014CEA420018CDE011CA2923 = {
@@ -44,6 +44,7 @@
 				014CEA420018CDE011CA2923,
 				014CEA430018CDE011CA2923,
 			);
+			hasScannedForEncodings = 1;
 			isa = PBXProject;
 			mainGroup = 089C166AFE841209C02AAC07;
 			projectDirPath = "";
@@ -93,7 +94,7 @@
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = "";
 				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = vlc;
+				PRODUCT_NAME = "VLC Media Player";
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
 				WRAPPER_EXTENSION = bundle;
@@ -195,12 +196,14 @@
 	<string>org.videolan.vlc</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>VLC Media Player</string>
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleSignature</key>
 	<string>VLC#</string>
 	<key>CFBundleVersion</key>
-	<string>0.5.0</string>
+	<string>0.5.0-test2</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
@@ -208,7 +211,6 @@
 </dict>
 </plist>
 ";
-			shouldUseHeadermap = 1;
 		};
 		089C1674FE841209C02AAC07 = {
 			buildActionMask = 2147483647;
@@ -361,6 +363,7 @@
 			refType = 4;
 		};
 		F69B0CA702E24F6401A80112 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
 			name = English;
 			path = Resources/English.lproj/InfoPlist.strings;

modules/gui/macosx/intf.h

@@ -2,7 +2,7 @@
  * intf.h: MacOS X interface plugin
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: intf.h,v 1.11 2003/01/05 16:23:57 massiot Exp $
+ * $Id: intf.h,v 1.12 2003/01/06 22:07:47 massiot Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -111,6 +111,13 @@ struct intf_sys_t
     IBOutlet id o_msgs_panel;   /* messages panel */
     IBOutlet id o_msgs_btn_ok;  /* messages btn   */
 
+    IBOutlet id o_error;        /* error panel    */
+    IBOutlet id o_err_msg;      /* NSTextView     */
+    IBOutlet id o_err_lbl;
+    IBOutlet id o_err_bug_lbl;
+    IBOutlet id o_err_btn_msgs; /* Open Messages  */
+    IBOutlet id o_err_btn_dismiss;
+
     /* main menu */
 
     IBOutlet id o_mi_about;
@@ -196,6 +203,8 @@ struct intf_sys_t
 - (IBAction)timesliderUpdate:(id)sender;
 - (void)displayTime;
 
+- (IBAction)closeError:(id)sender;
+
 @end
 
 @interface VLCMain (Internal)

modules/gui/macosx/intf.m

@@ -2,7 +2,7 @@
  * intf.m: MacOS X interface plugin
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: intf.m,v 1.19 2003/01/05 16:23:57 massiot Exp $
+ * $Id: intf.m,v 1.20 2003/01/06 22:07:47 massiot Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -199,12 +199,12 @@ static void Run( intf_thread_t *p_intf )
     [o_msgs_btn_ok setTitle: _NS("Close")];
 
     /* main menu */
-    [o_mi_about setTitle: _NS("About vlc")];
+    [o_mi_about setTitle: _NS("About VLC Media Player")];
     [o_mi_prefs setTitle: _NS("Preferences")];
-    [o_mi_hide setTitle: _NS("Hide vlc")];
+    [o_mi_hide setTitle: _NS("Hide VLC")];
     [o_mi_hide_others setTitle: _NS("Hide Others")];
     [o_mi_show_all setTitle: _NS("Show All")];
-    [o_mi_quit setTitle: _NS("Quit vlc")];
+    [o_mi_quit setTitle: _NS("Quit VLC")];
 
     [o_mu_file setTitle: _NS("File")];
     [o_mi_open_generic setTitle: _NS("Open...")];
@@ -258,6 +258,13 @@ static void Run( intf_thread_t *p_intf )
     [o_dmi_pause setTitle: _NS("Pause")];
     [o_dmi_stop setTitle: _NS("Stop")];
 
+    /* error panel */
+    [o_error setTitle: _NS("Error")];
+    [o_err_lbl setStringValue: _NS("An error has occurred which probably prevented the execution of your request :")];
+    [o_err_bug_lbl setStringValue: _NS("If you believe that it is a bug, please follow the instructions at :")];
+    [o_err_btn_msgs setTitle: _NS("Open Messages Window")];
+    [o_err_btn_dismiss setTitle: _NS("Dismiss")];
+
     [self manageMode];
 }
 
@@ -309,7 +316,7 @@ static void Run( intf_thread_t *p_intf )
             p_intf->p_sys->p_input = NULL;
         }
 
-        if( p_intf->p_sys->p_input != NULL )
+        if( p_intf->p_sys->p_input != NULL && !p_intf->p_sys->p_input->b_die )
         {
             vlc_bool_t b_need_menus = 0;
             input_thread_t * p_input = p_intf->p_sys->p_input;
@@ -323,24 +330,21 @@ static void Run( intf_thread_t *p_intf )
 
             vlc_mutex_lock( &p_input->stream.stream_lock );
 
-            if( !p_input->b_die )
-            {
-                [self displayTime];
+            [self displayTime];
 
-                /* New input or stream map change */
-                if( p_input->stream.b_changed )
-                {
-                    [self manageMode];
-                    b_need_menus = 1;
-                    p_intf->p_sys->b_playing = 1;
-                }
+            /* New input or stream map change */
+            if( p_input->stream.b_changed )
+            {
+                [self manageMode];
+                b_need_menus = 1;
+                p_intf->p_sys->b_playing = 1;
+            }
 
-                if( p_intf->p_sys->i_part !=
-                    p_input->stream.p_selected_area->i_part )
-                {
-                    p_intf->p_sys->b_chapter_update = 1;
-                    b_need_menus = 1;
-                }
+            if( p_intf->p_sys->i_part !=
+                p_input->stream.p_selected_area->i_part )
+            {
+                p_intf->p_sys->b_chapter_update = 1;
+                b_need_menus = 1;
             }
 
             if ( p_aout != NULL )
@@ -442,6 +446,23 @@ static void Run( intf_thread_t *p_intf )
                 [o_messages insertText: o_msg_color];
 
                 [o_messages insertText: @"\n"];
+
+                if ( i_type == 1 )
+                {
+                    /* Error panel */
+                    NSString *o_my_msg =
+                        [NSString stringWithFormat: @"%s: %s\n",
+                         p_intf->p_sys->p_sub->p_msg[i_start].psz_module,
+                         p_intf->p_sys->p_sub->p_msg[i_start].psz_msg];
+
+                    [o_err_msg setEditable: YES];
+                    [o_err_msg setSelectedRange:
+                                NSMakeRange( [[o_err_msg string] length], 0 )];
+                    [o_err_msg insertText: o_my_msg];
+
+                    [o_error makeKeyAndOrderFront: self];
+                    [o_err_msg setEditable: NO];
+                }
             }
 
             [o_messages setEditable: NO];
@@ -1058,6 +1079,17 @@ static void Run( intf_thread_t *p_intf )
 #undef p_area
 }
 
+- (IBAction)closeError:(id)sender
+{
+    /* Error panel */
+    [o_err_msg setEditable: YES];
+    [o_err_msg setSelectedRange:
+                NSMakeRange( 0, [[o_err_msg string] length] )];
+    [o_err_msg insertText: @""];
+    [o_err_msg setEditable: NO];
+    [o_error performClose: self];
+}
+
 @end
 
 @implementation VLCMain (NSMenuValidation)

modules/gui/macosx/open.m

@@ -2,7 +2,7 @@
  * open.m: MacOS X plugin for vlc
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: open.m,v 1.7 2003/01/06 02:45:09 massiot Exp $
+ * $Id: open.m,v 1.8 2003/01/06 22:07:47 massiot Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net> 
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -167,7 +167,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
         free(psz_sout);
     }
 
-    [o_panel setTitle: _NS("Open Target")];
+    [o_panel setTitle: _NS("Open Source")];
     [o_mrl_lbl setTitle: _NS("Media Resource Locator (MRL)")];
 
     [o_btn_ok setTitle: _NS("OK")];

po/de.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vlc 0.73.3\n"
-"POT-Creation-Date: 2002-12-31 00:38+0100\n"
+"POT-Creation-Date: 2003-01-06 22:35+0100\n"
 "PO-Revision-Date: 2002-04-18 23:38+0100\n"
 "Last-Translator: Thomas Graf <tgr@reeler.org>\n"
 "Language-Team: \n"
@@ -26,15 +26,15 @@ msgid ""
 "\n"
 msgstr "Usage: %s [Optionen] [Date]...\n"
 
-#: src/libvlc.c:1113 src/misc/configuration.c:880
+#: src/libvlc.c:1113 src/misc/configuration.c:916
 msgid "string"
 msgstr "text"
 
-#: src/libvlc.c:1131 src/misc/configuration.c:865
+#: src/libvlc.c:1131 src/misc/configuration.c:901
 msgid "integer"
 msgstr "zahl"
 
-#: src/libvlc.c:1134 src/misc/configuration.c:872
+#: src/libvlc.c:1134 src/misc/configuration.c:908
 msgid "float"
 msgstr "gleitpunktzahl"
 
@@ -802,7 +802,7 @@ msgid "Decoders"
 msgstr "Dekoder"
 
 #. Stream output options
-#: src/libvlc.h:503
+#: src/libvlc.h:503 modules/gui/macosx/open.m:210
 msgid "Stream output"
 msgstr ""
 
@@ -815,15 +815,15 @@ msgstr "Prozessor"
 #: src/libvlc.h:526 modules/gui/gtk/gnome_interface.c:512
 #: modules/gui/gtk/gnome_interface.c:2083
 #: modules/gui/gtk/gnome_interface.c:2108 modules/gui/gtk/gtk_interface.c:627
-#: modules/gui/gtk/gtk_interface.c:2364 modules/gui/macosx/intf.m:213
-#: modules/gui/macosx/playlist.m:69
+#: modules/gui/gtk/gtk_interface.c:2364 modules/gui/macosx/intf.m:187
+#: modules/gui/macosx/intf.m:225
 msgid "Playlist"
 msgstr "Abspielliste"
 
 #. Misc options
 #: src/libvlc.h:533 modules/audio_filter/converter/a52tofloat32.c:84
 #: modules/codec/a52old/a52old.c:59 modules/codec/mpeg_video/parser.c:84
-#: modules/gui/familiar/familiar.c:67 modules/gui/win32/win32.cpp:259
+#: modules/gui/familiar/familiar.c:69 modules/gui/win32/win32.cpp:259
 #: modules/misc/logger/logger.c:85 modules/video_filter/clone.c:55
 #: modules/video_filter/crop.c:58
 #: modules/video_filter/deinterlace/deinterlace.c:69
@@ -859,7 +859,7 @@ msgstr "Hilfe
 msgid "print version information"
 msgstr "Versionsinformationen ausgeben."
 
-#: src/misc/configuration.c:865
+#: src/misc/configuration.c:901
 msgid "boolean"
 msgstr "boolesch"
 
@@ -1547,192 +1547,208 @@ msgstr "BeOS Standard API Modul"
 #. ****************************************************************************
 #. * Module descriptor
 #. ****************************************************************************
-#: modules/gui/familiar/familiar.c:59
+#: modules/gui/familiar/familiar.c:61
 msgid "autoplay selected file"
 msgstr ""
 
-#: modules/gui/familiar/familiar.c:60
+#: modules/gui/familiar/familiar.c:62
 msgid "automatically play a file when selected in the file selection list"
 msgstr ""
 
-#: modules/gui/familiar/familiar.c:69
+#: modules/gui/familiar/familiar.c:71
 #, fuzzy
 msgid "Familiar Linux Gtk+ interface module"
 msgstr "Gtk+ Oberflche Modul"
 
-#: modules/gui/familiar/interface.c:69
+#: modules/gui/familiar/interface.c:70
 msgid "vlc (familiar)"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:93 modules/gui/macosx/open.m:559
-#: modules/gui/macosx/open.m:578 modules/gui/macosx/open.m:595
+#: modules/gui/familiar/interface.c:94 modules/gui/macosx/open.m:366
+#: modules/gui/macosx/open.m:533 modules/gui/macosx/open.m:794
 #, fuzzy
 msgid "Open"
 msgstr "Datei ffnen"
 
-#: modules/gui/familiar/interface.c:94
+#: modules/gui/familiar/interface.c:95
 #, fuzzy
 msgid "Open file"
 msgstr "Datei ffnen"
 
-#: modules/gui/familiar/interface.c:106 modules/gui/familiar/interface.c:107
-#: modules/gui/macosx/intf.m:191 modules/gui/macosx/prefs.m:196
+#: modules/gui/familiar/interface.c:107 modules/gui/familiar/interface.c:108
+#: modules/gui/macosx/intf.m:195 modules/gui/macosx/intf.m:203
+#: modules/gui/macosx/prefs.m:196
 #, fuzzy
 msgid "Preferences"
 msgstr "_Einstellungen"
 
-#: modules/gui/familiar/interface.c:121
+#: modules/gui/familiar/interface.c:122
 msgid "Rewind"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:122
+#: modules/gui/familiar/interface.c:123
 #, fuzzy
 msgid "Rewind stream"
 msgstr "Stream ffnen"
 
-#: modules/gui/familiar/interface.c:134 modules/gui/gtk/gnome_interface.c:471
+#: modules/gui/familiar/interface.c:135 modules/gui/gtk/gnome_interface.c:471
 #: modules/gui/gtk/gnome_interface.c:845 modules/gui/gtk/gtk_interface.c:589
-#: modules/gui/gtk/gtk_interface.c:1008 modules/gui/macosx/intf.m:218
-#: modules/gui/macosx/intf.m:244 modules/gui/macosx/controls.m:440
+#: modules/gui/gtk/gtk_interface.c:1008 modules/gui/macosx/intf.m:191
+#: modules/gui/macosx/intf.m:230 modules/gui/macosx/intf.m:258
+#: modules/gui/macosx/controls.m:409
 msgid "Pause"
 msgstr "Pause"
 
-#: modules/gui/familiar/interface.c:135
+#: modules/gui/familiar/interface.c:136
 #, fuzzy
 msgid "Pause stream"
 msgstr "Stream pausieren"
 
 #. dock menu
-#: modules/gui/familiar/interface.c:147 modules/gui/gtk/gnome_interface.c:459
+#: modules/gui/familiar/interface.c:148 modules/gui/gtk/gnome_interface.c:459
 #: modules/gui/gtk/gnome_interface.c:838 modules/gui/gtk/gtk_interface.c:578
-#: modules/gui/macosx/intf.m:217 modules/gui/macosx/intf.m:243
+#: modules/gui/macosx/intf.m:190 modules/gui/macosx/intf.m:229
+#: modules/gui/macosx/intf.m:257 modules/gui/macosx/playlist.m:67
 msgid "Play"
 msgstr "Abspielen"
 
-#: modules/gui/familiar/interface.c:148
+#: modules/gui/familiar/interface.c:149
 #, fuzzy
 msgid "Play stream"
 msgstr "Stream abspielen"
 
-#: modules/gui/familiar/interface.c:160 modules/gui/gtk/gnome_interface.c:435
+#: modules/gui/familiar/interface.c:161 modules/gui/gtk/gnome_interface.c:435
 #: modules/gui/gtk/gnome_interface.c:852 modules/gui/gtk/gtk_interface.c:556
-#: modules/gui/gtk/gtk_interface.c:1016 modules/gui/macosx/intf.m:219
-#: modules/gui/macosx/intf.m:245 modules/gui/macosx/controls.m:457
+#: modules/gui/gtk/gtk_interface.c:1016 modules/gui/macosx/intf.m:192
+#: modules/gui/macosx/intf.m:231 modules/gui/macosx/intf.m:259
+#: modules/gui/macosx/controls.m:426
 msgid "Stop"
 msgstr "Stop"
 
-#: modules/gui/familiar/interface.c:161
+#: modules/gui/familiar/interface.c:162
 #, fuzzy
 msgid "Stop stream"
 msgstr "Stream stoppen"
 
-#: modules/gui/familiar/interface.c:173
+#: modules/gui/familiar/interface.c:174
 msgid "Forward"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:174
+#: modules/gui/familiar/interface.c:175
 msgid "Forward stream"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:188 modules/gui/familiar/interface.c:189
-#: modules/gui/familiar/interface.c:448 modules/gui/gtk/gtk_interface.c:1341
+#: modules/gui/familiar/interface.c:189 modules/gui/familiar/interface.c:190
+#: modules/gui/familiar/interface.c:463 modules/gui/gtk/gtk_interface.c:1341
 msgid "About"
 msgstr "ber uns"
 
-#: modules/gui/familiar/interface.c:222
-msgid "URL:"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:241 modules/gui/familiar/interface.c:255
-#, fuzzy
-msgid "file://"
-msgstr "Titel:"
-
-#: modules/gui/familiar/interface.c:242
-msgid "ftp://"
+#: modules/gui/familiar/interface.c:198
+msgid "0:00:00"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:243
-msgid "http://"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:244
-msgid "udp://:1234"
-msgstr ""
-
-#: modules/gui/familiar/interface.c:245
-msgid "udpstream://@:1234"
+#: modules/gui/familiar/interface.c:235
+msgid "URL:"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:281 modules/gui/gtk/preferences.c:317
+#: modules/gui/familiar/interface.c:269 modules/gui/gtk/preferences.c:321
 #: modules/gui/kde/pluginsbox.cpp:45
 msgid "Name"
 msgstr "Name"
 
-#: modules/gui/familiar/interface.c:289
+#: modules/gui/familiar/interface.c:277
 msgid "Type"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:297
+#: modules/gui/familiar/interface.c:285
 msgid "Size"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:305
+#: modules/gui/familiar/interface.c:293
 #, fuzzy
 msgid "User"
 msgstr "Schnell"
 
-#: modules/gui/familiar/interface.c:313
+#: modules/gui/familiar/interface.c:301
 #, fuzzy
 msgid "Group"
 msgstr "Krzen"
 
+#: modules/gui/familiar/interface.c:318 modules/gui/familiar/interface.c:334
+#, fuzzy
+msgid "file://"
+msgstr "Titel:"
+
+#: modules/gui/familiar/interface.c:319
+msgid "ftp://"
+msgstr ""
+
+#: modules/gui/familiar/interface.c:320
+msgid "http://"
+msgstr ""
+
 #: modules/gui/familiar/interface.c:321
+msgid "udp://:1234"
+msgstr ""
+
+#: modules/gui/familiar/interface.c:322
+msgid "udp6://:1234"
+msgstr ""
+
+#: modules/gui/familiar/interface.c:323
+msgid "rtp://:1234"
+msgstr ""
+
+#: modules/gui/familiar/interface.c:324
+msgid "rtp6://:1234"
+msgstr ""
+
+#: modules/gui/familiar/interface.c:336
 msgid "Media"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:337 modules/gui/gtk/preferences.c:548
-#: modules/gui/gtk/preferences.c:565
+#: modules/gui/familiar/interface.c:352 modules/gui/gtk/preferences.c:592
+#: modules/gui/gtk/preferences.c:609 modules/gui/macosx/open.m:707
 msgid "Save"
 msgstr "Speichern"
 
-#: modules/gui/familiar/interface.c:347 modules/gui/gtk/preferences.c:561
-#: modules/gui/macosx/prefs.m:551
+#: modules/gui/familiar/interface.c:362 modules/gui/gtk/preferences.c:605
+#: modules/gui/macosx/prefs.m:558
 msgid "Apply"
 msgstr "bernehmen"
 
-#: modules/gui/familiar/interface.c:357 modules/gui/gtk/gtk_interface.c:2084
+#: modules/gui/familiar/interface.c:372 modules/gui/gtk/gtk_interface.c:2084
 #: modules/gui/gtk/gtk_interface.c:2312 modules/gui/gtk/gtk_interface.c:2543
-#: modules/gui/gtk/preferences.c:569 modules/gui/macosx/prefs.m:547
-#: modules/gui/macosx/open.m:144
+#: modules/gui/gtk/preferences.c:613 modules/gui/macosx/prefs.m:554
+#: modules/gui/macosx/open.m:174
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: modules/gui/familiar/interface.c:367
+#: modules/gui/familiar/interface.c:382
 msgid "Automatically play file."
 msgstr ""
 
-#: modules/gui/familiar/interface.c:378
+#: modules/gui/familiar/interface.c:393
 #, fuzzy
 msgid "Preference"
 msgstr "_Einstellungen"
 
-#: modules/gui/familiar/interface.c:404
+#: modules/gui/familiar/interface.c:419
 #, fuzzy
 msgid ""
 "VideoLAN Client\n"
 " for familiar Linux"
 msgstr "VideoLAN Client"
 
-#: modules/gui/familiar/interface.c:415
+#: modules/gui/familiar/interface.c:430
 msgid "(c) 2002, the VideoLAN Team"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:425
+#: modules/gui/familiar/interface.c:440
 msgid "Authors: The VideoLAN Team, http://www.videolan.org"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:436
+#: modules/gui/familiar/interface.c:451
 msgid ""
 "The VideoLAN Client is a MPEG, MPEG 2, MP3, DivX player, that accepts input "
 "from local or network sources."
@@ -1919,8 +1935,10 @@ msgstr "VideoLAN Client"
 #: modules/gui/gtk/gnome_interface.c:1327
 #: modules/gui/gtk/gnome_interface.c:1973 modules/gui/gtk/gtk_interface.c:498
 #: modules/gui/gtk/gtk_interface.c:1615 modules/gui/gtk/gtk_interface.c:2400
-#: modules/gui/gtk/gtk_interface.c:2517 modules/gui/macosx/intf.m:197
-#: modules/gui/macosx/open.m:146 modules/gui/macosx/open.m:250
+#: modules/gui/gtk/gtk_interface.c:2517 modules/gui/macosx/intf.m:209
+#: modules/gui/macosx/open.m:176 modules/gui/macosx/open.m:212
+#: modules/gui/macosx/open.m:316 modules/gui/macosx/open.m:727
+#: modules/gui/macosx/open.m:759
 msgid "File"
 msgstr "Datei"
 
@@ -1928,8 +1946,8 @@ msgstr "Datei"
 #: modules/gui/gtk/gnome_interface.c:1438
 #: modules/gui/gtk/gnome_interface.c:1966 modules/gui/gtk/gtk_interface.c:509
 #: modules/gui/gtk/gtk_interface.c:696 modules/gui/gtk/gtk_interface.c:1726
-#: modules/gui/gtk/gtk_interface.c:2393 modules/gui/macosx/open.m:147
-#: modules/gui/macosx/open.m:254
+#: modules/gui/gtk/gtk_interface.c:2393 modules/gui/macosx/open.m:177