Cosmetic.

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
index 4e4ca9c1f69a06e2c1ec67bf70d783f5cc0f8814..ea53cce1143b2071c9ea5b43ea5e083b3064224a 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
+++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
@@ -7,17 +7,12 @@
        <key>IBEditorPositions</key>
        <dict>
                <key>29</key>
-               <string>333 594 308 44 0 0 1152 746 </string>
+               <string>266 466 308 44 0 0 1152 746 </string>
                <key>303</key>
                <string>93 566 72 114 0 0 1600 1178 </string>
        </dict>
        <key>IBFramework Version</key>
        <string>291.0</string>
-       <key>IBOpenObjects</key>
-       <array>
-               <integer>29</integer>
-               <integer>636</integer>
-       </array>
        <key>IBSystem Version</key>
        <string>6G30</string>
 </dict>

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib
index 994a806900b37f5fe232b6b16986a3140246e2ba..ebd6c2884dc4c067ce1e7fa231aef1fa279e5a8f 100644 (file)
Binary files a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib and b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib differ

diff --git a/modules/demux/util/sub.h b/modules/demux/util/sub.h
index 58d4bc235e33aed445ec028c32403b9c9626906e..3c772d236ce51899cbd9d06bae1e33e567f119b5 100644 (file)
--- a/modules/demux/util/sub.h
+++ b/modules/demux/util/sub.h
@@ -2,7 +2,7 @@
  * sub.h
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: sub.h,v 1.1 2002/11/15 18:10:26 fenrir Exp $
+ * $Id: sub.h,v 1.2 2003/01/02 23:50:55 massiot Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  * 
@@ -144,7 +144,7 @@ static inline
     }
     else
     {
-        msg_Err( p_input, "failed to start subtitle demux" );
+        msg_Warn( p_input, "failed to start subtitle demux" );
         if( p_sub->p_module )
         {
             module_Unneed( p_sub, p_sub->p_module );

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index adb84b398df4532a4f19f4e0a12303159a78633f..e380cd596e2ae267218f263ee1a3be2b3a031681 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -2,7 +2,7 @@
  * intf.m: MacOS X interface plugin
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: intf.m,v 1.15 2003/01/02 23:09:30 massiot Exp $
+ * $Id: intf.m,v 1.16 2003/01/02 23:50:55 massiot Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -218,7 +218,7 @@ static void Run( intf_thread_t *p_intf )
     [o_mi_stop setTitle: _NS("Stop")];
     [o_mi_faster setTitle: _NS("Faster")];
     [o_mi_slower setTitle: _NS("Slower")];
-    [o_mi_previous setTitle: _NS("Prev")];
+    [o_mi_previous setTitle: _NS("Previous")];
     [o_mi_next setTitle: _NS("Next")];
     [o_mi_loop setTitle: _NS("Loop")];
     [o_mi_vol_up setTitle: _NS("Louder")];

diff --git a/modules/misc/network/ipv4.c b/modules/misc/network/ipv4.c
index 96ff9dbfb298173aa2b4bc6a6dfb002564c5ab83..5d96b1c41a1e479cd529f03b84722e2574807dfd 100644 (file)
--- a/modules/misc/network/ipv4.c
+++ b/modules/misc/network/ipv4.c
@@ -2,7 +2,7 @@
  * ipv4.c: IPv4 network abstraction layer
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: ipv4.c,v 1.10 2002/12/16 16:48:04 gbazin Exp $
+ * $Id: ipv4.c,v 1.11 2003/01/02 23:50:55 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Mathias Kretschmer <mathias@research.att.com>
@@ -319,10 +319,10 @@ static int OpenUDP( vlc_object_t * p_this, network_socket_t * p_socket )
                         (char*)&imr, sizeof(struct ip_mreq) ) == -1 )
         {
 #ifdef HAVE_ERRNO_H
-            msg_Err( p_this, "failed to join IP multicast group (%s)",
-                             strerror(errno) );
+            msg_Warn( p_this, "failed to join IP multicast group (%s)",
+                              strerror(errno) );
 #else
-            msg_Err( p_this, "failed to join IP multicast group" );
+            msg_Warn( p_this, "failed to join IP multicast group" );
 #endif
 #if defined( WIN32 ) || defined( UNDER_CE )
             closesocket( i_handle );

diff --git a/modules/misc/sap.c b/modules/misc/sap.c
index e4d0fc38b96ae14caeae4d59918c50a6717aa696..f5837ae54ea704e7a6ca398589a9406b0fb591cb 100644 (file)
--- a/modules/misc/sap.c
+++ b/modules/misc/sap.c
@@ -2,7 +2,7 @@
  * sap.c :  SAP interface module
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: sap.c,v 1.5 2002/12/10 00:02:29 gitan Exp $
+ * $Id: sap.c,v 1.6 2003/01/02 23:50:55 massiot Exp $
  *
  * Authors: Arnaud Schauly <gitan@via.ecp.fr>
  *
@@ -186,7 +186,7 @@ static void Run( intf_thread_t *p_intf )
 
     if( !( p_network = module_Need( p_intf, "network", psz_network ) ) )
     {
-        msg_Err( p_intf, "failed to open a connection (udp)" );
+        msg_Warn( p_intf, "failed to open a connection (udp)" );
         return;
     }
     module_Unneed( p_intf, p_network );

diff --git a/src/misc/modules.c b/src/misc/modules.c
index 44c5763ebd5066a81484825efd7bb3ec4d16c050..886ae683457f58cecfcb8974b0a41d4a965b77a1 100644 (file)
--- a/src/misc/modules.c
+++ b/src/misc/modules.c
@@ -2,7 +2,7 @@
  * modules.c : Builtin and plugin modules management functions
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: modules.c,v 1.108 2002/12/13 01:56:30 gbazin Exp $
+ * $Id: modules.c,v 1.109 2003/01/02 23:50:55 massiot Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Ethan C. Baldridge <BaldridgeE@cadmus.com>
@@ -496,8 +496,8 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability,
     }
     else if( psz_name != NULL && *psz_name )
     {
-        msg_Err( p_this, "no %s module matching \"%s\" could be loaded",
-                 psz_capability, (psz_name && *psz_name) ? psz_name : "any" );
+        msg_Warn( p_this, "no %s module matching \"%s\" could be loaded",
+                  psz_capability, (psz_name && *psz_name) ? psz_name : "any" );
     }
 
     if( psz_shortcuts )