Update to 1.0.4. Still doesn't work (hangs at startup)... :-<

10 files changed, 334 insertions, 554 deletions

diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index 7f32a808cdba..8200a2fd614c 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -6,19 +6,15 @@
 #
 
 PORTNAME=	nautilus
-PORTVERSION=	1.0.3
-PORTREVISION=	1
+PORTVERSION=	1.0.4
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/nautilus
 
 MAINTAINER=	gnome@FreeBSD.org
 
-BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2	# XXX
-# The following is only needed if --with-eazel-services is brought in,
-# which it isn't, because it depends on ammonite, which is Linux-only
-# BUILD_DEPENDS+=rpm:${PORTSDIR}/archivers/rpm
-
+BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2 \
+		msgfmt-new:${PORTSDIR}/devel/gettext-devel
 LIB_DEPENDS=	medusa.0:${PORTSDIR}/sysutils/medusa \
 		freetype.6:${PORTSDIR}/print/freetype2 \
 		eel.0:${PORTSDIR}/x11-toolkits/eel
@@ -37,7 +33,9 @@ USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -fno-rtti -fno-exceptions" \
 		LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib" \
-		LIBPNG="-L${LOCALBASE}/lib -lpng -lz ${MOZILLA_LIBS}"
+		LIBPNG="-L${LOCALBASE}/lib -lpng -lz ${MOZILLA_LIBS}" \
+		MSGFMT=${LOCALBASE}/bin/msgfmt-new \
+                XGETTEXT=${LOCALBASE}/bin/xgettext-new
 CONFIGURE_ARGS=	--with-freetype2-lib-place=${LOCALBASE}/lib \
 		--with-freetype2-include-place=${LOCALBASE}/include/freetype2
 
