diff -ruN old/mc-4.5.48/VERSION new/mc-4.5.49/VERSION
--- old/mc-4.5.48/VERSION	Fri May 19 18:15:02 2000
+++ new/mc-4.5.49/VERSION	Wed May 24 14:30:28 2000
@@ -1 +1 @@
-#define VERSION "4.5.48"
+#define VERSION "4.5.49"
diff -ruN old/mc-4.5.48/configure new/mc-4.5.49/configure
--- old/mc-4.5.48/configure	Fri May 19 18:15:02 2000
+++ new/mc-4.5.49/configure	Wed May 24 14:30:28 2000
@@ -588,7 +588,7 @@
 
 
 PACKAGE=mc
-VERSION=4.5.48
+VERSION=4.5.49
 cat >> confdefs.h <<EOF
 #define PACKAGE "$PACKAGE"
 EOF
diff -ruN old/mc-4.5.48/configure.in new/mc-4.5.49/configure.in
--- old/mc-4.5.48/configure.in	Fri May 19 18:15:02 2000
+++ new/mc-4.5.49/configure.in	Wed May 24 14:30:28 2000
@@ -5,7 +5,7 @@
 AC_CONFIG_HEADER(config.h)
 
 PACKAGE=mc
-VERSION=4.5.48
+VERSION=4.5.49
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AC_SUBST(VERSION)
diff -ruN old/mc-4.5.48/gnome/ChangeLog new/mc-4.5.49/gnome/ChangeLog
--- old/mc-4.5.48/gnome/ChangeLog	Fri May 19 18:15:12 2000
+++ new/mc-4.5.49/gnome/ChangeLog	Wed May 24 14:30:33 2000
@@ -1,3 +1,8 @@
+2000-05-24  Arik Devens <arik@helixcode.com> and Ian Peters <itp@helixcode.com>
+
+	* gdesktop-init.c (desktop_load_init_from): don't crash on 
+	recreating icons, iterating over NULL pointer.
+
 2000-05-15 Andrew Post <apost@cbmi.upmc.edu>
 
 	* gdesktop.c (get_icon_snap_pos): Icons no longer count themselves
