* ./po/ja.po: added Japanese translation from Fumio Nakayama
    <endymion@ca2.so-net.ne.jp>.
  * ./plugins/gtk/gtk_callbacks.c: fixed disc ejection code.
  * ./ChangeLog: how about a nice cup of 870 lines of ChangeLog for the 0.3.0
    release?

AUTHORS

@@ -240,6 +240,10 @@ N: Arkadiusz Miskiewicz
 E: misiek@pld.ORG.PL
 D: autoconf and Makefile patches
 
+N: Fumio Nakayama
+E: endymion@ca2.so-net.ne.jp
+D: Japanese translation
+
 N: Florian G. Pflug
 E: fgp@phlo.org
 C: fgp

configure

@@ -1235,7 +1235,7 @@ else
   VLC_MAKE="gmake"
 fi
 
-ALL_LINGUAS="de fr no ru nl"
+ALL_LINGUAS="de fr ja no ru nl"
 
 cat >> confdefs.h <<EOF
 #define PACKAGE "vlc"

configure.in

@@ -51,7 +51,7 @@ else
 fi
 
 dnl Gettext stuff
-ALL_LINGUAS="de fr no ru nl"
+ALL_LINGUAS="de fr ja no ru nl"
 
 AC_DEFINE_UNQUOTED(PACKAGE, "vlc")
 AC_DEFINE_UNQUOTED(VERSION, "$VLC_VERSION")

plugins/gtk/gtk_callbacks.c

@@ -2,7 +2,7 @@
  * gtk_callbacks.c : Callbacks for the Gtk+ plugin.
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: gtk_callbacks.c,v 1.34 2002/03/25 02:06:24 jobi Exp $
+ * $Id: gtk_callbacks.c,v 1.35 2002/04/03 02:43:14 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Stphane Borel <stef@via.ecp.fr>
@@ -480,48 +480,74 @@ void GtkMessagesActivate( GtkMenuItem * menuitem, gpointer user_data )
 gboolean GtkDiscEject ( GtkWidget *widget, GdkEventButton *event,
                         gpointer user_data )
 {
-  char *psz_device = NULL;
-
-  /*
-   * Get the active input
-   * Determine whether we can eject a media, ie it's a VCD or DVD
-   * If it's neither a VCD nor a DVD, then return
-   */
-
-  /*
-   * Don't really know if I must lock the stuff here, we're using it read-only
-   */
-
-  if (p_main->p_playlist->current.psz_name != NULL)
-  {
-      if (strncmp(p_main->p_playlist->current.psz_name, "dvd", 3)
-          || strncmp(p_main->p_playlist->current.psz_name, "vcd", 3))
-      {
-          /* Determine the device name by omitting the first 4 characters */
-          psz_device = strdup((p_main->p_playlist->current.psz_name + 4));
-      }
-  }
-
-  if( psz_device == NULL )
-  {
-      return TRUE;
-  }
-
-  /* If there's a stream playing, we aren't allowed to eject ! */
-  if( p_input_bank->pp_input[0] == NULL )
-  {
-      intf_WarnMsg( 4, "intf: ejecting %s", psz_device );
-
-      intf_Eject( psz_device );
-  }
-
-  free(psz_device);
-  return TRUE;
+    char *psz_device = NULL;
+
+    /*
+     * Get the active input
+     * Determine whether we can eject a media, ie it's a VCD or DVD
+     * If it's neither a VCD nor a DVD, then return
+     */
+
+    /*
+     * Don't really know if I must lock the stuff here, we're using it read-only
+     */
+
+    if (p_main->p_playlist->current.psz_name != NULL)
+    {
+        if( !strncmp(p_main->p_playlist->current.psz_name, "dvd:", 4) )
+        {
+            switch( p_main->p_playlist->current.psz_name[4] )
+            {
+            case '\0':
+            case '@':
+                psz_device = strdup( DVD_DEVICE );
+                break;
+            default:
+                /* Omit the first 4 characters */
+                psz_device = strdup( p_main->p_playlist->current.psz_name + 4 );
+                break;
+            }
+        }
+        else if( !strncmp(p_main->p_playlist->current.psz_name, "vcd:", 4) )
+        {
+            switch( p_main->p_playlist->current.psz_name[4] )
+            {
+            case '\0':
+            case '@':
+                psz_device = strdup( VCD_DEVICE );
+                break;
+            default:
+                /* Omit the first 4 characters */
+                psz_device = strdup( p_main->p_playlist->current.psz_name + 4 );
+                break;
+            }
+        }
+        else
+        {
+            psz_device = strdup( p_main->p_playlist->current.psz_name );
+        }
+    }
+
+    if( psz_device == NULL )
+    {
+        return TRUE;
+    }
+
+    /* If there's a stream playing, we aren't allowed to eject ! */
+    if( p_input_bank->pp_input[0] == NULL )
+    {
+        intf_WarnMsg( 4, "intf: ejecting %s", psz_device );
+
+        intf_Eject( psz_device );
+    }
+
+    free(psz_device);
+    return TRUE;
 }
 
 void GtkEjectDiscActivate ( GtkMenuItem *menuitem, gpointer user_data )
 {
-  GtkDiscEject( GTK_WIDGET( menuitem ), NULL, user_data );
+    GtkDiscEject( GTK_WIDGET( menuitem ), NULL, user_data );
 }
 
 /****************************************************************************