@@ -62,7 +60,7 @@ pre-extract:
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
diff --git a/x11-fm/nautilus/distinfo b/x11-fm/nautilus/distinfo
index 6fe59855dc7a..7d251fcb0595 100644
--- a/x11-fm/nautilus/distinfo
+++ b/x11-fm/nautilus/distinfo
@@ -1 +1 @@
-MD5 (nautilus-1.0.3.tar.gz) = 87db068765a72ca46b55ab6064ce3c00
+MD5 (nautilus-1.0.4.tar.gz) = e024b3d994838c4469ddbd8c1fbb4e28
diff --git a/x11-fm/nautilus/files/patch-ac b/x11-fm/nautilus/files/patch-ac
deleted file mode 100644
index 02e917cf8592..000000000000
--- a/x11-fm/nautilus/files/patch-ac
+++ /dev/null
@@ -1,260 +0,0 @@
-
-$FreeBSD$
-
---- libnautilus-private/nautilus-volume-monitor.c.orig	Fri Apr 27 04:19:07 2001
-+++ libnautilus-private/nautilus-volume-monitor.c	Mon May 14 18:36:00 2001
-@@ -67,6 +67,12 @@
- #define MOUNT_TABLE_PATH _PATH_MNTTAB
- #endif
- 
-+#ifdef __FreeBSD__
-+#include <sys/param.h>
-+#include <sys/ucred.h>
-+#include <sys/mount.h>
-+#endif
-+
- #ifdef HAVE_SYS_MNTTAB_H
- #define SOLARIS_MNT 1
- #include <sys/mnttab.h>
-@@ -119,6 +125,8 @@
- 
- #ifdef HAVE_SYS_MNTTAB_H
- typedef struct mnttab MountTableEntry;
-+#elif defined __FreeBSD__
-+typedef struct fstab MountTableEntry;
- #else
- typedef struct mntent MountTableEntry;
- #endif
-@@ -349,12 +357,18 @@
- static gboolean
- has_removable_mntent_options (MountTableEntry *ent)
- {
-+#ifndef __FreeBSD__
- 	/* Use "owner" or "user" or "users" as our way of determining a removable volume */
- 	if (hasmntopt (ent, "user") != NULL
- 	    || hasmntopt (ent, "users") != NULL
- 	    || hasmntopt (ent, "owner") != NULL) {
- 		return TRUE;
- 	}
-+#else
-+	if (strstr (ent->fs_mntops, "noauto") != NULL) {
-+		return TRUE;
-+	}
-+#endif
- 
- #ifdef SOLARIS_MNT
- 	if (eel_str_has_prefix (ent->mnt_special, "/vol/")) {
-@@ -377,6 +391,7 @@
- {
- 	FILE *file;
- 	GList *volumes;
-+
- 	MountTableEntry *ent;
- 	NautilusVolume *volume;
- #ifdef HAVE_SYS_MNTTAB_H
-@@ -385,11 +400,16 @@
- 	
- 	volumes = NULL;
- 	
-+#ifndef __FreeBSD__
- 	file = setmntent (MOUNT_TABLE_PATH, "r");
- 	if (file == NULL) {
- 		return NULL;
- 	}
-+#else
-+	setfsent();
-+#endif /* __FreeBSD__ */
- 	
-+#ifndef __FreeBSD__
- #ifdef HAVE_SYS_MNTTAB_H
-         ent = &ent_storage;
- 	while (! getmntent (file, ent)) {
-@@ -409,8 +429,20 @@
- 		}
- 	}
- #endif /* HAVE_SYS_MNTTAB_H */
--			
-+
- 	fclose (file);
-+			
-+#else	/* __FreeBSD__ */
-+	while ((ent = getfsent ()) != NULL) {
-+		/* Use noauto as our way of determining a removable volume */
-+		if (strstr (ent->fs_mntops, "noauto") != NULL) {
-+			volume = create_volume (ent->fs_spec, ent->fs_file, ent->fs_vfstype);
-+			volumes = mount_volume_add_filesystem (volume, volumes);
-+		}
-+	}
-+
-+	endfsent();
-+#endif /* __FreeBSD__ */
- 	
- #ifdef HAVE_CDDA
- 	volume = create_volume (CD_AUDIO_PATH, CD_AUDIO_PATH, CDDA_SCHEME);
-@@ -427,18 +459,27 @@
- static gboolean
- volume_is_removable (const NautilusVolume *volume)
- {
-+#ifndef	__FreeBSD__
- 	FILE *file;
-      	MountTableEntry *ent;
- #ifdef HAVE_SYS_MNTTAB_H
- 	MountTableEntry ent_storage;
- #endif
-+#else	/* __FreeBSD__ */
-+	struct fstab *ent;
-+#endif	/* __FreeBSD__ */
- 
-+#ifndef __FreeBSD__
- 	file = setmntent (MOUNT_TABLE_PATH, "r");
- 	if (file == NULL) {
- 		return FALSE;
- 	}
-+#else
-+	setfsent();
-+#endif	/* __FreeBSD__ */
- 	
- 	/* Search for our device in the fstab */
-+#ifndef __FreeBSD__
- #ifdef HAVE_SYS_MNTTAB_H
- 	MountTableEntry *ent = &ent_storage;
- 	while (!getmntent (file, ent)) {
-@@ -460,8 +501,22 @@
- 		}	
- 	}
- #endif /* HAVE_SYS_MNTTAB_H */
-+#else  /* __FreeBSD__ */
-+	while ((ent = getfsent ()) != NULL) {
-+		/* Use noauto as our way of determining a removable volume */
-+		if (strcmp (volume->device_path, ent->fs_spec) == 0
-+		    && has_removable_mntent_options (ent)) {
-+			endfsent();
-+			return TRUE;
-+		}
-+	}
-+
-+	endfsent();
-+#endif	/* __FreeBSD__ */
- 	
-+#ifndef __FreeBSD__
- 	fclose (file);
-+#endif
- 	return FALSE;
- }
- 
-@@ -490,12 +545,17 @@
-  		}
-  	}
- #else
-+#ifndef __FreeBSD__
- 	file = setmntent (MOUNT_TABLE_PATH, "r");
- 	if (file == NULL) {
- 		return FALSE;
- 	}
-+#else
-+	setfsent();
-+#endif	/* __FreeBSD__ */
- 		
- 	/* Search for our device in the fstab */
-+#ifndef __FreeBSD__
- 	while ((ent = getmntent (file)) != NULL) {
- 		if (strcmp (volume->device_path, ent->mnt_fsname) == 0) {
- 			if (strstr (ent->mnt_opts, MNTOPT_RO) != NULL) {
-@@ -504,9 +564,22 @@
- 			}
-         	 }
- 	}
-+#else	/* __FreeBSD__ */
-+	while ((ent = getfsent ()) != NULL) {
-+		if (strcmp (volume->device_path, ent->fs_spec) == 0
-+		    && strstr (ent->fs_type, FSTAB_RO) != NULL) {
-+			endfsent();
-+			return TRUE;
-+		}
-+	}
-+
-+	endfsent();
-+#endif	/* __FreeBSD__ */
- #endif
- 				
-+#ifndef __FreeBSD__
- 	fclose (file);
-+#endif
- 	return FALSE;
- }
- 
-@@ -948,13 +1021,20 @@
- 		}
- 	}
- #else
-+#ifndef __FreeBSD__
- 	const char *file_name;
- 	const char *separator;
- 	char line[PATH_MAX * 3];
- 	char device_name[sizeof (line)];
- 	EelStringList *list;
- 	char *device_path, *mount_path, *filesystem;
-+#else	/* __FreeBSD__ */
-+	struct statfs *mounted;
-+	int mounted_num;
-+	int i;
-+#endif	/* __FreeBSD__ */
- 
-+#ifndef __FreeBSD__
- 	if (mnttab_exists) { 
- 		file_name = "/etc/mnttab";
- 		separator = "\t";
-@@ -967,7 +1047,15 @@
- 		g_warning ("Unable to open %s: %s", file_name, strerror (errno));
- 		return NULL;
- 	}
-+#else	/* __FreeBSD__ */
-+	mounted_num = getmntinfo(&mounted, MNT_WAIT);
-+	if (mounted_num < 1) {
-+		g_warning ("Unable to get info about mounted fs: %s", strerror (errno));
-+		return NULL;
-+	}
-+#endif	/* __FreeBSD__ */
- 
-+#ifndef __FreeBSD__
- 	while (fgets (line, sizeof(line), fh)) {
- 		if (sscanf (line, "%s", device_name) == 1) {
- 			list = eel_string_list_new_from_tokens (line, separator, FALSE);
-@@ -983,17 +1071,28 @@
- 					g_free (device_path);
- 					g_free (mount_path);
- 					g_free (filesystem);
-+#else /* __FreeBSD__ */
-+	for (i = 0; i < mounted_num; i++) {
-+		volume = g_new0 (NautilusVolume, 1);
-+		volume->device_path = g_strdup(mounted[i].f_mntfromname);
-+		volume->mount_path = g_strdup(mounted[i].f_mntonname);
-+		volume->filesystem = g_strdup(mounted[i].f_fstypename);
-+#endif /* __FreeBSD__ */
- 					current_mounts = mount_volume_add_filesystem (volume, current_mounts);
-+#ifndef __FreeBSD__
- 				}				
- 				eel_string_list_free (list);
- 			}			
- 		}
-+#endif /* __FreeBSD__ */
-   	}
- #endif /* SOLARIS_MNT */
- 
-+#ifndef __FreeBSD__
- 	if (fh != NULL) {
- 		fclose (fh);
- 	}
-+#endif
- 	
- #ifdef HAVE_CDDA
- 	/* CD Audio tricks */
-@@ -1888,7 +1987,7 @@
- 	for (element = volume_list; element != NULL; element = element->next) {
- 		volume = element->data;
- 		
--#ifndef SOLARIS_MNT
-+#if !defined(SOLARIS_MNT) && !defined(__FreeBSD__)
- 		/* These are set up by get_current_mount_list for Solaris. */
- 		volume->is_removable = volume_is_removable (volume);
- 		volume->is_read_only = volume_is_read_only (volume);
diff --git a/x11-fm/nautilus/files/patch-po::Makefile.in.in b/x11-fm/nautilus/files/patch-po::Makefile.in.in
new file mode 100644
index 000000000000..53630b5680cd
--- /dev/null
+++ b/x11-fm/nautilus/files/patch-po::Makefile.in.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- po/Makefile.in.in	2001/07/06 11:16:00	1.1
++++ po/Makefile.in.in	2001/07/06 11:16:20
+@@ -104,7 +104,7 @@
+ 	@catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+-	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
++	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
+ 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+ 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
+ 	  if test -r $$cat; then \
diff --git a/x11-fm/nautilus/pkg-plist b/x11-fm/nautilus/pkg-plist
index 4ec2a8c2aef6..1b2dd61c865b 100644
--- a/x11-fm/nautilus/pkg-plist
+++ b/x11-fm/nautilus/pkg-plist
@@ -1,4 +1,5 @@
 bin/gnome-db2html2
+bin/gnome-db2html3
 bin/gnome-info2html2
 bin/gnome-man2html2
 bin/hyperbola
@@ -131,8 +132,8 @@ share/gnome/help/nautilus-release-notes/C/nautilus-release-notes.sgml
 share/gnome/help/nautilus-release-notes/C/new10.html
 share/gnome/help/nautilus-release-notes/C/new102.html
 share/gnome/help/nautilus-release-notes/C/new103.html
+share/gnome/help/nautilus-release-notes/C/new104.html
 share/gnome/help/nautilus-release-notes/C/require.html
-share/gnome/help/nautilus-release-notes/C/searching.html
 share/gnome/help/nautilus-release-notes/C/session.html
 share/gnome/help/nautilus-screenshot-guidelines/C/callouts.html
 share/gnome/help/nautilus-screenshot-guidelines/C/circling.html
@@ -244,6 +245,8 @@ share/gnome/help/nautilus-user-manual/ko/nautilus-user-manual.sgml
 share/gnome/help/nautilus-user-manual/ko/navigating.html
 share/gnome/help/nautilus-user-manual/ko/tree.html
 share/gnome/help/nautilus-user-manual/ko/viewopen.html
+share/gnome/idl/nautilus-distributed-undo.idl
+share/gnome/idl/nautilus-view-component.idl
 share/gnome/nautilus/browser.xml
 share/gnome/nautilus/components/hyperbola/maps/pages.map
 share/gnome/nautilus/components/hyperbola/topleveldocs.xml
@@ -676,23 +679,75 @@ share/gnome/pixmaps/nautilus/gnome-video-quicktime.png
 share/gnome/pixmaps/nautilus/gnome-video-x-msvideo.png
 share/gnome/pixmaps/nautilus/gnome/SearchWeb.png
 share/gnome/pixmaps/nautilus/gnome/Services.png
+share/gnome/pixmaps/nautilus/gnome/application-x-e-cfg.png
+share/gnome/pixmaps/nautilus/gnome/audio-192.png
+share/gnome/pixmaps/nautilus/gnome/emblem-nowrite-72.png
+share/gnome/pixmaps/nautilus/gnome/emblem-nowrite-96.png
+share/gnome/pixmaps/nautilus/gnome/emblem-nowrite.png
 share/gnome/pixmaps/nautilus/gnome/gnome.xml
+share/gnome/pixmaps/nautilus/gnome/i-core.png
+share/gnome/pixmaps/nautilus/gnome/i-dirclosed.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-12-aa.png
 share/gnome/pixmaps/nautilus/gnome/i-directory-12.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-192-aa.png
 share/gnome/pixmaps/nautilus/gnome/i-directory-192.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-20-aa.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-20.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-24-aa.png
 share/gnome/pixmaps/nautilus/gnome/i-directory-24.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-36-aa.png
 share/gnome/pixmaps/nautilus/gnome/i-directory-36.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-72-aa.png
 share/gnome/pixmaps/nautilus/gnome/i-directory-72.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-96-aa.png
 share/gnome/pixmaps/nautilus/gnome/i-directory-96.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-aa.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-accept-12-aa.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-accept-12.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-accept-192-aa.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-accept-192.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-accept-20-aa.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-accept-20.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-accept-24-aa.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-accept-24.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-accept-36-aa.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-accept-36.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-accept-72-aa.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-accept-72.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-accept-96-aa.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-accept-96.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-accept-aa.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-accept.png
 share/gnome/pixmaps/nautilus/gnome/i-directory.png
 share/gnome/pixmaps/nautilus/gnome/i-executable.png
+share/gnome/pixmaps/nautilus/gnome/i-music-192.png
 share/gnome/pixmaps/nautilus/gnome/i-music.png
-share/gnome/pixmaps/nautilus/gnome/i-regular-12.png
-share/gnome/pixmaps/nautilus/gnome/i-regular-192.png
-share/gnome/pixmaps/nautilus/gnome/i-regular-24.png
-share/gnome/pixmaps/nautilus/gnome/i-regular-36.png
-share/gnome/pixmaps/nautilus/gnome/i-regular-72.png
-share/gnome/pixmaps/nautilus/gnome/i-regular-96.png
+share/gnome/pixmaps/nautilus/gnome/i-nfs.png
+share/gnome/pixmaps/nautilus/gnome/i-regular-96-aa.png
 share/gnome/pixmaps/nautilus/gnome/i-regular.png
+share/gnome/pixmaps/nautilus/gnome/i-regular.xml
+share/gnome/pixmaps/nautilus/gnome/i-stalled.png
+share/gnome/pixmaps/nautilus/gnome/linux-penguin.png
+share/gnome/pixmaps/nautilus/gnome/rpm-directory.png
+share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/fill-active-prelight.png
+share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/fill-active.png
+share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/fill-empty-space.png
+share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/fill-prelight.png
+share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/fill.png
+share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/left-bumper-active-prelight.png
+share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/left-bumper-active.png
+share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/left-bumper-prelight.png
+share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/left-bumper.png
+share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/middle-normal-normal.png
+share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/middle-normal-prelight.png
+share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/middle-prelight-normal.png
+share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/right-bumper-prelight.png
+share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/right-bumper.png
+share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/right-empty-space.png
+share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/right-top-active-prelight.png
+share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/right-top-active.png
+share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/right-top-prelight.png
+share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/right-top.png
 share/gnome/pixmaps/nautilus/gnome/theme_preview.png
 share/gnome/pixmaps/nautilus/gnome/throbber/001.png
 share/gnome/pixmaps/nautilus/gnome/throbber/002.png
@@ -704,7 +759,18 @@ share/gnome/pixmaps/nautilus/gnome/throbber/007.png
 share/gnome/pixmaps/nautilus/gnome/throbber/008.png
 share/gnome/pixmaps/nautilus/gnome/throbber/009.png
 share/gnome/pixmaps/nautilus/gnome/throbber/010.png
+share/gnome/pixmaps/nautilus/gnome/throbber/011.png
+share/gnome/pixmaps/nautilus/gnome/throbber/012.png
+share/gnome/pixmaps/nautilus/gnome/throbber/013.png
+share/gnome/pixmaps/nautilus/gnome/throbber/014.png
+share/gnome/pixmaps/nautilus/gnome/throbber/015.png
 share/gnome/pixmaps/nautilus/gnome/throbber/rest.png
+share/gnome/pixmaps/nautilus/gnome/trash-empty-192.png
+share/gnome/pixmaps/nautilus/gnome/trash-empty-accept-192.png
+share/gnome/pixmaps/nautilus/gnome/trash-empty-accept.png
+share/gnome/pixmaps/nautilus/gnome/trash-empty.png
+share/gnome/pixmaps/nautilus/gnome/trash-full-192.png
+share/gnome/pixmaps/nautilus/gnome/trash-full.png
 share/gnome/pixmaps/nautilus/hand-72.png
 share/gnome/pixmaps/nautilus/hand-96.png
 share/gnome/pixmaps/nautilus/hand.png
@@ -920,6 +986,76 @@ share/gnome/pixmaps/nautilus/trash-empty.png
 share/gnome/pixmaps/nautilus/trash-full.png
 share/gnome/pixmaps/nautilus/uparrow.png
 share/gnome/pixmaps/nautilus/zoom_body.png
+share/gnome/sgml/docbook/gnome-customization-0.1/gnome-customization.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/VERSION
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/ca.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/common.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/cs.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/da.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/de.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/el.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/en.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/es.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/et.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/fi.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/fr.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/hu.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/id.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/it.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/ja.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/ko.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/l10n.dtd
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/l10n.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/l10n.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/nl.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/no.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/pl.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/pt.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/pt_br.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/ro.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/ru.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/sk.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/sl.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/sv.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/zh_cn.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/zh_tw.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/admon.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/autotoc.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/biblio.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/block.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/callout.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/changebars.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/chunk-common.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/chunk.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/component.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/division.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/docbook.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/ebnf.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/footnote.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/formal.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/glossary.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/graphics.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/html.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/index.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/info.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/inline.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/keywords.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/lists.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/math.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/param.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/pi.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/qandaset.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/refentry.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/sections.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/synop.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/table.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/titlepage.templates.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/titlepage.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/toc.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/verbatim.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/xref.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/xtchunk.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/lib/lib.xsl
 share/gnome/ui/nautilus-clipboard-ui.xml
 share/gnome/ui/nautilus-content-loser-ui.xml
 share/gnome/ui/nautilus-desktop-icon-view-ui.xml
@@ -954,6 +1090,7 @@ share/locale/nn/LC_MESSAGES/nautilus.mo
 share/locale/no/LC_MESSAGES/nautilus.mo
 share/locale/pl/LC_MESSAGES/nautilus.mo
 share/locale/pt_BR/LC_MESSAGES/nautilus.mo
+share/locale/ro/LC_MESSAGES/nautilus.mo
 share/locale/ru/LC_MESSAGES/nautilus.mo
 share/locale/sk/LC_MESSAGES/nautilus.mo
 share/locale/sl/LC_MESSAGES/nautilus.mo
@@ -967,6 +1104,7 @@ share/locale/zh_TW.Big5/LC_MESSAGES/nautilus.mo
 @dirrm share/gnome/pixmaps/nautilus/sierra
 @dirrm share/gnome/pixmaps/nautilus/sidebar_tab_pieces
 @dirrm share/gnome/pixmaps/nautilus/gnome/throbber
+@dirrm share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces
 @dirrm share/gnome/pixmaps/nautilus/gnome
 @dirrm share/gnome/pixmaps/nautilus/eazel-logos/throbber
 @dirrm share/gnome/pixmaps/nautilus/eazel-logos
diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile
index 7f32a808cdba..8200a2fd614c 100644
--- a/x11-fm/nautilus2/Makefile
+++ b/x11-fm/nautilus2/Makefile
@@ -6,19 +6,15 @@
 #
 
 PORTNAME=	nautilus
-PORTVERSION=	1.0.3
-PORTREVISION=	1
+PORTVERSION=	1.0.4
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/nautilus
 
 MAINTAINER=	gnome@FreeBSD.org
 
-BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2	# XXX
-# The following is only needed if --with-eazel-services is brought in,
-# which it isn't, because it depends on ammonite, which is Linux-only
-# BUILD_DEPENDS+=rpm:${PORTSDIR}/archivers/rpm
-
+BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2 \
+		msgfmt-new:${PORTSDIR}/devel/gettext-devel
 LIB_DEPENDS=	medusa.0:${PORTSDIR}/sysutils/medusa \
 		freetype.6:${PORTSDIR}/print/freetype2 \
 		eel.0:${PORTSDIR}/x11-toolkits/eel
@@ -37,7 +33,9 @@ USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -fno-rtti -fno-exceptions" \
 		LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib" \
-		LIBPNG="-L${LOCALBASE}/lib -lpng -lz ${MOZILLA_LIBS}"
+		LIBPNG="-L${LOCALBASE}/lib -lpng -lz ${MOZILLA_LIBS}" \
+		MSGFMT=${LOCALBASE}/bin/msgfmt-new \
+                XGETTEXT=${LOCALBASE}/bin/xgettext-new
 CONFIGURE_ARGS=	--with-freetype2-lib-place=${LOCALBASE}/lib \
 		--with-freetype2-include-place=${LOCALBASE}/include/freetype2
 
@@ -62,7 +60,7 @@ pre-extract:
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
diff --git a/x11-fm/nautilus2/distinfo b/x11-fm/nautilus2/distinfo
index 6fe59855dc7a..7d251fcb0595 100644
--- a/x11-fm/nautilus2/distinfo
+++ b/x11-fm/nautilus2/distinfo
@@ -1 +1 @@
-MD5 (nautilus-1.0.3.tar.gz) = 87db068765a72ca46b55ab6064ce3c00
+MD5 (nautilus-1.0.4.tar.gz) = e024b3d994838c4469ddbd8c1fbb4e28
diff --git a/x11-fm/nautilus2/files/patch-ac b/x11-fm/nautilus2/files/patch-ac
deleted file mode 100644
index 02e917cf8592..000000000000
--- a/x11-fm/nautilus2/files/patch-ac
+++ /dev/null
@@ -1,260 +0,0 @@
-
-$FreeBSD$
-
---- libnautilus-private/nautilus-volume-monitor.c.orig	Fri Apr 27 04:19:07 2001
-+++ libnautilus-private/nautilus-volume-monitor.c	Mon May 14 18:36:00 2001
-@@ -67,6 +67,12 @@
- #define MOUNT_TABLE_PATH _PATH_MNTTAB
- #endif
- 
-+#ifdef __FreeBSD__
-+#include <sys/param.h>
-+#include <sys/ucred.h>
-+#include <sys/mount.h>
-+#endif
-+
- #ifdef HAVE_SYS_MNTTAB_H
- #define SOLARIS_MNT 1
- #include <sys/mnttab.h>
-@@ -119,6 +125,8 @@
- 
- #ifdef HAVE_SYS_MNTTAB_H
- typedef struct mnttab MountTableEntry;
-+#elif defined __FreeBSD__
-+typedef struct fstab MountTableEntry;
- #else
- typedef struct mntent MountTableEntry;
- #endif
-@@ -349,12 +357,18 @@
- static gboolean
- has_removable_mntent_options (MountTableEntry *ent)
- {
-+#ifndef __FreeBSD__
- 	/* Use "owner" or "user" or "users" as our way of determining a removable volume */
- 	if (hasmntopt (ent, "user") != NULL
- 	    || hasmntopt (ent, "users") != NULL
- 	    || hasmntopt (ent, "owner") != NULL) {
- 		return TRUE;
- 	}
-+#else
-+	if (strstr (ent->fs_mntops, "noauto") != NULL) {
-+		return TRUE;
-+	}
-+#endif
- 
- #ifdef SOLARIS_MNT
- 	if (eel_str_has_prefix (ent->mnt_special, "/vol/")) {
-@@ -377,6 +391,7 @@
- {
- 	FILE *file;
- 	GList *volumes;
-+
- 	MountTableEntry *ent;
- 	NautilusVolume *volume;
- #ifdef HAVE_SYS_MNTTAB_H
-@@ -385,11 +400,16 @@
- 	
- 	volumes = NULL;
- 	
-+#ifndef __FreeBSD__
- 	file = setmntent (MOUNT_TABLE_PATH, "r");
- 	if (file == NULL) {
- 		return NULL;
- 	}
-+#else
-+	setfsent();
-+#endif /* __FreeBSD__ */
- 	
-+#ifndef __FreeBSD__
- #ifdef HAVE_SYS_MNTTAB_H
-         ent = &ent_storage;
- 	while (! getmntent (file, ent)) {
-@@ -409,8 +429,20 @@
- 		}
- 	}
- #endif /* HAVE_SYS_MNTTAB_H */
--			
-+
- 	fclose (file);
-+			
-+#else	/* __FreeBSD__ */
-+	while ((ent = getfsent ()) != NULL) {
-+		/* Use noauto as our way of determining a removable volume */
-+		if (strstr (ent->fs_mntops, "noauto") != NULL) {
-+			volume = create_volume (ent->fs_spec, ent->fs_file, ent->fs_vfstype);
-+			volumes = mount_volume_add_filesystem (volume, volumes);
-+		}
-+	}
-+
-+	endfsent();
-+#endif /* __FreeBSD__ */
- 	
- #ifdef HAVE_CDDA
- 	volume = create_volume (CD_AUDIO_PATH, CD_AUDIO_PATH, CDDA_SCHEME);
-@@ -427,18 +459,27 @@
- static gboolean
- volume_is_removable (const NautilusVolume *volume)
- {
-+#ifndef	__FreeBSD__
- 	FILE *file;
-      	MountTableEntry *ent;
- #ifdef HAVE_SYS_MNTTAB_H
- 	MountTableEntry ent_storage;
- #endif
-+#else	/* __FreeBSD__ */
-+	struct fstab *ent;
-+#endif	/* __FreeBSD__ */
- 
-+#ifndef __FreeBSD__
- 	file = setmntent (MOUNT_TABLE_PATH, "r");
- 	if (file == NULL) {
- 		return FALSE;
- 	}
-+#else
-+	setfsent();
-+#endif	/* __FreeBSD__ */
- 	
- 	/* Search for our device in the fstab */
-+#ifndef __FreeBSD__
- #ifdef HAVE_SYS_MNTTAB_H
- 	MountTableEntry *ent = &ent_storage;
- 	while (!getmntent (file, ent)) {
-@@ -460,8 +501,22 @@
- 		}	
- 	}
- #endif /* HAVE_SYS_MNTTAB_H */
-+#else  /* __FreeBSD__ */
-+	while ((ent = getfsent ()) != NULL) {
-+		/* Use noauto as our way of determining a removable volume */
-+		if (strcmp (volume->device_path, ent->fs_spec) == 0
-+		    && has_removable_mntent_options (ent)) {
-+			endfsent();
-+			return TRUE;
-+		}
-+	}
-+
-+	endfsent();
-+#endif	/* __FreeBSD__ */
- 	
-+#ifndef __FreeBSD__
- 	fclose (file);
-+#endif
- 	return FALSE;
- }
- 
-@@ -490,12 +545,17 @@
-  		}
-  	}
- #else
-+#ifndef __FreeBSD__
- 	file = setmntent (MOUNT_TABLE_PATH, "r");
- 	if (file == NULL) {
- 		return FALSE;
- 	}
-+#else
-+	setfsent();
-+#endif	/* __FreeBSD__ */
- 		
- 	/* Search for our device in the fstab */
-+#ifndef __FreeBSD__
- 	while ((ent = getmntent (file)) != NULL) {
- 		if (strcmp (volume->device_path, ent->mnt_fsname) == 0) {
- 			if (strstr (ent->mnt_opts, MNTOPT_RO) != NULL) {
-@@ -504,9 +564,22 @@
- 			}
-         	 }
- 	}
-+#else	/* __FreeBSD__ */
-+	while ((ent = getfsent ()) != NULL) {
-+		if (strcmp (volume->device_path, ent->fs_spec) == 0
-+		    && strstr (ent->fs_type, FSTAB_RO) != NULL) {
-+			endfsent();
-+			return TRUE;
-+		}
-+	}
-+
-+	endfsent();
-+#endif	/* __FreeBSD__ */
- #endif
- 				
-+#ifndef __FreeBSD__
- 	fclose (file);
-+#endif
- 	return FALSE;
- }
- 
-@@ -948,13 +1021,20 @@
- 		}
- 	}
- #else
-+#ifndef __FreeBSD__
- 	const char *file_name;
- 	const char *separator;
- 	char line[PATH_MAX * 3];
- 	char device_name[sizeof (line)];
- 	EelStringList *list;
- 	char *device_path, *mount_path, *filesystem;
-+#else	/* __FreeBSD__ */
-+	struct statfs *mounted;
-+	int mounted_num;
-+	int i;
-+#endif	/* __FreeBSD__ */
- 
-+#ifndef __FreeBSD__
- 	if (mnttab_exists) { 
- 		file_name = "/etc/mnttab";
- 		separator = "\t";
-@@ -967,7 +1047,15 @@
- 		g_warning ("Unable to open %s: %s", file_name, strerror (errno));
- 		return NULL;
- 	}
-+#else	/* __FreeBSD__ */
-+	mounted_num = getmntinfo(&mounted, MNT_WAIT);
-+	if (mounted_num < 1) {
-+		g_warning ("Unable to get info about mounted fs: %s", strerror (errno));
-+		return NULL;
-+	}
-+#endif	/* __FreeBSD__ */
- 
-+#ifndef __FreeBSD__
- 	while (fgets (line, sizeof(line), fh)) {
- 		if (sscanf (line, "%s", device_name) == 1) {
- 			list = eel_string_list_new_from_tokens (line, separator, FALSE);
-@@ -983,17 +1071,28 @@
- 					g_free (device_path);
- 					g_free (mount_path);
- 					g_free (filesystem);
-+#else /* __FreeBSD__ */
-+	for (i = 0; i < mounted_num; i++) {
-+		volume = g_new0 (NautilusVolume, 1);
-+		volume->device_path = g_strdup(mounted[i].f_mntfromname);
-+		volume->mount_path = g_strdup(mounted[i].f_mntonname);
-+		volume->filesystem = g_strdup(mounted[i].f_fstypename);
-+#endif /* __FreeBSD__ */
- 					current_mounts = mount_volume_add_filesystem (volume, current_mounts);
-+#ifndef __FreeBSD__
- 				}				
- 				eel_string_list_free (list);
- 			}			
- 		}
-+#endif /* __FreeBSD__ */
-   	}
- #endif /* SOLARIS_MNT */
- 
-+#ifndef __FreeBSD__
- 	if (fh != NULL) {
- 		fclose (fh);
- 	}
-+#endif
- 	
- #ifdef HAVE_CDDA
- 	/* CD Audio tricks */
-@@ -1888,7 +1987,7 @@
- 	for (element = volume_list; element != NULL; element = element->next) {
- 		volume = element->data;
- 		
--#ifndef SOLARIS_MNT
-+#if !defined(SOLARIS_MNT) && !defined(__FreeBSD__)
- 		/* These are set up by get_current_mount_list for Solaris. */
- 		volume->is_removable = volume_is_removable (volume);
- 		volume->is_read_only = volume_is_read_only (volume);
diff --git a/x11-fm/nautilus2/files/patch-po::Makefile.in.in b/x11-fm/nautilus2/files/patch-po::Makefile.in.in
new file mode 100644
index 000000000000..53630b5680cd
--- /dev/null
+++ b/x11-fm/nautilus2/files/patch-po::Makefile.in.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- po/Makefile.in.in	2001/07/06 11:16:00	1.1
++++ po/Makefile.in.in	2001/07/06 11:16:20
+@@ -104,7 +104,7 @@
+ 	@catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+-	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
++	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
+ 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+ 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
+ 	  if test -r $$cat; then \
diff --git a/x11-fm/nautilus2/pkg-plist b/x11-fm/nautilus2/pkg-plist
index 4ec2a8c2aef6..1b2dd61c865b 100644
--- a/x11-fm/nautilus2/pkg-plist
+++ b/x11-fm/nautilus2/pkg-plist
@@ -1,4 +1,5 @@
 bin/gnome-db2html2
+bin/gnome-db2html3
 bin/gnome-info2html2
 bin/gnome-man2html2
 bin/hyperbola
@@ -131,8 +132,8 @@ share/gnome/help/nautilus-release-notes/C/nautilus-release-notes.sgml
 share/gnome/help/nautilus-release-notes/C/new10.html
 share/gnome/help/nautilus-release-notes/C/new102.html
 share/gnome/help/nautilus-release-notes/C/new103.html
+share/gnome/help/nautilus-release-notes/C/new104.html
 share/gnome/help/nautilus-release-notes/C/require.html
-share/gnome/help/nautilus-release-notes/C/searching.html
 share/gnome/help/nautilus-release-notes/C/session.html
 share/gnome/help/nautilus-screenshot-guidelines/C/callouts.html
 share/gnome/help/nautilus-screenshot-guidelines/C/circling.html
@@ -244,6 +245,8 @@ share/gnome/help/nautilus-user-manual/ko/nautilus-user-manual.sgml
 share/gnome/help/nautilus-user-manual/ko/navigating.html
 share/gnome/help/nautilus-user-manual/ko/tree.html
 share/gnome/help/nautilus-user-manual/ko/viewopen.html
+share/gnome/idl/nautilus-distributed-undo.idl
+share/gnome/idl/nautilus-view-component.idl
 share/gnome/nautilus/browser.xml
 share/gnome/nautilus/components/hyperbola/maps/pages.map
 share/gnome/nautilus/components/hyperbola/topleveldocs.xml
@@ -676,23 +679,75 @@ share/gnome/pixmaps/nautilus/gnome-video-quicktime.png
 share/gnome/pixmaps/nautilus/gnome-video-x-msvideo.png
 share/gnome/pixmaps/nautilus/gnome/SearchWeb.png
 share/gnome/pixmaps/nautilus/gnome/Services.png
+share/gnome/pixmaps/nautilus/gnome/application-x-e-cfg.png
+share/gnome/pixmaps/nautilus/gnome/audio-192.png
+share/gnome/pixmaps/nautilus/gnome/emblem-nowrite-72.png
+share/gnome/pixmaps/nautilus/gnome/emblem-nowrite-96.png
+share/gnome/pixmaps/nautilus/gnome/emblem-nowrite.png
 share/gnome/pixmaps/nautilus/gnome/gnome.xml
+share/gnome/pixmaps/nautilus/gnome/i-core.png
+share/gnome/pixmaps/nautilus/gnome/i-dirclosed.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-12-aa.png
 share/gnome/pixmaps/nautilus/gnome/i-directory-12.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-192-aa.png
 share/gnome/pixmaps/nautilus/gnome/i-directory-192.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-20-aa.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-20.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-24-aa.png
 share/gnome/pixmaps/nautilus/gnome/i-directory-24.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-36-aa.png
 share/gnome/pixmaps/nautilus/gnome/i-directory-36.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-72-aa.png
 share/gnome/pixmaps/nautilus/gnome/i-directory-72.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-96-aa.png
 share/gnome/pixmaps/nautilus/gnome/i-directory-96.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-aa.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-accept-12-aa.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-accept-12.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-accept-192-aa.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-accept-192.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-accept-20-aa.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-accept-20.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-accept-24-aa.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-accept-24.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-accept-36-aa.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-accept-36.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-accept-72-aa.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-accept-72.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-accept-96-aa.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-accept-96.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-accept-aa.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-accept.png
 share/gnome/pixmaps/nautilus/gnome/i-directory.png
 share/gnome/pixmaps/nautilus/gnome/i-executable.png
+share/gnome/pixmaps/nautilus/gnome/i-music-192.png
 share/gnome/pixmaps/nautilus/gnome/i-music.png
-share/gnome/pixmaps/nautilus/gnome/i-regular-12.png
-share/gnome/pixmaps/nautilus/gnome/i-regular-192.png
-share/gnome/pixmaps/nautilus/gnome/i-regular-24.png
-share/gnome/pixmaps/nautilus/gnome/i-regular-36.png
-share/gnome/pixmaps/nautilus/gnome/i-regular-72.png
-share/gnome/pixmaps/nautilus/gnome/i-regular-96.png
+share/gnome/pixmaps/nautilus/gnome/i-nfs.png
+share/gnome/pixmaps/nautilus/gnome/i-regular-96-aa.png
 share/gnome/pixmaps/nautilus/gnome/i-regular.png
+share/gnome/pixmaps/nautilus/gnome/i-regular.xml
+share/gnome/pixmaps/nautilus/gnome/i-stalled.png
+share/gnome/pixmaps/nautilus/gnome/linux-penguin.png
+share/gnome/pixmaps/nautilus/gnome/rpm-directory.png
+share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/fill-active-prelight.png
+share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/fill-active.png
+share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/fill-empty-space.png
+share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/fill-prelight.png
+share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/fill.png
+share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/left-bumper-active-prelight.png
+share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/left-bumper-active.png
+share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/left-bumper-prelight.png
+share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/left-bumper.png
+share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/middle-normal-normal.png
+share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/middle-normal-prelight.png
+share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/middle-prelight-normal.png
+share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/right-bumper-prelight.png
+share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/right-bumper.png
+share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/right-empty-space.png
+share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/right-top-active-prelight.png
+share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/right-top-active.png
+share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/right-top-prelight.png
+share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/right-top.png
 share/gnome/pixmaps/nautilus/gnome/theme_preview.png
 share/gnome/pixmaps/nautilus/gnome/throbber/001.png
 share/gnome/pixmaps/nautilus/gnome/throbber/002.png
@@ -704,7 +759,18 @@ share/gnome/pixmaps/nautilus/gnome/throbber/007.png
 share/gnome/pixmaps/nautilus/gnome/throbber/008.png
 share/gnome/pixmaps/nautilus/gnome/throbber/009.png
 share/gnome/pixmaps/nautilus/gnome/throbber/010.png
+share/gnome/pixmaps/nautilus/gnome/throbber/011.png
+share/gnome/pixmaps/nautilus/gnome/throbber/012.png
+share/gnome/pixmaps/nautilus/gnome/throbber/013.png
+share/gnome/pixmaps/nautilus/gnome/throbber/014.png
+share/gnome/pixmaps/nautilus/gnome/throbber/015.png
 share/gnome/pixmaps/nautilus/gnome/throbber/rest.png
+share/gnome/pixmaps/nautilus/gnome/trash-empty-192.png
+share/gnome/pixmaps/nautilus/gnome/trash-empty-accept-192.png
+share/gnome/pixmaps/nautilus/gnome/trash-empty-accept.png
+share/gnome/pixmaps/nautilus/gnome/trash-empty.png
+share/gnome/pixmaps/nautilus/gnome/trash-full-192.png
+share/gnome/pixmaps/nautilus/gnome/trash-full.png
 share/gnome/pixmaps/nautilus/hand-72.png
 share/gnome/pixmaps/nautilus/hand-96.png
 share/gnome/pixmaps/nautilus/hand.png
@@ -920,6 +986,76 @@ share/gnome/pixmaps/nautilus/trash-empty.png
 share/gnome/pixmaps/nautilus/trash-full.png
 share/gnome/pixmaps/nautilus/uparrow.png
 share/gnome/pixmaps/nautilus/zoom_body.png
+share/gnome/sgml/docbook/gnome-customization-0.1/gnome-customization.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/VERSION
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/ca.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/common.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/cs.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/da.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/de.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/el.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/en.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/es.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/et.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/fi.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/fr.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/hu.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/id.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/it.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/ja.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/ko.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/l10n.dtd
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/l10n.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/l10n.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/nl.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/no.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/pl.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/pt.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/pt_br.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/ro.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/ru.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/sk.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/sl.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/sv.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/zh_cn.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/common/zh_tw.xml
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/admon.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/autotoc.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/biblio.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/block.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/callout.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/changebars.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/chunk-common.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/chunk.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/component.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/division.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/docbook.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/ebnf.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/footnote.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/formal.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/glossary.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/graphics.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/html.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/index.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/info.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/inline.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/keywords.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/lists.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/math.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/param.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/pi.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/qandaset.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/refentry.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/sections.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/synop.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/table.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/titlepage.templates.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/titlepage.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/toc.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/verbatim.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/xref.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/html/xtchunk.xsl
+share/gnome/sgml/docbook/xsl-stylesheets-1.29/lib/lib.xsl
 share/gnome/ui/nautilus-clipboard-ui.xml
 share/gnome/ui/nautilus-content-loser-ui.xml
 share/gnome/ui/nautilus-desktop-icon-view-ui.xml
@@ -954,6 +1090,7 @@ share/locale/nn/LC_MESSAGES/nautilus.mo
 share/locale/no/LC_MESSAGES/nautilus.mo
 share/locale/pl/LC_MESSAGES/nautilus.mo
 share/locale/pt_BR/LC_MESSAGES/nautilus.mo
+share/locale/ro/LC_MESSAGES/nautilus.mo
 share/locale/ru/LC_MESSAGES/nautilus.mo
 share/locale/sk/LC_MESSAGES/nautilus.mo
 share/locale/sl/LC_MESSAGES/nautilus.mo
@@ -967,6 +1104,7 @@ share/locale/zh_TW.Big5/LC_MESSAGES/nautilus.mo
 @dirrm share/gnome/pixmaps/nautilus/sierra
 @dirrm share/gnome/pixmaps/nautilus/sidebar_tab_pieces
 @dirrm share/gnome/pixmaps/nautilus/gnome/throbber
+@dirrm share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces
 @dirrm share/gnome/pixmaps/nautilus/gnome
 @dirrm share/gnome/pixmaps/nautilus/eazel-logos/throbber
 @dirrm share/gnome/pixmaps/nautilus/eazel-logos