diff -ruN old/mc-4.5.48/gnome/gdesktop-init.c new/mc-4.5.49/gnome/gdesktop-init.c
--- old/mc-4.5.48/gnome/gdesktop-init.c	Fri May 19 18:15:13 2000
+++ new/mc-4.5.49/gnome/gdesktop-init.c	Wed May 24 14:30:34 2000
@@ -19,22 +19,22 @@
 static void
 desktop_load_init_from (const char *file)
 {
+	char *key;
+	char *file_and_section;
+	char *title, *type;
+
 	void *iterator_handle;
 	char *config_path = g_strconcat ("=", file, "=", NULL);
 
 	iterator_handle = gnome_config_init_iterator_sections (config_path);
 
-	do {
-		char *key;
-		char *file_and_section;
-		char *title, *type;
-
-		/* Get next section name */
-		iterator_handle = gnome_config_iterator_next (
-			iterator_handle, &key, NULL);
+	iterator_handle = gnome_config_iterator_next (
+		iterator_handle, &key, NULL);
 
+	do {
 		/* Now access the values in the section */
 		file_and_section = g_strconcat (config_path, "/", key, "/", NULL);
+
 		gnome_config_push_prefix (file_and_section);
 		title = gnome_config_get_translated_string ("title=None");
 		type = gnome_config_get_string ("type=url");
@@ -71,6 +71,11 @@
 		g_free (title);
 		g_free (file_and_section);
 		gnome_config_pop_prefix ();
+		
+		/* Get next section name */
+		iterator_handle = gnome_config_iterator_next (
+			iterator_handle, &key, NULL);
+
 	} while (iterator_handle);
 
 	g_free (config_path);
diff -ruN old/mc-4.5.48/lib/cedit.menu new/mc-4.5.49/lib/cedit.menu
--- old/mc-4.5.48/lib/cedit.menu	Fri May 19 18:15:05 2000
+++ new/mc-4.5.49/lib/cedit.menu	Wed Dec 31 19:00:00 1969
@@ -1,458 +0,0 @@
-shell_patterns=0    # expression type
-
-# The macros are:
-#
-# %i The indent of blank space, equal the cursor column 
-#    position. For edit menu only.
-# %y The syntax type of current file. For edit menu only.
-# %k The block file name.
-# %e The error file name.
-# %m The menu name.
-# %f The current file name.
-# %b The current file name without extension.
-# %x The extension of current file name.
-# %d The current directory name.
-# %F The current file in the unselected panel.
-# %D The directory name of the unselected panel.
-# %t The currently tagged files.
-# %T The tagged files in the unselected panel.
-# %u and %U Similar to the %t and %T macros, but in
-#    addition the files are untagged. You can use this macro
-#    only once per menu file entry or extension file entry,
-#    because next time there will be no tagged files.
-# %s and %S The selected files: The tagged files if
-#    there are any. Otherwise the current file.
-# 
-# %% The % character
-#
-# %{some text} Prompt for the substitution. An input box
-#    is shown and the text inside the braces is used as a
-#    prompt. The macro is substituted by the text typed by the
-#    user. The user can press ESC or F10 to cancel. This macro
-#    doesn't work on the command line yet.
-
-#----------------------- Begin [perl] language template -----------------------
-+ y Perl\ Program | f \.pl$
-1       Author description header
-        unset LANG
-        AUTHOR="$(cat /etc/passwd |grep ^$(id -un) |awk -F: '{print($5)}')"
-        cat >>%k <<EOF
-        #----------------------------------------------------------------------
-        # Description:
-        # Author: $AUTHOR <$(echo -ne $REPLYTO)>
-        # Created at: $(date)
-        # Computer: $(uname -n) 
-        # System: $(uname -sr) on $(uname -m)
-        #    
-        # Copyright (c) $(date +%%Y) $AUTHOR  All rights reserved.
-        #
-        #----------------------------------------------------------------------
-        # Configure section:
-        
-        #----------------------------------------------------------------------
-        #
-        # main()
-        
-        EOF
-
-+ y Perl\ Program | f \.pl$
-2       while ()
-        cat <<EOF > %k
-        %iwhile() {
-        %i} # while
-        EOF
-
-+ y Perl\ Program | f \.pl$
-3       for ()
-        cat <<EOF > %k
-        %ifor ($i =  ; $i <  ; $i++) {
-        %i} # for
-        EOF
-
-+ y Perl\ Program | f \.pl$
-4       foreach ()
-        cat <<EOF > %k
-        %iforeach ($ ) {
-        %i} # foreach
-        EOF
-
-+ y Perl\ Program | f \.pl$
-5       if ()
-        cat <<EOF > %k
-        %iif () {
-        %i} # if
-        EOF
-                
-+ y Perl\ Program | f \.pl$
-6       if () else
-        cat <<EOF > %k
-        %iif () {
-        %i} else {
-        %i} # if
-        EOF
-
-+ y Perl\ Program | f \.pl$
-7       if () elsif ()
-        cat <<EOF > %k
-        %iif () {
-        %i} elsif () {
-        %i} # if
-        EOF
-
-+ y Perl\ Program | f \.pl$
-8       substr ()
-        echo "%i$ = substr(\$str, \$off, \$cnt);" >%k
-
-+ y Perl\ Program | f \.pl$
-9       opendir ()
-        cat <<EOF > %k
-        %iopendir(DIR, \$dir) || die("\$0: can't open \$dir\n");
-        EOF
-
-+ y Perl\ Program | f \.pl$
-a       sub ()
-        NAME=%{ Enter name of subroutine: }
-        cat <<EOF > %k
-        sub
-        $NAME ()
-        {
-        } # $NAME()        
-        EOF
-#----------------------- End [perl] language template -------------------------
-
-#---------------------- Begin [shell] language template -----------------------
-+ y Shell\ Script | f \.sh$
-1       Author description header
-        unset LANG
-        AUTHOR="$(cat /etc/passwd |grep ^$(id -un) |awk -F: '{print($5)}')"
-        cat >>%k <<EOF
-        #----------------------------------------------------------------------
-        # Description:
-        # Author: $AUTHOR <$(echo -ne $REPLYTO)>
-        # Created at: $(date)
-        # Computer: $(uname -n) 
-        # System: $(uname -sr) on $(uname -m)
-        #    
-        # Copyright (c) $(date +%%Y) $AUTHOR  All rights reserved.
-        #
-        #----------------------------------------------------------------------
-        # Configure section:
-        
-        #----------------------------------------------------------------------
-        #
-        # main()
-        
-        EOF
-
-+ y Shell\ Script | f \.sh$
-3       for
-        cat <<EOF > %k
-        %ifor i in \$
-        %ido
-        %idone
-        EOF
-
-+ y Shell\ Script | f \.sh$
-4       while
-        cat <<EOF > %k
-        %iwhile
-        %ido
-        %idone
-        EOF
-
-+ y Shell\ Script | f \.sh$
-5       if [] then else
-        cat <<EOF >> %k
-        %iif [ ];then
-        %ielse
-        %ifi
-        EOF
-
-+ y Shell\ Script | f \.sh$
-6       case
-        NUMBER=%{ Enter number elements of case:}
-        cat <<EOF > %k
-        %icase "\$" in
-        EOF
-        while [ "$NUMBER" -gt 0 ]
-        do
-        cat <<EOF >> %k
-        %i)
-        %i    ;;
-        EOF
-        let NUMBER=$NUMBER-1    
-        done
-        cat <<EOF >> %k
-        %i*)
-        %iesac
-        EOF
-
-+ y Shell\ Script | f \.sh$
-7       function
-        NAME=%{ Enter name of function:}
-        cat <<EOF >> %k
-        $NAME() {
-        } # end of $NAME()
-        EOF
-                
-+ y Shell\ Script | f \.sh$
-8       select of bash
-        cat <<EOF >> %k
-        %iselect i in \$l
-        %ido
-        %i    if [ -n "\$i" ];then
-        %i       break
-        %i    else
-        %i       continue
-        %i    fi	
-        %idone
-        EOF
-        
-#----------------------- End [shell] language template ------------------------
-
-#------------------------- Begin [c] language template ------------------------
-+ f \.h$ | f \.c$ | f \.cc$
-1       Author description header
-        unset LANG
-        AUTHOR="$(cat /etc/passwd |grep ^$(id -un) |awk -F: '{print($5)}')"
-        cat >> %k <<EOF
-        /********************************************************************
-        * Description:
-        * Author: $AUTHOR <$(echo -ne $REPLYTO)>
-        * Created at: $(date)
-        * Computer: $(uname -n) 
-        * System: $(uname -sr) on $(uname -m)
-        *    
-        * Copyright (c) $(date +%%Y) $AUTHOR  All rights reserved.
-        *
-        ********************************************************************/
-        EOF
-
-+ f \.h$ | f \.c$ | f \.cc$
-2       GPL description header
-        cat >>%k <<EOF
-        /*
-        * This program is free software; you can redistribute it and/or modify
-        * it under the terms of the GNU General Public License as published by
-        * the Free Software Foundation; either version 2 of the License, or
-        * (at your option) any later version.
-        *
-        * This program is distributed in the hope that it will be useful,
-        * but WITHOUT ANY WARRANTY; without even the implied warranty of
-        * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-        * GNU General Public License for more details.
-        *
-        * You should have received a copy of the GNU General Public License
-        * along with this program; if not, write to the Free Software
-        * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-        */
-        EOF
-
-+ f \.c$ | f \.cc$
-3       if ()
-        cat <<EOF > %k
-        %iif () {
-        %i} /* if */
-        EOF
-                
-+ f \.c$ | f \.cc$
-4       if () else
-        cat <<EOF > %k
-        %iif () {
-        %i} else {
-        %i} /* if */
-        EOF
-
-+ f \.c$ | f \.cc$
-5       if () else if ()
-        cat <<EOF > %k
-        %iif ( ) {
-        %i} else if ( ) {
-        %i} /* if */
-        EOF
-
-+ f \.c$ | f \.cc$
-6       switch ()
-        NUMBER=%{ Enter number elements of switch:}
-        echo "%iswitch () {" >%k
-        while [ "$NUMBER" -gt 0 ]
-        do
-        echo "%icase '':" >>%k
-        echo "%i	break;" >>%k
-        let NUMBER=$NUMBER-1    
-        done
-        echo "%idefault:" >>%k
-        echo "%i} /* switch */" >>%k
-        
-+ f \.c$ | f \.cc$
-7       for ()
-        cat <<EOF > %k
-        %ifor (i =  ; i <  ; i++) {
-        %i} /* for */
-        EOF
-        
-+ f \.c$ | f \.cc$
-8       while ()               
-        cat <<EOF > %k
-        %iwhile () {
-        %i} /* while */
-        EOF
-
-+ f \.c$ | f \.cc$
-9       do {} while ()               
-        cat <<EOF > %k
-        %ido {
-        %i} while ()
-        EOF
-        
-+ f \.c$ | f \.cc$
-a       array
-        cat <<EOF > %k
-        %ichar const x[] = {
-        %i, ,
-        %i};
-        EOF
-        
-+ f \.c$ | f \.cc$
-b       enum
-        cat <<EOF > %k
-        %ienum x {
-        %i, ,
-        %i};
-        EOF
-        
-+ f \.c$ | f \.cc$
-c       struct
-        cat <<EOF > %k
-        %istruct ? {
-        %i;
-        %i};
-        EOF
-        
-+ f \.c$ | f \.cc$
-d       union
-        cat <<EOF > %k
-        %iunion ? {
-        %i;
-        %i};
-        EOF
-        
-+ f \.c$ | f \.cc$
-e       typedef struct
-        cat <<EOF > %k
-        %itypedef struct {
-        %i;
-        %i} ?;
-        EOF
-
-+ f \.c$ | f \.cc$
-f       function
-        NAME=%{ Enter name of function:}
-        cat <<EOF >> %k
-        $NAME()
-        {
-        } /* $NAME() */
-        EOF
-
-+ f \.c$ | f \.h$ | f \.cc$
-g       #include
-        INC=%{ Enter include name: }
-        if [ -r "$INC" ];then
-            echo \#include \"$INC\" >%k
-        else
-            echo \#include \<$INC\> >%k
-        fi
-
-+ f \.c$ | f \.h$ | f \.cc$
-d       #define
-        echo "#define " >%k
-
-+ f \.c$ | f \.h$ | f \.cc$
-d       #ifdef
-        cat <<EOF > %k
-        #ifdef
-        #else
-        #endif
-        EOF
-
-+ f \.c$ | f \.h$ | f \.cc$
-
-+ f \.c$ | f \.h$ | f \.cc$
-h       View all *.h into current directory
-        cat *.h |less
-
-+ f \.c$ | f \.cc$
-d       Run gdb for current file
-        [ -x "./%b" ] && gdb ./%b
-
-= f \.c$ | f \.cc$
-+ f \.c$ | f \.cc$
-c       Compile, link and run the current .c file
-        export CFLAGS="-g -Wall -O2"
-        make || make %b || cc $CFLAGS -o %b %f
-        [ -r "%b" ] && (echo "*** press any key for run... ***"; read)
-        [ -x "%b" ] && ./%b
-        (echo -ne "\n--- Press any key for return to edit. ---"; read)
-
-+ f \.c$ | f \.h$
-t       Indent `C' formatter
-        indent -kr -pcs %k 1>/dev/null 2> %e
-
-#--------------------- End [c/c++] language template --------------------------
-
-#------------------------- Begin unknown template -----------------------------
-+ y unknown & t r
-s       #!/bin/sh
-        echo "#!/bin/sh" >%k
-
-+ y unknown & t r
-p       #!/usr/bin/perl
-        echo "#!/usr/bin/perl" >%k
-
-+ y unknown & t r
-a       Author description header
-        unset LANG
-        AUTHOR="$(cat /etc/passwd |grep ^$(id -un) |awk -F: '{print($5)}')"
-        cat >>%k <<EOF
-        ----------------------------------------------------------------------
-        Description:
-        Author: $AUTHOR <$(echo -ne $REPLYTO)>
-        Created at: $(date)
-        Computer: $(uname -n) 
-        System: $(uname -sr) on $(uname -m)
-        
-        Copyright (c) $(date +%%Y) $AUTHOR  All rights reserved.
-        ----------------------------------------------------------------------
-                
-        EOF
-#--------------------------- End unknown template -----------------------------
-
-#----------------------- Begin common section ---------------------------------
-I       Insert `ChangeLog' string
-        DATE=$(date +%%Y-%%m-%%d)
-        AUTHOR="$(cat /etc/passwd |grep ^$(id -un) |awk -F: '{print($5)}')"
-        EMAIL="<$(echo -ne $REPLYTO)>"
-        echo "$DATE  $AUTHOR  $EMAIL" >%k
-
-+ x /bin/sh
-s       Invoke `shell'
-        /bin/sh
-
-m       view `man'
-        MAN=%{Enter name of man:}
-        TMPFILE=/tmp/mcview.$MAN.$$
-        man -Pcat $MAN >$TMPFILE
-        mcview $TMPFILE
-        rm -f $TMPFILE
-                
-i       Insert an out of command
-        CMD=%{ Enter command: }
-        eval $CMD > %k
-
-+ x /usr/bin/open | x /usr/local/bin/open & x /bin/sh
-o       Open next a free console
-        open -s -- sh
-
-e       Edit this menu
-        mcedit %m
-#-------------------------- End of common section -----------------------------
diff -ruN old/mc-4.5.48/lib/mc.csh new/mc-4.5.49/lib/mc.csh
--- old/mc-4.5.48/lib/mc.csh	Fri May 19 18:15:05 2000
+++ new/mc-4.5.49/lib/mc.csh	Wed May 24 14:30:30 2000
@@ -1,2 +1,2 @@
-alias mc 'setenv MC `/gnome/bin/mc -P \!*`; cd $MC; unsetenv MC'
+alias mc 'setenv MC `/usr/local/bin/mc -P \!*`; cd $MC; unsetenv MC'
 
diff -ruN old/mc-4.5.48/lib/mc.sh new/mc-4.5.49/lib/mc.sh
--- old/mc-4.5.48/lib/mc.sh	Fri May 19 18:15:05 2000
+++ new/mc-4.5.49/lib/mc.sh	Wed May 24 14:30:30 2000
@@ -3,7 +3,7 @@
         mkdir -p ~/.mc/tmp 2> /dev/null
 	chmod 700 ~/.mc/tmp
 	MC=~/.mc/tmp/mc-$$
-	/gnome/bin/mc -P "$@" > "$MC"
+	/usr/local/bin/mc -P "$@" > "$MC"
 	cd "`cat $MC`"
 	rm "$MC"
         unset MC;
diff -ruN old/mc-4.5.48/mc.spec new/mc-4.5.49/mc.spec
--- old/mc-4.5.48/mc.spec	Fri May 19 18:15:02 2000
+++ new/mc-4.5.49/mc.spec	Wed May 24 14:30:28 2000
@@ -1,5 +1,5 @@
 # Note that this is NOT a relocatable package
-%define ver     4.5.48
+%define ver     4.5.49
 %define  RELEASE 1
 %define  rel     %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
 %define prefix  /usr
Binary files old/mc-4.5.48/po/ca.gmo and new/mc-4.5.49/po/ca.gmo differ
Binary files old/mc-4.5.48/po/cs.gmo and new/mc-4.5.49/po/cs.gmo differ
Binary files old/mc-4.5.48/po/da.gmo and new/mc-4.5.49/po/da.gmo differ
Binary files old/mc-4.5.48/po/de.gmo and new/mc-4.5.49/po/de.gmo differ
Binary files old/mc-4.5.48/po/el.gmo and new/mc-4.5.49/po/el.gmo differ
Binary files old/mc-4.5.48/po/es.gmo and new/mc-4.5.49/po/es.gmo differ
Binary files old/mc-4.5.48/po/es_ES.gmo and new/mc-4.5.49/po/es_ES.gmo differ
Binary files old/mc-4.5.48/po/fi.gmo and new/mc-4.5.49/po/fi.gmo differ
Binary files old/mc-4.5.48/po/fr.gmo and new/mc-4.5.49/po/fr.gmo differ
Binary files old/mc-4.5.48/po/hu.gmo and new/mc-4.5.49/po/hu.gmo differ
Binary files old/mc-4.5.48/po/it.gmo and new/mc-4.5.49/po/it.gmo differ
Binary files old/mc-4.5.48/po/ja.gmo and new/mc-4.5.49/po/ja.gmo differ
diff -ruN old/mc-4.5.48/po/ja.po new/mc-4.5.49/po/ja.po
--- old/mc-4.5.48/po/ja.po	Fri May 19 18:16:18 2000
+++ new/mc-4.5.49/po/ja.po	Wed May 24 14:30:50 2000
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mc CVS-20000516\n"
-"POT-Creation-Date: 2000-05-16 08:11+0900\n"
-"PO-Revision-Date: 2000-05-16 08:54+0900\n"
+"POT-Creation-Date: 2000-05-22 02:21+0900\n"
+"PO-Revision-Date: 2000-05-22 02:54+0900\n"
 "Last-Translator: Akira TAGOH <at@ff.iij4u.or.jp>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
 "MIME-Version: 1.0\n"
@@ -51,7 +51,7 @@
 "実行に失敗しました\n"
 "\"%s\"\n"
 "\n"
-"有効なコマンドを指定したかどうかを確認してください"
+"有効なコマンドを指定したか確認してください"
 
 #: gnome/gaction.c:40
 #, c-format
@@ -342,11 +342,11 @@
 
 #: gnome/gcustom-layout.c:142
 msgid "Possible Columns"
-msgstr "可能な横幅"
+msgstr "表示可能な情報"
 
 #: gnome/gcustom-layout.c:162
 msgid "Displayed Columns"
-msgstr "表示横幅"
+msgstr "表示する情報"
 
 #: gnome/gcustom-layout.c:304
 msgid "Custom View"
@@ -363,11 +363,11 @@
 
 #: gnome/gdesktop.c:1347
 msgid "While running the mount/umount command"
-msgstr "mount/umountコマンド実行中"
+msgstr "mount/umount 実行中"
 
 #: gnome/gdesktop.c:1416
 msgid "While running the eject command"
-msgstr "ejectコマンド実行中"
+msgstr "eject 実行中"
 
 #: gnome/gdesktop.c:1600 gnome/gicon.c:282 gnome/gtools.c:46
 msgid "Error"
@@ -393,7 +393,7 @@
 
 #: gnome/gdesktop.c:2855 gnome/glayout.c:363
 msgid "Launch a new terminal in the current directory"
-msgstr "現在のディレクトリで新規端末を起動"
+msgstr "現在のディレクトリで端末を起動"
 
 #. If this ever changes, make sure you update create_new_menu accordingly.
 #: gnome/gdesktop.c:2857 gnome/glayout.c:365
@@ -402,7 +402,7 @@
 
 #: gnome/gdesktop.c:2857 gnome/glayout.c:366
 msgid "Creates a new directory"
-msgstr "新規ディレクトリの作成"
+msgstr "ディレクトリを作成する"
 
 #: gnome/gdesktop.c:2858
 msgid "URL L_ink..."
@@ -418,7 +418,7 @@
 
 #: gnome/gdesktop.c:2859
 msgid "Creates a new launcher"
-msgstr "新規ランチャをこの場所で作成する"
+msgstr "ランチャを作成する"
 
 #: gnome/gdesktop.c:2865
 msgid "By _Name"
@@ -458,15 +458,15 @@
 
 #: gnome/gdesktop.c:2882 gnome/glayout.c:464
 msgid "Rescan _Desktop Directory"
-msgstr "デスクトップディレクトリを再スキャン(_D)"
+msgstr "デスクトップの再走査(_D)"
 
 #: gnome/gdesktop.c:2883 gnome/glayout.c:465
 msgid "Rescan De_vices"
-msgstr "デバイスを再スキャン(_v)"
+msgstr "デバイスの再走査(_v)"
 
 #: gnome/gdesktop.c:2884 gnome/glayout.c:466
 msgid "Recreate Default _Icons"
-msgstr "デフォルトのアイコンを再作成(_I)"
+msgstr "デフォルトアイコンの再作成(_I)"
 
 #: gnome/gdesktop.c:2886
 msgid "Configure _Background Image"
@@ -587,7 +587,7 @@
 
 #: gnome/gdialogs.c:629
 msgid "Advanced Options"
-msgstr "上級オプション"
+msgstr "詳細オプション"
 
 #: gnome/gdialogs.c:633
 msgid "Preserve symlinks"
@@ -637,35 +637,35 @@
 
 #: gnome/gdialogs.c:794
 msgid "Do the same for the rest"
-msgstr "残りも同様に"
+msgstr "残りも同様に処理を続ける"
 
 #: gnome/gdialogs.c:877
 msgid "Move Progress"
-msgstr "移動過程"
+msgstr "移動中"
 
 #: gnome/gdialogs.c:880
 msgid "Copy Progress"
-msgstr "コピー過程"
+msgstr "コピー中"
 
 #: gnome/gdialogs.c:883
 msgid "Delete Progress"
-msgstr "削除過程"
+msgstr "削除中"
 
 #: gnome/gdialogs.c:939
 msgid "File "
-msgstr "ファイル"
+msgstr "ファイル "
 
 #: gnome/gdialogs.c:943
 msgid "is "
-msgstr "は "
+msgstr " "
 
 #: gnome/gdialogs.c:946
 msgid "done."
-msgstr "終了しました"
+msgstr "を処理しました"
 
 #. Translators should take care as "Password" or its translations
 #. are used to identify password boxes and hide characters with "*"
-#: gnome/gdialogs.c:1007 src/wtools.c:587 vfs/vfs.c:1833
+#: gnome/gdialogs.c:1007 src/wtools.c:587 vfs/vfs.c:1823
 msgid "Password:"
 msgstr "パスワード:"
 
@@ -676,15 +676,15 @@
 #. Create the dialog
 #: gnome/gdialogs.c:1039
 msgid "Symbolic Link"
-msgstr "シンボリック"
+msgstr "リンク"
 
 #: gnome/gdialogs.c:1055 src/boxes.c:803
 msgid "Existing filename (filename symlink will point to):"
-msgstr "存在するファイル名(シンボリックのポイント先):"
+msgstr "存在するファイル名(リンクのポイント先):"
 
 #: gnome/gdialogs.c:1069 src/boxes.c:801
 msgid "Symbolic link filename:"
-msgstr "シンボリックファイル名:"
+msgstr "リンクファイル名:"
 
 #: gnome/gdnd.c:53
 msgid "_Move here"
@@ -832,11 +832,11 @@
 
 #: gnome/glayout.c:393
 msgid "Show directory sizes"
-msgstr "ディレクトリサイズを見る"
+msgstr "ディレクトリサイズを表示"
 
 #: gnome/glayout.c:393
 msgid "Shows the disk space used by each directory"
-msgstr "各ディレクトリでディスク空き容量を見る"
+msgstr "各ディレクトリでディスク空き容量を表示"
 
 #: gnome/glayout.c:395
 msgid "Close window"
@@ -880,11 +880,11 @@
 
 #: gnome/glayout.c:411 gnome/gscreen.c:1428
 msgid "_Rescan Directory"
-msgstr "ディレクトリを再スキャン(_R)"
+msgstr "ディレクトリを再走査(_R)"
 
 #: gnome/glayout.c:411
 msgid "Rescan the directory contents"
-msgstr "ディレクトリ内容を再スキャンする"
+msgstr "ディレクトリ内容を再走査する"
 
 #: gnome/glayout.c:421
 msgid "_Sort By..."
@@ -892,7 +892,7 @@
 
 #: gnome/glayout.c:421
 msgid "Confirmation settings"
-msgstr "確認設定"
+msgstr "設定の確認"
 
 #: gnome/glayout.c:422
 msgid "_Filter View..."
@@ -994,8 +994,7 @@
 #: gnome/gmount.c:383
 #, c-format
 msgid "Could not symlink %s to %s; will not have such a desktop device icon."
-msgstr ""
-"%sを%sへsymlinkできません; デスクトップ・デバイス・アイコンはなくなります"
+msgstr "%s を %s へリンクできません; このデバイスのアイコンは表示できません"
 
 #: gnome/gmount.c:439
 #, c-format
@@ -1296,19 +1295,19 @@
 
 #: gnome/gpopup2.c:197
 msgid "Mount device"
-msgstr "デバイスをマウントする"
+msgstr "マウント"
 
 #: gnome/gpopup2.c:198
 msgid "Unmount device"
-msgstr "デバイスをマウント解除する"
+msgstr "マウント解除"
 
 #: gnome/gpopup2.c:199
 msgid "Eject device"
-msgstr "デバイスをイジェクトする"
+msgstr "取り出し"
 
 #: gnome/gpopup2.c:202
 msgid "Open with..."
-msgstr "別コマンドで開く..."
+msgstr "コマンドで開く..."
 
 #: gnome/gpopup2.c:204
 msgid "View Unfiltered"
@@ -1353,7 +1352,7 @@
 
 #: gnome/gprefs.c:100
 msgid "Mix files and directories"
-msgstr "ファイルとディレクトリを混在させる"
+msgstr "ファイルとディレクトリを混在して表示"
 
 #: gnome/gprefs.c:104
 msgid "Use shell patterns instead of regular expressions"
@@ -1377,11 +1376,11 @@
 
 #: gnome/gprefs.c:129
 msgid "Show progress while operations are being performed"
-msgstr "操作が処理されている間にその経過をみる"
+msgstr "操作が処理されている間にその経過を表示"
 
 #: gnome/gprefs.c:138
 msgid "VFS Timeout:"
-msgstr "VFS 時間アウト:"
+msgstr "VFS タイムアウト:"
 
 #: gnome/gprefs.c:139 gnome/gprefs.c:164
 msgid "Seconds"
@@ -1405,7 +1404,7 @@
 
 #: gnome/gprefs.c:163
 msgid "FTP directory cache timeout :"
-msgstr "FTPディレクトリキャッシュ時間アウト :"
+msgstr "FTPディレクトリキャッシュタイムアウト :"
 
 #: gnome/gprefs.c:167
 msgid "Allow customization of icons in icon view"
@@ -1481,7 +1480,7 @@
 
 #: gnome/gscreen.c:1430
 msgid "Creates a new directory here"
-msgstr "ここに新規ディレクトリの作成"
+msgstr "新規ディレクトリを作成する"
 
 #: gnome/gscreen.c:1432
 msgid "New _File..."
@@ -1489,7 +1488,7 @@
 
 #: gnome/gscreen.c:1432
 msgid "Creates a new file here"
-msgstr "ここに新規ファイルを作成"
+msgstr "新規ファイルを作成する"
 
 #: gnome/gscreen.c:1633
 #, c-format
@@ -1552,7 +1551,7 @@
 
 #: gnome/gscreen.c:2265
 msgid "Rescan the current directory"
-msgstr "現在のディレクトリを再スキャンする"
+msgstr "現在のディレクトリを再走査する"
 
 #: gnome/gscreen.c:2268
 msgid "Home"
@@ -1560,7 +1559,7 @@
 
 #: gnome/gscreen.c:2268
 msgid "Go to your home directory"
-msgstr "あなたのホームディレクトリへ移動する"
+msgstr "ホームディレクトリへ移動する"
 
 #: gnome/gscreen.c:2408
 msgid "Location:"
@@ -1605,7 +1604,7 @@
 
 #: gnome/gview.c:309
 msgid "Monitor file growing"
-msgstr "ファイルが大きくなるのを監視"
+msgstr "ファイルの増大を監視する"
 
 #: gnome/gview.c:316
 msgid "Regexp search"
@@ -1691,15 +1690,15 @@
 
 #: gnome/gmc-client.c:208
 msgid "Rescan the specified directory"
-msgstr "指定したディレクトリを再スキャン"
+msgstr "指定したディレクトリを再走査する"
 
 #: gnome/gmc-client.c:210
 msgid "Rescan the desktop icons"
-msgstr "デスクトップアイコンを再スキャン"
+msgstr "デスクトップアイコンを再走査する"
 
 #: gnome/gmc-client.c:212
 msgid "Rescan the desktop device icons"
-msgstr "デスクトップデバイスアイコンを再スキャン"
+msgstr "デバイスアイコンを再走査する"
 
 #: gnome/gmc-client.c:214
 msgid "Arrange the desktop icons"
@@ -1724,7 +1723,7 @@
 
 #: gtkedit/edit.c:149 gtkedit/edit.c:341 gtkedit/edit.c:379
 msgid " Failed trying to open file for reading: "
-msgstr "読み出しのためファイルを開くことに失敗しました: "
+msgstr "ファイルの読みだしでオープンに失敗しました: "
 
 #: gtkedit/edit.c:318
 msgid " Error reading from pipe: "
@@ -1732,7 +1731,7 @@
 
 #: gtkedit/edit.c:323
 msgid " Failed trying to open pipe for reading: "
-msgstr "読み込むためのパイプを開く試みが失敗しました: "
+msgstr "読みだし用のパイプのオープンに失敗しました: "
 
 #: gtkedit/edit.c:337
 msgid " Error reading file: "
@@ -1771,7 +1770,7 @@
 
 #: gtkedit/editcmd.c:304
 msgid " Failed trying to open pipe for writing: "
-msgstr "書き込むためのパイプを開く試みに失敗しました: "
+msgstr "書き込み用のパイプのオープンに失敗しました: "
 
 #: gtkedit/editcmd.c:379
 msgid "Quick save "
@@ -1894,7 +1893,7 @@
 
 #: gtkedit/editcmd.c:831 gtkedit/editcmd.c:833
 msgid " Confirm save file? : "
-msgstr "ファイルを保存しても良いですか? : "
+msgstr "ファイルを保存して良いですか? : "
 
 #. Buttons to 'Confirm save file' query
 #: gtkedit/editcmd.c:836
@@ -6631,141 +6630,141 @@
 msgid "Aborted transfer would be successful."
 msgstr "転送中断に成功しました"
 
-#: vfs/ftpfs.c:318
+#: vfs/ftpfs.c:315
 #, c-format
 msgid "ftpfs: Disconnecting from %s"
 msgstr "ftpfs: %s から切断中です"
 
-#: vfs/ftpfs.c:376
+#: vfs/ftpfs.c:373
 msgid " FTP: Password required for "
 msgstr " FTP: パスワードが必要です "
 
-#: vfs/ftpfs.c:409
+#: vfs/ftpfs.c:402
 msgid " Proxy: Password required for "
 msgstr " Proxy: パスワードが必要です "
 
-#: vfs/ftpfs.c:435
+#: vfs/ftpfs.c:428
 msgid "ftpfs: sending proxy login name"
 msgstr "ftpfs: proxy のログイン名を送信中"
 
-#: vfs/ftpfs.c:439
+#: vfs/ftpfs.c:432
 msgid "ftpfs: sending proxy user password"
 msgstr "ftpfs: proxy のユーザパスワードを送信中"
 
-#: vfs/ftpfs.c:443
+#: vfs/ftpfs.c:436
 msgid "ftpfs: proxy authentication succeeded"
 msgstr "ftpfs: proxy の認証が成功しました"
 
-#: vfs/ftpfs.c:447
+#: vfs/ftpfs.c:440
 #, c-format
 msgid "ftpfs: connected to %s"
 msgstr "ftpfs: %s に接続しました"
 
-#: vfs/ftpfs.c:464
+#: vfs/ftpfs.c:457
 msgid "ftpfs: sending login name"
 msgstr "ftpfs: ログイン名を送信中"
 
-#: vfs/ftpfs.c:469
+#: vfs/ftpfs.c:462
 msgid "ftpfs: sending user password"
 msgstr "ftpfs: パスワードを送信中"
 
-#: vfs/ftpfs.c:474
+#: vfs/ftpfs.c:467
 msgid "ftpfs: logged in"
 msgstr "ftpfs: ログインしました"
 
-#: vfs/ftpfs.c:489
+#: vfs/ftpfs.c:482
 #, c-format
 msgid "ftpfs: Login incorrect for user %s "
 msgstr "ftpfs: ユーザ %s のログインが失敗しました "
 
-#: vfs/ftpfs.c:521
+#: vfs/ftpfs.c:514
 #, c-format
 msgid " Could not set source routing (%s)"
 msgstr " ソースルーティングに失敗しました (%s)"
 
-#: vfs/ftpfs.c:647
+#: vfs/ftpfs.c:640
 msgid "ftpfs: Invalid host name."
 msgstr "ftpfs: 不正なホスト名です"
 
-#: vfs/ftpfs.c:667
+#: vfs/ftpfs.c:660
 msgid "ftpfs: Invalid host address."
 msgstr "ftpfs: 不正なホストのアドレスです"
 
-#: vfs/ftpfs.c:690
+#: vfs/ftpfs.c:683
 #, c-format
 msgid "ftpfs: making connection to %s"
 msgstr "ftpfs: %s へ接続中"
 
-#: vfs/ftpfs.c:700
+#: vfs/ftpfs.c:693
 msgid "ftpfs: connection interrupted by user"
 msgstr "ftpfs: ユーザによって接続が断たれました"
 
-#: vfs/ftpfs.c:702
+#: vfs/ftpfs.c:695
 #, c-format
 msgid "ftpfs: connection to server failed: %s"
 msgstr "ftpfs: サーバへの接続に失敗しました: %s"
 
-#: vfs/ftpfs.c:744
+#: vfs/ftpfs.c:736
 #, c-format
 msgid "Waiting to retry... %d (Control-C to cancel)"
 msgstr "再試行するのでお待ちください... %d (Control-C で中止)"
 
-#: vfs/ftpfs.c:930
+#: vfs/ftpfs.c:922
 msgid "ftpfs: could not setup passive mode"
 msgstr "ftpfs: パッシブモードに失敗しました"
 
-#: vfs/ftpfs.c:1005
+#: vfs/ftpfs.c:997
 msgid "ftpfs: aborting transfer."
 msgstr "ftpfs: 転送を中断します"
 
-#: vfs/ftpfs.c:1007
+#: vfs/ftpfs.c:999
 #, c-format
 msgid "ftpfs: abort error: %s"
 msgstr "ftpfs: 中断: %s"
 
-#: vfs/ftpfs.c:1012
+#: vfs/ftpfs.c:1004
 msgid "ftpfs: abort failed"
 msgstr "ftpfs: 中断に失敗"
 
-#: vfs/ftpfs.c:1101 vfs/ftpfs.c:1200
+#: vfs/ftpfs.c:1093 vfs/ftpfs.c:1192
 msgid "ftpfs: CWD failed."
 msgstr "ftpfs: CWD 失敗"
 
-#: vfs/ftpfs.c:1111 vfs/ftpfs.c:1118
+#: vfs/ftpfs.c:1103 vfs/ftpfs.c:1110
 msgid "ftpfs: couldn't resolve symlink"
 msgstr "ftpfs: シンボリックリンクの展開に失敗"
 
-#: vfs/ftpfs.c:1169
+#: vfs/ftpfs.c:1161
 msgid "Resolving symlink..."
 msgstr "シンボリックリンクを展開する..."
 
-#: vfs/ftpfs.c:1188
+#: vfs/ftpfs.c:1180
 #, c-format
 msgid "ftpfs: Reading FTP directory %s... %s%s"
 msgstr "ftpfs: FTPディレクトリ %s を読み込み中... %s%s"
 
-#: vfs/ftpfs.c:1189
+#: vfs/ftpfs.c:1181
 msgid "(strict rfc959)"
 msgstr "(厳密な rfc959)"
 
-#: vfs/ftpfs.c:1190
+#: vfs/ftpfs.c:1182
 msgid "(chdir first)"
 msgstr "(初めに chdir)"
 
-#: vfs/ftpfs.c:1287
+#: vfs/ftpfs.c:1279
 msgid "ftpfs: failed"
 msgstr "ftpfs: 失敗しました"
 
-#: vfs/ftpfs.c:1297
+#: vfs/ftpfs.c:1289
 msgid "ftpfs: failed; nowhere to fallback to"
 msgstr "ftpfs: 失敗しました。フォールバックできません"
 
-#: vfs/ftpfs.c:1360
+#: vfs/ftpfs.c:1352
 #, c-format
 msgid "ftpfs: storing file %d (%d)"
 msgstr "ftpfs: ファイルの保存中 %d (%d)"
 
-#: vfs/ftpfs.c:1775
+#: vfs/ftpfs.c:1767
 msgid ""
 "~/.netrc file has not correct mode.\n"
 "Remove password or correct mode."
@@ -6898,11 +6897,11 @@
 msgid "Unexpected EOF on archive file"
 msgstr "予期しないEOFがアーカイブファイルにあります"
 
-#: vfs/tar.c:339 vfs/tar.c:346
+#: vfs/tar.c:336 vfs/tar.c:343
 msgid "Inconsistent tar archive"
 msgstr "tar アーカイブに不整合"
 
-#: vfs/tar.c:411
+#: vfs/tar.c:413
 #, c-format
 msgid ""
 "Hmm,...\n"
@@ -6913,31 +6912,31 @@
 "%s\n"
 "これはtarアーカイブではないようです"
 
-#: vfs/vfs.c:1151
+#: vfs/vfs.c:1141
 msgid "Changes to file lost"
 msgstr "紛失したファイルに変更します"
 
-#: vfs/vfs.c:1794
+#: vfs/vfs.c:1784
 msgid "Could not parse:"
 msgstr "構文解析が出来ません:"
 
-#: vfs/vfs.c:1796
+#: vfs/vfs.c:1786
 msgid "More parsing errors will be ignored."
 msgstr "多くの構文解析エラーがでましたが無視します"
 
-#: vfs/vfs.c:1796
+#: vfs/vfs.c:1786
 msgid "(sorry)"
 msgstr "(sorry)"
 
-#: vfs/vfs.c:1807
+#: vfs/vfs.c:1797
 msgid "Internal error:"
 msgstr "内部エラー:"
 
-#: vfs/vfs.c:1817
+#: vfs/vfs.c:1807
 msgid "%s: %s: %s %3d%% (%ld bytes transfered)"
 msgstr "%s: %s: %s %3d%% (%ld バイト転送)"
 
-#: vfs/vfs.c:1818
+#: vfs/vfs.c:1808
 #, c-format
 msgid "%s: %s: %s %ld bytes transfered"
 msgstr "%s: %s: %s %ld バイト転送しました"
Binary files old/mc-4.5.48/po/ko.gmo and new/mc-4.5.49/po/ko.gmo differ
diff -ruN old/mc-4.5.48/po/mc.pot new/mc-4.5.49/po/mc.pot
--- old/mc-4.5.48/po/mc.pot	Fri May 19 18:16:23 2000
+++ new/mc-4.5.49/po/mc.pot	Wed May 24 14:30:50 2000
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-05-19 18:16-0400\n"
+"POT-Creation-Date: 2000-05-24 14:30-0400\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"
@@ -472,7 +472,7 @@
 msgstr ""
 
 #. Create the link to the user's home directory so that he will have an icon
-#: gnome/gdesktop-init.c:141
+#: gnome/gdesktop-init.c:146
 msgid "Home directory"
 msgstr ""
 
Binary files old/mc-4.5.48/po/nl.gmo and new/mc-4.5.49/po/nl.gmo differ
Binary files old/mc-4.5.48/po/no.gmo and new/mc-4.5.49/po/no.gmo differ
Binary files old/mc-4.5.48/po/pl.gmo and new/mc-4.5.49/po/pl.gmo differ
Binary files old/mc-4.5.48/po/pt_BR.gmo and new/mc-4.5.49/po/pt_BR.gmo differ
Binary files old/mc-4.5.48/po/ro.gmo and new/mc-4.5.49/po/ro.gmo differ
Binary files old/mc-4.5.48/po/ru.gmo and new/mc-4.5.49/po/ru.gmo differ
Binary files old/mc-4.5.48/po/sk.gmo and new/mc-4.5.49/po/sk.gmo differ
Binary files old/mc-4.5.48/po/sv.gmo and new/mc-4.5.49/po/sv.gmo differ
Binary files old/mc-4.5.48/po/tr.gmo and new/mc-4.5.49/po/tr.gmo differ
Binary files old/mc-4.5.48/po/uk.gmo and new/mc-4.5.49/po/uk.gmo differ
Binary files old/mc-4.5.48/po/wa.gmo and new/mc-4.5.49/po/wa.gmo differ
Binary files old/mc-4.5.48/po/zh_CN.GB2312.gmo and new/mc-4.5.49/po/zh_CN.GB2312.gmo differ
Binary files old/mc-4.5.48/po/zh_TW.Big5.gmo and new/mc-4.5.49/po/zh_TW.Big5.gmo differ
diff -ruN old/mc-4.5.48/vfs/samba/include/config.h new/mc-4.5.49/vfs/samba/include/config.h
--- old/mc-4.5.48/vfs/samba/include/config.h	Fri May 19 18:15:04 2000
+++ new/mc-4.5.49/vfs/samba/include/config.h	Wed May 24 14:30:30 2000
@@ -104,7 +104,7 @@
 /* #undef HAVE_TRAPDOOR_UID */
 /* #undef HAVE_ROOT */
 /* #undef HAVE_UNION_SEMUN */
-/* #undef HAVE_NETMASK_IFCONF */
+#define HAVE_NETMASK_IFCONF 1
 #define HAVE_GETTIMEOFDAY_TZ 1
 /* #undef HAVE_SOCK_SIN_LEN */
 /* #undef STAT_READ_FILSYS */